Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -60,7 +60,7 @@
     </select>
     <select id="getDetail" resultType="java.util.Map">
         SELECT jed.sequence_nbr        as sequenceNbr,
-               concat(jed.receive_org_code,'_',jed.receive_org_name)    as receiveOrgCode,
+               concat(jed.receive_company_code,'_',jed.receive_org_name)    as receiveOrgCode,
                concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
                       use.STREET_NAME) as fullAddress,
                jri.EQU_CODE            as equCode,

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

@@ -122,7 +122,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         maintainInfo.put("county",ObjectUtils.isEmpty(notice.getCounty()) ? null :  notice.getCounty() + "_" + notice.getCountyName());
         maintainInfo.put("fullAddress", notice.getProvinceName() + notice.getCityName() + notice.getCounty() + notice.getStreetName() + notice.getAddress());
         maintainInfo.put("useUnitCreditCode",ObjectUtils.isEmpty(notice.getUseUnitCreditCode()) ? null :   notice.getUseUnitCreditCode() + "_" + notice.getUseUnitName());
-        maintainInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
+        maintainInfo.put("receiveOrgCode", notice.getReceiveCompanyCode() + "_" + notice.getReceiveOrgName());
         if (!ValidationUtil.isEmpty(notice.getInspectionUnitCreditCode()) && !ValidationUtil.isEmpty(notice.getInspectionUnitName())) {
             maintainInfo.put("inspectUnitId", notice.getInspectionUnitCreditCode() + "_" + notice.getInspectionUnitName());
         }
@@ -633,6 +633,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             if (receiveOrgIdList.length > 1) {
                 model.setReceiveCompanyCode(receiveOrgIdList[0]);
                 model.setReceiveOrgName(receiveOrgIdList[1]);
+                model.setReceiveOrgCode(null);
             }
         }
 

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

@@ -103,6 +103,12 @@
   },
   {
     "type": "107",
+    "pageType": "draft",
+    "name": "使用登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "107",
     "pageType": "look",
     "name": "使用登记",
     "url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=look"