fix(JG)：改造告知代码提交

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

@@ -204,4 +204,16 @@ public class JgReformNoticeDto extends BaseDto {
 
     @ApiModelProperty(value = "状态")
     private String status;
+
+    /**
+     * 设备监管码
+     */
+    @ApiModelProperty(value = "监管码")
+    private String supervisoryCode;
+
+    /**
+     * 设备类型
+     */
+    @ApiModelProperty(value = "设备类型")
+    private String equList;
 }

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

@@ -315,4 +315,19 @@ public class JgReformNotice extends BaseEntity {
      */
     @TableField(value = "next_task_id")
     private String nextTaskId;
+
+    @TableField(value = "create_user_company_name")
+    private String createUserCompanyName;
+
+    /**
+     * 设备监管码
+     */
+    @TableField(exist = false)
+    private String supervisoryCode;
+
+    /**
+     * 设备类型
+     */
+    @TableField(exist = false)
+    private String equList;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgReformNoticeService.java

@@ -22,7 +22,7 @@ public interface IJgReformNoticeService extends IService<JgReformNotice> {
      * @param sequenceNbr 主键
      * @return 改造告知
      */
-    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+    Map<String, Object> queryBySequenceNbr(Long sequenceNbr);
 
     /**
      * 更新改造告知

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

@@ -92,9 +92,6 @@
         isn.construction_manager AS installLeaderName,
         isn.construction_manager_phone AS installLeaderPhone,
         ri.equ_code AS equRegisterCode,
-        ri.equ_list AS equList,
-        ri.equ_category AS equCategory,
-        ri.EQU_DEFINE AS equDefine,
         fi.FACTORY_NUM AS produceCode,
         ri.product_name AS productName,
         ri.brand_name AS brandName,
@@ -124,7 +121,11 @@
         ei.legal_person AS safetyManager,
         ei.legal_phone AS safetyManagerPhone,
         ei.ADDRESS AS useUnitAddress,
-        ei2.use_code AS useCode
+        ei2.use_code AS useCode,
+        tec2.name AS equCategory,
+        tec1.name AS equList,
+        tec.name AS equDefine,
+        oi.SUPERVISORY_CODE AS supervisoryCode
         FROM
         tzs_jg_reform_notice isn
             LEFT JOIN tzs_jg_reform_notice_eq re ON re.equip_transfer_id = isn.sequence_nbr
@@ -135,6 +136,10 @@
             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
             LEFT JOIN tz_base_enterprise_info ei2 ON ei2.use_code = isn.install_unit_credit_code
+            LEFT JOIN tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
+            LEFT JOIN tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
+            LEFT JOIN tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
+            LEFT JOIN idx_biz_jg_other_info oi ON ri.RECORD = oi.RECORD
         WHERE
         isn.sequence_nbr = #{sequenceNbr}
         LIMIT 1

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

@@ -57,13 +57,12 @@ public class JgReformByWorkFlowController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/cancel")
     @ApiOperation (httpMethod = "POST", value = "改造告知撤销", notes = "改造告知撤销")
-    public ResponseModel<JgReformNoticeDto> cancel(@RequestBody Map<String, Object> model) {
-        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformInfo")), JgReformNoticeDto.class, true);
-        if (Objects.isNull(installationInfo)) {
+    public ResponseModel<JgReformNoticeDto> cancel(@RequestBody JgReformNoticeDto model) {
+        if (Objects.isNull(model)) {
             throw new IllegalArgumentException("参数reformInfo不能为空");
         }
-        jgReformNoticeService.cancel(installationInfo);
-        return ResponseHelper.buildResponse(installationInfo);
+        jgReformNoticeService.cancel(model);
+        return ResponseHelper.buildResponse(model);
     }
 
     /**
@@ -77,9 +76,8 @@ public class JgReformByWorkFlowController {
     public ResponseModel<JgReformNoticeDto> accept(@RequestBody Map<String, Object> model, String op) {
         // TODO 受理改造告知流程
         LinkedHashMap model1 = (LinkedHashMap) model.get("model");
-        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("reformInfo");
         String opinion = (String) model.get("opinion");
-        JgReformNoticeDto jgReformNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgReformNoticeDto.class);
+        JgReformNoticeDto jgReformNoticeDto = JSON.parseObject(JSON.toJSONString(model1), JgReformNoticeDto.class);
         jgReformNoticeDto.setRemark(opinion);
         jgReformNoticeService.accept(jgReformNoticeDto, op);
         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/controller/JgReformNoticeController.java

@@ -59,15 +59,11 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @PutMapping (value = "/update")
     @ApiOperation (httpMethod = "PUT", value = "根据sequenceNbr更新改造告知", notes = "根据sequenceNbr更新改造告知")
-    public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam (value = "op", required = false) String op) {
-        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformInfo")), JgReformNoticeDto.class, true);
+    public ResponseModel<JgReformNoticeDto> updateBySequenceNbrJgReformNotice(@RequestParam String submitType, @RequestBody JgReformNoticeDto installationInfo, @RequestParam (value = "op", required = false) String op) {
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数installationInfo不能为空");
         }
-        // Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
-        // Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
-        // installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
-        // installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
+
         return ResponseHelper.buildResponse(jgReformNoticeService.updateInstallationNotice(submitType, installationInfo, op));
     }
 
@@ -107,8 +103,7 @@ public class JgReformNoticeController extends BaseController {
     @TycloudOperation (ApiLevel = UserType.AGENCY)
     @GetMapping (value = "/details")
     @ApiOperation (httpMethod = "GET", value = "根据sequenceNbr查询单个改造告知", notes = "根据sequenceNbr查询单个改造告知")
-    public ResponseModel<Map<String,
-            Map<String, Object>>> selectOne(@RequestParam ("sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<Map<String, Object>> selectOne(@RequestParam ("sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(jgReformNoticeService.queryBySequenceNbr(sequenceNbr));
     }
 

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

@@ -585,6 +585,7 @@ public class CommonServiceImpl implements ICommonService {
 
             JgEquipTransferDto jgEquipTransferDto = JSON.parseObject(JSON.toJSONString(noticeObj), JgEquipTransferDto.class);
             JSONObject jsonObject = (JSONObject) JSONObject.toJSON(jgEquipTransferDto);
+            jsonObject.put("businessCode", type);
             jgEquipTransferServiceImpl.saveTransfer(submitType, jsonObject, reginParams);
         } else if (type.contains(ApplicationFormTypeEnum.YZBF.getBusinessCode())||type.contains(ApplicationFormTypeEnum.ZXBF.getBusinessCode())) {
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -19,15 +19,15 @@
   },
   {
     "type": "103",
-    "pageType": "look",
+    "pageType": "edit",
     "name": "改造告知",
-    "url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&formType=detail&noticeStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&formType=edit&roleIds={roleIds}&userId={userId}"
   },
   {
     "type": "103",
-    "pageType": "edit",
+    "pageType": "look",
     "name": "改造告知",
-    "url": ""
+    "url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&roleIds={roleIds}&userId={userId}&formType=detail"
   },
   {
     "type": "104",