Merge remote-tracking branch 'origin/master'

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/RehearsalYearVO.java

@@ -50,4 +50,7 @@ public class RehearsalYearVO {
 
     @ApiModelProperty("12月完成数")
     private Long decemberNum;
+
+    @ApiModelProperty("合计完成数")
+    private Long sum;
 }

hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/vo/TrainYearVO.java

@@ -50,4 +50,7 @@ public class TrainYearVO {
 
     @ApiModelProperty("12月完成数")
     private Long decemberNum;
+
+    @ApiModelProperty("合计完成数")
+    private Long sum;
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/ConferenceController.java

@@ -114,8 +114,8 @@ public class ConferenceController extends BladeController {
     @ApiOperation(value = "会议记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<ConferenceRecordEntity>> recordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<ConferenceRecordEntity> page = conferenceRecordService.page(Condition.getPage(query),
+        IPage<ConferenceRecordEntity> page = conferenceRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
-                Condition.getQueryWrapper(param, ConferenceRecordEntity.class));
+                param, ConferenceRecordEntity.class).lambda().orderByDesc(ConferenceRecordEntity::getCreateTime));
         return R.data(page);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/HygieneController.java

@@ -2,11 +2,9 @@ package com.hnac.hzims.safeproduct.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.hnac.hzims.common.utils.Condition;
 import com.hnac.hzims.safeproduct.dto.HygienePlanDTO;
 import com.hnac.hzims.safeproduct.dto.HygieneRecordDTO;
 import com.hnac.hzims.safeproduct.entity.HygienePlanEntity;
-import com.hnac.hzims.safeproduct.entity.HygieneRecordEntity;
 import com.hnac.hzims.safeproduct.service.IHygienePlanService;
 import com.hnac.hzims.safeproduct.service.IHygieneRecordService;
 import com.hnac.hzims.safeproduct.vo.HygienePlanDetailVO;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/RehearsalController.java

@@ -116,24 +116,24 @@ public class RehearsalController extends BladeController {
     @ApiOperation(value = "演练记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<RehearsalRecordEntity>> rehearsalRecordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<RehearsalRecordEntity> page = rehearsalRecordService.page(Condition.getPage(query),
+        IPage<RehearsalRecordEntity> page = rehearsalRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
-                Condition.getQueryWrapper(param, RehearsalRecordEntity.class));
+                param, RehearsalRecordEntity.class).lambda().orderByDesc(RehearsalRecordEntity::getCreateTime));
         return R.data(page);
     }
 
     @GetMapping("/dataByMonth")
     @ApiOperation(value = "月度统计表")
     @ApiOperationSupport(order = 11)
-    public R<IPage<RehearsalMonthVO>> dataByMonth(@RequestParam String month, Query query) {
+    public R<IPage<RehearsalMonthVO>> dataByMonth(@RequestParam String month, String unit, Query query) {
-        IPage<RehearsalMonthVO> page = rehearsalPlanService.dataByMonth(month, query);
+        IPage<RehearsalMonthVO> page = rehearsalPlanService.dataByMonth(month, unit, query);
         return R.data(page);
     }
 
     @GetMapping("/dataByYear")
     @ApiOperation(value = "年度统计表")
     @ApiOperationSupport(order = 12)
-    public R<IPage<RehearsalYearVO>> dataByYear(@RequestParam String year, Query query) {
+    public R<IPage<RehearsalYearVO>> dataByYear(@RequestParam String year, String unit, Query query) {
-        IPage<RehearsalYearVO> page = rehearsalPlanService.dataByYear(year, query);
+        IPage<RehearsalYearVO> page = rehearsalPlanService.dataByYear(year, unit, query);
         return R.data(page);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/TrainController.java

@@ -128,7 +128,8 @@ public class TrainController extends BladeController {
     @ApiOperation(value = "培训记录分页")
     @ApiOperationSupport(order = 10)
     public R<IPage<TrainRecordEntity>> trainRecordPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<TrainRecordEntity> page = trainRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TrainRecordEntity.class));
+        IPage<TrainRecordEntity> page = trainRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(
+                param, TrainRecordEntity.class).lambda().orderByDesc(TrainRecordEntity::getCreateTime));
         return R.data(page);
     }
 
