维保备案列表合并接口修改

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

@@ -133,12 +133,25 @@
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
                 and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
             </if>
-            <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
-                and use_unit_code = #{contractDto.useUnitCode}
-            </if>
-            <if test="contractDto.maintenanceUnitCode != '' and contractDto.maintenanceUnitCode != null">
-                and maintenance_unit_code = #{contractDto.maintenanceUnitCode}
-            </if>
+
+        <choose>
+            <when test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null and
+                contractDto.maintenanceUnitCode != '' and contractDto.maintenanceUnitCode != null">
+                -- 同时有使用单位和维保单位用
+                and (use_unit_code = #{contractDto.useUnitCode}
+                    or maintenance_unit_code = #{contractDto.maintenanceUnitCode})
+            </when>
+            <otherwise >
+                -- 只有使用单位或者维保单位用，或者都没有
+                <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
+                    and use_unit_code = #{contractDto.useUnitCode}
+                </if>
+                <if test="contractDto.maintenanceUnitCode != '' and contractDto.maintenanceUnitCode != null">
+                    and maintenance_unit_code = #{contractDto.maintenanceUnitCode}
+                </if>
+            </otherwise>
+        </choose>
+            -- 监管单位用
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>

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

@@ -170,13 +170,12 @@ public class JgMaintenanceContractController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "维保合同备案分页查询", notes = "分页查询维保合同备案")
     public ResponseModel<Page<JgMaintenanceContractVo>> queryForPage(@RequestParam(value = "current") int current,
                                                                       @RequestParam(value = "size") int size,
-                                                                      @RequestParam(value = "phase") int phase,
                                                                       Map<String,Object> map) {
         Page<JgMaintenanceContract> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         ReginParams reginParams = getSelectedOrgInfo();
-        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, phase, map, reginParams);
+        Page<JgMaintenanceContractVo> contractDtoPage = jgMaintenanceContractServiceImpl.queryForPage(page, map, reginParams);
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 

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

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
@@ -16,10 +15,10 @@ import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -78,10 +77,13 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     CommonServiceImpl commonService;
 
+    @Autowired
+    IJgInstallationNoticeService jrmInstallationNoticeService;
+
     /**
      * 分页查询
      */
-    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page, int phase,
+    public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
                                                       Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto dto = new JgMaintenanceContractDto();
         if (map.containsKey("jgMaintenanceContractDto")) {
@@ -90,20 +92,44 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
-        if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
-            //使用单位用"使用单位统一信用代码"匹配数据
-            dto.setUseUnitCode(company.getCompanyCode());
-            dto.setRoleIds(null);
-            contractList = maintenanceContractMapper.getContractList(page, dto);
-        } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
-            //维保单位用"维保单位统一信用代码"匹配数据
-            dto.setMaintenanceUnitCode(company.getCompanyCode());
-            contractList = maintenanceContractMapper.getContractList(page, dto);
-        } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
+        Map<String, Object> companyTypeMap = jrmInstallationNoticeService.getCompanyType();
+        String companyLevel = "";
+        String companyType = "";
+        if (companyTypeMap.containsKey("companyLevel")) {
+            companyLevel = companyTypeMap.get("companyLevel").toString();
+        }
+        if (companyTypeMap.containsKey("companyType")) {
+            companyType = companyTypeMap.get("companyType").toString();
+        }
+        if ("supervision".equals(companyLevel)) {
             //监管单位用"接收机构统一使用代码"匹配
             dto.setReceiveOrgCode(company.getCompanyCode());
-            contractList = maintenanceContractMapper.getContractList(page, dto);
+        } else if ("company".equals(companyLevel)) {
+            if (companyType.contains("use")) {
+                //使用单位用"使用单位统一信用代码"匹配数据
+                dto.setUseUnitCode(company.getCompanyCode());
+                dto.setRoleIds(null);
+            }
+            if (companyType.contains("construction")) {
+                //维保单位用"维保单位统一信用代码"匹配数据
+                dto.setMaintenanceUnitCode(company.getCompanyCode());
+            }
         }
+        contractList = maintenanceContractMapper.getContractList(page, dto);
+//        if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
+//            //使用单位用"使用单位统一信用代码"匹配数据
+//            dto.setUseUnitCode(company.getCompanyCode());
+//            dto.setRoleIds(null);
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
+//            //维保单位用"维保单位统一信用代码"匹配数据
+//            dto.setMaintenanceUnitCode(company.getCompanyCode());
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
+//            //监管单位用"接收机构统一使用代码"匹配
+//            dto.setReceiveOrgCode(company.getCompanyCode());
+//            contractList = maintenanceContractMapper.getContractList(page, dto);
+//        }
         BeanUtils.copyProperties(contractList, result);
         return result;
     }