维修告知接口调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgMaintainNoticeDto.java

@@ -203,4 +203,7 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "状态")
     private String status;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
 }

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

@@ -2,39 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper">
     <update id="updatePromoter">
-        UPDATE tzs_jg_maintain_notice set promoter = null
+        UPDATE tzs_jg_maintain_notice
+        set promoter = null
         where sequence_nbr = #{id}
     </update>
 
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice">
-        select
-        isn.sequence_nbr AS sequenceNbr,
-        isn.apply_no AS applyNo,
-        isn.notice_date AS noticeDate,
-        isn.use_unit_name AS useUnitName,
-        isn.receive_org_name AS receiveOrgName,
-        isn.address AS address,
-        isn.notice_status AS noticeStatus,
-        isn.install_unit_name AS installUnitName,
-        isn.province,
-        isn.city,
-        isn.county,
-        isn.factory_use_site_street,
-        isn.street_name,
-        isn.street,
-        isn.maintain_type,
-        isn.plan_date,
-        isn.notice_report_url,
-        isn.province_name AS provinceName,
-        isn.city_name AS cityName,
-        isn.county_name AS countyName,
-        isn.promoter,
-        isn.equ_category AS equCategory,
-        isn.equ_list_code AS equListCode,
-        isn.instance_id AS instanceId,
-        isn.accept_date AS acceptDate
-        FROM
-        tzs_jg_maintain_notice isn
+        select isn.* FROM tzs_jg_maintain_notice isn
         <where>
             isn.is_delete = 0
             <if test="param != null ">
@@ -70,80 +44,75 @@
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">
-        select
-            isn.sequence_nbr AS sequenceNbr,
-            isn.apply_no AS applyNo,
-            isn.notice_date AS noticeDate,
-            isn.use_unit_name AS useUnitName,
-            isn.receive_org_name AS receiveOrgName,
-            isn.address AS address,
-            isn.notice_status AS noticeStatus,
-            isn.install_unit_name AS installUnitName,
-            isn.province,
-            isn.city,
-            isn.county,
-            isn.factory_use_site_street AS factoryUseSiteStreet,
-            isn.street_name AS streetName,
-            isn.street,
-            isn.maintain_type AS maintainType,
-            isn.notice_report_url AS noticeReportUrl,
-            isn.province_name AS provinceName,
-            isn.city_name AS cityName,
-            isn.county_name AS countyName,
-            isn.instance_id AS instanceId,
-            isn.promoter,
-            isn.equ_category AS equCategory,
-            isn.equ_list_code AS equListCode,
-            isn.plan_date AS installStartDate,
-            isn.construction_manager AS installLeaderName,
-            isn.construction_manager_phone AS installLeaderPhone,
-            ri.equ_list AS equList,
-            ri.equ_category AS equCategory,
-            ri.EQU_DEFINE AS equDefine,
-            ri.product_name AS productName,
-            ri.brand_name AS brandName,
-            ri.equ_type AS equType,
-            ri.equ_code AS equRegisterCode,
-            ri.equ_price AS equPrice,
-            ri.product_photo AS productPhoto,
-            di.design_unit_credit_code AS designUnitCreditCode,
-            di.design_unit_name AS designUnitName,
-            di.design_license_num AS designLicenseNum,
-            di.design_use_date AS designUseDate,
-            di.design_date AS designDate,
-            di.drawing_do AS drawingDo,
-            di.appraisal_unit AS appraisalUnit,
-            di.appraisal_date AS appraisalDate,
-            di.design_doc AS designDoc,
-            di.design_standard AS designStandard,
-            fi.produce_unit_credit_code AS produceUnitCreditCode,
-            fi.produce_unit_name AS produceUnitName,
-            fi.produce_license_num AS produceLicenseNum,
-            fi.FACTORY_NUM AS produceCode,
-            fi.FACTORY_NUM AS factoryNum,
-            fi.produce_date AS produceDate,
-            fi.imported AS imported,
-            fi.produce_country AS produceCountry,
-            fi.factory_standard AS factoryStandard,
-            fi.product_quality_yield_prove AS productQualityYieldProve,
-            fi.ins_use_maintain_explain AS insUseMaintainExplain,
-            ui.safety_manager AS safetyManager,
-            ei.legal_person AS safetyManager,
-            ei.legal_phone AS safetyManagerPhone,
-            ui.CITY_NAME AS useUnitCityName,
-            ui.COUNTY_NAME AS useUnitCountyName,
-            ei.ADDRESS AS useUnitAddress
-        FROM
-            tzs_jg_maintain_notice isn
-                LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
-                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
-                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
-                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
-                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
-                LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
-        WHERE
-            isn.sequence_nbr = #{sequenceNbr}
-            LIMIT 1
+        select isn.sequence_nbr               AS sequenceNbr,
+               isn.apply_no                   AS applyNo,
+               isn.notice_date                AS noticeDate,
+               isn.use_unit_name              AS useUnitName,
+               isn.receive_org_name           AS receiveOrgName,
+               isn.address                    AS address,
+               isn.notice_status              AS noticeStatus,
+               isn.install_unit_name          AS installUnitName,
+               isn.province,
+               isn.city,
+               isn.county,
+               isn.factory_use_site_street    AS factoryUseSiteStreet,
+               isn.street_name                AS streetName,
+               isn.street,
+               isn.maintain_type              AS maintainType,
+               isn.notice_report_url          AS noticeReportUrl,
+               isn.province_name              AS provinceName,
+               isn.city_name                  AS cityName,
+               isn.county_name                AS countyName,
+               isn.instance_id                AS instanceId,
+               isn.promoter,
+               isn.equ_list_code              AS equListCode,
+               isn.plan_date                  AS installStartDate,
+               isn.construction_manager       AS installLeaderName,
+               isn.construction_manager_phone AS installLeaderPhone,
+               ri.equ_list                    AS equList,
+               ri.equ_category                AS equCategory,
+               ri.EQU_DEFINE                  AS equDefine,
+               ri.product_name                AS productName,
+               ri.brand_name                  AS brandName,
+               ri.equ_type                    AS equType,
+               ri.equ_code                    AS equRegisterCode,
+               ri.equ_price                   AS equPrice,
+               ri.product_photo               AS productPhoto,
+               di.design_unit_credit_code     AS designUnitCreditCode,
+               di.design_unit_name            AS designUnitName,
+               di.design_license_num          AS designLicenseNum,
+               di.design_use_date             AS designUseDate,
+               di.design_date                 AS designDate,
+               di.drawing_do                  AS drawingDo,
+               di.appraisal_unit              AS appraisalUnit,
+               di.appraisal_date              AS appraisalDate,
+               di.design_doc                  AS designDoc,
+               di.design_standard             AS designStandard,
+               fi.produce_unit_credit_code    AS produceUnitCreditCode,
+               fi.produce_unit_name           AS produceUnitName,
+               fi.produce_license_num         AS produceLicenseNum,
+               fi.FACTORY_NUM                 AS produceCode,
+               fi.FACTORY_NUM                 AS factoryNum,
+               fi.produce_date                AS produceDate,
+               fi.imported                    AS imported,
+               fi.produce_country             AS produceCountry,
+               fi.factory_standard            AS factoryStandard,
+               fi.product_quality_yield_prove AS productQualityYieldProve,
+               fi.ins_use_maintain_explain    AS insUseMaintainExplain,
+               ui.safety_manager              AS safetyManager,
+               ei.legal_person                AS safetyManager,
+               ei.legal_phone                 AS safetyManagerPhone,
+               ui.CITY_NAME                   AS useUnitCityName,
+               ui.COUNTY_NAME                 AS useUnitCountyName,
+               ei.ADDRESS                     AS useUnitAddress
+        FROM tzs_jg_maintain_notice isn
+                 LEFT JOIN tzs_jg_maintain_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
+                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                 LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+                 LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+        WHERE isn.sequence_nbr = #{sequenceNbr} LIMIT 1
     </select>
 </mapper>

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/JgMaintainNoticeServiceImpl.java