@@ -176,7 +177,8 @@ public class TrainController extends BladeController {
     @ApiOperation(value = "考试记录分页")
     @ApiOperationSupport(order = 16)
     public R<IPage<TestEntity>> testPage(@ApiIgnore @RequestParam Map<String, Object> param, Query query) {
-        IPage<TestEntity> page = testService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TestEntity.class));
+        IPage<TestEntity> page = testService.page(Condition.getPage(query), Condition.getQueryWrapper(param, TestEntity.class)
+                .lambda().orderByDesc(TestEntity::getCreateTime));
         return R.data(page);
     }
 
@@ -206,16 +208,16 @@ public class TrainController extends BladeController {
     @GetMapping("/trainDataByMonth")
     @ApiOperation(value = "培训月度统计表")
     @ApiOperationSupport(order = 20)
-    public R<IPage<TrainMonthVO>> trainDataByMonth(@RequestParam String month, Query query) {
+    public R<IPage<TrainMonthVO>> trainDataByMonth(@RequestParam String month, String unit, Query query) {
-        IPage<TrainMonthVO> page = trainPlanService.dataByMonth(month, query);
+        IPage<TrainMonthVO> page = trainPlanService.dataByMonth(month, unit, query);
         return R.data(page);
     }
 
     @GetMapping("/trainDataByYear")
     @ApiOperation(value = "培训年度统计表")
     @ApiOperationSupport(order = 21)
-    public R<IPage<TrainYearVO>> trainDataByYear(@RequestParam String year, Query query) {
+    public R<IPage<TrainYearVO>> trainDataByYear(@RequestParam String year, String unit, Query query) {
-        IPage<TrainYearVO> page = trainPlanService.dataByYear(year, query);
+        IPage<TrainYearVO> page = trainPlanService.dataByYear(year, unit, query);
         return R.data(page);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferencePlanMapper.xml

@@ -19,5 +19,7 @@
         <if test="endTime != 'null' and endTime != ''">
             AND t1.scheduled_end_time &lt; #{endTime}
         </if>
+        ORDER BY
+            t1.create_time DESC
     </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneRecordMapper.xml

@@ -22,5 +22,7 @@
         <if test="param.hygienePlanId != null and param.hygienePlanId != ''">
             AND hygiene_plan_id = #{hygienePlanId}
         </if>
+        ORDER BY
+            create_time DESC
     </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/HygieneZoneMapper.java

@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+/**
+ * 卫生自查责任区Mapper类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 @Mapper
 public interface HygieneZoneMapper extends BaseMapper<HygieneZoneEntity> {
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.java

@@ -24,26 +24,29 @@ public interface RehearsalPlanMapper extends BaseMapper<RehearsalPlanEntity> {
     /**
      * 查询当月各单位的演练总数
      * @param page 分页类
+     * @param unit 单位
      * @param month 月份
      * @return 当月的演练总数据
      */
-    IPage<RehearsalMonthVO> selectByMonth(IPage<RehearsalMonthVO> page, String month);
+    IPage<RehearsalMonthVO> selectByMonth(IPage<RehearsalMonthVO> page, String unit, String month);
 
     /**
      * 查询当月各单位已完成的演练数据
      * @param page 分页类
+     * @param unit 单位
      * @param month 月份
      * @return 当月的已完成数据
      */
-    IPage<RehearsalMonthVO> selectFinishedDataByMonth(IPage<RehearsalMonthVO> page, String month);
+    IPage<RehearsalMonthVO> selectFinishedDataByMonth(IPage<RehearsalMonthVO> page, String unit, String month);
 
     /**
      * 查询当年的所有单位
      * @param page 分页类
+     * @param unit 单位
      * @param year 年份
      * @return 年度单位数据
      */
-    IPage<RehearsalYearVO> selectUnitByYear(IPage<RehearsalYearVO> page, @Param("year") String year);
+    IPage<RehearsalYearVO> selectUnitByYear(IPage<RehearsalYearVO> page, String unit, @Param("year") String year);
 
     /**
      * 查询各单位全年已完成的演练数据

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/RehearsalPlanMapper.xml

@@ -10,6 +10,9 @@
         WHERE
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{month}, '%')
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         GROUP BY
             unit
         ORDER BY
@@ -25,6 +28,9 @@
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{month}, '%')
             AND rehearsal_status = 'FINISHED'
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         GROUP BY
             unit
         ORDER BY
@@ -39,6 +45,9 @@
         WHERE
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{year}, '%')
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         ORDER BY
             unit
     </select>
@@ -80,5 +89,7 @@
         <if test="endTime != 'null' and endTime != ''">
             AND t1.scheduled_end_time &lt; #{endTime}
         </if>
+        ORDER BY
+            t1.create_time DESC
     </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TestMapper.xml

@@ -9,6 +9,10 @@
             hzims_test
         WHERE
             is_deleted = 0
+        <if test="trainPlanId != null and trainPlanId != ''">
             AND train_plan_id = #{trainPlanId}
+        </if>
+        ORDER BY
+            create_time DESC
     </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.java

@@ -22,26 +22,29 @@ public interface TrainPlanMapper extends BaseMapper<TrainPlanEntity> {
     /**
      * 查询当月各单位的培训计划总数
      * @param page 分页类
+     * @param unit 单位
      * @param month 月份
      * @return 当月培训计划总数
      */
-    IPage<TrainMonthVO> selectByMonth(IPage<TrainMonthVO> page, String month);
+    IPage<TrainMonthVO> selectByMonth(IPage<TrainMonthVO> page, String unit, String month);
 
     /**
      * 查询当月各单位已完成的培训计划数据
      * @param page1 分页类
+     * @param unit 单位
      * @param month 月份
      * @return 当月已完成培训计划数
      */
-    IPage<TrainMonthVO> selectFinishedDataByMonth(IPage<TrainMonthVO> page1, String month);
+    IPage<TrainMonthVO> selectFinishedDataByMonth(IPage<TrainMonthVO> page1, String unit, String month);
 
     /**
      * 查询当年的所有单位
      * @param page 分页类
+     * @param unit 单位
      * @param year 年份
      * @return 年度单位数据
      */
-    IPage<TrainYearVO> selectUnitByYear(IPage<TrainYearVO> page, String year);
+    IPage<TrainYearVO> selectUnitByYear(IPage<TrainYearVO> page, String unit, String year);
 
     /**
      * 查询各单位全年已完成的培训计划数

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/TrainPlanMapper.xml

@@ -10,6 +10,9 @@
         WHERE
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{month}, '%')
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         GROUP BY
             unit
         ORDER BY
@@ -25,6 +28,9 @@
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{month}, '%')
             AND train_status = 'FINISHED'
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         GROUP BY
             unit
         ORDER BY
@@ -39,6 +45,9 @@
         WHERE
             is_deleted = 0
             AND scheduled_end_time like concat('%', #{year}, '%')
+        <if test="unit != null and unit != ''">
+            AND unit like concat('%', #{unit}, '%')
+        </if>
         ORDER BY
             unit
     </select>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IHygieneZoneService.java

@@ -5,6 +5,12 @@ import com.hnac.hzims.safeproduct.entity.HygieneZoneEntity;
 
 import java.util.List;
 
+/**
+ * 卫生自查责任区服务类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 public interface IHygieneZoneService extends IService<HygieneZoneEntity> {
 
     /**

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/IRehearsalPlanService.java

@@ -29,18 +29,20 @@ public interface IRehearsalPlanService extends IService<RehearsalPlanEntity> {
     /**
      * 演练月度数据
      * @param month 月份
+     * @param unit 单位
      * @param query 分页类
      * @return 月度统计分页
      */
-    IPage<RehearsalMonthVO> dataByMonth(String month, Query query);
+    IPage<RehearsalMonthVO> dataByMonth(String month, String unit, Query query);
 
     /**
      * 演练年度数据
      * @param year 年份
+     * @param unit 单位
      * @param query 分页类
      * @return 年度统计分页
      */
-    IPage<RehearsalYearVO> dataByYear(String year, Query query);
+    IPage<RehearsalYearVO> dataByYear(String year, String unit, Query query);
 
     /**
      * 演练计划数据导出

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ITrainPlanService.java

@@ -22,18 +22,20 @@ public interface ITrainPlanService extends IService<TrainPlanEntity> {
     /**
      * 月度培训数据
      * @param month 月份
+     * @param unit 单位
      * @param query 分页类
      * @return 月度培训分页
      */
-    IPage<TrainMonthVO> dataByMonth(String month, Query query);
+    IPage<TrainMonthVO> dataByMonth(String month, String unit, Query query);
 
     /**
      * 年度培训数据
      * @param year 年份
+     * @param unit 单位
      * @param query 分页类
      * @return 年度培训分页
      */
-    IPage<TrainYearVO> dataByYear(String year, Query query);
+    IPage<TrainYearVO> dataByYear(String year, String unit, Query query);
 
     /**
      * 删除培训计划

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/ConferencePlanServiceImpl.java

@@ -73,6 +73,7 @@ public class ConferencePlanServiceImpl extends ServiceImpl<ConferencePlanMapper,
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(ConferencePlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(ConferencePlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygienePlanServiceImpl.java

@@ -85,6 +85,7 @@ public class HygienePlanServiceImpl extends ServiceImpl<HygienePlanMapper, Hygie
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(HygienePlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(HygienePlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneRecordServiceImpl.java

@@ -6,7 +6,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.converters.longconverter.LongStringConverter;
 import com.alibaba.excel.util.CollectionUtils;
-import com.alibaba.excel.write.merge.LoopMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -25,8 +24,6 @@ import com.hnac.hzims.safeproduct.utils.BaseUtil;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordPageVO;
 import com.hnac.hzims.safeproduct.vo.HygieneZoneDetailVO;
 import com.hnac.hzims.safeproduct.vo.HygieneRecordDetailVO;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/HygieneZoneServiceImpl.java

@@ -11,6 +11,12 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.stream.Collectors;
 
+/**
+ * 卫生自查责任区服务实现类
+ *
+ * @author liwen
+ * @date 2024-01-02
+ */
 @Service
 public class HygieneZoneServiceImpl extends ServiceImpl<HygieneZoneMapper, HygieneZoneEntity> implements IHygieneZoneService {
 

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/RehearsalPlanServiceImpl.java

@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -68,10 +69,10 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
      * 演练月度数据
      */
     @Override
-    public IPage<RehearsalMonthVO> dataByMonth(String month, Query query) {
+    public IPage<RehearsalMonthVO> dataByMonth(String month, String unit, Query query) {
         // 查询当月各单位的演练总数
         IPage<RehearsalMonthVO> page = new Page<>(query.getCurrent(), query.getSize());
-        IPage<RehearsalMonthVO> unitPage = baseMapper.selectByMonth(page, month);
+        IPage<RehearsalMonthVO> unitPage = baseMapper.selectByMonth(page, unit, month);
         List<RehearsalMonthVO> unitList = unitPage.getRecords();
         // 若无数据，返回空页面
         if (CollectionUtils.isEmpty(unitList)) {
@@ -79,18 +80,18 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         }
         // 查询当月各单位已完成的演练数据
         IPage<RehearsalMonthVO> page1 = new Page<>(query.getCurrent(), query.getSize());
-        IPage<RehearsalMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, month);
+        IPage<RehearsalMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, unit, month);
         List<RehearsalMonthVO> finishedList = finishedPage.getRecords();
         // 处理统计数据
-        for (RehearsalMonthVO unit : unitList) {
+        for (RehearsalMonthVO u : unitList) {
-            Long taskNum = unit.getScheduledTaskNum();
+            Long taskNum = u.getScheduledTaskNum();
-            Optional<RehearsalMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(unit.getUnit())).findFirst();
+            Optional<RehearsalMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(u.getUnit())).findFirst();
             Long finishedTaskNum = finishedRehearsal.isPresent() ? finishedRehearsal.get().getFinishedTaskNum() : 0L;
-            unit.setFinishedTaskNum(finishedTaskNum);
+            u.setFinishedTaskNum(finishedTaskNum);
-            unit.setUnfinishedTaskNum(taskNum - finishedTaskNum);
+            u.setUnfinishedTaskNum(taskNum - finishedTaskNum);
             BigDecimal taskDecimal = new BigDecimal(taskNum);
             BigDecimal finishedDecimal = new BigDecimal(finishedTaskNum);
-            unit.setTaskCompletionRate(finishedDecimal.divide(taskDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+            u.setTaskCompletionRate(finishedDecimal.divide(taskDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
                     .setScale(2, RoundingMode.HALF_UP));
         }
         unitPage.setRecords(unitList);
@@ -101,10 +102,10 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
      * 演练年度数据
      */
     @Override
-    public IPage<RehearsalYearVO> dataByYear(String year, Query query) {
+    public IPage<RehearsalYearVO> dataByYear(String year, String unit, Query query) {
         IPage<RehearsalYearVO> page = new Page<>(query.getCurrent(), query.getSize());
         // 查询当年的所有单位
-        IPage<RehearsalYearVO> unitPage = baseMapper.selectUnitByYear(page, year);
+        IPage<RehearsalYearVO> unitPage = baseMapper.selectUnitByYear(page, unit, year);
         List<RehearsalYearVO> records = unitPage.getRecords();
         // 若无数据，返回空页面
         if (CollectionUtils.isEmpty(records)) {
@@ -114,49 +115,66 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         // 查询各单位全年已完成的演练数据
         List<AnalysisYearDTO> unitMonthDataList = baseMapper.selectFinishedDataByUnit(unitList, year);
         // 将各单位每个月的演练数据写入统计列表
+        List<RehearsalYearVO> res = new ArrayList<>();
         unitMonthDataList.forEach(data -> {
             RehearsalYearVO rehearsalYearVO = records.stream().filter(x -> x.getUnit().equals(data.getUnit()))
                     .collect(Collectors.toList()).get(0);
+            long sum = rehearsalYearVO.getSum() == null ? 0 : rehearsalYearVO.getSum();
             // 根据月份匹配写入对应字段
             switch (data.getDateTime()) {
                 case "01":
                     rehearsalYearVO.setJanuaryNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "02":
                     rehearsalYearVO.setFebruaryNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "03":
                     rehearsalYearVO.setMarchNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "04":
                     rehearsalYearVO.setAprilNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "05":
                     rehearsalYearVO.setMayNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "06":
                     rehearsalYearVO.setJuneNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "07":
                     rehearsalYearVO.setJulyNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "08":
                     rehearsalYearVO.setAugustNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "09":
                     rehearsalYearVO.setSeptemberNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "10":
                     rehearsalYearVO.setOctoberNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "11":
                     rehearsalYearVO.setNovemberNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "12":
                     rehearsalYearVO.setDecemberNum(data.getFinishedNum());
+                    rehearsalYearVO.setSum(sum + data.getFinishedNum());
+            }
+            if (rehearsalYearVO.getSum() != 0) {
+                res.add(rehearsalYearVO);
             }
         });
-        unitPage.setRecords(records);
+        unitPage.setRecords(res);
         return unitPage;
     }
 
@@ -259,6 +277,7 @@ public class RehearsalPlanServiceImpl extends ServiceImpl<RehearsalPlanMapper, R
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(RehearsalPlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(RehearsalPlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainPlanServiceImpl.java

@@ -34,6 +34,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -58,10 +59,10 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
      * 月度培训数据
      */
     @Override
-    public IPage<TrainMonthVO> dataByMonth(String month, Query query) {
+    public IPage<TrainMonthVO> dataByMonth(String month, String unit, Query query) {
         // 查询当月各单位的培训计划总数
         IPage<TrainMonthVO> page = new Page<>(query.getCurrent(), query.getSize());
-        IPage<TrainMonthVO> unitPage = baseMapper.selectByMonth(page, month);
+        IPage<TrainMonthVO> unitPage = baseMapper.selectByMonth(page, unit, month);
         List<TrainMonthVO> unitList = unitPage.getRecords();
         // 若无数据，返回空页面
         if (CollectionUtils.isEmpty(unitList)) {
@@ -69,18 +70,18 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         }
         // 查询当月各单位已完成的培训数据
         IPage<TrainMonthVO> page1 = new Page<>(query.getCurrent(), query.getSize());
-        IPage<TrainMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, month);
+        IPage<TrainMonthVO> finishedPage = baseMapper.selectFinishedDataByMonth(page1, unit, month);
         List<TrainMonthVO> finishedList = finishedPage.getRecords();
         // 处理统计数据
-        for (TrainMonthVO unit : unitList) {
+        for (TrainMonthVO u : unitList) {
-            Long taskNum = unit.getScheduledTrainNum();
+            Long taskNum = u.getScheduledTrainNum();
-            Optional<TrainMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(unit.getUnit())).findFirst();
+            Optional<TrainMonthVO> finishedRehearsal = finishedList.stream().filter(x -> x.getUnit().equals(u.getUnit())).findFirst();
             Long finishedTaskNum = finishedRehearsal.isPresent() ? finishedRehearsal.get().getFinishedTrainNum() : 0L;
-            unit.setFinishedTrainNum(finishedTaskNum);
+            u.setFinishedTrainNum(finishedTaskNum);
-            unit.setUnfinishedTrainNum(taskNum - finishedTaskNum);
+            u.setUnfinishedTrainNum(taskNum - finishedTaskNum);
             BigDecimal taskDecimal = new BigDecimal(taskNum);
             BigDecimal finishedDecimal = new BigDecimal(finishedTaskNum);
-            unit.setCompletionRate(finishedDecimal.divide(taskDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
+            u.setCompletionRate(finishedDecimal.divide(taskDecimal, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))
                     .setScale(2, RoundingMode.HALF_UP));
         }
         unitPage.setRecords(unitList);
@@ -91,10 +92,10 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
      * 年度培训数据
      */
     @Override
-    public IPage<TrainYearVO> dataByYear(String year, Query query) {
+    public IPage<TrainYearVO> dataByYear(String year, String unit, Query query) {
         IPage<TrainYearVO> page = new Page<>(query.getCurrent(), query.getSize());
         // 查询当年的所有单位
-        IPage<TrainYearVO> unitPage = baseMapper.selectUnitByYear(page, year);
+        IPage<TrainYearVO> unitPage = baseMapper.selectUnitByYear(page, unit, year);
         List<TrainYearVO> records = unitPage.getRecords();
         // 若无数据，返回空页面
         if (CollectionUtils.isEmpty(records)) {
@@ -104,49 +105,66 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         // 查询各单位全年已完成的培训计划数
         List<AnalysisYearDTO> unitMonthDataList = baseMapper.selectFinishedDataByUnit(unitList, year);
         // 将各单位每个月的培训计划数据写入统计列表
+        List<TrainYearVO> res = new ArrayList<>();
         unitMonthDataList.forEach(data -> {
             TrainYearVO trainYearVO = records.stream().filter(x -> x.getUnit().equals(data.getUnit()))
                     .collect(Collectors.toList()).get(0);
+            long sum = trainYearVO.getSum() == null ? 0 : trainYearVO.getSum();
             // 根据月份匹配写入对应字段
             switch (data.getDateTime()) {
                 case "01":
                     trainYearVO.setJanuaryNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "02":
                     trainYearVO.setFebruaryNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "03":
                     trainYearVO.setMarchNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "04":
                     trainYearVO.setAprilNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "05":
                     trainYearVO.setMayNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "06":
                     trainYearVO.setJuneNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "07":
                     trainYearVO.setJulyNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "08":
                     trainYearVO.setAugustNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "09":
                     trainYearVO.setSeptemberNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "10":
                     trainYearVO.setOctoberNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "11":
                     trainYearVO.setNovemberNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
                     break;
                 case "12":
                     trainYearVO.setDecemberNum(data.getFinishedNum());
+                    trainYearVO.setSum(sum + data.getFinishedNum());
+            }
+            if (trainYearVO.getSum() != 0) {
+                res.add(trainYearVO);
             }
         });
-        unitPage.setRecords(records);
+        unitPage.setRecords(res);
         return unitPage;
     }
 
@@ -256,6 +274,7 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         if (!endTime.equals("null") && !endTime.equals("")) {
             queryWrapper.lambda().le(TrainPlanEntity::getScheduledEndTime, endTime);
         }
+        queryWrapper.lambda().orderByDesc(TrainPlanEntity::getCreateTime);
         return this.page(Condition.getPage(query), queryWrapper);
     }
 
@@ -277,7 +296,7 @@ public class TrainPlanServiceImpl extends ServiceImpl<TrainPlanMapper, TrainPlan
         if (!endTime.equals("null")) {
             queryWrapper.lt(TrainPlanEntity::getScheduledEndTime, endTime);
         }
-        queryWrapper.orderByDesc(TrainPlanEntity::getScheduledEndTime);
+        queryWrapper.orderByDesc(TrainPlanEntity::getCreateTime);
         return this.list(queryWrapper);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TrainRecordServiceImpl.java

@@ -213,7 +213,7 @@ public class TrainRecordServiceImpl extends ServiceImpl<TrainRecordMapper, Train
         if (!trainPlanId.equals("null")) {
             queryWrapper.ge(TrainRecordEntity::getTrainPlanId, trainPlanId);
         }
-        queryWrapper.orderByDesc(TrainRecordEntity::getActualEndTime);
+        queryWrapper.orderByDesc(TrainRecordEntity::getCreateTime);
         return this.list(queryWrapper);
     }
 }

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@@ -516,7 +516,7 @@ public class TicketProcessServiceImpl implements TicketProcessService {
             contentService.saveOrUpdateBatch(workTicketContentDtoList);
         }
         WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish();
-        if(CollectionUtil.isNotEmpty(workTicketContentDtoList)) {
+        if(ObjectUtil.isNotEmpty(workTicketFinish)) {
             workTicketFinishService.saveOrUpdate(workTicketFinish);
         }
         // 推送消息