检查任务

smart-steward-entity/src/main/java/com/smartSteward/entity/database/task/TaskCheck.java

@@ -1,6 +1,8 @@
 package com.smartSteward.entity.database.task;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -126,4 +128,7 @@ public class TaskCheck extends BaseEntity
    /** 逻辑删除标识 */
    @ApiModelProperty("逻辑删除标识")
    private Long delFlag;
+   /** 检查子项列表 */
+   @ApiModelProperty("检查子项列表")
+   private List<TaskCheckSubItem> taskCheckSubItems;
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/database/task/TaskCheckItem.java

@@ -1,5 +1,6 @@
 package com.smartSteward.entity.database.task;
 
+import com.smartSteward.common.annotation.FilePathField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +35,7 @@ public class TaskCheckItem extends BaseEntity
    @Excel(name = "检查子项ID")
    @ApiModelProperty("检查子项ID")
    @NotNull(message = "检查子项ID不能为空")
-   private Long subitemId;
+   private Long subItemId;
 
    /** 检查项名称 */
    @Excel(name = "检查项名称")
@@ -80,6 +81,7 @@ public class TaskCheckItem extends BaseEntity
    /** 示例图 */
    @Excel(name = "示例图")
    @ApiModelProperty("示例图")
+   @FilePathField()
    private String exampleImage;
 
    /** 检查说明 */
@@ -105,11 +107,26 @@ public class TaskCheckItem extends BaseEntity
    @ApiModelProperty("照片")
    private String photo;
    /** 分数 */
+   @Excel(name = "分数")
    @ApiModelProperty("分数")
    private Integer score;
 
    /** 限制分数 */
+   @Excel(name = "限制分数")
    @ApiModelProperty("限制分数")
    private Integer limitScore;
+   /** 输入内容 */
+   @Excel(name = "输入内容")
+   @ApiModelProperty("输入内容")
+   private String inputItem;
+
+   @Excel(name = "检查结果",readConverterExp = "1=正常,2=异常")
+   @ApiModelProperty("检查结果1正常2异常")
+   private Long result;
+
+
+
+
+
 
 }

smart-steward-entity/src/main/java/com/smartSteward/entity/database/task/TaskCheckSubItem.java

@@ -8,6 +8,7 @@ import com.smartSteward.common.annotation.Excel;
 import com.smartSteward.common.core.BaseEntity;
 
 import javax.validation.constraints.*;
+import java.util.List;
 
 /**
 * 任务检查子项对象 task_check_sub_item
@@ -40,4 +41,12 @@ public class TaskCheckSubItem extends BaseEntity
    @Excel(name = "排序序号")
    @ApiModelProperty("排序序号")
    private Long sortOrder;
+
+   /** 模板子项主键ID */
+   @ApiModelProperty("模板子项主键ID")
+   private Long subItemId;
+
+   /** 检查项列表 */
+   @ApiModelProperty("检查项列表")
+   private List<TaskCheckItem> taskCheckItems;
 }

smart-steward-mapper/src/main/java/com/smartSteward/mapper/task/TaskCheckItemMapper.java

@@ -25,6 +25,13 @@ public interface TaskCheckItemMapper
      * @return 任务检查项集合
      */
     public List<TaskCheckItem> selectTaskCheckItemList(TaskCheckItem taskCheckItem);
+     /**
+     * 批量新增任务检查项
+     *
+     * @param list 任务检查项列表
+     * @return 结果
+     */
+    public int insertBatchTaskCheckItem(List<TaskCheckItem> list);
 
     /**
      * 新增任务检查项

smart-steward-mapper/src/main/java/com/smartSteward/mapper/task/TaskCheckSubItemMapper.java

@@ -25,6 +25,13 @@ public interface TaskCheckSubItemMapper
      * @return 任务检查子项集合
      */
     public List<TaskCheckSubItem> selectTaskCheckSubItemList(TaskCheckSubItem taskCheckSubItem);
