添加大屏查询使用登记证接口

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationManageMapper.java

@@ -25,4 +25,9 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
                                            @Param("sort") SortVo sortMap);
 
     Long countCertificateByReginCode(String orgCode);
+
+    Page<JgUseRegistrationManageDto> getRecords(@Param("page") Page<JgUseRegistrationManageDto> page,
+                                                @Param("dto") JgUseRegistrationManageDto dto,
+                                                @Param("orgCode") String orgCode);
+
 }

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

@@ -149,4 +149,43 @@
             pc.org_code like concat (#{reginCode},'%')
             and tjurm.certificate_status = '已登记'
     </select>
+    <select id="getRecords" resultType="com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto">
+        <include refid="page_list"/>
+        from tzs_jg_use_registration_manage tjurm
+         INNER JOIN  privilege_company pc on tjurm.receive_company_code = pc.company_code
+        <where>
+            tjurm.is_delete = 0 and pc.org_code  like concat (#{orgCode}, '%')
+            <if test="dto.equList != null and dto.equList != ''">
+                and tjurm.equ_list = #{dto.equList}
+            </if>
+            <if test="dto.equListCode != null and dto.equListCode != ''">
+                and tjurm.equ_list_code = #{dto.equListCode}
+            </if>
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                and tjurm.equ_category = #{dto.equCategory}
+            </if>
+            <if test="dto.equCategoryCode != null and dto.equCategoryCode != ''">
+                and tjurm.equ_category_code = #{dto.equCategoryCode}
+            </if>
+            <if test="dto.useRegistrationCode != null and dto.useRegistrationCode != ''">
+                and tjurm.use_registration_code like concat('%',#{dto.useRegistrationCode},'%')
+            </if>
+            <if test="dto.applyNo != null and dto.applyNo != ''">
+                and tjurm.apply_no like concat('%',#{dto.applyNo},'%')
+            </if>
+            <if test="dto.certificateNo != null and dto.certificateNo != ''">
+                and tjurm.certificate_no = #{dto.certificateNo}
+            </if>
+            <if test="dto.auditPassDate != null and dto.auditPassDate != ''">
+                and tjurm.audit_pass_date like concat('%',DATE_FORMAT(#{dto.auditPassDate},'%Y-%m-%d'),'%')
+            </if>
+            <if test="dto.certificateStatus != null and dto.certificateStatus != ''">
+                and tjurm.certificate_status = #{dto.certificateStatus}
+            </if>
+            <if test="dto.useUnitCreditCodeForSearch != null and dto.useUnitCreditCodeForSearch != ''">
+                and tjurm.use_unit_credit_code = #{dto.useUnitCreditCodeForSearch}
+            </if>
+            ORDER BY tjurm.rec_date DESC
+        </where>
+    </select>
 </mapper>

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

@@ -161,7 +161,25 @@ public class JgUseRegistrationManageController extends BaseController {
         }
         return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.queryForJgUseRegistrationManagePage(page, dto, sort));
     }
-
+    /**
+     * 列表分页查询-大屏监督管理使用
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page/dp")
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<Page<JgUseRegistrationManageDto>> getRecords(JgUseRegistrationManageDto dto,
+                                                                        @RequestParam(value = "cityCode") String cityCode,
+                                                                        @RequestParam(value = "current") int current,
+                                                                        @RequestParam(value = "size") int size) {
+        Page<JgUseRegistrationManageDto> page = new Page<JgUseRegistrationManageDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.getRecords(page, dto, cityCode));
+    }
     /**
      * 按照单位统一代码查询当前单位下的证
      *

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

@@ -113,6 +113,24 @@ public class SafetyProblemTracingController extends BaseController {
 		problemModel.setGoverningBodyOrgCode(loginParams.getCompany().getOrgCode());
 	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingPage(page, problemModel));
 	}
+	/**
+     * 列表分页查询-大屏使用
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/page/dp")
+	@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题-大屏使用",  notes = "分页查询安全追溯问题-大屏使用")
+	public ResponseModel<Page<SafetyProblemTracingDto>> getProblemRecords(@RequestParam(value = "current") int current,
+																		  @RequestParam(value = "size") int size,
+																		  @RequestBody(required = false) SafetyProblemTracingDto problemModel) {
+	    Page<SafetyProblemTracingDto> page = new Page<>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.getProblemRecords(page, problemModel));
+	}
 
 	/**
 	 * 设备问题列表分页查询

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

@@ -11,10 +11,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CylinderTypeEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationManageMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgUseRegistrationManageService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -49,6 +46,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import static com.alibaba.fastjson.JSON.parseArray;
@@ -106,6 +104,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     @Value("classpath:/json/registrationBasic.json")
     private Resource registrationBasicJson;
 
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+    @Autowired
+    CommonMapper commonMapper;
+
+
     /**
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
      */
@@ -239,6 +242,22 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
 
     }
 
+    public Page<JgUseRegistrationManageDto> getRecords(Page<JgUseRegistrationManageDto> page, JgUseRegistrationManageDto dto, String cityCode) {
+        String orgCode = getAndSetOrgCode(cityCode);
+        return jgUseRegistrationManageMapper.getRecords(page, dto, orgCode);
+
+    }
+
+    public String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = commonMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode != null) {
+                regionCodeOrgCodeMap.put(cityCode, orgCode);
+            }
+        }
+        return orgCode;
+    }
     /**
      * 根据sequenceNbr查询---使用登记证详情用
      *

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

@@ -9,12 +9,14 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemSourceTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper;
 import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.jg.api.service.ISafetyProblemTracingService;
@@ -30,6 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
 import static org.springframework.jdbc.object.BatchSqlUpdate.DEFAULT_BATCH_SIZE;
@@ -46,6 +49,10 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     @Autowired
     IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
 
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+    @Autowired
+    CommonMapper commonMapper;
+
     /**
      * 分页查询
      */
@@ -53,6 +60,28 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
         return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
     }
 
+    public Page<SafetyProblemTracingDto> getProblemRecords(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
+        String orgCode = getAndSetOrgCode(problemModel.getRegionCode());
+        if (ObjectUtils.isEmpty(orgCode)){
+            return new Page<>();
+        }
+        problemModel.setGoverningBodyOrgCode(orgCode);
+        // 使用orgCode过滤
+        problemModel.setRegionCode(null);
+        return this.baseMapper.queryForSafetyProblemTracingPage(page, problemModel);
+    }
+
+    public String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = commonMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode != null) {
+                regionCodeOrgCodeMap.put(cityCode, orgCode);
+            }
+        }
+        return orgCode;
+    }
+
     public Page<SafetyProblemTracingDto> queryProblemPageByEquipId(Page<SafetyProblemTracingDto> page, String equipId) {
         SafetyProblemTracingDto problemModel = new SafetyProblemTracingDto();
         problemModel.setSourceId(equipId);