两个规定-企业排查情况优化

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

@@ -28,5 +28,8 @@ public interface TzsTwoStaffingMapper extends BaseMapper<TzsTwoStaffing> {
     void truncateTwoStaffingStatistics();
     List<TzsTwoStaffing> getListByOrgCode(@Param("orgCode")String orgCode, @Param("type")String type, @Param("level")String level);
 
-    Page<TzsTwoStaffingCompanyCheckDto> getCompanyCheckList(@Param("page")Page<TzsTwoStaffingCompanyCheckDto> page, @Param("orgCode") String orgCode, @Param("companyDto")TzsTwoStaffingCompanyCheckDto companyDto);
+    Page<TzsTwoStaffingCompanyCheckDto> getCompanyCheckList(@Param("page")Page<TzsTwoStaffingCompanyCheckDto> page,
+                                                            @Param("orgCode") String orgCode,
+                                                            @Param("staticTableName") String staticTableName,
+                                                            @Param("companyDto")TzsTwoStaffingCompanyCheckDto companyDto);
 }

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

@@ -65,19 +65,19 @@
         ei.legal_person,
         ei.contact_phone,
         CASE
-        WHEN ( SELECT COUNT ( 1 ) FROM amos_tzs_biz.p_plan_task pt WHERE pt.finish_status = '3' AND ppt.use_code = pt.use_code AND pt.plan_type = #{companyDto.planType} AND pt.check_date BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime}   ) > 0 THEN
+        WHEN ( SELECT COUNT ( 1 ) FROM ${staticTableName} pt WHERE pt.time_out > 0 AND psd.unit_code = ei.use_code  AND pt.check_time BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime}   ) > 0 THEN
         '超期未检'
-        WHEN ( SELECT COUNT ( 1 ) FROM amos_tzs_biz.p_plan_task pt WHERE (pt.finish_status = '0' OR pt.finish_status = '1') AND ppt.use_code = pt.use_code AND pt.plan_type = #{companyDto.planType} AND pt.check_date BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
+        WHEN ( SELECT COUNT ( 1 ) FROM ${staticTableName} pt WHERE pt.not_start > 0 AND psd.unit_code = ei.use_code  AND pt.check_time BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
         '未完成'
-        WHEN ( SELECT COUNT ( 1 ) FROM amos_tzs_biz.p_plan_task pt WHERE pt.finish_status = '2' AND pt.risk_status = '1' AND ppt.use_code = pt.use_code  AND pt.plan_type = #{companyDto.planType} AND pt.check_date BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
+        WHEN ( SELECT COUNT ( 1 ) FROM ${staticTableName} pt WHERE pt.risk_end > 0 AND psd.unit_code = ei.use_code   AND pt.check_time BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
         '已完成有风险'
-        WHEN ( SELECT COUNT ( 1 ) FROM amos_tzs_biz.p_plan_task pt WHERE pt.finish_status = '2' AND pt.risk_status = '2' AND ppt.use_code = pt.use_code AND pt.plan_type = #{companyDto.planType} AND pt.check_date BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
+        WHEN ( SELECT COUNT ( 1 ) FROM ${staticTableName} pt WHERE pt.no_risk_end > 0 AND psd.unit_code = ei.use_code  AND pt.check_time BETWEEN #{companyDto.checkStartTime} AND #{companyDto.checkEndTime} ) > 0 THEN
         '已完成无风险'
         ELSE '无任务'
         END AS checkStatus
         FROM
-        amos_tzs_biz.tz_base_enterprise_info ei
-        LEFT JOIN  amos_tzs_biz.p_plan_task  ppt  ON ei.use_code = ppt.use_code
+        tz_base_enterprise_info ei
+        LEFT JOIN  ${staticTableName} psd  ON ei.use_code = psd.unit_code
         WHERE
             ei.supervise_org_code like concat(#{orgCode},'%')
         <if test="companyDto.useUnit != '' and companyDto.useUnit != null">
@@ -94,7 +94,5 @@
                 and tt.checkStatus = #{companyDto.checkStatus}
             </if>
         </where>
-
-
     </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/service/impl/TzsTwoStaffingServiceImpl.java

@@ -155,7 +155,9 @@ public class TzsTwoStaffingServiceImpl extends BaseService<TzsTwoStaffingDto, Tz
         companyDto.setPlanType(ObjectUtils.isEmpty(companyDto.getPlanType()) ? "1" : companyDto.getPlanType());
         companyDto.setCheckStartTime(ObjectUtils.isEmpty(companyDto.getCheckStartTime()) ? startDay : companyDto.getCheckStartTime());
         companyDto.setCheckEndTime(ObjectUtils.isEmpty(companyDto.getCheckEndTime()) ? endDay : companyDto.getCheckEndTime());
-        return tzsTwoStaffingMapper.getCompanyCheckList(page, orgCode, companyDto);
+        // todo 此处统计表名通过接口查询得到 接口暂未实现
+        String staticTableName = "p_static_day";
+        return tzsTwoStaffingMapper.getCompanyCheckList(page, orgCode, staticTableName, companyDto);
     }