feat(jyjc): 报检开发调整

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

@@ -2979,7 +2979,7 @@
                                 #{record}
                             </foreach>
                             and (a.status <![CDATA[ <> ]]> '使用单位待提交' and a.status <![CDATA[ <> ]]> '已作废')
-                            group by b.record
+                            group by b.equ_id
                      UNION all
                          select
                              count(1)  as inUseNumber,

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEvent;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
@@ -84,7 +85,7 @@ public class JyjcInspectionApplicationController extends BaseController {
         }
         // operationType: 1-暂存 0-提交
         ReginParams selectedOrgInfo = getSelectedOrgInfo();
-        model.put("applicationUnitCode", selectedOrgInfo.getCompany().getCompanyCode());
+        model.put("applicationUnitCode", CommonServiceImpl.getUnitCode(getSelectedOrgInfo().getCompany()));
 
         if (model.get("operationType").toString().equals("2") || model.get("operationType").toString().equals("0")) {
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -278,6 +278,7 @@ public class JyjcOpeningApplicationController extends BaseController {
     public ResponseModel<List<TzsUserInfoVo>> getBizUserInfosByUnitCode(@ApiParam(value = "公司编码") @RequestParam(required = false) String unitCode, @ApiParam(value = "人员类型", allowableValues = "jy,jc") @RequestParam String personType) {
         if (StringUtils.isEmpty(unitCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
+            // 完整的包括个人的人证件类型6600_
             unitCode = reginParams.getCompany().getCompanyCode();
         }
         return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.getUserListByUnitCodeAndPost(unitCode, personType));
@@ -297,6 +298,7 @@ public class JyjcOpeningApplicationController extends BaseController {
                                                                                         @ApiParam(value = "人员类型", allowableValues = "jy,jc") @RequestParam String personType) {
         if (StringUtils.isEmpty(unitCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
+            // 完整的包括个人的人证件类型6600_
             unitCode = reginParams.getCompany().getCompanyCode();
         }
         // 前端表单特殊结构封装 ，key有用不能更换

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -177,10 +177,10 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         }
         if (type) {
             // 检验检测单位分页查询
-            model.setInspectionUnitCode(reginParams.getCompany().getCompanyCode());
+            model.setInspectionUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
         } else {
             // 报检单位分页查询
-            model.setApplicationUnitCode(reginParams.getCompany().getCompanyCode());
+            model.setApplicationUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
         }
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectJyjcInspectionResultpPage(page, model);
         resultPage.getRecords().forEach(v -> {
@@ -203,7 +203,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         }
         // 判断当前登录人身份（报检机构、接收机构、即时报检又是接收机构、都不是（不存在此情况））
         String identity = CommonServiceImpl.getCompanyIdentityByType(reginParams.getCompany().getCompanyType());
-        model.setCompanyCode(reginParams.getCompany().getCompanyCode());
+        model.setCompanyCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()));
         Page<JyjcInspectionResultModel> resultPage = resultMapper.selectForPage(page, model, identity, sortMap);
         resultPage.getRecords().forEach(v -> {
             if (ResultStatusEnum.NO_RESULT.getCode().equals(v.getResultStatus())) {
@@ -735,7 +735,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
                 JyjcInspectionResult jyjcInspectionResult = new JyjcInspectionResult()
                         .setInspectionUnitCode(Objects.toString(entryData.getOrDefault("inspectOrgCode", "")))
                         .setApplicationNo(applicationNos.get(i))
-                        .setApplicationUnitCode(reginParams.getCompany().getCompanyCode())
+                        .setApplicationUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()))
                         .setEquipUnicode(Objects.toString(equ.get("record")))
                         .setResultStatus(ResultStatusEnum.YES_RESULT.getCode())
                         .setLicenseNumber(null)
@@ -867,7 +867,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         try {
             JyjcInspectionResult jyjcInspectionResult = new JyjcInspectionResult()
                     .setInspectionUnitCode(Objects.toString(entryData.getOrDefault("inspectOrgCode", "")))
-                    .setApplicationUnitCode(reginParams.getCompany().getCompanyCode())
+                    .setApplicationUnitCode(CommonServiceImpl.getUnitCode(reginParams.getCompany()))
                     .setEquipUnicode(Objects.toString(equ.get("record")))
                     .setResultStatus(ResultStatusEnum.YES_RESULT.getCode())
                     .setLicenseNumber(null)