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

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

@@ -13,8 +13,13 @@
         isn.notice_status AS noticeStatus,
         isn.install_unit_name AS installUnitName,
         isn.province_name AS provinceName,
+        isn.province,
+        isn.city,
+        isn.county,
         isn.city_name AS cityName,
         isn.county_name AS countyName,
+        isn.street_name AS streetName,
+        isn.street,
         isn.instance_id AS instanceId,
         isn.plan_date AS planDate,
         isn.receive_company_code AS receiveCompanyCode,
@@ -42,6 +47,7 @@
             </if>
             <if test="type == 'supervision'">
                 AND isn.notice_status in ('6612', '6613', '6614')
+                AND isn.receive_org_credit_code = #{orgCode}
                 <!--                AND (isn.notice_status in ('6612', '6613', '6614') or isn.status in('6614') )-->
             </if>
             <if test="orgCode != null and orgCode != ''">
@@ -60,11 +66,17 @@
         isn.province_name AS provinceName,
         isn.city_name AS cityName,
         isn.county_name AS countyName,
+        isn.province,
+        isn.city,
+        isn.county,
+        isn.street_name AS streetName,
+        isn.street,
         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_code AS equRegisterCode,
         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/service/impl/JgReformNoticeServiceImpl.java

@@ -76,7 +76,7 @@ import java.util.stream.Collectors;
 public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, JgReformNotice, JgReformNoticeMapper> implements IJgReformNoticeService {
 
     private static final String SUBMIT_TYPE_FLOW = "1";
-    private static final String PROCESS_DEFINITION_KEY = "renovationNotice";
+    private static final String PROCESS_DEFINITION_KEY = "renovationNoticeNew";
     private static final String TABLE_PAGE_ID = "reformNoticeAdd";
 
 
@@ -136,26 +136,24 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             return null;
         }
         Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
-
         installationInfo.put("province", notice.getProvince() + "_" + notice.getProvinceName());
         installationInfo.put("city", notice.getCity() + "_" + notice.getCityName());
         installationInfo.put("county", notice.getCounty() + "_" + notice.getCountyName());
+        installationInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCityName() + notice.getStreetName() + notice.getAddress());
         installationInfo.put("useUnitCreditCode", notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
-        installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
+        // installationInfo.put("receiveOrgCreditCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
+        installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
         // if (!ValidationUtil.isEmpty(notice.getInspectUnitId()) && ValidationUtil.isEmpty(notice.getInspectUnitName())) {
         //     installationInfo.put("inspectUnitId", notice.getInspectUnitId() + "_" + notice.getInspectUnitName());
         // }
-        if(!ValidationUtil.isEmpty(notice.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
-            installationInfo.put("factoryUseSiteStreet", notice.getFactoryUseSiteStreet() + "_" + notice.getStreetName());
+        if (!ValidationUtil.isEmpty(notice.getStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
+            installationInfo.put("street", notice.getStreet() + "_" + notice.getStreetName());
         }
-
         String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
                 "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
                 "proxyStatementAttachment", "installContractAttachment"};
-
         // 设备信息
         List<Map<String, Object>> equipmentInfos = JgReformNoticeMapper.queryEquipInformation(sequenceNbr);
-
         for (String s : fields) {
             if (installationInfo.containsKey(s)) {
                 installationInfo.put(s, JSON.parseArray(installationInfo.get(s).toString()));
@@ -164,7 +162,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 equipmentInfos.get(0).put(s, JSON.parseArray(equipmentInfos.get(0).get(s).toString()));
             }
         }
-
         return new HashMap<String, Map<String, Object>>() {{
             this.put("reformInfo", installationInfo);
             this.put("equipmentInfo", equipmentInfos.get(0));
@@ -181,10 +178,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
-
         // 字段转换
         this.convertField(noticeDto);
-
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             AjaxResult ajaxResult;
             // 发起流程
@@ -245,13 +240,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @Override
     public Page<JgReformNoticeDto> queryForJgReformNoticePage(Page<JgReformNotice> page, JgReformNoticeDto model, String type, ReginParams reginParams) {
 
-        String orgCode;
-        if (type.equals("enterprise")) {
-            orgCode = reginParams.getCompany().getCompanyCode();
-        } else {
-            orgCode = reginParams.getCompany().getOrgCode();
-        }
-
+        String orgCode = reginParams.getCompany().getCompanyCode();
         Page<JgReformNotice> noticePage = JgReformNoticeMapper.queryForPage(page, model, type, orgCode);
 
         // 将Page<JgReformNotice>转化为Page<JgReformNoticeDto>
@@ -533,12 +522,12 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             }
         }
 
-        String factoryUseSiteStreet = model.getFactoryUseSiteStreet();
-        if (!ObjectUtils.isEmpty(factoryUseSiteStreet)) {
-            String[] factoryUseSiteStreetList = factoryUseSiteStreet.split("_");
-            if (factoryUseSiteStreetList.length > 1) {
-                model.setFactoryUseSiteStreet(factoryUseSiteStreetList[0]);
-                model.setStreetName(factoryUseSiteStreetList[1]);
+        String street = model.getStreet();
+        if (!ObjectUtils.isEmpty(street)) {
+            String[] streetList = street.split("_");
+            if (streetList.length > 1) {
+                model.setStreet(streetList[0]);
+                model.setStreetName(streetList[1]);
             }
         }