+     /**
+     * 批量新增任务检查子项
+     *
+     * @param list 任务检查子项列表
+     * @return 结果
+     */
+    public int insertBatchTaskCheckSubItem(List<TaskCheckSubItem> list);
 
     /**
      * 新增任务检查子项

smart-steward-mapper/src/main/resources/mapper/task/TaskCheckItemMapper.xml

@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TaskCheckItem" id="TaskCheckItemResult">
         <result property="id"    column="id"    />
         <result property="checkId"    column="check_id"    />
-        <result property="subitemId"    column="subitem_id"    />
+        <result property="subItemId"    column="sub_item_id"    />
         <result property="itemName"    column="item_name"    />
         <result property="isRandom"    column="is_random"    />
         <result property="tag"    column="tag"    />
@@ -28,17 +28,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="photo"    column="photo"    />
         <result property="score"    column="score"    />
         <result property="limitScore"    column="limit_score"    />
+        <result property="inputItem"    column="input_item"    />
+        <result property="result"    column="result"    />
     </resultMap>
 
     <sql id="selectTaskCheckItemVo">
-        select id, check_id, subitem_id, item_name, is_random, tag, has_input, input_content, has_photo, photo_prompt, check_result, example_image, check_description, sort_order, status, create_by, update_by, update_time, create_time, del_flag, photo, score, limit_score from task_check_item
+        select id, check_id, sub_item_id, item_name, is_random, tag, has_input, input_content,
+        has_photo, photo_prompt, check_result, example_image, check_description, sort_order,
+        status, create_by, update_by, update_time, create_time, del_flag, photo, score,
+        limit_score, input_item, result from task_check_item
     </sql>
 
     <select id="selectTaskCheckItemList" parameterType="TaskCheckItem" resultMap="TaskCheckItemResult">
         <include refid="selectTaskCheckItemVo"/>
         <where>
             <if test="checkId != null "> and check_id = #{checkId}</if>
-            <if test="subitemId != null "> and subitem_id = #{subitemId}</if>
+            <if test="subItemId != null "> and sub_item_id = #{subItemId}</if>
             <if test="itemName != null  and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
             <if test="isRandom != null "> and is_random = #{isRandom}</if>
             <if test="tag != null  and tag != ''"> and tag = #{tag}</if>
@@ -54,6 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null "> and del_flag = #{delFlag}</if>
             <if test="score != null "> and score = #{score}</if>
             <if test="limitScore != null "> and limit_score = #{limitScore}</if>
+            <if test="inputItem != null  and inputItem != ''"> and input_item = #{inputItem}</if>
+            <if test="result != null "> and result = #{result}</if>
             <!-- 如果有station_id字段，则增加站点集合查询条件 -->
         </where>
     </select>
@@ -67,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into task_check_item
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="checkId != null">check_id,</if>
-            <if test="subitemId != null">subitem_id,</if>
+            <if test="subItemId != null">sub_item_id,</if>
             <if test="itemName != null and itemName != ''">item_name,</if>
             <if test="isRandom != null">is_random,</if>
             <if test="tag != null">tag,</if>
@@ -88,10 +95,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="photo != null">photo,</if>
             <if test="score != null">score,</if>
             <if test="limitScore != null">limit_score,</if>
+            <if test="inputItem != null and inputItem != ''">input_item,</if>
+            <if test="result != null">result,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkId != null">#{checkId},</if>
-            <if test="subitemId != null">#{subitemId},</if>
+            <if test="subItemId != null">#{subItemId},</if>
             <if test="itemName != null and itemName != ''">#{itemName},</if>
             <if test="isRandom != null">#{isRandom},</if>
             <if test="tag != null">#{tag},</if>
@@ -112,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="photo != null">#{photo},</if>
             <if test="score != null">#{score},</if>
             <if test="limitScore != null">#{limitScore},</if>
+            <if test="inputItem != null and inputItem != ''">#{inputItem},</if>
+            <if test="result != null">#{result},</if>
         </trim>
     </insert>
 
@@ -119,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update task_check_item
         <trim prefix="SET" suffixOverrides=",">
             <if test="checkId != null">check_id = #{checkId},</if>
-            <if test="subitemId != null">subitem_id = #{subitemId},</if>
+            <if test="subItemId != null">sub_item_id = #{subItemId},</if>
             <if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
             <if test="isRandom != null">is_random = #{isRandom},</if>
             <if test="tag != null">tag = #{tag},</if>
@@ -140,18 +151,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="photo != null">photo = #{photo},</if>
             <if test="score != null">score = #{score},</if>
             <if test="limitScore != null">limit_score = #{limitScore},</if>
+            <if test="inputItem != null and inputItem != ''">input_item = #{inputItem},</if>
+            <if test="result != null">result = #{result},</if>
         </trim>
         where id = #{id} and del_flag = 0
     </update>
 
-    <delete id="deleteTaskCheckItemById" parameterType="Long">
-        delete from task_check_item where id = #{id} and del_flag = 0
-    </delete>
 
-    <delete id="deleteTaskCheckItemByIds" parameterType="String">
-        delete from task_check_item where id in 
+    <sql id="insertBatchSql">
+        insert into task_check_item(
+        check_id,
+        sub_item_id,
+        item_name,
+        is_random,
+        tag,
+        has_input,
+        input_content,
+        has_photo,
+        photo_prompt,
+        check_result,
+        example_image,
+        check_description,
+        sort_order,
+        status,
+        create_by,
+        update_by,
+        update_time,
+        create_time,
+        del_flag,
+        photo,
+        score,
+        limit_score,
+        input_item,
+        result
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (
+            #{item.checkId},
+            #{item.subItemId},
+            #{item.itemName},
+            #{item.isRandom},
+            #{item.tag},
+            #{item.hasInput},
+            #{item.inputContent},
+            #{item.hasPhoto},
+            #{item.photoPrompt},
+            #{item.checkResult},
+            #{item.exampleImage},
+            #{item.checkDescription},
+            #{item.sortOrder},
+            #{item.status},
+            #{item.createBy},
+            #{item.updateBy},
+            #{item.updateTime},
+            #{item.createTime},
+            #{item.delFlag},
+            #{item.photo},
+            #{item.score},
+            #{item.limitScore},
+            #{item.inputItem},
+            #{item.result},
+            )
+        </foreach>
+    </sql>
+
+    <insert id="insertBatchTaskCheckItem"  useGeneratedKeys="true" keyProperty="id">
+        <include refid="insertBatchSql"/>
+    </insert>
+
+    <update id="deleteTaskCheckItemById" parameterType="Long">
+       update task_check_item set del_flag = 1 where id = #{id} and del_flag = 0
+    </update>
+
+    <update id="deleteTaskCheckItemByIds" parameterType="String">
+        update task_check_item set del_flag = 1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
 </mapper>

smart-steward-mapper/src/main/resources/mapper/task/TaskCheckSubItemMapper.xml

@@ -44,6 +44,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <sql id="insertBatchSql">
+        insert into task_check_sub_item(
+            check_id,
+            name,
+            sort_order
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (
+                #{item.checkId},
+                #{item.name},
+                #{item.sortOrder}
+            )
+        </foreach>
+    </sql>
+
+    <insert id="insertBatchTaskCheckSubItem"  useGeneratedKeys="true" keyProperty="id">
+        <include refid="insertBatchSql"/>
+    </insert>
+
+
+
     <update id="updateTaskCheckSubItem" parameterType="TaskCheckSubItem">
         update task_check_sub_item
         <trim prefix="SET" suffixOverrides=",">

smart-steward-service/src/main/java/com/smartSteward/service/schedule/impl/ScheduleTasksServiceImpl.java

@@ -13,9 +13,7 @@ import com.smartSteward.entity.database.task.*;
 import com.smartSteward.entity.view.system.SysUserStationResult;
 import com.smartSteward.mapper.inspection.InspectionMainMapper;
 import com.smartSteward.mapper.system.SysUserMapper;
-import com.smartSteward.mapper.task.TaskAttachmentMapper;
-import com.smartSteward.mapper.task.TaskCheckMapper;
-import com.smartSteward.mapper.task.TaskPhotoMapper;
+import com.smartSteward.mapper.task.*;
 import com.smartSteward.service.inspection.IInspectionMainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,7 +40,10 @@ public class ScheduleTasksServiceImpl implements IScheduleTasksService {
     private TaskCheckMapper taskCheckMapper;
     @Autowired
     private InspectionMainMapper inspectionMainMapper;
-
+    @Autowired
+    private TaskCheckSubItemMapper taskCheckSubItemMapper;
+    @Autowired
+    private TaskCheckItemMapper taskCheckItemMapper;
 
 
     /**
@@ -71,7 +72,7 @@ public class ScheduleTasksServiceImpl implements IScheduleTasksService {
     public String validateTask(ScheduleTasks scheduleTasks) {
 
         if (Objects.equals(scheduleTasks.getFormType(), FormTypeEnum.INSPECTION.getCode())
-                &&scheduleTasks.getChecklist()==null) {
+                && scheduleTasks.getChecklist() == null) {
             return "请选择检查表单";
         }
         return "";
@@ -397,67 +398,132 @@ public class ScheduleTasksServiceImpl implements IScheduleTasksService {
         int insert = taskCheckMapper.insertTaskCheck(taskCheck);
         if (insert > 0) {
             if (scheduleTasks.getChecklist() != null) {
+                List<TaskCheckItem> taskCheckItems = new ArrayList<>();
+                List<TaskCheckSubItem> taskCheckSubItems = new ArrayList<>();
                 //获取检查表单
                 InspectionMain inspectionMain = inspectionMainMapper.selectInspectionById(scheduleTasks.getChecklist());
                 if (inspectionMain != null) {
+                    if (inspectionMain.getSubItems() != null && inspectionMain.getSubItems().size() > 0) {
+                        //遍历子项
+                        inspectionMain.getSubItems().forEach(subItem -> {
+                            //创建子项
+                            TaskCheckSubItem taskCheckSubItem = new TaskCheckSubItem();
+                            taskCheckSubItem.setCheckId(taskCheck.getId());
+                            taskCheckSubItem.setName(subItem.getName());
+                            taskCheckSubItem.setSortOrder(subItem.getSortOrder());
+                            taskCheckSubItem.setSubItemId(subItem.getId());
+                            taskCheckSubItems.add(taskCheckSubItem);
+                        });
+                    }
+
+                    if (taskCheckSubItems.size() > 0) {
+                        //批量新增子项
+                        taskCheckSubItemMapper.insertBatchTaskCheckSubItem(taskCheckSubItems);
+                        if (inspectionMain.getItems() != null && inspectionMain.getItems().size() > 0) {
+                            //遍历检查项
+                            inspectionMain.getItems().forEach(item -> {
+                                TaskCheckItem taskCheckItem = new TaskCheckItem();
+                                //设置检查项id
+                                taskCheckItem.setCheckId(taskCheck.getId());
+                                //设置子项id
+                                taskCheckItem.setSubItemId(taskCheckSubItems.stream()
+                                        .filter(subItem -> subItem.getSubItemId().equals(item.getSubItemId()))
+                                        .findFirst()
+                                        .map(TaskCheckSubItem::getId)
+                                        .orElse(null));
+                                //设置检查项名称
+                                taskCheckItem.setItemName(item.getItemName());
+                                //设置是否随机
+                                taskCheckItem.setIsRandom(item.getIsRandom());
+                                //设置标签
+                                taskCheckItem.setTag(item.getTag());
+                                //设置是否有输入项
+                                taskCheckItem.setHasInput(item.getHasInput());
+                                //设置输入项内容/提示
+                                taskCheckItem.setInputContent(item.getInputContent());
+                                //设置是否有拍照
+                                taskCheckItem.setHasPhoto(item.getHasPhoto());
+                                //设置拍照提示
+                                taskCheckItem.setPhotoPrompt(item.getPhotoPrompt());
+                                //设置检查结果
+                                taskCheckItem.setCheckResult(item.getCheckResult());
+                                //设置示例图
+                                taskCheckItem.setExampleImage(item.getExampleImage());
+                                //设置检查说明
+                                taskCheckItem.setCheckDescription(item.getCheckDescription());
+                                //设置排序序号
+                                taskCheckItem.setSortOrder(item.getSortOrder());
+                                //设置状态
+                                taskCheckItem.setStatus(item.getStatus());
+                                //设置限制分数
+                                taskCheckItem.setLimitScore(item.getLimitScore());
+                                taskCheckItems.add(taskCheckItem);
+                            });
+                        }
+                    }
+                    if (taskCheckItems.size() > 0) {
 
+                        //去除子项id为null的检查项
+                        taskCheckItems.removeIf(item -> item.getSubItemId() == null);
+                        if(taskCheckItems.size() > 0){
+                            //批量新增检查项
+                            taskCheckItemMapper.insertBatchTaskCheckItem(taskCheckItems);
+                        }
+                    }
                 }
             }
             return taskCheck.getId();
         }
-        return insert;
-    }
-
-
+         return insert;
 
+     }
 
 
+        /**
+         * 获取任务时间
+         *
+         * @param day           天
+         * @param hour          小时
+         * @param frequencyEnum 任务频率枚举
+         * @return 任务时间
+         */
+        private Date getTime (Long day, Long hour, TaskFrequencyEnum frequencyEnum){
+            Date nextExecutionTime = null;
+            Date startTime = null;
+            switch (frequencyEnum) {
+                case DAILY:
+                    if (day == -1) {
+                        //如果是-1，说明开始日期是前一天获取前一天日期
+                        startTime = DateUtils.addDays(new Date(), -1);
+                    } else {
+                        startTime = new Date();
+                    }
+                    break;
+                case WEEKLY:
+                    // 获取今日是本周第几天
+                    int currentDayOfWeek = DateUtils.getDayOfWeek(new Date());
+                    if (day >= currentDayOfWeek) {
+                        // 如果开始时间在当前时间之后，说明开始时间就是本周
+                        startTime = DateUtils.getThisWeekDate(day);
+                    } else {
+                        // 如果开始时间在当前时间之前，说明开始时间是下周
+                        startTime = DateUtils.getNextWeekDate(day);
+                    }
+                    break;
+                case MONTHLY:
+                    //获取符合条件的日期
+                    startTime = DateUtils.generateDate(Math.toIntExact(day), Math.toIntExact(hour));
+                    break;
+                default:
+                    startTime = DateUtils.addDays(new Date(), (int) (day - 1));
+                    break;
+            }
+            //获取开始日期的时间字符串，格式为yyyy-MM-dd
+            String dateTime = DateUtils.dateTime(startTime);
+            //将时间字符串解析为Date对象，格式为yyyy-MM-dd HH:mm:ss
+            nextExecutionTime = DateUtils.parseDate(
+                    dateTime + " " + hour + ":00");
+            return nextExecutionTime;
 
-    /**
-     * 获取任务时间
-     *
-     * @param day           天
-     * @param hour          小时
-     * @param frequencyEnum 任务频率枚举
-     * @return 任务时间
-     */
-    private Date getTime(Long day, Long hour, TaskFrequencyEnum frequencyEnum) {
-        Date nextExecutionTime = null;
-        Date startTime = null;
-        switch (frequencyEnum) {
-            case DAILY:
-                if (day == -1) {
-                    //如果是-1，说明开始日期是前一天获取前一天日期
-                    startTime = DateUtils.addDays(new Date(), -1);
-                } else {
-                    startTime = new Date();
-                }
-                break;
-            case WEEKLY:
-                // 获取今日是本周第几天
-                int currentDayOfWeek = DateUtils.getDayOfWeek(new Date());
-                if (day >= currentDayOfWeek) {
-                    // 如果开始时间在当前时间之后，说明开始时间就是本周
-                    startTime = DateUtils.getThisWeekDate(day);
-                } else {
-                    // 如果开始时间在当前时间之前，说明开始时间是下周
-                    startTime = DateUtils.getNextWeekDate(day);
-                }
-                break;
-            case MONTHLY:
-                //获取符合条件的日期
-                startTime = DateUtils.generateDate(Math.toIntExact(day), Math.toIntExact(hour));
-                break;
-            default:
-                startTime = DateUtils.addDays(new Date(), (int) (day - 1));
-                break;
         }
-        //获取开始日期的时间字符串，格式为yyyy-MM-dd
-        String dateTime = DateUtils.dateTime(startTime);
-        //将时间字符串解析为Date对象，格式为yyyy-MM-dd HH:mm:ss
-        nextExecutionTime = DateUtils.parseDate(
-                dateTime + " " + hour + ":00");
-        return nextExecutionTime;
-
-    }
-}
+    }