维修告知批量提交业务部分功能提交

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -334,6 +334,9 @@ public class JgMaintainNotice extends BaseEntity {
     private String equList;
 
     @TableField(exist = false)
+    private String equCategoryDesc;
+
+    @TableField(exist = false)
     private String supervisoryCode;
     /**
      * 维修类型名称

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNoticeEq.java

@@ -6,7 +6,6 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 维修告知设备关系表
@@ -34,4 +33,29 @@ public class JgMaintainNoticeEq extends BaseEntity {
 	@TableField("equ_id")
     private String equId;
 
+    /**
+     * 设备代码
+     */
+    @TableField("equ_code")
+    private String equCode;
+
+
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "inform_number")
+    private String informNumber;
+
+    /**
+     * 设备类别
+     */
+    @TableField(value = "equ_list_code")
+    private String equListCode;
+
+    /**
+     * 设备类别名称
+     */
+    @TableField(value = "equ_category_code")
+    private String equCategoryCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml

@@ -67,20 +67,9 @@
         isn.create_user_company_name AS createUserCompanyName,
         isn.next_execute_user_ids AS nextExecuteUserIds,
         isn.transfer_to_user_ids AS transferToUserIds,
-        isn.inform_number AS informNumber,
-        ri.EQU_CODE AS equCode,
-        (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equListName,
-        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_DEFINE) AS equDefineName,
-        (select name from tz_equipment_category ec WHERE ec.code = ri.EQU_CATEGORY) AS equCategoryName,
-        concat(ibjui."PROVINCE_NAME", '', ibjui."CITY_NAME", '', ibjui."COUNTY_NAME", '', ibjui."STREET_NAME") as fullAddress,
-        ibjui."ADDRESS" as detailedAddress,
-        ibjoi.SUPERVISORY_CODE as supervisoryCode,
-        ibjoi.CODE96333 as code96333
+        (SELECT name from tz_equipment_category ec WHERE ec.code = isn.equ_list_code) AS equListName,
+        (select name from tz_equipment_category ec WHERE ec.code = isn.equ_category) AS equCategoryName
         FROM tzs_jg_maintain_notice isn
-        left join tzs_jg_maintain_notice_eq isneq on isn.sequence_nbr = isneq.equip_transfer_id
-        LEFT JOIN idx_biz_jg_use_info ibjui on isneq.equ_id = ibjui.RECORD
-        LEFT JOIN idx_biz_jg_register_info ri ON isneq.equ_id = ri.record
-        LEFT JOIN idx_biz_jg_other_info ibjoi ON isneq.equ_id = ibjoi.RECORD
         <where>
             isn.is_delete = 0
             <if test="param != null ">
@@ -108,37 +97,17 @@
                 <if test="param.informNumber != null and param.informNumber != ''">
                     AND isn.inform_number like concat('%',#{param.informNumber},'%')
                 </if>
-                <if test="param.supervisoryCode != null and param.supervisoryCode != ''">
-                    AND ibjoi.supervisory_code like concat('%',#{param.supervisoryCode},'%')
-                </if>
                 <if test="param.installUnitCreditCode != null and param.installUnitCreditCode != ''">
                     AND isn.install_unit_credit_code like concat('%',#{param.installUnitCreditCode},'%')
                 </if>
-                <if test="param.code96333 != null and param.code96333 != ''">
-                    AND ibjoi.code96333 like concat('%',#{param.code96333},'%')
-                </if>
-                <if test="param.equCode != null and param.equCode != ''">
-                    AND ri.EQU_CODE like concat('%',#{param.equCode},'%')
-                </if>
                 <if test="param.noticeDate != null">
                     AND isn.notice_date like concat('%',DATE_FORMAT(#{param.noticeDate},'%Y-%m-%d'),'%')
                 </if>
                 <if test="param.equListCode != null and param.equListCode != ''">
-                    AND ri."EQU_LIST" = #{param.equListCode}
+                    AND isn."equ_list_code" = #{param.equListCode}
                 </if>
                 <if test="param.equCategory != null and param.equCategory != ''">
-                    AND ri."equ_category" = #{param.equCategory}
-                </if>
-                <if test="param.equDefine != null and param.equDefine != ''">
-                    AND ri."EQU_DEFINE" = #{param.equDefine}
-                </if>
-                <if test="param.fullAddress != null and param.fullAddress != ''">
-                    AND (
-                    ibjui."PROVINCE_NAME" LIKE CONCAT('%', #{param.fullAddress}, '%')
-                    OR ibjui."CITY_NAME" LIKE CONCAT('%', #{param.fullAddress}, '%')
-                    OR ibjui."COUNTY_NAME" LIKE CONCAT('%', #{param.fullAddress}, '%')
-                    OR ibjui."STREET_NAME" LIKE CONCAT('%', #{param.fullAddress}, '%')
-                    )
+                    AND isn."equ_category" = #{param.equCategory}
                 </if>
             </if>
             <if test="type != 'company'">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgMaintainByWorkFlowController.java

@@ -80,7 +80,7 @@ public class JgMaintainByWorkFlowController {
         LinkedHashMap maintainInfo = (LinkedHashMap) model1.get(TABLE_PAGE_ID);
         String opinion = model.get("opinion").toString();
         JgMaintainNoticeDto jgMaintainNoticeDto = JSON.parseObject(JSON.toJSONString(maintainInfo), JgMaintainNoticeDto.class);
-        jgMaintainNoticeServiceImpl.accept(jgMaintainNoticeDto, op,opinion);
+        jgMaintainNoticeServiceImpl.accept(jgMaintainNoticeDto, op, opinion, model1);
         return ResponseHelper.buildResponse(null);
     }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -269,7 +269,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(noticeParams));
             commonService.saveExecuteFlowData2Redis(instanceId, buildInstanceRuntimeData(jgScrapCancel));
             String equListName = EquipmentClassifityEnum.getNameByCode(jsonObject.get("equListCode").toString());
-            save2HisData(jsonObject, jgScrapCancel.getSequenceNbr().toString());
+            save2HisData(jsonObject, jgScrapCancel.getSequenceNbr().toString(),jgScrapCancel.getCancelTypeDesc());
             JgScrapCancelDto dto = new JgScrapCancelDto();
             BeanUtil.copyProperties(jgScrapCancel, dto);
             dto.setEquListName(equListName);
@@ -419,8 +419,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     }
 
 
-    private void save2HisData(JSONObject jsonObject, String currentDocumentId) {
-        commonService.saveOrUpdateHistory("", jsonObject, null, currentDocumentId);
+    private void save2HisData(JSONObject jsonObject, String currentDocumentId,String cancelTypeDesc) {
+        commonService.saveOrUpdateHistory(cancelTypeDesc, jsonObject, null, currentDocumentId);
     }
 
     private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {