From 460a1a07b6715aa9000af261df903ffc6d3d026c Mon Sep 17 00:00:00 2001
From: mythxb <mythxb@qq.com>
Date: Fri, 19 May 2023 13:57:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=E5=92=8C?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A4=BE=E4=BF=9D=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/rzyc/model/EntDevice.java   | 15 ++++++++++-
 .../main/resources/mapper/EntDeviceMapper.xml | 25 +++++++++++++++----
 .../rzyc/controller/MinWorkController.java    |  9 -------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java
index ef68914..dd306b3 100644
--- a/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java
+++ b/inventory-dao/src/main/java/com/rzyc/model/EntDevice.java
@@ -7,6 +7,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -17,7 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 设备
  * </p>
  *
- * @author 
+ * @author
  * @since 2022-10-18
  */
 @TableName("ent_device")
@@ -166,6 +167,18 @@ public class EntDevice implements Serializable {
     @TableField(exist = false)
     private Integer inspectionCycle;
 
+    @ApiModelProperty("文件")
+    @TableField(exist = false)
+    private List<Sysdocument> sysdocumentList;
+
+    public List<Sysdocument> getSysdocumentList() {
+        return sysdocumentList;
+    }
+
+    public void setSysdocumentList(List<Sysdocument> sysdocumentList) {
+        this.sysdocumentList = sysdocumentList;
+    }
+
     public Integer getInspectionCycle() {
         return inspectionCycle;
     }
diff --git a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml
index 07f77cd..8cc9dca 100644
--- a/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/EntDeviceMapper.xml
@@ -58,11 +58,26 @@
         <result column="modify_by" property="modifyBy" />
         <result column="frequency" property="frequency" />
         <result column="recordNumber" property="recordNumber" />
+        <collection property="sysdocumentList" ofType="com.rzyc.model.Sysdocument" column="SysDocumentId">
+            <result column="SysDocumentId" jdbcType="VARCHAR" property="sysDocumentId" />
+            <result column="BizFileName" jdbcType="VARCHAR" property="bizFileName" />
+            <result column="SortId" jdbcType="INTEGER" property="sortId" />
+            <result column="RealFileName" jdbcType="VARCHAR" property="realFileName" />
+            <result column="FilePath" jdbcType="VARCHAR" property="filePath" />
+            <result column="FileType" jdbcType="VARCHAR" property="fileType" />
+            <result column="FileSize" jdbcType="VARCHAR" property="fileSize" />
+            <result column="OTCId" jdbcType="VARCHAR" property="OTCId" />
+            <result column="OTCType" jdbcType="VARCHAR" property="OTCType" />
+        </collection>
     </resultMap>
 
     <select id="selectEntEquipmentOverdue" resultMap="entEquipmentOverdueMap">
-        select ed.*,cycle.frequency,cycle.recordNumber from ent_device ed
-        left join (select edic.device_id,edic.frequency,count(eir.ins_record_id)as recordNumber from ent_device_ins_cycle edic
+        select ed.*,cycle.frequency,cycle.recordNumber,sd.*
+        from ent_device ed
+                 left join sysdocument sd on ed.device_id = sd.OTCId
+        left join (select edic.device_id,edic.frequency,
+                          count(eir.ins_record_id)as recordNumber
+        from ent_device_ins_cycle edic
         left join ent_ins_record eir on edic.inspection_id = eir.cycle_id)as cycle on ed.device_id = cycle.device_id
         where ed.enterprise_id = #{enterpriseId} and overdue_inspection = 2
     </select>
@@ -117,11 +132,11 @@
         <result column="model_state" property="state" />
         <result column="countRecord" property="countRecord"/>
         <collection property="sysdocumentList" ofType="com.rzyc.model.Sysdocument" column="SysDocumentId">
-            <result column="SysDocumentId" jdbcType="VARCHAR" property="SysDocumentId" />
+            <result column="SysDocumentId" jdbcType="VARCHAR" property="sysDocumentId" />
             <result column="BizFileName" jdbcType="VARCHAR" property="bizFileName" />
             <result column="SortId" jdbcType="INTEGER" property="sortId" />
-            <result column="RealFileName" jdbcType="VARCHAR" property="RealFileName" />
-            <result column="FilePath" jdbcType="VARCHAR" property="FilePath" />
+            <result column="RealFileName" jdbcType="VARCHAR" property="realFileName" />
+            <result column="FilePath" jdbcType="VARCHAR" property="filePath" />
             <result column="FileType" jdbcType="VARCHAR" property="fileType" />
             <result column="FileSize" jdbcType="VARCHAR" property="fileSize" />
             <result column="OTCId" jdbcType="VARCHAR" property="OTCId" />
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
index fafe4f0..b361132 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java
@@ -2186,7 +2186,6 @@ public class MinWorkController extends BaseController{
         SysUser sysUser = super.getUser(userId);
         sysEnterprise.setCreatedby(sysUser.getChinaname());
         sysEnterprise.setModifiedby(sysUser.getChinaname());
-        int result = 0;
         if (null == sysEnterpriseDo.getSysenterpriseid()){
             SysEnterprise verifyEnterprise = sysEnterpriseMapper.selectByName(sysEnterpriseDo.getEntname(),null);
             if (null != verifyEnterprise){
@@ -2253,14 +2252,6 @@ public class MinWorkController extends BaseController{
         saveEntWork(sysEnterprise.getSysenterpriseid());
 
 
-
-        if (result > 0){
-            singleResult.setMessage(Message.SUCCESS);
-            singleResult.setCode(Code.SUCCESS.getCode());
-        }else {
-            singleResult.setMessage(Message.ERROR);
-            singleResult.setCode(Code.ERROR.getCode());
-        }
         return singleResult;
 
     }