Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/common/BizCommonConstant.java

@@ -33,4 +33,9 @@ public interface BizCommonConstant {
 	 */
 	String TCM_ALL_DATA_DICT_REDIS_KEY = "TCM_ALL_DATA_DICT_REDIS_KEY";
 
+	/**
+	 * 监管单位列表redisKey
+	 * */
+	String REGULATOR_UNIT_LIST = "REGULATOR_UNIT_LIST";
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzsTwoStaffingMapper.java

 package com.yeejoin.amos.boot.module.tcm.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,5 +19,10 @@ public interface TzsTwoStaffingMapper extends BaseMapper<TzsTwoStaffing> {
     Page<TzsTwoStaffingCompanyDto> getCompanyList(@Param("page")Page<TzsTwoStaffingCompanyDto> page,
                                                   @Param("companyDto") TzsTwoStaffingCompanyDto companyDto,
                                                   @Param("orgCode") String orgCode);
+    List<TzsTwoStaffing> getListByOrgCode(@Param("orgCode")String orgCode, @Param("type")String type);
+
+    List<TzsTwoStaffingCompanyDto> getListAll();
+
+    void truncateTwoStaffingStatistics();
     List<TzsTwoStaffing> getListByOrgCode(@Param("orgCode")String orgCode, @Param("type")String type, @Param("level")String level);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzsTwoStaffingService.java

@@ -2,10 +2,8 @@ package com.yeejoin.amos.boot.module.tcm.api.service;
 
 
 
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
 
 import java.util.LinkedHashMap;
@@ -21,4 +19,6 @@ public interface ITzsTwoStaffingService {
 
     List<TzsTwoStaffing>  getStatisticsMessage(List<LinkedHashMap> list, String type);
     Page<TzsTwoStaffingCompanyDto> getCompanyList(String orgCode, TzsTwoStaffingCompanyDto companyDto,Page<TzsTwoStaffingCompanyDto> page);
+
+    public void generateTwoStaffingStatistics();
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzsTwoStaffingMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tcm.api.mapper.TzsTwoStaffingMapper">
-
-<select id="getCompanyList" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto">
+    <select id="getCompanyList" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto">
 
     SELECT
         *
@@ -43,4 +42,13 @@
             and supervisory_unit_level = #{level}
         </if>
     </select>
+    <select id="getListAll" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto">
+        SELECT
+            *
+        FROM
+            view_two_staffing
+    </select>
+    <select id="truncateTwoStaffingStatistics">
+        TRUNCATE TABLE tzs_two_staffing;
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsTwoStaffingController.java

@@ -4,9 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.tcm.api.dto.TzsTwoStaffingCompanyDto;
+import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsTwoStaffing;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsTwoStaffingService;
 import com.yeejoin.amos.boot.module.tcm.api.vo.TzsTwoStaffingExportVo;
@@ -73,8 +73,6 @@ public class TzsTwoStaffingController extends BaseController {
         ExcelUtil.createTemplate(response, "企业两员配备情况", "企业两员配备情况", equipExportData, TzsTwoStaffingCompanyDto.class, null, false);
     }
 
-
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getStatisticsMessage")
     @ApiOperation(httpMethod = "GET", value = "监管单位统计信息", notes = "监管单位统计信息")
@@ -88,6 +86,14 @@ public class TzsTwoStaffingController extends BaseController {
         return ResponseHelper.buildResponse(tzsTwoStaffingPage);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/generateTwoStaffingStatistics")
+    @ApiOperation(httpMethod = "GET", value = "生成两员配备统计", notes = "生成两员配备统计")
+    public ResponseModel<Object> generateTwoStaffingStatistics() {
+        tzsTwoStaffingService.generateTwoStaffingStatistics();
+        return ResponseHelper.buildResponse("ok");
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/exportData")
     @ApiOperation(httpMethod = "GET", value = "监管单位统计信息导出", notes = "监管单位统计信息导出")