工作情况表 导出字段 查询逻辑调整

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -166,7 +166,7 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
     Integer getQuarterAllNetworkDrillNumber(@Param("orgPath") String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
-    Integer getQuarterAllNetworkDrillPeopleNumber(String orgPath);
+    Integer getQuarterAllNetworkDrillPeopleNumber(@Param("orgPath")String orgPath, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
      * 物防达标情况

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -542,18 +542,18 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             Integer eduNumber = baseMapper.getEduNumber(s.getPath(), beginOfQuarter, endOfQuarter);
             securityWorkExport.setQuarterSafetyEducationNumber(eduNumber);
             //教育人数
-            Integer eduUser = baseMapper.getEduUser(s.getPath());
-            securityWorkExport.setSafetyEducationPeopleNumber(eduUser);
+//            Integer eduUser = baseMapper.getEduUser(s.getPath());
+//            securityWorkExport.setSafetyEducationPeopleNumber(eduUser);
             //总行演练次数
             Integer quarterDrillNumber = baseMapper.getQuarterDrillNumber(s.getPath(), beginOfQuarter, endOfQuarter);
             securityWorkExport.setQuarterDrillNumber(quarterDrillNumber);
             //总行演练人数
-            Integer quarterDrillPeopleNumber = baseMapper.getQuarterDrillPeopleNumber(s.getPath());
-            securityWorkExport.setQuarterDrillPeopleNumber(quarterDrillPeopleNumber);
+//            Integer quarterDrillPeopleNumber = baseMapper.getQuarterDrillPeopleNumber(s.getPath());
+//            securityWorkExport.setQuarterDrillPeopleNumber(quarterDrillPeopleNumber);
             //营业网点预案演练
             Integer quarterAllNetworkDrillNumber = baseMapper.getQuarterAllNetworkDrillNumber(s.getPath(), beginOfQuarter, endOfQuarter);
             securityWorkExport.setQuarterAllNetworkDrillNumber(quarterAllNetworkDrillNumber);
-            Integer quarterAllNetworkDrillPeopleNumber = baseMapper.getQuarterAllNetworkDrillPeopleNumber(s.getPath());
+            Integer quarterAllNetworkDrillPeopleNumber = baseMapper.getQuarterAllNetworkDrillPeopleNumber(s.getPath(), beginOfQuarter, endOfQuarter);
             securityWorkExport.setQuarterAllNetworkDrillPeopleNumber(quarterAllNetworkDrillPeopleNumber);
             securityWorkExportList.add(securityWorkExport);
         });

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -15,7 +15,7 @@ import lombok.Data;
  */
 @Data
 @ColumnWidth(15) //列宽,最大值为255
-@HeadRowHeight(32) //表头行高
+@HeadRowHeight(48) //表头行高
 @ContentRowHeight(16) //数据行高
 public class SecurityWorkExport {
     @ExcelProperty(value = {"序号", ""}, index = 0)
@@ -129,21 +129,21 @@ public class SecurityWorkExport {
     private Integer foundDangerNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "已整改隐患数"}, index = 54)
     private Integer rectificationDangerNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含逾期整改、未整改隐患)"}, index = 55)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含待整改、已逾期、逾期整改)"}, index = 55)
     private Integer noRectificationDangerNumber;
     @ExcelProperty(value = {"营业网点安全检查", "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 56)
     private Integer quarterSelfInspectNumber;
     @ExcelProperty(value = {"安全教育", "本季度总行(联社)组织开展安全教育次数"}, index = 57)
     private Integer quarterSafetyEducationNumber;
-    @ExcelProperty(value = {"安全教育", "共计参与安全教育员工人次"}, index = 58)
-    private Integer safetyEducationPeopleNumber;
-    @ExcelProperty(value = {"总行（联社）预案演练", "本季度开展预案演练次数"}, index = 59)
+//    @ExcelProperty(value = {"安全教育", "共计参与安全教育员工人次"}, index = 58)
+//    private Integer safetyEducationPeopleNumber;
+    @ExcelProperty(value = {"总行（联社）预案演练", "本季度开展预案演练次数"}, index = 58)
     private Integer quarterDrillNumber;
-    @ExcelProperty(value = {"总行（联社）预案演练", "参与预案演练员工人次"}, index = 60)
-    private Integer quarterDrillPeopleNumber;
-    @ExcelProperty(value = {"营业网点预案演练", "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）"}, index = 61)
+//    @ExcelProperty(value = {"总行（联社）预案演练", "参与预案演练员工人次"}, index = 60)
+//    private Integer quarterDrillPeopleNumber;
+    @ExcelProperty(value = {"营业网点预案演练", "本季度辖内所有营业网点开展预案演练次数（每个网点演练次数的累计数）"}, index = 59)
     private Integer quarterAllNetworkDrillNumber;
-    @ExcelProperty(value = {"营业网点预案演练", "辖内所有营业网点参与预案演练员工人次"}, index = 62)
+    @ExcelProperty(value = {"营业网点预案演练", "辖内所有营业网点参与预案演练员工人次"}, index = 60)
     private Integer quarterAllNetworkDrillPeopleNumber;
 
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1073,8 +1073,8 @@ and
           AND b.deleted = 0
           and b.is_lock = 0
           AND c.check_type =3
-and a.org_path LIKE concat(#{orgPath}, '%')
- AND a.ymd_date BETWEEN #{startTime} and #{endTime}
+          and a.org_path LIKE concat(#{orgPath}, '%')
+          AND a.submit_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="getEduNumber" resultType="java.lang.Integer">
         SELECT
@@ -1083,7 +1083,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
             core_edu_training_task a
                 LEFT JOIN core_edu_training_plan b ON a.plan_id = b.id
         WHERE
-            b.exec_org_type = 1
+            b.exec_org_type = 3
           AND b.deleted =0
         and a.org_path    like concat(concat('%',#{orgPath}),'%')
           AND a.training_start_date_time BETWEEN #{startTime} and #{endTime}
@@ -1103,7 +1103,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
         FROM
             core_drill_task a
                 LEFT JOIN core_drill_plan b ON a.plan_id = b.id
-        WHERE b.exec_org_type=1
+        WHERE b.exec_org_type=3
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
           AND a.drill_start_time BETWEEN #{startTime} and #{endTime}
     </select>
@@ -1115,7 +1115,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
                 LEFT JOIN core_drill_plan b ON a.plan_id = b.id
                 LEFT JOIN core_drill_task_to_user c ON c.drill_task_id = a.id
         WHERE
-            b.exec_org_type = 1
+            b.exec_org_type = 3
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
     </select>
     <select id="getQuarterAllNetworkDrillNumber" resultType="java.lang.Integer">
@@ -1138,6 +1138,7 @@ and a.org_path LIKE concat(#{orgPath}, '%')
         WHERE
             b.exec_org_type = 4
           and a.org_path    like concat(concat('%',#{orgPath}),'%')
+          AND a.drill_start_time BETWEEN #{startTime} and #{endTime}
     </select>
     <select id="getAlone" resultType="java.lang.Integer">
         SELECT