Merge branch 'develop_tzs_bugfix' into develop_tzs_register_test

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

@@ -2597,7 +2597,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 增加监管端查询, 查询规则看到本级及之下的设备
         if(!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))){
             if(companyLevel.equals(BaseController.COMPANY_TYPE_SUPERVISION)) { // 监管 右模糊查询
-                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(company.getString("ORG_BRANCH_CODE")) + "*"));
+                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
             } else {                                                           // 企业 等于查询
                 boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", map.getString("ORG_BRANCH_CODE")));
             }

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

@@ -409,7 +409,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private void updateOrCreateInspectionDetection(Map<String, Object> equipment, JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo) {
         InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
         BeanUtil.copyProperties(equipment, inspectionDetectionInfo);
-
         if("unit".equals(jgUseRegistration.getManageType())){
             if (registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
                 // 压力管道逻辑，根据设备record + 检验报告编号判定唯一一条检验流水，有进行更新，无则进行插入
@@ -423,7 +422,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (equipment.get("jySeq") != null) {
                 // 更新逻辑
                 InspectionDetectionInfo inspectionDetectionInfoDb = inspectionDetectionInfoMapper.selectById(equipment.get("jySeq").toString());
+                String inspectionSeq = inspectionDetectionInfoDb.getSequenceNbr();
+                String record = inspectionDetectionInfoDb.getRecord();
                 Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfoDb);
+                inspectionDetectionInfoDb.setSequenceNbr(inspectionSeq);
+                inspectionDetectionInfoDb.setRecord(record);
+                inspectionDetectionInfoDb.setRecDate(new Date());
                 inspectionDetectionInfoMapper.updateById(inspectionDetectionInfoDb);
             } else {
                 String record = Optional.ofNullable(equipment.get("equipId"))
@@ -1295,26 +1299,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return "";
     }
 
-    private void savePieLineProjectInspectData(JgUseRegistration jgUseRegistration, IdxBizJgRegisterInfo registerInfo, JSONObject mapData) {
-        // 单位办理的压力管道，在完成审批时，将检验信息写入到装置检验信息表
-        if("unit".equals(jgUseRegistration.getManageType()) && registerInfo.getEquList().equals(EquipmentClassifityEnum.YLGD.getCode())){
-            IdxBizJgProjectInspection inspectionDetectionInfo = new IdxBizJgProjectInspection();
-            BeanUtil.copyProperties(mapData, inspectionDetectionInfo);
-            if (mapData.get("jySeq") != null) {
-                // 更新逻辑
-                IdxBizJgProjectInspection inspectionDetectionInfoDb = projectInspectionMapper.selectById(mapData.get("jySeq").toString());
-                Bean.copyExistPropertis(inspectionDetectionInfo, inspectionDetectionInfoDb);
-                projectInspectionMapper.updateById(inspectionDetectionInfo);
-            } else {
-                inspectionDetectionInfo.setProjectContraptionId(jgUseRegistration.getProjectContraptionId());
-                inspectionDetectionInfo.setRecDate(new Date());
-                // 使用登记创建新增的检验信息id设置为使用登记的主键id,在作废时级联作废
-                inspectionDetectionInfo.setSequenceNbr(jgUseRegistration.getSequenceNbr() + "");
-                projectInspectionMapper.insert(inspectionDetectionInfo);
-            }
-        }
-    }
-
     /**
      * 生成使用登记证变更记录
      *
@@ -3015,6 +2999,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if ("unit".equals(jgUseRegistration.getManageType())){
             //单位办理-历史作废
             if ("1".equals(jgUseRegistration.getRegType())){
+                this.updateById(jgUseRegistration);
                 // 构建设备删除的 DTO 列表
                 List<ESEquipmentCategoryDto> esDtoList = records.stream().map(v -> {
                     ESEquipmentCategoryDto esDto = new ESEquipmentCategoryDto();

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/UserBizByTCMServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
 import com.yeejoin.amos.boot.module.statistics.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.UserInfoMapper;
@@ -15,13 +16,15 @@ import com.yeejoin.amos.boot.module.statistics.api.vo.TzsUserInfoVo;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -56,6 +59,9 @@ public class UserBizByTCMServiceImpl {
     private UserInfoMapper tzsUserInfoMapper;
     @Autowired
     private UserPermissionMapper tzsUserPermissionMapper;
+    @Autowired
+    private DataDictionaryServiceImpl dictionaryService;
+
     public Map<String, Object> getDetail(Long id) {
         Map<String, Object> maps = new HashMap<>();
         TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectById(id);
@@ -146,6 +152,33 @@ public class UserBizByTCMServiceImpl {
         // 作业项目【jobItem】 字段特殊处理
         JSONArray jobItem = JSON.parseArray(String.valueOf(json.get("jobItem")));
         json.put("jobItem", jobItem);
+
+        // 处理检验、检测资质级别、项目字典code->名称
+        if (JYRY_TYPE.equals(permission.getPermissionPost()) || JCRY_TYPE.equals(permission.getPermissionPost())) {
+            List<DictionarieValueModel> dataDictionaryList = Systemctl.dictionarieClient.dictValues("RYJB_JYJC").getResult();
+            String permissionLevel = String.valueOf(json.get("permissionLevel"));
+            List<DictionarieValueModel> itemDictionaryList = Systemctl.dictionarieClient.dictValues("ZZXM_" + permissionLevel).getResult();
+            if (!ValidationUtil.isEmpty(dataDictionaryList)) {
+                dataDictionaryList.forEach(item -> {
+                    if (item.getDictDataKey().equals(permissionLevel)) {
+                        json.put("permissionLevel", item.getDictDataValue());
+                    }
+                });
+            }
+
+            JSONArray permissionItem = JSON.parseArray(String.valueOf(json.get("permissionItem")));
+            JSONArray permissionItemName = new JSONArray();
+            if (!ValidationUtil.isEmpty(permissionItem)) {
+                if (!ValidationUtil.isEmpty(itemDictionaryList)) {
+                    for (Object item : permissionItem) {
+                        String finalItem = item.toString();
+                        item = itemDictionaryList.stream().filter(dict -> dict.getDictDataKey().equals(finalItem)).findFirst().map(DictionarieValueModel::getDictDataValue).orElse(finalItem);
+                        permissionItemName.add(item);
+                    }
+                }
+                json.put("permissionItem", permissionItemName);
+            }
+        }
         return json;
     }
 }