Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -127,7 +127,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @GetMapping(value = "/category/list")
     @ApiOperation(httpMethod = "GET", value = "查询不同单位类型可新增的设备种类列表", notes = "查询不同单位类型可新增的设备种类列表")
     public ResponseModel<List<DictionarieValueModel>> equCategoryListByCompanyType() {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, null,null));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), null, null,null, null));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -135,8 +135,9 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "按照人员身份、设备种类查询设备类别", notes = "按照人员身份、设备种类查询设备类别")
     public ResponseModel<List<DictionarieValueModel>> equCategoryList(@RequestParam(value = "equList") String equList,
                                                                       @RequestParam(value = "dataSource",required = false) String dataSource,
-                                                                      @RequestParam(value = "businessScenarios",required = false) String businessScenarios) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios,dataSource));
+                                                                      @RequestParam(value = "businessScenarios",required = false) String businessScenarios,
+                                                                      @RequestParam(value = "type",required = false) String type) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios,dataSource, type));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -31,7 +31,7 @@ public interface IIdxBizJgRegisterInfoService {
 
     Map<String, Object> getDetailFieldCamelCaseByRecord(String record);
 
-    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList,String businessScenarios,String dataSource);
+    List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList,String businessScenarios,String dataSource, String type);
 
     Page<JSONObject> queryForUnitEquipmentPage(JSONObject jsonObject);
 

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -543,9 +543,15 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList, String businessScenarios, String dataSource) {
+    public List<DictionarieValueModel> equCategoryListByCompanyType(ReginParams selectedOrgInfo, String equList, String businessScenarios, String dataSource, String type) {
         // 历史设备录入 直接取所有的设备种类（equList）下的所有设备类别
         if ("his".equals(dataSource)) {
+            // 历史数据导入设备类别限制
+            if (!ObjectUtils.isEmpty(type) && "PL_DR".equals(type)){
+                return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
+                        .filter(x ->  "2300".equals(x.getDictDataKey()))
+                        .collect(Collectors.toList());
+            }
             return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
         }
 

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/JgChangeRegistrationUnitServiceImpl.java

@@ -1052,19 +1052,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                     JSONArray historyJson = JSON.parseArray(history.getChangeData());
                     List<String> ids = historyJson.stream().map(v -> JSON.parseObject(v.toString()).getString("sequenceNbr")).collect(Collectors.toList());
                     List<JgUseRegistrationManage> list = useRegistrationManageService.lambdaQuery().in(BaseEntity::getSequenceNbr, ids).list();
-                    LambdaQueryWrapper<TzBaseEnterpriseInfo> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(TzBaseEnterpriseInfo::getUseCode, registration.getNewUseUnitCreditCode())
-                            .eq(TzBaseEnterpriseInfo::getIsDelete, false);
                     for (JgUseRegistrationManage registrationManage : list) {
                         registrationManage.setUseUnitName(registration.getNewUseUnitName());
                         registrationManage.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
                         registrationManage.setReceiveOrgName(registration.getReceiveOrgName());
                         registrationManage.setReceiveCompanyCode(registration.getReceiveOrgCode());
                         registrationManage.setAuditPassDate(registration.getAuditPassDate());
-                        if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {
+                        if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {//回填新单位地址
                             TzBaseEnterpriseInfo useCodeResult = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_unit_code", registration.getNewUseUnitCreditCode()));
                             if (useCodeResult != null) {
                                 registrationManage.setUseUnitAddress(useCodeResult.getAddress());
+                                registrationManage.setEquUseAddress(useCodeResult.getAddress());
                             }
                         }
                     }