@@ -140,9 +140,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (!ValidationUtil.isEmpty(notice.getStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             maintainInfo.put("street", notice.getStreet() + "_" + notice.getStreetName());
         }
-        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
+        String[] fields = {"productPhoto",  "designDoc", "designStandard", "factoryStandard", "productQualityYieldProve",
                 "insUseMaintainExplain", "inspectReport", "proxyStatementAttachment", "installContractAttachment"};
-        // 设备信息
+        // 设备信息 "equCategory",  "equDefine",  "equRegisterCode",  "produceCountry",  "produceLicenseNum",
         List<Map<String, Object>> equipmentInfos = jgMaintainNoticeMapper.queryEquipInformation(sequenceNbr);
         for (String s : fields) {
             if (maintainInfo.containsKey(s))
@@ -242,7 +242,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (Objects.nonNull(notice.getMaintainType())) {
                 noticeDto.setMaintainTypeDesc(dictionaries.stream().filter(d -> notice.getMaintainType().equals(d.getCode())).map(DataDictionary::getName).collect(Collectors.joining()));
             }
-            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
+            noticeDto.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
             return noticeDto;
         }).collect(java.util.stream.Collectors.toList());
         noticeDtoPage.setRecords(records);
@@ -464,6 +464,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
+            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
                 dto.setNextExecuteIds(String.join(",", roleListSecond));
                 dto.setInstanceStatus(String.join(",", roleListFirst));
@@ -480,6 +482,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             } else {
                 dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
             }
+            dto.setCreateUserId(reginParams.getUserModel().getUserId());
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
@@ -631,7 +634,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             jgInstallationNotice.setStatus(taskName[0]);
             jgInstallationNotice.setPromoter("");
             jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             updateById(jgInstallationNotice);
         }
     }
@@ -667,6 +670,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     map.put("cityCode", jgMaintainNotice.getCity());
                     map.put("countyCode", jgMaintainNotice.getCounty());
                     map.put("equCategory", tzsJgRegistrationInfo.getEquCategory());
+                    jgMaintainNotice.setAcceptDate(new Date());
                     jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
                     jgMaintainNotice.setPromoter("");