fix(jg):维修告知bug修改

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

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -29,10 +30,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +46,8 @@ import java.util.stream.Collectors;
 public class IdxBizJqEquipmentRegisterController extends BaseController {
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+    @Autowired
+    private CommonServiceImpl commonServiceImpl;
 
     /**
      * 设备注册和更新信息
@@ -283,22 +283,26 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getProjectContraption")
     @ApiOperation(httpMethod = "GET", value = "查询当前单位下工程装置信息", notes = "查询当前单位下工程装置信息")
-    public ResponseModel<Object> queryEquipCanUsedByVesselPageHistory(@RequestParam(value = "equCategoryCode") String equCategoryCode) {
+    public ResponseModel<Object> queryEquipCanUsedByVesselPageHistory(@RequestParam("equCategoryCode") String equCategoryCode,
+                                                                      @RequestParam(value = "cityCode", required = false) String cityCode,
+                                                                      @RequestParam(value = "useUnitSeq", required = false) String useUnitSeq) {
+
         ReginParams info = getSelectedOrgInfo();
-        CompanyBo companyBo = info.getCompany();
-        // 确保公司级别符合要求
-        if (!BaseController.COMPANY_TYPE_COMPANY.equals(companyBo.getLevel())) {
-            return ResponseHelper.buildResponse(new ArrayList<String>());
-        }
-        String companyCode = companyBo.getCompanyCode();
-        String type = companyBo.getCompanyType();
-        // 根据公司类型设置使用和安装改造维修单位代码
-        String useUnitCreditCode = type.contains("使用单位") || type.contains("个人主体") ? companyCode : "";
-        String uscUnitCreditCode = type.contains("安装改造维修单位") ? companyCode : "";
-
-        return ResponseHelper.buildResponse(
-                idxBizJgRegisterInfoService.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode)
-        );
+        CompanyBo company = info.getCompany();
+        if (!BaseController.COMPANY_TYPE_COMPANY.equals(company.getLevel())) {
+            return ResponseHelper.buildResponse(Collections.emptyList());
+        }
+        String uscUnitCreditCode = company.getCompanyType().contains("安装改造维修单位") ? company.getCompanyCode() : "";
+        String useUnitCreditCode = Optional.ofNullable(useUnitSeq)
+                .map(commonServiceImpl::queryUnitCreditInfoBySeq)
+                .filter(StringUtils::isNotBlank)
+                .map(val -> val.contains("_") ? val.substring(0, val.indexOf("_")) : val)
+                .orElse("");
+        String city = Optional.ofNullable(cityCode)
+                .filter(StringUtils::isNotBlank)
+                .map(code -> code.contains("_") ? code.substring(0, code.indexOf("_")) : code)
+                .orElse("");
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode, city));
     }
 
     @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

@@ -46,7 +46,7 @@ public interface IIdxBizJgRegisterInfoService {
 
     Object savePressureVesselData(Map<String, Object> paramMap);
 
-    Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode, String equCategoryCode);
+    Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode, String equCategoryCode, String city);
 
     Boolean esSynchronousProjectContraption();
 

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

@@ -4602,8 +4602,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode,String equCategoryCode) {
-        return this.baseMapper.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode);
+    public Object getProjectContraption(String uscUnitCreditCode, String useUnitCreditCode,String equCategoryCode, String city) {
+        return this.baseMapper.getProjectContraption(uscUnitCreditCode, useUnitCreditCode, equCategoryCode, city);
     }
 
     @Override

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

@@ -987,6 +987,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
+            taskMessageDto.setEQU_LIST_CODE(item.getEquListCode());
             taskModelDtoList.add(taskModelDto);
             if (isDeleteDraft) {
                 // 删除暂存时生成的待办

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

@@ -840,6 +840,14 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 model.setInspectionUnitName(inspectUnitIdList[1]);
             }
         }
+        String projectContraption = model.getProjectContraption();
+        if (!ObjectUtils.isEmpty(projectContraption)) {
+            String[] projectContraptionList = projectContraption.split("_");
+            if (projectContraptionList.length > 1) {
+                model.setProjectContraptionId(projectContraptionList[0]);
+                model.setProjectContraption(projectContraptionList[1]);
+            }
+        }
     }
 
     public boolean submit(JgMaintainNotice notice, String op, String opinion) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -28,7 +28,8 @@ public interface IdxBizJgRegisterInfoMapper extends BaseMapper<IdxBizJgRegisterI
 
     List<Map<String, Object>> getProjectContraption(@Param("uscUnitCreditCode") String uscUnitCreditCode,
                                                     @Param("useUnitCreditCode") String useUnitCreditCode,
-                                                    @Param("equCategoryCode")String equCategoryCode);
+                                                    @Param("equCategoryCode")String equCategoryCode,
+                                                    @Param("city")String city);
 
     @Select("SELECT SEQUENCE_NBR,REC_DATE,ORG_BRANCH_NAME,ORG_BRANCH_CODE,USE_UNIT_NAME,USE_UNIT_CREDIT_CODE,EQU_LIST_CODE,EQU_LIST,EQU_CATEGORY,EQU_CATEGORY_CODE,USE_ORG_CODE,CODE96333,EQU_CODE,SUPERVISORY_CODE,USE_PLACE,ADDRESS,EQU_STATE,STATUS,USE_INNER_CODE,FACTORY_NUM,PRODUCE_UNIT_NAME,INSPECT_REPORT,NEXT_INSPECT_DATE,CONSTRUCTION_TYPE,USC_UNIT_CREDIT_CODE,USC_UNIT_NAME,EQU_DEFINE,EQU_DEFINE_CODE,PRODUCT_NAME,BRAND_NAME,EQU_TYPE,DATA_SOURCE,IS_INTO_MANAGEMENT,WHETHER_VEHICLE_CYLINDER,WHETHER_SKID_MOUNTED_PRESSURE_VESSEL,DATE_FORMAT(PRODUCE_DATE,'%Y-%m-%d %H:%i:%s')as PRODUCE_DATE,PROJECT_CONTRAPTION from idx_biz_view_jg_all WHERE PROJECT_CONTRAPTION is not null")
     List<Map<String, Object>> esSynchronousProjectContraption();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -227,8 +227,8 @@
             ibjpc.USE_REGISTRATION_CODE USE_ORG_CODE,
             ibjpc.ADDRESS,
             ibjpc.REC_DATE,
-            ibjpc.ORG_BRANCH_CODE,
-            ibjpc.ORG_BRANCH_NAME,
+            ibjpc.ORG_CODE ORG_BRANCH_CODE,
+            ibjpc.ORG_NAME ORG_BRANCH_NAME,
             ibjpc.EQU_CODE,
             ibjui.EQU_STATE,
             ibjtpp."PIPE_NAME" AS PRODUCT_NAME,

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgRegisterInfoMapper.xml

@@ -19,6 +19,9 @@
 			<if test="useUnitCreditCode != null and !useUnitCreditCode.isEmpty()">
 				AND jui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode}
 			</if>
+			<if test="city != null and !city.isEmpty()">
+				AND jui.CITY = #{city}
+			</if>
 		</where>
 		GROUP BY jui.PROJECT_CONTRAPTION
 	</select>