维修告知新增代办并更新调用工作流接口

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

@@ -206,4 +206,12 @@ public class JgMaintainNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "下一执行节点ids")
     private String nextExecuteIds;
+
+    private String createUserCompanyName;
+
+    private String nextTaskId;
+
+    private String equListName;
+
+    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/JgMaintainNotice.java

@@ -313,4 +313,17 @@ public class JgMaintainNotice extends BaseEntity {
 
     @TableField("next_execute_ids")
     private String nextExecuteIds;
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+
+    @TableField("next_task_id")
+    private String nextTaskId;
+
+    @TableField(exist = false)
+    private String equListName;
+
+    @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/mapper/JgMaintainNoticeMapper.java

@@ -35,4 +35,7 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
 
     void updatePromoter(@Param("id")Long id);
+
+    Map<String, Object> getEquipInfoByRecord(String record);
+
 }

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

@@ -119,4 +119,51 @@
                  LEFT JOIN tz_base_enterprise_info eio ON eio.use_code = isn.install_unit_credit_code
         WHERE isn.sequence_nbr = #{sequenceNbr} LIMIT 1
     </select>
+
+    <select id="getEquipInfoByRecord" resultType="java.util.Map">
+        select
+            ri.product_name                 AS productName,
+            ri.brand_name                   AS brandName,
+            ri.equ_type                     AS equType,
+            ri.equ_code                     AS equCode,
+            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,
+            idi.INSPECT_REPORT              AS inspectReport,
+            tec2.name                       AS equCategory,
+            tec1.name                       AS equList,
+            tec.name                        AS equDefine,
+            oi.SUPERVISORY_CODE             AS supervisoryCode
+        FROM
+            idx_biz_jg_other_info oi
+                 LEFT JOIN idx_biz_jg_register_info ri ON ri.record = oi.record
+                 LEFT JOIN idx_biz_jg_design_info di ON di.record = oi.record
+                 LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = oi.record
+                 LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = oi.record
+                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+                 LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
+        WHERE oi.record = #{record} ORDER BY oi."rec_date" DESC 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/CommonServiceImpl.java

@@ -575,7 +575,7 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(provideMap);
             jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.WBBA.getBusinessCode())) {
-
+            noticeObj.put("pageType","add");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             jgMaintenanceContractServiceImpl.saveOrSubmit(submitType, jsonObject, reginParams);