完善

platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -139,7 +139,10 @@ public class CheckJobDTO extends BaseDTO implements Serializable {
      * 搜索开始时间
      */
     private LocalDateTime searchStartTime;
-
+    /**
+     * 任务超时：0否，1是
+     */
+    private Boolean receiveOvertime;
     /**
      * 搜索结束时间
      */

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFeeDTO.java

@@ -34,7 +34,7 @@ public class RepairFeeDTO extends BaseDTO implements Serializable {
     /**
      * 费用日期
      */
-    private LocalDate date;
+    private LocalDate feeDate;
     /**
      * 主键
      */
@@ -103,4 +103,14 @@ public class RepairFeeDTO extends BaseDTO implements Serializable {
 
     private List<SysFile> fileList;
 
+    /**
+     * 费用日期开始时间:fee_date
+     */
+    private LocalDateTime searchStartTime;
+
+    /**
+     * 搜索结束时间:fee_date
+     */
+    private LocalDateTime searchEndTime;
+
 }

platform-dao/src/main/java/com/platform/dao/entity/check/CheckJob.java

@@ -141,6 +141,10 @@ public class CheckJob implements Serializable {
      * 任务状态: 1-未执行 2-执行中 3-已完成 4-已逾期
      */
     private Integer status;
+    /**
+     * 任务超时：0否，1是
+     */
+    private Boolean receiveOvertime;
     /**
      * 设备状态: 1-正常 2-停机
      */

platform-dao/src/main/java/com/platform/dao/entity/repair/RepairFee.java

@@ -94,6 +94,16 @@ public class RepairFee implements Serializable {
      * 单号:系统内部的单号，不是维修单号或者其他的单号
      */
     private String no;
+    /**
+     * 设备名称
+     */
+    @Transient
+    private String sbName;
+    /**
+     * 设备编号
+     */
+    @Transient
+    private String sbNo;
     /**
      * 委外单号
      */

platform-dao/src/main/java/com/platform/dao/enums/CheckJobStatusEnum.java

@@ -24,11 +24,7 @@ public enum CheckJobStatusEnum {
     /**
      * 已完成
      */
-    FINISHED(3),
-    /**
-     * 已过期
-     */
-    OUT_OF_DATE(4)
+    FINISHED(3)
     ;
     private final Integer value;
 

platform-dao/src/main/java/com/platform/dao/enums/CheckPlanUserTypeEnum.java

@@ -21,14 +21,10 @@ public enum CheckPlanUserTypeEnum {
      * 维修人
      */
     REPAIR_USER(2),
-    /**
-     * 指定
-     */
-    ZHIDING(3),
     /**
      * 厂家
      */
-    FACTORY(4);
+    ZHIDING(3),;
 
     private final Integer value;
 

platform-dao/src/main/java/com/platform/dao/mapper/check/CheckJobMapper.java

@@ -3,6 +3,7 @@ package com.platform.dao.mapper.check;
 import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.config.MyMapper;
 import com.platform.dao.entity.check.CheckJob;
+import com.platform.dao.entity.check.CheckStandard;
 import com.platform.dao.vo.query.check.CheckJobVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -45,4 +46,6 @@ public interface CheckJobMapper extends MyMapper<CheckJob> {
     CheckJobVO  getScreenCountByTime(CheckJobDTO model);
 
     int getNotFinishNumByDTO(CheckJobDTO record);
+
+    void updateBatch(List<CheckJob> updateList);
 }

platform-dao/src/main/java/com/platform/dao/vo/export/check/ExportCheckJobVO.java

@@ -3,6 +3,7 @@ package com.platform.dao.vo.export.check;
 import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -18,10 +19,10 @@ import java.time.LocalDateTime;
 public class ExportCheckJobVO implements Serializable {
 
     /**
-   * 主键
-   */
-  @Excel(name = "主键", orderNum = "1")
-  private String id;
+     * 主键
+     */
+    @Excel(name = "主键", orderNum = "1")
+    private String id;
     /**
      * 设备新号
      */
@@ -38,60 +39,73 @@ public class ExportCheckJobVO implements Serializable {
     @Excel(name = "设备部位", orderNum = "4")
     private String partName;
     /**
-     * 任务名称
+     * 编码
+     */
+    @Excel(name = "标准编码", orderNum = "5")
+    private String standardNo;
+    /**
+     * 要求
      */
-    @Excel(name = "任务名称", orderNum = "5")
-    private String name;
+    @Excel(name = "检查项目", orderNum = "6")
+    private String requirement;
+    /**
+     * 备注
+     */
+    @Excel(name = "执行标准", orderNum = "7")
+    private String remark;
     /**
      * 计划周期
      */
-    @Excel(name = "计划周期", orderNum = "6")
+    @Excel(name = "计划周期", orderNum = "8")
     private String period;
     /**
      * 周期类型
      */
-    @Excel(name = "周期类型", orderNum = "7", dicCode="CHECK_PLAN_PERIOD_TYPE")
+    @Excel(name = "周期类型", orderNum = "9", dicCode = "CHECK_PLAN_PERIOD_TYPE")
     private String periodType;
-  /**
-   * 负责人
-   */
-  @Excel(name = "负责人", orderNum = "8")
-  private String checkUserName;
+    /**
+     * 负责人
+     */
+    @Excel(name = "负责人", orderNum = "10")
+    private String checkUserName;
 
     /**
-   * 任务开始时间
-   */
-  @Excel(name = "执行日期", orderNum = "9")
-  private LocalDate startTime;
+     * 任务开始时间
+     */
+    @Excel(name = "执行日期", orderNum = "11")
+    private LocalDate startTime;
 
     /**
      * 标准工时
      */
-    @Excel(name = "标准工时", orderNum = "10")
+    @Excel(name = "标准工时", orderNum = "12")
     private LocalDate standardHour;
     /**
      * 实际工时
      */
-    @Excel(name = "实际工时", orderNum = "11")
+    @Excel(name = "实际工时", orderNum = "13")
     private String realHours;
     /**
-   * 实际开始时间
-   */
-  @Excel(name = "实际开始时间", orderNum = "12")
-  private LocalDateTime actualStartTime;
+     * 实际开始时间
+     */
+    @Excel(name = "实际开始时间", orderNum = "14")
+    private LocalDateTime actualStartTime;
 
     /**
-   * 实际结束时间
-   */
-  @Excel(name = "实际完成时间", orderNum = "13")
-  private LocalDateTime actualEndTime;
+     * 实际结束时间
+     */
+    @Excel(name = "实际完成时间", orderNum = "15")
+    private LocalDateTime actualEndTime;
 
     /**
-   * 任务状态: 1-未负责 2-负责中 3-已完成 4-已逾期
-   */
-  @Excel(name = "任务状态: 1-未负责 2-负责中 3-已完成 4-已逾期", orderNum = "14", dicCode="CHECK_JOB_STATUS")
-  private Integer status;
-
-
+     * 任务状态: 1-未负责 2-负责中 3-已完成 4-已逾期
+     */
+    @Excel(name = "任务状态", orderNum = "16", dicCode = "CHECK_JOB_STATUS")
+    private Integer status;
+    /**
+     * 任务超时：0否，1是
+     */
+    @Excel(name = "任务超时(0:否，1：是)", orderNum = "17")
+    private Boolean receiveOvertime;
 
 }

platform-dao/src/main/java/com/platform/dao/vo/export/check/ExportCheckStandardVO.java

@@ -3,6 +3,7 @@ package com.platform.dao.vo.export.check;
 import com.platform.office.annotation.Excel;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -18,10 +19,10 @@ import java.time.LocalDateTime;
 public class ExportCheckStandardVO implements Serializable {
 
     /**
-   * id
-   */
-  @Excel(name = "id", orderNum = "1")
-  private String id;
+     * id
+     */
+    @Excel(name = "id", orderNum = "1")
+    private String id;
     /**
      * 标准名称
      */
@@ -35,7 +36,7 @@ public class ExportCheckStandardVO implements Serializable {
     /**
      * 设备等级
      */
-    @Excel(name = "设备等级", orderNum = "4", dicCode="SBINFO_LEVEL")
+    @Excel(name = "设备等级", orderNum = "4", dicCode = "SBINFO_LEVEL")
     private Integer sbLevel;
     /**
      * 设备第一维修人
@@ -43,27 +44,21 @@ public class ExportCheckStandardVO implements Serializable {
     @Excel(name = "设备第一维修人", orderNum = "5")
     private String repairUserName;
     /**
-   * 标准名称
-   */
-  @Excel(name = "标准名称", orderNum = "6")
-  private String name;
-    /**
-   * 编码
-   */
-  @Excel(name = "编码", orderNum = "7")
-  private String no;
-
+     * 编码
+     */
+    @Excel(name = "标准编码", orderNum = "7")
+    private String no;
     /**
-   * 要求
-   */
-  @Excel(name = "要求", orderNum = "8")
-  private String requirement;
+     * 要求
+     */
+    @Excel(name = "检查项目", orderNum = "8")
+    private String requirement;
 
     /**
-   * 备注
-   */
-  @Excel(name = "备注", orderNum = "9")
-  private String remark;
+     * 备注
+     */
+    @Excel(name = "执行标准", orderNum = "9")
+    private String remark;
     /**
      * 计划周期
      */
@@ -72,7 +67,7 @@ public class ExportCheckStandardVO implements Serializable {
     /**
      * 周期类型
      */
-    @Excel(name = "周期类型", orderNum = "11", dicCode="CHECK_PLAN_PERIOD_TYPE")
+    @Excel(name = "周期类型", orderNum = "11", dicCode = "CHECK_PLAN_PERIOD_TYPE")
     private Integer periodType;
     /**
      * 上次实际执行日期
@@ -87,7 +82,7 @@ public class ExportCheckStandardVO implements Serializable {
     /**
      * 执行人方式（1使用人、2维修人、3指定人）
      */
-    @Excel(name = "执行人方式", orderNum = "14", dicCode="CHECK_USER_TYPE")
+    @Excel(name = "执行人方式", orderNum = "14", dicCode = "CHECK_USER_TYPE")
     private Integer checkUserType;
 
     /**

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairApplicationFormVO.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -81,7 +82,7 @@ public class ExportRepairApplicationFormVO implements Serializable {
      * 分析时间
      */
     @Excel(name = "分析时间", orderNum = "12")
-    private LocalDateTime analyzeTime;
+    private LocalDate analyzeTime;
 
     /**
      * 问题描述

platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java

@@ -159,6 +159,10 @@ public class CheckJobVO implements Serializable{
      * 更新时间
      */
     private LocalDateTime updateTime;
+    /**
+     * 任务超时：0否，1是
+     */
+    private Boolean receiveOvertime;
     /**
      * 计划名称
      */

platform-dao/src/main/java/com/platform/dao/vo/report/RepairReportFee.java

@@ -0,0 +1,48 @@
+package com.platform.dao.vo.report;
+
+import com.platform.dao.entity.repair.RepairFee;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *
+ * 费用月统计报表
+ *
+ * @author cyz
+ */
+@Data
+@Accessors(chain = true)
+public class RepairReportFee implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 月份
+     */
+    @Excel(name = "月份", orderNum = "1")
+    private String month;
+
+    /**
+     * 次数
+     */
+    @Excel(name = "费用次数", orderNum = "2")
+    private Integer num;
+    /**
+     * 次数
+     */
+    @Excel(name = "费用总额", orderNum = "3")
+    private Double totalFee;
+    /**
+     * 平均修复时间（Mean time to repair，MTTR）
+     */
+    @Excel(name = "平均费用", orderNum = "4")
+    private Double meanFee;
+
+    /**
+     * 明细列表
+     */
+    List<RepairFee> detailList;
+}

platform-dao/src/main/java/com/platform/dao/vo/tuicalendar/TuiCalendarUtil.java

@@ -79,20 +79,20 @@ public class TuiCalendarUtil {
         calendarInfo3.setDragBgColor(COLOR_FINISHED);
         calendarInfo3.setBorderColor(COLOR_FINISHED);
 
-        CalendarInfo calendarInfo4 = new CalendarInfo();
+        /*CalendarInfo calendarInfo4 = new CalendarInfo();
         calendarInfo4.setId(CheckJobStatusEnum.OUT_OF_DATE.getValue().toString());
         // 红色
         calendarInfo4.setName("已过期");
         calendarInfo4.setColor("#ffffff");
         calendarInfo4.setBgColor(COLOR_OUT_OF_DATE);
         calendarInfo4.setDragBgColor(COLOR_OUT_OF_DATE);
-        calendarInfo4.setBorderColor(COLOR_OUT_OF_DATE);
+        calendarInfo4.setBorderColor(COLOR_OUT_OF_DATE);*/
 
         List<CalendarInfo> list = new ArrayList<CalendarInfo>();
         list.add(calendarInfo);
         list.add(calendarInfo2);
         list.add(calendarInfo3);
-        list.add(calendarInfo4);
+        //list.add(calendarInfo4);
         return list;
     }
     /**

platform-dao/src/main/resources/mapper/check/CheckJobMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.check.CheckJobMapper">
     <sql id="Base_Column_List">
-                             checkjob.id,
+                                     checkjob.id,
                                      checkjob.plan_id,
                                      checkstandard.standard_hours,
                                      checkstandard.real_hours,
@@ -14,6 +14,7 @@
                                      checkjob.actual_end_time,
                                      checkjob.status,
                                      checkjob.sb_status,
+                                     checkjob.receive_overtime,
                                      checkjob.check_user_id,
                                      checkjob.created_user_id,
                                      checkjob.update_user_id,
@@ -21,9 +22,10 @@
                                      checkjob.update_user_name,
                                      checkjob.created_time,
                                      checkjob.update_time
-                        </sql>
+    </sql>
     <sql id="Ref_Column_List">
-                                     checkjob.plan_id,checkjob.actual_user,
+                                     checkjob.plan_id,
+                                     checkjob.actual_user,
                                      checkstandard.standard_hours,
                                      checkstandard.real_hours,
                                      checkjob.start_time,
@@ -36,12 +38,16 @@
                                      checkjob.abnormal_num,
                                      checkjob.check_num,
                                      checkjob.status,
+                                     checkjob.receive_overtime,
                                      checkjob.sb_status
     </sql>
     <sql id="List_Condition">
         <if test="id != null and id != ''">
             and checkjob.id = #{id}
         </if>
+        <if test="receiveOvertime != null">
+            and checkjob.receive_overtime = #{receiveOvertime}
+        </if>
         <if test="planId != null and planId != ''">
             and checkjob.plan_id = #{planId}
         </if>
@@ -186,10 +192,10 @@
     <select id="selectList" parameterType="com.platform.dao.dto.check.CheckJobDTO"
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*, u.real_name as checkUserName,
-               sbinfo.name sbName, sbinfo.no sbNo, sbinfo.level sbLevel,
-               partinfo.name partName,
-               standard.no standardNo, standard.name standardName,standard.level standardLevel,
-               standard.period period, standard.period_type periodType
+        sbinfo.name sbName, sbinfo.no sbNo, sbinfo.level sbLevel,
+        partinfo.name partName,
+        standard.no standardNo, standard.name standardName,standard.level standardLevel,
+        standard.period period, standard.period_type periodType
         from t_check_job as checkjob
         left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
         left join t_part_info partinfo on partinfo.id = checkjob.part_id
@@ -199,11 +205,11 @@
             <include refid="List_Condition"/>
         </where>
         Order By
-                 checkjob.start_time asc,
-                 sbinfo.level asc,
-                 sbinfo.no asc,
-                 standard.period_type asc,
-                 standard.period asc
+        checkjob.start_time asc,
+        sbinfo.level asc,
+        sbinfo.no asc,
+        standard.period_type asc,
+        standard.period asc
     </select>
 
     <select id="getScreenCountByTime" parameterType="com.platform.dao.dto.check.CheckJobDTO"
@@ -224,25 +230,32 @@
     </select>
 
     <select id="selectDetail" resultType="com.platform.dao.vo.query.check.CheckJobVO">
-        select checkjob.*, u.real_name as checkUserName,
-               sbinfo.name sbName, sbinfo.no sbNo,sbinfo.level sbLevel,
-               partinfo.name partName,standard.no standardNo, standard.name standardName,standard.level standardLevel,
-               standard.period period, standard.period_type periodType
+        select checkjob.*,
+               u.real_name as       checkUserName,
+               sbinfo.name          sbName,
+               sbinfo.no            sbNo,
+               sbinfo.level         sbLevel,
+               partinfo.name        partName,
+               standard.no          standardNo,
+               standard.name        standardName,
+               standard.level       standardLevel,
+               standard.period      period,
+               standard.period_type periodType
         from t_check_job as checkjob
-        left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
-        left join t_part_info partinfo on partinfo.id = checkjob.part_id
-        left join t_check_standard standard on standard.id = checkjob.standard_id
-        left join t_sys_user u on checkjob.check_user_id = u.user_id
+                 left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
+                 left join t_part_info partinfo on partinfo.id = checkjob.part_id
+                 left join t_check_standard standard on standard.id = checkjob.standard_id
+                 left join t_sys_user u on checkjob.check_user_id = u.user_id
         where checkjob.id = #{id}
     </select>
 
     <select id="getNotFinishNumByDTO" resultType="java.lang.Integer">
         select count(checkjob.id)
         from t_check_job as checkjob
-                 left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
-                 left join t_part_info partinfo on partinfo.id = checkjob.part_id
-                 left join t_check_standard standard on standard.id = checkjob.standard_id
-                 left join t_sys_user u on checkjob.check_user_id = u.user_id
+        left join t_sb_info sbinfo on sbinfo.id = checkjob.sb_id
+        left join t_part_info partinfo on partinfo.id = checkjob.part_id
+        left join t_check_standard standard on standard.id = checkjob.standard_id
+        left join t_sys_user u on checkjob.check_user_id = u.user_id
         <where>
             <include refid="List_Condition"/>
         </where>
@@ -252,10 +265,20 @@
             resultType="com.platform.dao.vo.query.check.CheckJobVO">
         select checkjob.*
         from t_check_job as checkjob
-        where
-          checkjob.sb_id = #{sbId}
+        where checkjob.sb_id = #{sbId}
           and checkjob.standard_id = #{standardId}
-        order by checkjob.created_time desc
-        limit 1
+        order by checkjob.created_time desc limit 1
     </select>
+
+    <update id="updateBatch" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update t_check_job
+            <set>
+                <if test="item.receiveOvertime != null and item.receiveOvertime != ''">
+                    receive_overtime = #{receiveOvertime}
+                </if>
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>

platform-dao/src/main/resources/mapper/repair/RepairFeeMapper.xml

@@ -15,19 +15,17 @@
         <result column="fee_date" jdbcType="DATE" property="feeDate"/>
         <result column="money_type" jdbcType="SMALLINT" property="moneyType"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="created_user_id" jdbcType="VARCHAR" property="createdUserId"/>
-        <result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
-        <association column="created_user_id" javaType="string" property="createdUserName"
-                     select="com.platform.dao.mapper.upms.SysUserMapper.selectUserNameById"/>
-        <association column="update_user_id" javaType="string" property="updateUserName"
-                     select="com.platform.dao.mapper.upms.SysUserMapper.selectUserNameById"/>
+        <association column="sb_id" javaType="string" property="sbName"
+                     select="com.platform.dao.mapper.sb.SbInfoMapper.selectNameById"/>
+        <association column="sb_id" javaType="string" property="sbNo"
+                     select="com.platform.dao.mapper.sb.SbInfoMapper.selectNoById"/>
         <association column="repair_id" javaType="string" property="repairNo"
                      select="com.platform.dao.mapper.repair.RepairFormMapper.selectNoById"/>
     </resultMap>
     <sql id="Base_Column_List">
         id, sb_id, no, repair_id, fee, type, reason,
-fee_date,money_type,
-descripition, remark, created_time, update_time,
+        fee_date,money_type,
+        descripition, remark, created_time, update_time,
         created_user_id, update_user_id
     </sql>
     <select id="selectPageList" parameterType="com.platform.dao.dto.repair.RepairFeeDTO" resultMap="BaseResultMap">
@@ -44,6 +42,12 @@ descripition, remark, created_time, update_time,
             <if test="sbId != null and sbId != ''">
                 and sb_id = #{sbId}
             </if>
+            <if test="searchStartTime != null">
+                and fee_date <![CDATA[ >= ]]> #{searchStartTime}
+            </if>
+            <if test="searchEndTime != null">
+                and fee_date <![CDATA[ <= ]]> #{searchEndTime}
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object" resultMap="BaseResultMap">

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.platform.dao.mapper.sb.SbInfoMapper">
     <sql id="Base_Column_List">
-        id, no,
+        id
+        , no,
 financing_no,
 financing_no_two,
 financing_no_third,
@@ -80,7 +81,10 @@ scrap_user_name
     </sql>
 
     <sql id="Left_Column">
-        sb.id, sb.no,
+        sb
+        .
+        id
+        , sb.no,
 sb.financing_no_two,
 sb.financing_no_third,
 sb.financing_no_four,
@@ -191,7 +195,7 @@ user.real_name as saveUserName
         where
         1 = 1
         <if test="keyword != null and keyword != ''">
-            and  (
+            and (
             sb.name like concat('%',#{keyword},'%')
             or
             sb.no like concat('%',#{keyword},'%')
@@ -327,7 +331,7 @@ user.real_name as saveUserName
         where
         1 = 1
         <if test="keyword != null and keyword != ''">
-            and  (
+            and (
             sb.name like concat('%',#{keyword},'%')
             or
             sb.no like concat('%',#{keyword},'%')
@@ -408,6 +412,7 @@ user.real_name as saveUserName
         <where>
             sb.zjm is not null
             and sb.jbdh is not null
+            and is_show = true
         </where>
     </select>
 
@@ -424,7 +429,7 @@ user.real_name as saveUserName
         where
         TIMESTAMPDIFF( DAY, CURDATE( ), sb.next_check_date ) <![CDATA[ <= ]]> sb.seat_number
         <if test="keyword != null and keyword != ''">
-            and  (
+            and (
             sb.name like concat('%',#{keyword},'%')
             or
             sb.no like concat('%',#{keyword},'%')
@@ -559,6 +564,12 @@ user.real_name as saveUserName
         where id = #{value}
     </select>
 
+    <select id="selectNoById" parameterType="Object" resultType="java.lang.String">
+        select no
+        from t_sb_info
+        where id = #{value}
+    </select>
+
     <update id="updateBatch" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_sb_info

platform-rest/src/main/java/com/platform/rest/controller/report/RepairReportController.java

@@ -5,15 +5,18 @@ import com.platform.common.util.DateUtils;
 import com.platform.common.util.R;
 import com.platform.dao.dto.check.CheckJobDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
+import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.repair.ExportRepairApplicationFormVO;
 import com.platform.dao.vo.report.CheckJobReportVO;
 import com.platform.dao.vo.report.RepairReport24VO;
+import com.platform.dao.vo.report.RepairReportFee;
 import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.rest.log.annotation.SysLog;
 import com.platform.service.check.CheckJobService;
 import com.platform.service.repair.RepairApplicationFormService;
+import com.platform.service.repair.RepairFeeService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -33,40 +36,43 @@ import java.util.List;
 @RequestMapping("/report/repair")
 public class RepairReportController {
 
-  private final RepairApplicationFormService repairApplicationFormService;
+    private final RepairApplicationFormService repairApplicationFormService;
 
-  /**
-   * 1：>24小时停机次数按月统计
-   * 统计规则：
-   *    1：非计划性维修
-   *    2：报修和维修结束的时间大于24小时,即设备停机修复时间
-   *
-   * 2：设备故障次数按月统计
-   * 统计规则：
-   *    1: 非计划性维修
-   *    2: 时间不限制
-   *
-   * @param dto 查询条件
-   * @param year 查询年份
-   * @return R
-   */
-  @GetMapping("")
-  @SysLog(">24小时停机次数按月统计")
-  public R getMonthReportBig24(RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType){
-      return new R(repairApplicationFormService.getMonthReportBig24(dto, year, startMonth, endMonth, searchType));
-  }
+    private final RepairFeeService repairFeeService;
 
     /**
-     * 1: >24小时停机次数按月统计
+     * 1：>24小时停机次数按月统计
+     * 统计规则：
+     * 1：非计划性维修
+     * 2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     * <p>
+     * 2：设备故障次数按月统计
      * 统计规则：
-     *      1：非计划性维修
-     *      2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     * 1: 非计划性维修
+     * 2: 时间不限制
      *
+     * @param dto  查询条件
+     * @param year 查询年份
+     * @return R
+     */
+    @GetMapping("")
+    @SysLog(">24小时停机次数按月统计")
+    public R getMonthReportBig24(RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType) {
+        return new R(repairApplicationFormService.getMonthReportBig24(dto, year, startMonth, endMonth, searchType));
+    }
+
+    /**
+     * 1: >24小时停机次数按月统计
+     * 统计规则：
+     * 1：非计划性维修
+     * 2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     * <p>
      * 2：设备故障次数按月统计
      * 统计规则：
-     *      1: 非计划性维修
-     *      2: 时间不限制
-     * @param dto 查询条件
+     * 1: 非计划性维修
+     * 2: 时间不限制
+     *
+     * @param dto  查询条件
      * @param year 查询年份
      * @return R
      */
@@ -75,10 +81,10 @@ public class RepairReportController {
     public void export(HttpServletResponse response, RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType) {
         List<RepairReport24VO> list = repairApplicationFormService.getMonthReportBig24(dto, year, startMonth, endMonth, searchType);
         String fileName = "";
-        if(year == null){
-            fileName =  DateUtils.dateToString(startMonth, DateUtils.PATTERN_YMD) + "-" + DateUtils.dateToString(endMonth, DateUtils.PATTERN_YMD)  + (searchType==1?"-24小时停机次数按月统计表":"年-设备故障次数按月统计");
-        }else{
-            fileName =  year + (searchType==1?"年-24小时停机次数按月统计表":"年-设备故障次数按月统计");
+        if (year == null) {
+            fileName = DateUtils.dateToString(startMonth, DateUtils.PATTERN_YMD) + "-" + DateUtils.dateToString(endMonth, DateUtils.PATTERN_YMD) + (searchType == 1 ? "-24小时停机次数按月统计表" : "年-设备故障次数按月统计");
+        } else {
+            fileName = year + (searchType == 1 ? "年-24小时停机次数按月统计表" : "年-设备故障次数按月统计");
         }
         ExcelUtil.exportResponseDict(response, RepairReport24VO.class, list, fileName);
     }
@@ -86,15 +92,16 @@ public class RepairReportController {
     /**
      * MTTR月统计报表
      * 统计规则：
-     *    1：所有非计划性维修，且dealMinutes小于24小时的
-     *    2：所有维修时间累加除以每月的次数
-     * @param dto 查询条件
+     * 1：所有非计划性维修，且dealMinutes小于24小时的
+     * 2：所有维修时间累加除以每月的次数
+     *
+     * @param dto  查询条件
      * @param year 查询年份
      * @return R
      */
     @GetMapping("mttr")
     @SysLog("MTTR月统计报表")
-    public R getMonthReportMttr(RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType){
+    public R getMonthReportMttr(RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType) {
         return new R(repairApplicationFormService.getMonthReportMtrr(dto, year, startMonth, endMonth));
     }
 
@@ -102,22 +109,60 @@ public class RepairReportController {
      * 1: >24小时停机次数按月统计
      * 2: 设备故障次数按月统计
      * 统计规则：
-     *    1：非计划性维修，且dealMinutes小于24小时的
-     *    2：报修和维修结束的时间大于24小时,即设备停机修复时间
-     * @param dto 查询条件
+     * 1：非计划性维修，且dealMinutes小于24小时的
+     * 2：报修和维修结束的时间大于24小时,即设备停机修复时间
+     *
+     * @param dto  查询条件
      * @param year 查询年份
      * @return R
      */
     @GetMapping("/mttr/export")
-    @SysLog("MTTR月统计报表")
+    @SysLog("MTTR月统计报表导出")
     public void exportMttr(HttpServletResponse response, RepairApplicationFormDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
         List<RepairReportMttr> list = repairApplicationFormService.getMonthReportMtrr(dto, year, startMonth, endMonth);
         String fileName = "";
-        if(year == null){
-            fileName =  DateUtils.dateToString(startMonth, DateUtils.PATTERN_YMD) + "-" + DateUtils.dateToString(endMonth, DateUtils.PATTERN_YMD)  + "-MTTR月统计报表";
-        }else{
-            fileName =  year + "年-MTTR月统计报表";
+        if (year == null) {
+            fileName = DateUtils.dateToString(startMonth, DateUtils.PATTERN_YMD) + "-" + DateUtils.dateToString(endMonth, DateUtils.PATTERN_YMD) + "-MTTR月统计报表";
+        } else {
+            fileName = year + "年-MTTR月统计报表";
         }
         ExcelUtil.exportResponseDict(response, RepairReportMttr.class, list, fileName);
     }
+
+    /**
+     * 费用月统计报表
+     * 统计规则：
+     * 1：所有费用
+     *
+     * @param dto  查询条件
+     * @param year 查询年份
+     * @return R
+     */
+    @GetMapping("fee")
+    @SysLog("费用月统计报表")
+    public R getMonthReportFee(RepairFeeDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth, @RequestParam(defaultValue = "1") Integer searchType) {
+        return new R(repairFeeService.getMonthReport(dto, year, startMonth, endMonth));
+    }
+
+    /**
+     * 费用月统计报表
+     * 统计规则：
+     * 1：所有费用
+     *
+     * @param dto  查询条件
+     * @param year 查询年份
+     * @return R
+     */
+    @GetMapping("/fee/export")
+    @SysLog("费用月统计报表导出")
+    public void exportFee(HttpServletResponse response, RepairFeeDTO dto, @RequestParam(required = false) Integer year, @RequestParam(required = false) LocalDate startMonth, @RequestParam(required = false) LocalDate endMonth) {
+        List<RepairReportFee> list = repairFeeService.getMonthReport(dto, year, startMonth, endMonth);
+        String fileName = "";
+        if (year == null) {
+            fileName = DateUtils.dateToString(startMonth, DateUtils.PATTERN_YMD) + "-" + DateUtils.dateToString(endMonth, DateUtils.PATTERN_YMD) + "-费用月统计报表";
+        } else {
+            fileName = year + "年-费用月统计报表";
+        }
+        ExcelUtil.exportResponseDict(response, RepairReportFee.class, list, fileName);
+    }
 }

platform-rest/src/main/java/com/platform/rest/controller/work/WorkJobController.java

@@ -1,169 +0,0 @@
-package com.platform.rest.controller.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.R;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.check.CheckJobDTO;
-import com.platform.dao.entity.work.WorkJob;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.check.ExportCheckJobVO;
-import com.platform.dao.vo.query.check.CheckJobVO;
-import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.check.CheckJobService;
-import com.platform.service.work.WorkJobService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * @Description 点检任务 控制器
- * @Author liuyu
- * @Date 2020-05-29 10:39:40
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/work/jobs")
-public class WorkJobController {
-
-  private final WorkJobService checkJobService;
-
-  /**
-   * 通过id查询单条任务
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<CheckJobVO> getById(@PathVariable("id") String id){
-      return new R<>(checkJobService.getDetail(id));
-  }
-
-  /**
-   * 新增任务
-   *
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @SysLog("新增点检任务")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-add') or @pms.hasPermission('check-polling-jobs-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
-      return new R<>(checkJobService.saveModelByDTO(checkJobDTO));
-  }
-
-  /**
-   * 修改任务
-   *
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @SysLog("修改点检任务")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-edit') or @pms.hasPermission('check-polling-jobs-del')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
-      checkJobService.modModelByDTO(checkJobDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条任务
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除点检任务")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-del') or @pms.hasPermission('check-polling-jobs-del')")
-  public R removeById(@PathVariable String id){
-    checkJobService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量任务
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除点检任务")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-jobs-del') or @pms.hasPermission('check-polling-jobs-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        checkJobService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<CheckJobVO>> query(CheckJobDTO checkJobDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(checkJobService.selectPageList(checkJobDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(CheckJobDTO checkJobDTO) {
-      return new R<>(checkJobService.getModelListByDTO(checkJobDTO));
-  }
-
-  /**
-     * 点检任务导出
-     *
-     * @param checkJobDTO 点检任务DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("点检任务导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-export') or @pms.hasPermission('check-polling-jobs-export')")
-  public void export(HttpServletResponse response, CheckJobDTO checkJobDTO) {
-    List<WorkJob> list = checkJobService.getModelListByDTO(checkJobDTO);
-    ExcelUtil.exportResponseDict(response, ExportCheckJobVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckJobVO.class), "点检任务");
-  }
-
-  /**
-   * 执行点检任务
-   *
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @SysLog("执行点检任务")
-  @PutMapping("/execute")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-execute') or @pms.hasPermission('check-polling-jobs-execute')")
-  public R executeJob(@Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
-    checkJobService.executeJob(checkJobDTO.getId());
-    return new R<>();
-  }
-
-  /**
-   * 修改任务
-   *
-   * @param checkJobDTO 点检任务DTO
-   * @return R
-   */
-  @SysLog("完成点检任务")
-  @PutMapping("/finish")
-  @PreAuthorize("@pms.hasPermission('check-spot-jobs-finish') or @pms.hasPermission('check-polling-jobs-finish')")
-  public R finishJob(@Validated({UpdateGroup.class}) @RequestBody CheckJobDTO checkJobDTO) {
-    checkJobService.finishJob(checkJobDTO);
-    return new R<>();
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/work/WorkPlanController.java

@@ -1,140 +0,0 @@
-package com.platform.rest.controller.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.R;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.check.CheckPlanDTO;
-import com.platform.dao.entity.work.WorkPlan;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.check.ExportCheckPlanVO;
-import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.check.CheckPlanService;
-import com.platform.service.work.WorkPlanService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * @Description 点检计划 控制器
- * @Author liuyu
- * @Date 2020-05-29 10:15:36
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/work/plans")
-public class WorkPlanController {
-
-  private final WorkPlanService checkPlanService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<WorkPlan> getById(@PathVariable("id") String id){
-      return new R<>(checkPlanService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param checkPlanDTO 点检计划DTO
-   * @return R
-   */
-  @SysLog("新增点检计划")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-plans-add') or @pms.hasPermission('check-polling-plans-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody CheckPlanDTO checkPlanDTO) {
-      return new R<>(checkPlanService.saveModelByDTO(checkPlanDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param checkPlanDTO 点检计划DTO
-   * @return R
-   */
-  @SysLog("修改点检计划")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-plans-edit') or @pms.hasPermission('check-polling-plans-add')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CheckPlanDTO checkPlanDTO) {
-      checkPlanService.modModelByDTO(checkPlanDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除点检计划")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-plans-del') or @pms.hasPermission('check-polling-plans-add')")
-  public R removeById(@PathVariable String id){
-    checkPlanService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除点检计划")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-plans-del') or @pms.hasPermission('check-polling-plans-add')")
-    public R removeIds(@RequestBody List<String> ids){
-        checkPlanService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param checkPlanDTO 点检计划DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<WorkPlan>> query(CheckPlanDTO checkPlanDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(checkPlanService.selectPageInfo(checkPlanDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param checkPlanDTO 点检计划DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(CheckPlanDTO checkPlanDTO) {
-      return new R<>(checkPlanService.getModelListByDTO(checkPlanDTO));
-  }
-
-  /**
-     * 点检计划导出
-     *
-     * @param checkPlanDTO 点检计划DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("点检计划导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-plans-export') or @pms.hasPermission('check-polling-plans-add')")
-  public void export(HttpServletResponse response, CheckPlanDTO checkPlanDTO) {
-    List<WorkPlan> list = checkPlanService.getModelListByDTO(checkPlanDTO);
-    ExcelUtil.exportResponseDict(response, ExportCheckPlanVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckPlanVO.class), "点检计划");
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/work/WorkProjectController.java

@@ -1,141 +0,0 @@
-package com.platform.rest.controller.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.R;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.check.CheckProjectDTO;
-import com.platform.dao.entity.work.WorkProject;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.check.ExportCheckProjectVO;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.check.CheckProjectService;
-import com.platform.service.work.WorkProjectService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * @Description 点检项目 控制器
- * @Author liuyu
- * @Date 2020-05-28 17:48:35
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/work/projects")
-public class WorkProjectController {
-
-  private final WorkProjectService checkProjectService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<CheckProjectVO> getById(@PathVariable("id") String id){
-      return new R<>(checkProjectService.selectDetail(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param checkProjectDTO 点检项目DTO
-   * @return R
-   */
-  @SysLog("新增点检项目")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-projects-add') or @pms.hasPermission('check-polling-projects-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody CheckProjectDTO checkProjectDTO) {
-      return new R<>(checkProjectService.saveModelByDTO(checkProjectDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param checkProjectDTO 点检项目DTO
-   * @return R
-   */
-  @SysLog("修改点检项目")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-projects-edit') or @pms.hasPermission('check-polling-projects-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CheckProjectDTO checkProjectDTO) {
-      checkProjectService.modModelByDTO(checkProjectDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除点检项目")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-projects-del') or @pms.hasPermission('check-polling-projects-del')")
-  public R removeById(@PathVariable String id){
-    checkProjectService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除点检项目")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-projects-del') or @pms.hasPermission('check-polling-projects-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        checkProjectService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param checkProjectDTO 点检项目DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<CheckProjectVO>> query(CheckProjectDTO checkProjectDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(checkProjectService.selectPageList(checkProjectDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param checkProjectDTO 点检项目DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(CheckProjectDTO checkProjectDTO) {
-      return new R<>(checkProjectService.getModelListByDTO(checkProjectDTO));
-  }
-
-  /**
-     * 点检项目导出
-     *
-     * @param checkProjectDTO 点检项目DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("点检项目导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-projects-export') or @pms.hasPermission('check-polling-projects-export')")
-  public void export(HttpServletResponse response, CheckProjectDTO checkProjectDTO) {
-    List<WorkProject> list = checkProjectService.getModelListByDTO(checkProjectDTO);
-    ExcelUtil.exportResponseDict(response, ExportCheckProjectVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckProjectVO.class), "点检项目");
-  }
-
-}

platform-rest/src/main/java/com/platform/rest/controller/work/WorkStandardController.java

@@ -1,140 +0,0 @@
-package com.platform.rest.controller.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.R;
-import com.platform.common.validation.group.AddGroup;
-import com.platform.common.validation.group.UpdateGroup;
-import com.platform.dao.dto.check.CheckStandardDTO;
-import com.platform.dao.entity.work.WorkStandard;
-import com.platform.dao.util.ExcelUtil;
-import com.platform.dao.vo.export.check.ExportCheckStandardVO;
-import com.platform.rest.log.annotation.SysLog;
-import com.platform.service.check.CheckStandardService;
-import com.platform.service.work.WorkStandardService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * @Description 点检标准 控制器
- * @Author liuyu
- * @Date 2020-05-28 17:23:30
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/work/standards")
-public class WorkStandardController {
-
-  private final WorkStandardService checkStandardService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<WorkStandard> getById(@PathVariable("id") String id){
-      return new R<>(checkStandardService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param checkStandardDTO 点检标准DTO
-   * @return R
-   */
-  @SysLog("新增点检标准")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-add') or @pms.hasPermission('check-polling-standards-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody CheckStandardDTO checkStandardDTO) {
-      return new R<>(checkStandardService.saveModelByDTO(checkStandardDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param checkStandardDTO 点检标准DTO
-   * @return R
-   */
-  @SysLog("修改点检标准")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CheckStandardDTO checkStandardDTO) {
-      checkStandardService.modModelByDTO(checkStandardDTO);
-      return new R<>();
-  }
-
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除点检标准")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-del') or @pms.hasPermission('check-polling-standards-del')")
-  public R removeById(@PathVariable String id){
-    checkStandardService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
-
-    /**
-     * 批量记录
-     *
-     * @param ids 主键
-     * @return R
-     */
-    @SysLog("批量删除点检标准")
-    @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('check-spot-standards-del') or @pms.hasPermission('check-polling-standards-del')")
-    public R removeIds(@RequestBody List<String> ids){
-        checkStandardService.batchDelete(ids);
-        return new R<>();
-    }
-
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param checkStandardDTO 点检标准DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<WorkStandard>> query(CheckStandardDTO checkStandardDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(checkStandardService.selectPageInfo(checkStandardDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param checkStandardDTO 点检标准DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(CheckStandardDTO checkStandardDTO) {
-      return new R<>(checkStandardService.getModelListByDTO(checkStandardDTO));
-  }
-
-  /**
-     * 点检标准导出
-     *
-     * @param checkStandardDTO 点检标准DTO
-     * @return R
-     */
-  @GetMapping("/export")
-  @SysLog("点检标准导出")
-  @PreAuthorize("@pms.hasPermission('check-spot-standards-export') or @pms.hasPermission('check-polling-standards-export')")
-  public void export(HttpServletResponse response, CheckStandardDTO checkStandardDTO) {
-    List<WorkStandard> list = checkStandardService.getModelListByDTO(checkStandardDTO);
-    ExcelUtil.exportResponseDict(response, ExportCheckStandardVO.class, BeanConverterUtil.copyListProperties(list, ExportCheckStandardVO.class), "点检标准");
-  }
-
-}

platform-service/src/main/java/com/platform/service/check/impl/CheckJobServiceImpl.java

@@ -92,7 +92,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
         record.setStatusList(statusList);
         return mapper.getNotFinishNumByDTO(record);
     }
@@ -172,7 +171,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
         model.setStatusList(statusList);
         List<CheckJobVO> voList = mapper.selectList(model);
 
@@ -356,7 +354,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                     relation.setLastGenerateTime(standard.getLastGenerateTime());
                     relation.setLastNum(standard.getLastNum() == null ? 0 : standard.getLastNum());
                     projectStandardRelationList.add(relation);
-
+                    checkJob.setReceiveOvertime(false);
                     checkJob.setPlanId(projectPlan.getPlanId());
                     checkJob.setStatus(CheckJobStatusEnum.NOT_EXECUTE.getValue());
                     // 计算计划开始时间和结束时间
@@ -458,6 +456,9 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
                     if(sbInfo == null){
                         continue;
                     }
+                    if(!sbInfo.getStatus().equals(SbInfoStatusEnum.IN_USE.getValue())){
+                        continue;
+                    }
                     if(standard.getCheckUserType() == null){
                         if(standard.getPeriodType()< CheckPlanPeriodTypeEnum.WEEK.getValue()){
                             checkJob.setCheckUserId(sbInfo.getSaveUser());
@@ -619,6 +620,10 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     }
 
 
+    /**
+     * 如果当前时间大于了任务的期限，则判断过期
+     *
+     */
     @Override
     public void checkJobStatus() {
         // 1.查询状态为未执行和执行中的任务
@@ -626,15 +631,22 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         Integer[] status = {1, 2};
         weekend.weekendCriteria().andIn(CheckJob::getStatus, Arrays.asList(status));
         List<CheckJob> checkJobs = mapper.selectByExample(weekend);
+        List<CheckJob> updateJobs = new ArrayList<>();
         // 2.判断当前时间是否大于结束时间是则设置状态未已过期
         LocalDate now = LocalDate.now();
         checkJobs.forEach(job -> {
             LocalDate endTime = job.getEndTime();
             if (now.isAfter(endTime)) {
-                job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
-                mapper.updateByPrimaryKeySelective(job);
+                CheckJob updateJob = new CheckJob();
+                updateJob.setId(job.getId());
+                updateJob.setReceiveOvertime(true);
+                updateJobs.add(updateJob);
             }
         });
+
+        if(CollectionUtil.isNotEmpty(updateJobs)){
+            mapper.updateBatch(updateJobs);
+        }
     }
 
     /**
@@ -887,7 +899,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
     @Override
     public void executeJob(Object id) {
         CheckJob checkJob = mapper.selectByPrimaryKey(id);
-        if(!CheckJobStatusEnum.NOT_EXECUTE.getValue().equals(checkJob.getStatus()) && !CheckJobStatusEnum.OUT_OF_DATE.getValue().equals(checkJob.getStatus())){
+        if(!CheckJobStatusEnum.NOT_EXECUTE.getValue().equals(checkJob.getStatus())){
             return;
         }
         checkJob.setStatus(CheckJobStatusEnum.EXECUTING.getValue());
@@ -960,7 +972,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
         Weekend<CheckJob> weekend = new Weekend<>(CheckJob.class);
         WeekendCriteria<CheckJob, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(CheckJob::getStandardId, checkJob.getStandardId()).andIn(CheckJob::getStatus, statusList);
@@ -977,6 +988,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
             calcNextJobTime(nextCheckJob, checkJob.getActualEndTime(), checkStandard);
             nextCheckJob.setCreatedTime(LocalDateTime.now());
             nextCheckJob.setSbId(checkStandard.getSbId());
+            nextCheckJob.setReceiveOvertime(false);
             nextCheckJob.setCheckUserId(checkJob.getCheckUserId());
             nextCheckJob.setPartId(checkStandard.getPart());
             nextCheckJob.setStandardId(checkStandard.getId());
@@ -1057,7 +1069,6 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         List<Integer> statusList = new ArrayList<Integer>();
         statusList.add(CheckJobStatusEnum.NOT_EXECUTE.getValue());
         statusList.add(CheckJobStatusEnum.EXECUTING.getValue());
-        statusList.add(CheckJobStatusEnum.OUT_OF_DATE.getValue());
         Weekend<CheckJob> weekend = new Weekend<>(CheckJob.class);
         WeekendCriteria<CheckJob, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(CheckJob::getStandardId, checkJob.getStandardId()).andIn(CheckJob::getStatus, statusList);
@@ -1164,7 +1175,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         weekendCriteria.andEqualTo(CheckJob::getType, type);
 
         List<Integer> statusList = ListUtils.newArrayList(CheckJobStatusEnum.NOT_EXECUTE.getValue(),
-                CheckJobStatusEnum.EXECUTING.getValue(), CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                CheckJobStatusEnum.EXECUTING.getValue());
         weekendCriteria.andIn(CheckJob::getStatus, statusList);
         return mapper.selectCountByExample(weekend);
     }
@@ -1195,7 +1206,7 @@ public class CheckJobServiceImpl extends BaseServiceImpl<CheckJobMapper, CheckJo
         weekendCriteria.andEqualTo(CheckJob::getType, type);
 
         List<Integer> statusList = ListUtils.newArrayList(CheckJobStatusEnum.NOT_EXECUTE.getValue(),
-                CheckJobStatusEnum.EXECUTING.getValue(), CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                CheckJobStatusEnum.EXECUTING.getValue());
         weekendCriteria.andIn(CheckJob::getStatus, statusList);
         return mapper.selectCountByExample(weekend);
     }

platform-service/src/main/java/com/platform/service/check/impl/CheckStandardServiceImpl.java

@@ -172,8 +172,6 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
             model.setNo(str1);
         }
 
-        // 设置等级
-        setLevel(model);
         CheckStandard checkStandard = super.saveModelByDTO(model);
         this.saveFile(model);
         this.saveImage(model);
@@ -202,22 +200,11 @@ public class CheckStandardServiceImpl extends BaseServiceImpl<CheckStandardMappe
     public String setNo(int no){
        return String.format("%05d", no);
     }
-    private void setLevel(CheckStandardDTO model) {
-        if(model.getCheckUserType().equals(CheckPlanUserTypeEnum.USE_USER.getValue())){
-            model.setLevel(CheckStandardLevelEnum.A.getValue());
-        }else if(model.getCheckUserType().equals(CheckPlanUserTypeEnum.REPAIR_USER.getValue())){
-            model.setLevel(CheckStandardLevelEnum.B.getValue());
-        }else  if(model.getCheckUserType().equals(CheckPlanUserTypeEnum.ZHIDING.getValue())){
-            model.setLevel(CheckStandardLevelEnum.B.getValue());
-        }else  if(model.getCheckUserType().equals(CheckPlanUserTypeEnum.FACTORY.getValue())){
-            model.setLevel(CheckStandardLevelEnum.C.getValue());
-        }
-    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void modModelByDTO(CheckStandardDTO model) {
-        setLevel(model);
+
         super.modModelByDTO(model);
 
         // 先删后插,前端删除的不存在与ids里面，说明被删掉了，需要删除

platform-service/src/main/java/com/platform/service/redis/impl/RedisTaskService.java

@@ -117,19 +117,19 @@ public class RedisTaskService extends KeyExpirationEventMessageListener {
 
             // 发送给牛工，通过角色来查询
             if(expiredKeyArr[0].equalsIgnoreCase(RedisKeyConstants.EXPIRE_BUSINESS_KEY_REPAIR_STEP_SECOND)){
-                logger.info("处理第二阶段过期，发送消息给牛");
-                List<SysUser> userList = sysUserService.getRepairUser(new SysUserDTO());
-                List<SysUser> filterUsers = userList.stream().filter(item -> item.getWorkFlag()).collect(Collectors.toList());
+                logger.info("处理第二阶段过期，发送消息给维修主管");
+                // 发送短信通知给所有维修，且必须是正式环境
+                SysUserDTO sysUserDTO = new SysUserDTO();
+                sysUserDTO.setRoleCode(SysRoleCodeEnum.MM.name());
+                List<SysUserVO> userList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
+                List<SysUserVO> filterUsers = userList.stream().filter(item -> item.getWorkFlag()).collect(Collectors.toList());
                 if (CollectionUtil.isEmpty(filterUsers)) {
-                    filterUsers = userList.stream().filter(item -> item.getIdentityType().equals(SysUserIdentityType.WXZGMANAGER.getValue())).collect(Collectors.toList());
-                }
-                if (CollectionUtil.isEmpty(filterUsers)) {
-                    logger.info("处理第三阶段过期，维修主管领导身份未设置，无法发送消息，设备编号：" + sbInfoVO.getNo());
+                    logger.info("处理第二阶段过期，维修主管角色未设置，无法发送消息，设备编号：" + sbInfoVO.getNo());
                     return;
                 }else{
-                    SysUser user = filterUsers.get(0);
+                    SysUserVO user = filterUsers.get(0);
                     // 通过给当天值班维修人员
-                    sendMessage(repairId, repairApplicationForm,BeanConverterUtil.copyObjectProperties(user, SysUserVO.class),sbInfoVO, "repairEmailSecond.ftl");
+                    sendMessage(repairId, repairApplicationForm,user,sbInfoVO, "repairEmailSecond.ftl");
                 }
                 return;
             }

platform-service/src/main/java/com/platform/service/repair/RepairFeeService.java

@@ -1,8 +1,13 @@
 package com.platform.service.repair;
 
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairFee;
+import com.platform.dao.vo.report.RepairReportFee;
+import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.service.base.IBaseService;
+
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -20,4 +25,7 @@ public interface RepairFeeService extends IBaseService<RepairFee, RepairFeeDTO>
     * @return ：
     */
     int batchDelete(List<String> ids);
+
+    List<RepairReportFee> getMonthReport(RepairFeeDTO repairFeeDTO, Integer year, LocalDate startMonth, LocalDate endMonth);
+
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -315,11 +315,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     // 微信id
                     openIds.add(sysUserVO.getWxOpenid());
                 }
-                if (StringUtils.isNotBlank(sysUserVO.getWxOpenid())) {
+                if (StringUtils.isNotBlank(sysUserVO.getPhone())) {
                     // 手机
                     receiverList.add(sysUserVO.getPhone());
                 }
-                if (StringUtils.isNotBlank(sysUserVO.getWxOpenid())) {
+                if (StringUtils.isNotBlank(sysUserVO.getEmail())) {
                     // 邮箱
                     mails.add(sysUserVO.getEmail());
                 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairFeeServiceImpl.java

@@ -3,18 +3,25 @@ package com.platform.service.repair.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.BigDecimalUtil;
+import com.platform.common.util.DateUtils;
 import com.platform.common.util.IdGeneratorUtils;
 import com.platform.common.util.ListUtils;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.check.CheckStandardDTO;
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.repair.RepairFeeDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.repair.RepairFee;
 import com.platform.dao.entity.upms.SysFile;
+import com.platform.dao.enums.RepairApplicationFormCategoryEnum;
 import com.platform.dao.enums.SysFileTypeEnum;
 import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.repair.RepairFeeMapper;
 import com.platform.dao.mapper.upms.SysFileMapper;
+import com.platform.dao.vo.repair.RepairApplicationFormVO;
+import com.platform.dao.vo.report.RepairReportFee;
+import com.platform.dao.vo.report.RepairReportMttr;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.repair.RepairFeeService;
 import com.platform.service.util.SysFileUtils;
@@ -23,7 +30,11 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 维修费用单 service 实现类
@@ -76,7 +87,7 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
             Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
             weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_FEE_FILES.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
             sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getFileList(), model.getId(),  SysFileTypeEnum.REPAIR_FEE_FILES.getValue());
+            List<SysFile> list = SysFileUtils.changeFileList(model.getFileList(), model.getId(), SysFileTypeEnum.REPAIR_FEE_FILES.getValue());
             if (CollectionUtil.isNotEmpty(list)) {
                 sysFileMapper.insertListforComplex(list);
             }
@@ -88,7 +99,7 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
             Weekend<SysFile> weekend = new Weekend<>(SysFile.class);
             weekend.weekendCriteria().andEqualTo(SysFile::getType, SysFileTypeEnum.REPAIR_FEE_IMGS.getValue()).andEqualTo(SysFile::getTargetId, model.getId());
             sysFileMapper.deleteByExample(weekend);
-            List<SysFile> list = SysFileUtils.changeFileList(model.getImageList(), model.getId(),  SysFileTypeEnum.REPAIR_FEE_IMGS.getValue());
+            List<SysFile> list = SysFileUtils.changeFileList(model.getImageList(), model.getId(), SysFileTypeEnum.REPAIR_FEE_IMGS.getValue());
             if (CollectionUtil.isNotEmpty(list)) {
                 sysFileMapper.insertListforComplex(list);
             }
@@ -114,9 +125,76 @@ public class RepairFeeServiceImpl extends BaseServiceImpl<RepairFeeMapper, Repai
         model.setImageList(checkImgList);
         model.setFileList(checkFileList);
         RepairApplicationForm repairApplicationForm = repairApplicationFormMapper.selectById(model.getRepairId());
-        if(repairApplicationForm != null){
+        if (repairApplicationForm != null) {
             model.setRepairNo(repairApplicationFormMapper.selectById(model.getRepairId()).getNo());
         }
         return model;
     }
+
+    /**
+     * 1: 如果年份是当前年份，则统计到当前月份
+     * 2：如果不是当前年份，则统计全年的
+     *
+     * @param repairApplicationFormDTO
+     * @param searchYear               查询年份
+     * @return
+     */
+    @Override
+    public List<RepairReportFee> getMonthReport(RepairFeeDTO repairApplicationFormDTO, Integer searchYear, LocalDate startMonth, LocalDate endMonth) {
+
+        List<Map<String, LocalDateTime>> monthStartAndEndList = new ArrayList<Map<String, LocalDateTime>>();
+        LocalDateTime searchStartTime = null;
+        LocalDateTime searchEndTime = null;
+        if (searchYear != null) {
+            LocalDate localDate = LocalDate.now();
+            int year = localDate.getYear();
+            // 如2021-10-15号码，则month=10，需要计算到11月份，需要加1
+            int month = localDate.getMonthValue() + 1;
+            if (searchYear < year) {
+                month = 12;
+                year = searchYear;
+            }
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(year, month);
+            // 当前年份只统计到当前月，历史年份统计全年
+            searchStartTime = DateUtils.getFirstDayOfThisYear(year);
+            searchEndTime = DateUtils.getLastDayOfMonth(year, month);
+        } else {
+            monthStartAndEndList = DateUtils.getMonthStartAndEndByYear(startMonth, endMonth);
+            searchStartTime = DateUtils.getFirstDayOfMonth(startMonth);
+            searchEndTime = DateUtils.getLastDayOfMonth(endMonth);
+        }
+
+        repairApplicationFormDTO.setSearchStartTime(searchStartTime);
+        repairApplicationFormDTO.setSearchEndTime(searchEndTime);
+        List<RepairFee> list = mapper.selectPageList(repairApplicationFormDTO);
+
+        List<RepairReportFee> result = new ArrayList<RepairReportFee>();
+        for (Map<String, LocalDateTime> map : monthStartAndEndList) {
+            RepairReportFee vo = new RepairReportFee();
+            List<RepairFee> detailList = new ArrayList<RepairFee>();
+            vo.setMonth(map.get("searchStartTimeMonth").getYear() + "-" + map.get("searchStartTimeMonth").getMonthValue() + "月");
+            double totalFee = 0.0;
+            double meanFee = 0.0;
+            int i = 0;
+            for (RepairFee fee : list) {
+                if ((fee.getFeeDate().compareTo(map.get("searchStartTimeMonth").toLocalDate())>=0) && (fee.getFeeDate().compareTo(map.get("searchEndTimeMonth").toLocalDate())<=0)) {
+                    i++;
+                    detailList.add(fee);
+                    totalFee = totalFee + fee.getFee();
+                }
+            }
+            if (totalFee == 0.0) {
+                meanFee = 0.0;
+            } else {
+                totalFee = BigDecimalUtil.decimal(totalFee, 2);
+                meanFee = BigDecimalUtil.decimal(totalFee / i, 2);
+            }
+            vo.setTotalFee(totalFee);
+            vo.setMeanFee(meanFee);
+            vo.setNum(i);
+            vo.setDetailList(detailList);
+            result.add(vo);
+        }
+        return result;
+    }
 }

platform-service/src/main/java/com/platform/service/sb/impl/SbStoreCheckJobServiceImpl.java

@@ -97,8 +97,8 @@ public class SbStoreCheckJobServiceImpl extends BaseServiceImpl<SbStoreCheckJobM
         checkJobs.forEach(job -> {
             LocalDateTime endTime = job.getEndTime();
             if (now.isAfter(endTime)) {
-                job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
-                mapper.updateByPrimaryKeySelective(job);
+                // job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                //mapper.updateByPrimaryKeySelective(job);
             }
         });
     }
@@ -159,7 +159,7 @@ public class SbStoreCheckJobServiceImpl extends BaseServiceImpl<SbStoreCheckJobM
         WeekendCriteria<SbStoreCheckJob, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(SbStoreCheckJob::getCheckUserId, userId);
         List<Integer> statusList = ListUtils.newArrayList(CheckJobStatusEnum.NOT_EXECUTE.getValue(),
-                CheckJobStatusEnum.EXECUTING.getValue(), CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                CheckJobStatusEnum.EXECUTING.getValue());
         weekendCriteria.andIn(SbStoreCheckJob::getStatus, statusList);
         return mapper.selectCountByExample(weekend);
     }

platform-service/src/main/java/com/platform/service/store/impl/StoreCheckJobServiceImpl.java

@@ -112,8 +112,8 @@ public class StoreCheckJobServiceImpl extends BaseServiceImpl<StoreCheckJobMappe
         checkJobs.forEach(job -> {
             LocalDateTime endTime = job.getEndTime();
             if (now.isAfter(endTime)) {
-                job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
-                mapper.updateByPrimaryKeySelective(job);
+                // job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                // mapper.updateByPrimaryKeySelective(job);
             }
         });
     }
@@ -175,7 +175,7 @@ public class StoreCheckJobServiceImpl extends BaseServiceImpl<StoreCheckJobMappe
         WeekendCriteria<StoreCheckJob, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(StoreCheckJob::getCheckUserId, userId);
         List<Integer> statusList = ListUtils.newArrayList(CheckJobStatusEnum.NOT_EXECUTE.getValue(),
-                CheckJobStatusEnum.EXECUTING.getValue(), CheckJobStatusEnum.OUT_OF_DATE.getValue());
+                CheckJobStatusEnum.EXECUTING.getValue());
         weekendCriteria.andIn(StoreCheckJob::getStatus, statusList);
         return mapper.selectCountByExample(weekend);
     }

platform-service/src/main/java/com/platform/service/work/WorkJobService.java

@@ -1,70 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.dto.check.CheckJobDTO;
-import com.platform.dao.entity.work.WorkJob;
-import com.platform.dao.vo.query.check.CheckJobVO;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检记录 service
- * @Author liuyu
- * @Date 2020-05-29 10:39:40
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkJobService extends IBaseService<WorkJob, CheckJobDTO> {
-
-    /**
-     * 批量删除
-     *
-     * @param ids ：
-     * @return ：
-     */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     *
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<CheckJobVO> selectPageList(CheckJobDTO record, int pageNum, int pageSize);
-
-    /**
-     * 生成点巡检任务
-     *
-     * @param checkType 检查类型: 1-点检 2-巡检
-     */
-    void genTask(int checkType);
-
-    /**
-     * 检查任务状态
-     */
-    void checkJobStatus();
-
-    /**
-     * 查看详情
-     *
-     * @param id
-     * @return
-     */
-    CheckJobVO getDetail(Object id);
-
-    /**
-     * 执行任务
-     *
-     * @param id
-     */
-    void executeJob(Object id);
-
-    /**
-     * 完成任务
-     *
-     * @param dto
-     */
-    void finishJob(CheckJobDTO dto);
-}

platform-service/src/main/java/com/platform/service/work/WorkPlanService.java

@@ -1,31 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.dao.dto.check.CheckPlanDTO;
-import com.platform.dao.entity.work.WorkPlan;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检计划 service
- * @Author liuyu
- * @Date 2020-05-29 10:15:36
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkPlanService extends IBaseService<WorkPlan, CheckPlanDTO> {
-    /**
-     * 级联删除
-     * 删除出库单与出库详情，同时要更新库存
-     *
-     * @param id ：
-     * @return ：
-     */
-    boolean cascadingDeleteByKey(String id);
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-}

platform-service/src/main/java/com/platform/service/work/WorkProjectPlanRelationService.java

@@ -1,24 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检项目计划关联 service
- * @Author liuyu
- * @Date 2020-05-28 18:32:33
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkProjectPlanRelationService extends IBaseService<WorkProjectPlanRelation, CheckProjectPlanRelationDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-}

platform-service/src/main/java/com/platform/service/work/WorkProjectService.java

@@ -1,49 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckProjectDTO;
-import com.platform.dao.entity.work.WorkProject;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检项目 service
- * @Author liuyu
- * @Date 2020-05-28 17:48:35
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkProjectService extends IBaseService<WorkProject, CheckProjectDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    MyPage<CheckProjectVO> selectPageList(CheckProjectDTO record, int pageNum, int pageSize);
- /**
-  * 级联删除
-  * 删除出库单与出库详情，同时要更新库存
-  *
-  * @param id ：
-  * @return ：
-  */
- boolean cascadingDeleteByKey(String id);
-    /**
-     * 查看详情
-     * @param id
-     * @return
-     */
-    CheckProjectVO selectDetail(Object id);
-}

platform-service/src/main/java/com/platform/service/work/WorkProjectStandardRelationService.java

@@ -1,35 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
-import com.platform.dao.entity.work.WorkProjectStandardRelation;
-import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检项目标准关联 service
- * @Author liuyu
- * @Date 2020-06-05 10:46:56
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkProjectStandardRelationService extends IBaseService<WorkProjectStandardRelation, CheckProjectStandardRelationDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-
-    /**
-     * 分页查询
-     * @param record
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    AbstractPageResultBean<CheckProjectStandardRelationVO> selectPageList(CheckProjectStandardRelationDTO record, int pageNum, int pageSize);
-}

platform-service/src/main/java/com/platform/service/work/WorkStandardParamService.java

@@ -1,24 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.dao.dto.check.CheckStandardParamDTO;
-import com.platform.dao.entity.work.WorkStandardParam;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检标准参数 service
- * @Author liuyu
- * @Date 2020-05-29 10:09:49
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkStandardParamService extends IBaseService<WorkStandardParam, CheckStandardParamDTO> {
-
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-}

platform-service/src/main/java/com/platform/service/work/WorkStandardService.java

@@ -1,31 +0,0 @@
-package com.platform.service.work;
-
-import com.platform.dao.dto.check.CheckStandardDTO;
-import com.platform.dao.entity.work.WorkStandard;
-import com.platform.service.base.IBaseService;
-
-import java.util.List;
-
-/**
- * @Description 点检标准 service
- * @Author liuyu
- * @Date 2020-05-28 17:23:30
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-public interface WorkStandardService extends IBaseService<WorkStandard, CheckStandardDTO> {
-    /**
-     * 级联删除
-     * 删除出库单与出库详情，同时要更新库存
-     *
-     * @param id ：
-     * @return ：
-     */
-    boolean cascadingDeleteByKey(String id);
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
-    int batchDelete(List<String> ids);
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkJobServiceImpl.java

@@ -1,188 +0,0 @@
-package com.platform.service.work.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.model.UserInfo;
-import com.platform.common.util.DateUtils;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.SecurityUtils;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckJobDTO;
-import com.platform.dao.dto.check.CheckPlanDTO;
-import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
-import com.platform.dao.entity.work.WorkJob;
-import com.platform.dao.entity.work.WorkPlan;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import com.platform.dao.enums.CheckJobSbStatusEnum;
-import com.platform.dao.enums.CheckJobStatusEnum;
-import com.platform.dao.enums.CheckPlanPeriodTypeEnum;
-import com.platform.dao.enums.YesNoEnum;
-import com.platform.dao.mapper.check.*;
-import com.platform.dao.mapper.work.*;
-import com.platform.dao.vo.query.check.CheckJobVO;
-import com.platform.dao.vo.query.check.CheckPlanVO;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.dao.vo.query.check.CheckStandardVO;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckJobService;
-import com.platform.service.work.WorkJobService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description 点检记录 service 实现类
- * @Author liuyu
- * @Date 2020-05-29 10:39:40
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workJobService")
-public class WorkJobServiceImpl extends BaseServiceImpl<WorkJobMapper, WorkJob, CheckJobDTO> implements WorkJobService {
-    private WorkPlanMapper planMapper;
-    private WorkProjectPlanRelationMapper checkProjectPlanRelationMapper;
-    private WorkProjectMapper projectMapper;
-    private WorkStandardMapper standardMapper;
-
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<WorkJob> weekend = new Weekend<>(WorkJob.class);
-        WeekendCriteria<WorkJob, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(WorkJob::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<CheckJobVO> selectPageList(CheckJobDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkJob> selectPageInfo(CheckJobDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkJob> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-
-    @Override
-    public void genTask(int checkType) {
-
-    }
-
-    @Override
-    public void checkJobStatus() {
-        // 1.查询状态为未执行和执行中的任务
-        Weekend<WorkJob> weekend = new Weekend<>(WorkJob.class);
-        Integer[] status = {1, 2};
-        weekend.weekendCriteria().andIn(WorkJob::getStatus, Arrays.asList(status));
-        List<WorkJob> checkJobs = mapper.selectByExample(weekend);
-        // 2.判断当前时间是否大于结束时间是则设置状态未已过期
-        LocalDateTime now = LocalDateTime.now();
-        checkJobs.forEach(job -> {
-            LocalDateTime endTime = job.getEndTime();
-            if(now.isAfter(endTime)){
-                job.setStatus(CheckJobStatusEnum.OUT_OF_DATE.getValue());
-                mapper.updateByPrimaryKeySelective(job);
-            }
-        });
-    }
-
-    /**
-     * 判断是否今日生成任务
-     *
-     * @param lastGeneratedTime
-     * @param period
-     * @param periodType
-     * @return
-     */
-    private boolean isGenTask(LocalDateTime lastGeneratedTime, LocalDate currentDate, int period, int periodType) {
-        if (ObjectUtil.isNull(lastGeneratedTime)) {
-            return true;
-        }
-        LocalDate endDate = null;
-        LocalDate lastGenerateDate = lastGeneratedTime.toLocalDate();
-        if (CheckPlanPeriodTypeEnum.DAY.getValue() == periodType) {
-            endDate = DateUtils.plus(lastGenerateDate, period, ChronoUnit.DAYS);
-        }
-        if (CheckPlanPeriodTypeEnum.WEEK.getValue() == periodType) {
-            endDate = DateUtils.plus(lastGenerateDate, periodType * 7, ChronoUnit.DAYS);
-        }
-        if (CheckPlanPeriodTypeEnum.MONTH.getValue() == periodType) {
-            endDate = DateUtils.plus(lastGenerateDate, period, ChronoUnit.MONTHS);
-        }
-        if (CheckPlanPeriodTypeEnum.SEASON.getValue() == periodType) {
-            endDate = DateUtils.plus(lastGenerateDate, period * 3, ChronoUnit.MONTHS);
-        }
-        if (CheckPlanPeriodTypeEnum.YEAR.getValue() == periodType) {
-            endDate = DateUtils.plus(lastGenerateDate, period, ChronoUnit.YEARS);
-        }
-        return currentDate.isAfter(endDate);
-    }
-
-    private void calcTime(WorkJob checkJob, LocalDate currentDate, int validaTime, int validTimeType) {
-        LocalDate endDate = null;
-        checkJob.setStartTime(LocalDateTime.of(currentDate, LocalTime.of(9, 0)));
-        if (CheckPlanPeriodTypeEnum.DAY.getValue() == validTimeType) {
-            endDate = DateUtils.plus(currentDate, validaTime, ChronoUnit.DAYS);
-        }
-        if (CheckPlanPeriodTypeEnum.WEEK.getValue() == validTimeType) {
-            endDate = DateUtils.plus(currentDate, validaTime * 7, ChronoUnit.DAYS);
-        }
-        if (CheckPlanPeriodTypeEnum.MONTH.getValue() == validTimeType) {
-            endDate = DateUtils.plus(currentDate, validaTime, ChronoUnit.MONTHS);
-        }
-        if (CheckPlanPeriodTypeEnum.SEASON.getValue() == validTimeType) {
-            endDate = DateUtils.plus(currentDate, validaTime * 3, ChronoUnit.MONTHS);
-        }
-        if (CheckPlanPeriodTypeEnum.YEAR.getValue() == validTimeType) {
-            endDate = DateUtils.plus(currentDate, validaTime, ChronoUnit.YEARS);
-        }
-        endDate = DateUtils.plus(endDate, -1, ChronoUnit.DAYS);
-        checkJob.setEndTime(LocalDateTime.of(endDate, LocalTime.of(18, 0)));
-
-    }
-
-    @Override
-    public CheckJobVO getDetail(Object id) {
-        return mapper.selectDetail(id);
-    }
-
-    @Override
-    public void executeJob(Object id) {
-        WorkJob checkJob = mapper.selectByPrimaryKey(id);
-        checkJob.setStatus(CheckJobStatusEnum.EXECUTING.getValue());
-        checkJob.setActualStartTime(LocalDateTime.now());
-        UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
-        checkJob.setUpdateTime(LocalDateTime.now());
-        checkJob.setUpdateUserId(userInfo.getUserId());
-        checkJob.setUpdateUserName(userInfo.getUsername());
-        mapper.updateByPrimaryKeySelective(checkJob);
-    }
-
-    @Override
-    public void finishJob(CheckJobDTO dto) {
-        WorkJob checkJob = mapper.selectByPrimaryKey(dto.getId());
-        checkJob.setStatus(CheckJobStatusEnum.FINISHED.getValue());
-        checkJob.setActualEndTime(LocalDateTime.now());
-        UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
-        checkJob.setUpdateTime(LocalDateTime.now());
-        checkJob.setUpdateUserId(userInfo.getUserId());
-        checkJob.setUpdateUserName(userInfo.getUsername());
-        checkJob.setSbStatus(dto.getSbStatus());
-        checkJob.setFeedback(dto.getFeedback());
-        mapper.updateByPrimaryKeySelective(checkJob);
-    }
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkPlanServiceImpl.java

@@ -1,133 +0,0 @@
-package com.platform.service.work.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.model.OauthUser;
-import com.platform.common.model.UserInfo;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.SecurityUtils;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckPlanDTO;
-import com.platform.dao.dto.check.CheckProjectDTO;
-import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
-import com.platform.dao.entity.work.WorkPlan;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import com.platform.dao.mapper.check.CheckPlanMapper;
-import com.platform.dao.mapper.check.CheckProjectPlanRelationMapper;
-import com.platform.dao.mapper.work.WorkPlanMapper;
-import com.platform.dao.mapper.work.WorkProjectPlanRelationMapper;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckPlanService;
-import com.platform.service.check.CheckProjectPlanRelationService;
-import com.platform.service.work.WorkPlanService;
-import com.platform.service.work.WorkProjectPlanRelationService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.weekend.Weekend;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description 点检计划 service 实现类
- * @Author liuyu
- * @Date 2020-05-29 10:15:36
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workPlanService")
-public class WorkPlanServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan, CheckPlanDTO> implements WorkPlanService {
-    private WorkProjectPlanRelationService relationService;
-
-    private WorkProjectPlanRelationMapper relationMapper;
-
-    @Override
-    public boolean cascadingDeleteByKey(String id) {
-        // 刪除
-        int result = mapper.deleteByPrimaryKey(id);
-        Weekend<WorkProjectPlanRelation> weekend = new Weekend<>(WorkProjectPlanRelation.class);
-        weekend.weekendCriteria().andEqualTo(WorkProjectPlanRelation::getPlanId,id);
-        relationMapper.deleteByExample(weekend);
-        return true;
-    }
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        ids.forEach(id -> {
-            cascadingDeleteByKey(id);
-        });
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkPlan> selectPageInfo(CheckPlanDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkPlan> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public WorkPlan saveModelByDTO(CheckPlanDTO model) {
-        // 设置编码
-        Weekend<WorkPlan> weekend = new Weekend<>(WorkPlan.class);
-        weekend.weekendCriteria().andIsNotNull(WorkPlan::getId);
-        Integer count = mapper.selectCountByExample(weekend);
-        model.setNo(IdGeneratorUtils.getCheckPlanNo(count));
-        WorkPlan checkPlan = super.saveModelByDTO(model);
-        // 保存项目
-        List<CheckProjectDTO> projectList = model.getProjectList();
-        saveProjects(checkPlan.getId(),projectList);
-        return checkPlan;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void modModelByDTO(CheckPlanDTO model) {
-        super.modModelByDTO(model);
-        // 修改项目
-        Weekend<WorkProjectPlanRelation> weekend = new Weekend<>(WorkProjectPlanRelation.class);
-        List<CheckProjectDTO> detailList = model.getProjectList();
-        List<String> ids = detailList.stream().map(CheckProjectDTO::getId).collect(Collectors.toList());
-        weekend.weekendCriteria().andNotIn(WorkProjectPlanRelation::getId, ids).andEqualTo(WorkProjectPlanRelation::getPlanId,model.getId());
-
-        // 保存项目
-        saveProjects(model.getId(),detailList);
-    }
-
-    /**
-     * 保存点检项目
-     * @param id
-     * @param projectList
-     */
-    private void saveProjects(String id,List<CheckProjectDTO> projectList){
-        List<CheckProjectPlanRelationDTO> relationDTOS = new ArrayList<>(projectList.size());
-        OauthUser user = SecurityUtils.getUser();
-        UserInfo userInfo = user.getUserInfo();
-        projectList.forEach(item -> {
-            WorkProjectPlanRelation realDetail = relationMapper.selectByPrimaryKey(item.getId());
-            if(ObjectUtil.isNull(realDetail)) {// 新增的
-                CheckProjectPlanRelationDTO relationDTO = new CheckProjectPlanRelationDTO();
-                relationDTO.setPlanId(id);
-                relationDTO.setProjectId(item.getId());
-                relationDTOS.add(relationDTO);
-                relationDTO.setUserInfo(userInfo);
-                relationDTO.setId(IdGeneratorUtils.getObjectId());
-            }
-        });
-        relationService.saveModelListByDTO(relationDTOS);
-    }
-
-    @Override
-    public WorkPlan getModelById(Object id) {
-        WorkPlan checkPlan = super.getModelById(id);
-        // 查询项目
-        List<CheckProjectVO> projectList = mapper.selectPlanProjectList(checkPlan.getId());
-        checkPlan.setProjectList(projectList);
-        return checkPlan;
-    }
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkProjectPlanRelationServiceImpl.java

@@ -1,45 +0,0 @@
-package com.platform.service.work.impl;
-
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckProjectPlanRelationDTO;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import com.platform.dao.mapper.check.CheckProjectPlanRelationMapper;
-import com.platform.dao.mapper.work.WorkProjectPlanRelationMapper;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckProjectPlanRelationService;
-import com.platform.service.work.WorkProjectPlanRelationService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import java.util.List;
-
-/**
- * @Description 点检项目计划关联 service 实现类
- * @Author liuyu
- * @Date 2020-05-28 18:32:33
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workProjectPlanRelationService")
-public class WorkProjectPlanRelationServiceImpl extends BaseServiceImpl<WorkProjectPlanRelationMapper, WorkProjectPlanRelation, CheckProjectPlanRelationDTO> implements WorkProjectPlanRelationService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<WorkProjectPlanRelation> weekend = new Weekend<>(WorkProjectPlanRelation.class);
-        WeekendCriteria<WorkProjectPlanRelation, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(WorkProjectPlanRelation::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkProjectPlanRelation> selectPageInfo(CheckProjectPlanRelationDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkProjectPlanRelation> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkProjectServiceImpl.java

@@ -1,144 +0,0 @@
-package com.platform.service.work.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.model.OauthUser;
-import com.platform.common.model.UserInfo;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.SecurityUtils;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckProjectDTO;
-import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
-import com.platform.dao.dto.check.CheckStandardDTO;
-import com.platform.dao.entity.work.WorkProject;
-import com.platform.dao.entity.work.WorkProjectPlanRelation;
-import com.platform.dao.entity.work.WorkProjectStandardRelation;
-import com.platform.dao.mapper.check.CheckProjectMapper;
-import com.platform.dao.mapper.check.CheckProjectStandardRelationMapper;
-import com.platform.dao.mapper.maintain.MaintainProjectPlanRelationMapper;
-import com.platform.dao.mapper.work.WorkProjectMapper;
-import com.platform.dao.mapper.work.WorkProjectStandardRelationMapper;
-import com.platform.dao.vo.query.check.CheckProjectVO;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckProjectService;
-import com.platform.service.check.CheckProjectStandardRelationService;
-import com.platform.service.work.WorkProjectService;
-import com.platform.service.work.WorkProjectStandardRelationService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.weekend.Weekend;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description 点检项目 service 实现类
- * @Author liuyu
- * @Date 2020-05-28 17:48:35
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workProjectService")
-public class WorkProjectServiceImpl extends BaseServiceImpl<WorkProjectMapper, WorkProject, CheckProjectDTO> implements WorkProjectService {
-    private WorkProjectStandardRelationService relationService;
-    private MaintainProjectPlanRelationMapper planRelationMapper;
-    private WorkProjectStandardRelationMapper relationMapper;
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        ids.forEach(id -> {
-            cascadingDeleteByKey(id);
-        });
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkProject> selectPageInfo(CheckProjectDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkProject> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-
-    @Override
-    public MyPage<CheckProjectVO> selectPageList(CheckProjectDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        MyPage<CheckProjectVO> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-
-    @Override
-    public boolean cascadingDeleteByKey(String id) {
-        int result = mapper.deleteByPrimaryKey(id);
-        Weekend<WorkProjectStandardRelation> weekend = new Weekend<>(WorkProjectStandardRelation.class);
-        weekend.weekendCriteria().andEqualTo(WorkProjectStandardRelation::getProjectId,id);
-        relationMapper.deleteByExample(weekend);
-
-        Weekend<WorkProjectStandardRelation> weekend2 = new Weekend<>(WorkProjectStandardRelation.class);
-        weekend2.weekendCriteria().andEqualTo(WorkProjectStandardRelation::getProjectId,id);
-        planRelationMapper.deleteByExample(weekend2);
-        return true;
-    }
-
-    @Override
-    public CheckProjectVO selectDetail(Object id) {
-        CheckProjectVO checkProjectVO = mapper.selectDetail(id);
-        checkProjectVO.setStandardList(mapper.selectStandardList(id));
-        return checkProjectVO;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public WorkProject saveModelByDTO(CheckProjectDTO model) {
-        // 设置编码
-        Weekend<WorkProject> weekend = new Weekend<>(WorkProject.class);
-        weekend.weekendCriteria().andIsNotNull(WorkProject::getId);
-        Integer count = mapper.selectCountByExample(weekend);
-        model.setNo(IdGeneratorUtils.getCheckStandardNo(++count));
-        WorkProject checkProject = super.saveModelByDTO(model);
-        // 保存关联关系
-        List<CheckStandardDTO> standardList = model.getStandardList();
-        saveStandardList(checkProject.getId(),standardList);
-        return checkProject;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void modModelByDTO(CheckProjectDTO model) {
-        super.modModelByDTO(model);
-        // 先删后插
-        Weekend<WorkProjectStandardRelation> weekend = new Weekend<>(WorkProjectStandardRelation.class);
-        List<CheckStandardDTO> detailList = model.getStandardList();
-        List<String> ids = detailList.stream().map(CheckStandardDTO::getId).collect(Collectors.toList());
-        weekend.weekendCriteria().andNotIn(WorkProjectStandardRelation::getId, ids).andEqualTo(WorkProjectStandardRelation::getProjectId,model.getId());
-        relationMapper.deleteByExample(weekend);
-        saveStandardList(model.getId(),detailList);
-    }
-
-    /**
-     * 关联标准列表
-     * @param projectId
-     * @param standardList
-     */
-    private void saveStandardList(String projectId,List<CheckStandardDTO> standardList){
-        OauthUser user = SecurityUtils.getUser();
-        UserInfo userInfo = user.getUserInfo();
-        List<CheckProjectStandardRelationDTO> relationDTOList = new ArrayList<>(standardList.size());
-        standardList.forEach(item -> {
-            WorkProjectStandardRelation realDetail = relationMapper.selectByPrimaryKey(item.getId());
-            if(ObjectUtil.isNull(realDetail)) {// 新增的
-                CheckProjectStandardRelationDTO relationDTO = new CheckProjectStandardRelationDTO();
-                relationDTO.setId(IdGeneratorUtils.getObjectId());
-                relationDTO.setUserInfo(userInfo);
-                relationDTO.setProjectId(projectId);
-                relationDTO.setStandardId(item.getId());
-                relationDTOList.add(relationDTO);
-            }
-        });
-        relationService.saveModelListByDTO(relationDTOList);
-
-    }
-
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkProjectStandardRelationServiceImpl.java

@@ -1,51 +0,0 @@
-package com.platform.service.work.impl;
-
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckProjectStandardRelationDTO;
-import com.platform.dao.entity.work.WorkProjectStandardRelation;
-import com.platform.dao.mapper.check.CheckProjectStandardRelationMapper;
-import com.platform.dao.mapper.work.WorkProjectStandardRelationMapper;
-import com.platform.dao.vo.query.check.CheckProjectStandardRelationVO;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckProjectStandardRelationService;
-import com.platform.service.work.WorkProjectStandardRelationService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import java.util.List;
-
-/**
- * @Description 点检项目标准关联 service 实现类
- * @Author liuyu
- * @Date 2020-06-05 10:46:56
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workProjectStandardRelationService")
-public class WorkProjectStandardRelationServiceImpl extends BaseServiceImpl<WorkProjectStandardRelationMapper, WorkProjectStandardRelation, CheckProjectStandardRelationDTO> implements WorkProjectStandardRelationService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<WorkProjectStandardRelation> weekend = new Weekend<>(WorkProjectStandardRelation.class);
-        WeekendCriteria<WorkProjectStandardRelation, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(WorkProjectStandardRelation::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<CheckProjectStandardRelationVO> selectPageList(CheckProjectStandardRelationDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkProjectStandardRelation> selectPageInfo(CheckProjectStandardRelationDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkStandardParamServiceImpl.java

@@ -1,45 +0,0 @@
-package com.platform.service.work.impl;
-
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckStandardParamDTO;
-import com.platform.dao.entity.work.WorkStandardParam;
-import com.platform.dao.mapper.check.CheckStandardParamMapper;
-import com.platform.dao.mapper.work.WorkStandardParamMapper;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckStandardParamService;
-import com.platform.service.work.WorkStandardParamService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-
-import java.util.List;
-
-/**
- * @Description 点检标准参数 service 实现类
- * @Author liuyu
- * @Date 2020-05-29 10:09:49
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workStandardParamService")
-public class WorkStandardParamServiceImpl extends BaseServiceImpl<WorkStandardParamMapper, WorkStandardParam, CheckStandardParamDTO> implements WorkStandardParamService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<WorkStandardParam> weekend = new Weekend<>(WorkStandardParam.class);
-        WeekendCriteria<WorkStandardParam, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(WorkStandardParam::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkStandardParam> selectPageInfo(CheckStandardParamDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkStandardParam> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-}

platform-service/src/main/java/com/platform/service/work/impl/WorkStandardServiceImpl.java

@@ -1,118 +0,0 @@
-package com.platform.service.work.impl;
-
-import com.github.pagehelper.PageHelper;
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.dao.bean.MyPage;
-import com.platform.dao.dto.check.CheckStandardDTO;
-import com.platform.dao.dto.check.CheckStandardParamDTO;
-import com.platform.dao.entity.work.WorkProjectStandardRelation;
-import com.platform.dao.entity.work.WorkStandard;
-import com.platform.dao.entity.work.WorkStandardParam;
-import com.platform.dao.mapper.check.CheckProjectStandardRelationMapper;
-import com.platform.dao.mapper.check.CheckStandardMapper;
-import com.platform.dao.mapper.check.CheckStandardParamMapper;
-import com.platform.dao.mapper.work.WorkProjectStandardRelationMapper;
-import com.platform.dao.mapper.work.WorkStandardMapper;
-import com.platform.dao.mapper.work.WorkStandardParamMapper;
-import com.platform.service.base.impl.BaseServiceImpl;
-import com.platform.service.check.CheckStandardParamService;
-import com.platform.service.check.CheckStandardService;
-import com.platform.service.work.WorkProjectService;
-import com.platform.service.work.WorkStandardParamService;
-import com.platform.service.work.WorkStandardService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.weekend.Weekend;
-
-import java.util.List;
-
-/**
- * @Description 点检标准 service 实现类
- * @Author liuyu
- * @Date 2020-05-28 17:23:30
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workStandardService")
-public class WorkStandardServiceImpl extends BaseServiceImpl<WorkStandardMapper, WorkStandard, CheckStandardDTO> implements WorkStandardService {
-    private WorkStandardParamService paramService;
-    private WorkProjectStandardRelationMapper relationMapper;
-    private WorkStandardParamMapper paramMapper;
-
-    @Override
-    public boolean cascadingDeleteByKey(String id) {
-        int result = mapper.deleteByPrimaryKey(id);
-        Weekend<WorkProjectStandardRelation> weekend = new Weekend<>(WorkProjectStandardRelation.class);
-        weekend.weekendCriteria().andEqualTo(WorkProjectStandardRelation::getStandardId,id);
-        relationMapper.deleteByExample(weekend);
-
-        // 删除标准参数
-        Weekend<WorkStandardParam> checkStandardParamWeekend = new Weekend<>(WorkStandardParam.class);
-        checkStandardParamWeekend.weekendCriteria().andEqualTo(WorkStandardParam::getStandardId,id);
-        paramMapper.deleteByExample(weekend);
-        return true;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public int batchDelete(List<String> ids) {
-
-        ids.forEach(id -> {
-            cascadingDeleteByKey(id);
-        });
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkStandard> selectPageInfo(CheckStandardDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        AbstractPageResultBean<WorkStandard> pageInfo = new MyPage(mapper.selectList(record));
-        return pageInfo;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public WorkStandard saveModelByDTO(CheckStandardDTO model) {
-        // 设置编码
-        Weekend<WorkStandard> weekend = new Weekend<>(WorkStandard.class);
-        weekend.weekendCriteria().andIsNotNull(WorkStandard::getId);
-        Integer count = mapper.selectCountByExample(weekend);
-        model.setNo(IdGeneratorUtils.getCheckStandardNo(++count));
-        WorkStandard checkStandard = super.saveModelByDTO(model);
-        // 保存参数
-        /*List<CheckStandardParamDTO> paramList = model.getParamList();
-        paramList.forEach(item -> {
-            item.setStandardId(checkStandard.getId());
-        });
-        paramService.saveModelListByDTO(paramList);*/
-        return checkStandard;
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void modModelByDTO(CheckStandardDTO model) {
-        super.modModelByDTO(model);
-        // 删掉参数后插入
-        Weekend<WorkStandardParam> weekend = new Weekend<>(WorkStandardParam.class);
-        weekend.weekendCriteria().andEqualTo(WorkStandardParam::getStandardId, model.getId());
-        paramMapper.deleteByExample(weekend);
-        // 保存参数
-/*        List<CheckStandardParamDTO> paramList = model.getParamList();
-        paramList.forEach(item -> {
-            item.setStandardId(model.getId());
-        });
-        paramService.saveModelListByDTO(paramList);*/
-    }
-
-    @Override
-    public WorkStandard getModelById(Object id) {
-        WorkStandard checkStandard = super.getModelById(id);
-        Weekend<WorkStandardParam> weekend = new Weekend<>(WorkStandardParam.class);
-        weekend.weekendCriteria().andEqualTo(WorkStandardParam::getStandardId, id);
-        List<WorkStandardParam> paramList = paramMapper.selectByExample(weekend);
-        checkStandard.setParamList(paramList);
-        return checkStandard;
-    }
-}