fix(改造告知)：流程相关接口前端参数key更换

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

@@ -179,4 +179,6 @@ public class JgReformNoticeDto extends BaseDto {
     @ApiModelProperty(value = "设备使用地点-街道（镇）")
     private String streetName;
 
+    private String receiveOrgCreditCode;
+
 }

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

@@ -15,7 +15,10 @@
         isn.province_name AS provinceName,
         isn.city_name AS cityName,
         isn.county_name AS countyName,
-        isn.instance_id AS instanceId
+        isn.instance_id AS instanceId,
+        isn.plan_date AS planDate,
+        isn.receive_company_code AS receiveCompanyCode,
+        isn.receive_org_name AS receiveOrgName
         FROM
         tzs_jg_reform_notice isn
         <where>
@@ -38,7 +41,8 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )
+                AND isn.notice_status in ('6612', '6613', '6614')
+                <!--                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )-->
             </if>
             <if test="orgCode != null and orgCode != ''">
                 AND isn.install_unit_credit_code = #{orgCode}
@@ -58,6 +62,9 @@
         isn.county_name AS countyName,
         isn.address AS address,
         isn.use_unit_name AS useUnitName,
+        isn.receive_company_code AS receiveCompanyCode,
+        isn.receive_org_name AS receiveOrgName,
+        isn.receive_org_code AS receiveOrgCode,
         ri.equ_list AS equList,
         ri.equ_category AS equCategory,
         ri.EQU_DEFINE AS equDefine,

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

@@ -58,7 +58,7 @@ public class JgReformByWorkFlowController {
     @PostMapping (value = "/cancel")
     @ApiOperation (httpMethod = "POST", value = "改造告知撤销", notes = "改造告知撤销")
     public ResponseModel<JgReformNoticeDto> cancel(@RequestBody Map<String, Object> model) {
-        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformNoticeAdd")), JgReformNoticeDto.class, true);
+        JgReformNoticeDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("reformInfo")), JgReformNoticeDto.class, true);
         if (Objects.isNull(installationInfo)) {
             throw new IllegalArgumentException("参数reformInfo不能为空");
         }
@@ -77,7 +77,7 @@ 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("reformNoticeAdd");
+        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("reformInfo");
         JgReformNoticeDto JgReformNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgReformNoticeDto.class);
         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/service/impl/JgReformNoticeServiceImpl.java

@@ -166,7 +166,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
 
         return new HashMap<String, Map<String, Object>>() {{
-            this.put(TABLE_PAGE_ID, installationInfo);
+            this.put("reformInfo", installationInfo);
             this.put("equipmentInfo", equipmentInfos.get(0));
         }};
     }
@@ -551,7 +551,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 model.setUseUnitName(useUnitList[1]);
             }
         }
-
+        if (org.apache.commons.lang3.StringUtils.isEmpty(model.getReceiveOrgCode())) {
+            model.setReceiveOrgCode(model.getReceiveOrgCreditCode());
+        }
         String receiveOrgId = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgId)) {
             String[] receiveOrgIdList = receiveOrgId.split("_");