0.2.1 细节更新

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/attach/mapper/AttachMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ba.create_time,
             ba.deleted,
             bac.name as classify_name,
-            su.user_name as create_name
+            su.nick_name as create_name
         from bst_attach ba
             left join bst_attach_classify bac on bac.id = ba.classify_id
             left join sys_user su on su.user_id = ba.create_id
@@ -32,8 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.classifyName != null  and query.classifyName != ''"> and bac.name like concat('%', #{query.classifyName}, '%')</if>
         <if test="query.deleted != null"> and ba.deleted = #{query.deleted}</if>
         <if test="query.deleted == null"> and ba.deleted = false</if>
+        <if test="query.createName != null  and query.createName != ''"> and su.nick_name like concat('%', #{query.createName}, '%')</if>
         <if test="query.classifyAncestorId != null">
-            and find_in_set(#{query.classifyAncestorId}, bac.ancestors)
+            and bac.id = #{query.classifyAncestorId} or find_in_set(#{query.classifyAncestorId}, bac.ancestors)
         </if>
         ${query.params.dataScope}
     </sql>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/project/domain/Project.java

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.ValidGroup;
+import com.ruoyi.common.vo.FileNameVO;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,7 +72,7 @@ public class Project extends BaseEntity
 
     @Excel(name = "附件")
     @ApiModelProperty("附件")
-    private String attaches;
+    private List<FileNameVO> attaches;
 
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/project/mapper/ProjectMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="ProjectVO" id="ProjectResult" autoMapping="true">
         <result property="memberIds" column="member_ids" typeHandler="com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler"/>
+        <result property="attaches" column="attaches" typeHandler="com.ruoyi.common.mapper.typehandler.FileNameJsonTypeHandler"/>
     </resultMap>
 
     <sql id="selectProjectVo">
@@ -68,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.expectedCompleteDateEnd != null "> and date(bp.expected_complete_date) &lt;= #{query.expectedCompleteDateEnd}</if>
         <if test="query.maintenanceEndDateStart != null "> and date(bp.maintenance_end_date) >= #{query.maintenanceEndDateStart}</if>
         <if test="query.maintenanceEndDateEnd != null "> and date(bp.maintenance_end_date) &lt;= #{query.maintenanceEndDateEnd}</if>
-        <if test="query.statusList != null and query.statusList.size() > 0"> 
+        <if test="query.statusList != null and query.statusList.size() > 0">
             and bp.status in
             <foreach item="item" collection="query.statusList" open="(" separator="," close=")">
                 #{item}
@@ -128,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operationAmount != null">#{operationAmount},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="remark != null">#{remark},</if>
-            <if test="attaches != null">#{attaches},</if>
+            <if test="attaches != null">#{attaches, typeHandler=com.ruoyi.common.mapper.typehandler.FileNameJsonTypeHandler},</if>
             <if test="customerId != null">#{customerId},</if>
             <if test="createId != null">#{createId},</if>
             <if test="completeTime != null">#{completeTime},</if>
@@ -162,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.operationAmount != null">operation_amount = #{data.operationAmount},</if>
         <if test="data.status != null and data.status != ''">status = #{data.status},</if>
         <if test="data.remark != null">remark = #{data.remark},</if>
-        <if test="data.attaches != null">attaches = #{data.attaches},</if>
+        <if test="data.attaches != null">attaches = #{data.attaches, typeHandler=com.ruoyi.common.mapper.typehandler.FileNameJsonTypeHandler},</if>
         <if test="data.customerId != null">customer_id = #{data.customerId},</if>
         <if test="data.deleted != null">deleted = #{data.deleted},</if>
         <if test="data.createId != null">create_id = #{data.createId},</if>
@@ -175,7 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <update id="logicDel" parameterType="String">
-        update bst_project set 
+        update bst_project set
         deleted = true
         where id in
             <foreach item="id" collection="ids" open="(" separator="," close=")">
@@ -185,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="selectNameList" parameterType="ProjectQuery" resultType="ProjectNameVO">
-        select 
+        select
             bp.id,
             bp.name
         from bst_project bp
@@ -193,16 +194,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="searchCondition"/>
         </where>
     </select>
-    
+
     <select id="selectCount" parameterType="ProjectQuery" resultType="Integer">
         select count(bp.id) from bst_project bp
         <where>
             <include refid="searchCondition"/>
         </where>
-    </select>    
+    </select>
 
     <select id="selectCountGroupByStatus" parameterType="ProjectQuery" resultMap="com.ruoyi.common.mapper.CommonMapper.StringIntegerVO">
-        select 
+        select
             bp.status as `key`,
             count(bp.id) as `value`
         from bst_project bp
@@ -212,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by `key`
     </select>
 
-    <!-- updateByQuery --> 
+    <!-- updateByQuery -->
 
     <update id="updateByQuery">
         update bst_project bp
@@ -224,10 +225,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </update>
 
-    <!-- selectCountGroupByCreateMonth --> 
+    <!-- selectCountGroupByCreateMonth -->
 
     <select id="selectCountGroupByCreateMonth">
-        select 
+        select
             month(bp.create_time) as `key`,
             count(bp.id) as `value`
         from bst_project bp
@@ -237,10 +238,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by `key`
     </select>
 
-    <!-- selectCountGroupByCompleteMonth --> 
+    <!-- selectCountGroupByCompleteMonth -->
 
     <select id="selectCountGroupByCompleteMonth">
-        select 
+        select
             month(bp.complete_time) as `key`,
             count(bp.id) as `value`
         from bst_project bp
@@ -248,12 +249,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="searchCondition"/>
         </where>
         group by `key`
-    </select>    
+    </select>
 
-    <!-- selectCountGroupByStartMonth --> 
+    <!-- selectCountGroupByStartMonth -->
 
     <select id="selectCountGroupByStartMonth">
-        select 
+        select
             month(bp.start_time) as `key`,
             count(bp.id) as `value`
         from bst_project bp
@@ -262,5 +263,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         group by `key`
     </select>
-    
+
 </mapper>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/Task.java

@@ -1,9 +1,9 @@
 package com.ruoyi.bst.task.domain;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import org.springframework.format.annotation.DateTimeFormat;
@@ -65,8 +65,8 @@ public class Task extends BaseEntity
 
     @Excel(name = "负责人ID")
     @ApiModelProperty("负责人ID")
-    @NotNull(message = "负责人ID不能为空", groups = {ValidGroup.Create.class})
+    @Size(min = 1, message = "负责人不能为空", groups = {ValidGroup.Create.class})
-    private Long ownerId;
+    private List<Long> ownerIds;
 
     @Excel(name = "任务内容")
     @ApiModelProperty("任务内容")

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/TaskQuery.java

@@ -8,10 +8,16 @@ import lombok.Data;
 @Data
 public class TaskQuery extends TaskVO{
 
+    @ApiModelProperty("负责人ID")
+    private Long ownerId;
+
     @ApiModelProperty("项目id列表")
     private List<Long> projectIds;
 
     @ApiModelProperty("状态列表")
     private List<String> statusList;
 
+    @ApiModelProperty("任务id列表")
+    private List<Long> taskIds;
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/TaskVO.java

@@ -3,6 +3,7 @@ package com.ruoyi.bst.task.domain;
 import java.util.List;
 
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
+import com.ruoyi.system.user.domain.vo.SysUserNameVO;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,12 +17,18 @@ public class TaskVO extends Task{
     @ApiModelProperty(value = "创建人名称")
     private String createName;
 
-    @ApiModelProperty(value = "负责人名称")
-    private String ownerName;
-
     @ApiModelProperty(value = "取消人名称")
     private String cancelUserName;
 
+    @ApiModelProperty(value = "负责人列表")
+    private List<SysUserNameVO> ownerList;
+
     @ApiModelProperty(value = "提交列表")
     private List<TaskSubmitVO> submitList;
+
+    @ApiModelProperty("提交数量")
+    private Integer submitCount;
+
+    @ApiModelProperty("通过数量")
+    private Integer passCount;
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/domain/enums/TaskStatus.java

@@ -11,11 +11,11 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum TaskStatus {
 
-    WAIT_COMPLETED("1", "待完成"),
+    WAIT_COMPLETED("1", "待完成（停用）"),
     PROCESSING("2", "进行中"),
-    WAIT_CONFIRM("3", "待确认"),
+    WAIT_CONFIRM("3", "待确认（停用）"),
     PASS("4", "通过"),
-    REJECT("5", "驳回"),
+    REJECT("5", "驳回（停用）"),
     CANCEL("6", "取消");
 
     private final String status;
@@ -26,27 +26,27 @@ public enum TaskStatus {
      * 获取可以提交的任务状态
      */
     public static List<String> canSubmit() {
-        return CollectionUtils.map(TaskStatus::getStatus, PROCESSING, REJECT);
+        return CollectionUtils.map(TaskStatus::getStatus, PROCESSING);
-    }
-
-    /**
-     * 获取可以开始任务的状态
-     */
-    public static List<String> canStart() {
-        return CollectionUtils.map(TaskStatus::getStatus, WAIT_COMPLETED, CANCEL);
-    }
-
-    /**
-     * 获取可以审核的任务状态
-     */
-    public static List<String> canVerify() {
-        return CollectionUtils.map(TaskStatus::getStatus, WAIT_CONFIRM);
     }
 
     /**
      * 获取可以取消的任务状态
      */
     public static List<String> canCancel() {
-        return CollectionUtils.map(TaskStatus::getStatus, WAIT_COMPLETED, PROCESSING, REJECT);
+        return CollectionUtils.map(TaskStatus::getStatus, WAIT_COMPLETED, PROCESSING);
     } 
+
+    /**
+     * 获取可以通过的任务状态
+     */
+    public static List<String> canPass() {
+        return CollectionUtils.map(TaskStatus::getStatus, PROCESSING);
+    }
+
+    /**
+     * 获取可以开始的任务状态
+     */
+    public static List<String> canStart() {
+        return CollectionUtils.map(TaskStatus::getStatus, PASS, CANCEL);
+    }
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/mapper/TaskMapper.xml

@@ -4,7 +4,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.bst.task.mapper.TaskMapper">
 
-    <resultMap type="TaskVO" id="TaskResult" autoMapping="true"/>
+    <resultMap type="TaskVO" id="TaskResult" autoMapping="true">
+        <result property="ownerIds" column="owner_ids" typeHandler="com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler"/>
+    </resultMap>
 
     <sql id="selectTaskVo">
         select
@@ -17,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bt.create_time,
             bt.create_id,
             bt.expire_time,
-            bt.owner_id,
+            bt.owner_ids,
             bt.deleted,
             bt.description,
             bt.expect_finish_time,
@@ -27,12 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bt.cancel_remark,
             bp.name as project_name,
             su.nick_name as create_name,
-            ou.nick_name as owner_name,
             cu.nick_name as cancel_user_name
         from bst_task bt
             left join bst_project bp on bt.project_id = bp.id
             left join sys_user su on bt.create_id = su.user_id
-            left join sys_user ou on bt.owner_id = ou.user_id
             left join sys_user cu on bt.cancel_user_id = cu.user_id
     </sql>
 
@@ -43,12 +43,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.status != null  and query.status != ''"> and bt.status = #{query.status}</if>
         <if test="query.level != null  and query.level != ''"> and bt.level = #{query.level}</if>
         <if test="query.createId != null "> and bt.create_id = #{query.createId}</if>
-        <if test="query.ownerId != null "> and bt.owner_id = #{query.ownerId}</if>
+        <if test="query.ownerId != null">
+            and find_in_set(#{query.ownerId}, bt.owner_ids)
+        </if>
         <if test="query.deleted != null "> and bt.deleted = #{query.deleted}</if>
         <if test="query.deleted == null "> and bt.deleted = false</if>
         <if test="query.projectName != null and query.projectName != ''"> and bp.name like concat('%', #{query.projectName}, '%')</if>
         <if test="query.createName != null and query.createName != ''"> and su.nick_name like concat('%', #{query.createName}, '%')</if>
-        <if test="query.ownerName != null and query.ownerName != ''"> and ou.nick_name like concat('%', #{query.ownerName}, '%')</if>
         <if test="query.description != null and query.description != ''"> and bt.description like concat('%', #{query.description}, '%')</if>
         <if test="query.cancelUserId != null"> and bt.cancel_user_id = #{query.cancelUserId}</if>
         <if test="query.cancelRemark != null and query.cancelRemark != ''"> and bt.cancel_remark like concat('%', #{query.cancelRemark}, '%')</if>
@@ -85,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="createId != null">create_id,</if>
             <if test="expireTime != null">expire_time,</if>
-            <if test="ownerId != null">owner_id,</if>
+            <if test="ownerIds != null and ownerIds.size() > 0">owner_ids,</if>
             <if test="description != null and description != ''">`description`,</if>
             <if test="deleted != null">deleted,</if>
             <if test="expectFinishTime != null">expect_finish_time,</if>
@@ -103,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="createId != null">#{createId},</if>
             <if test="expireTime != null">#{expireTime},</if>
-            <if test="ownerId != null">#{ownerId},</if>
+            <if test="ownerIds != null and ownerIds.size() > 0">#{ownerIds, typeHandler=com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler},</if>
             <if test="description != null and description != ''">#{description},</if>
             <if test="deleted != null">#{deleted},</if>
             <if test="expectFinishTime != null">#{expectFinishTime},</if>
@@ -131,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.createTime != null">create_time = #{data.createTime},</if>
         <if test="data.createId != null">create_id = #{data.createId},</if>
         <if test="data.expireTime != null">expire_time = #{data.expireTime},</if>
-        <if test="data.ownerId != null">owner_id = #{data.ownerId},</if>
+        <if test="data.ownerIds != null and data.ownerIds.size() > 0">owner_ids = #{data.ownerIds, typeHandler=com.ruoyi.common.mybatis.typehandler.LongSplitListTypeHandler},</if>
         <if test="data.deleted != null">deleted = #{data.deleted},</if>
         <if test="data.description != null and data.description != ''">description = #{data.description},</if>
         <if test="data.expectFinishTime != null">expect_finish_time = #{data.expectFinishTime},</if>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/TaskAssembler.java

@@ -11,5 +11,22 @@ public interface TaskAssembler {
      * @param list 任务列表
      */
     void assembleSubmitList(List<TaskVO> list);
-    
+
+    /**
+     * 组装负责人列表
+     * @param list 任务列表
+     */
+    void assembleOwnerList(List<TaskVO> list);  
+
+    /**
+     * 组装提交数量
+     * @param list 任务列表
+     */
+    void assembleSubmitCount(List<TaskVO> list);
+
+    /**
+     * 组装通过数量
+     * @param list 任务列表
+     */
+    void assemblePassCount(List<TaskVO> list);
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/TaskService.java

@@ -6,7 +6,6 @@ import com.ruoyi.bst.task.domain.Task;
 import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.task.domain.TaskVO;
 import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
-import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
 import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
 import com.ruoyi.common.vo.LongIntegerVO;
 import com.ruoyi.common.vo.StringIntegerVO;
@@ -87,13 +86,6 @@ public interface TaskService
      */
     int submitTask(TaskSubmitDTO dto);
 
-    /**
-     * 开始任务
-     * @param dto
-     * @return
-     */
-    int startTask(TaskStartDTO dto);
-
     /**
      * 取消任务
      * @param dto
@@ -108,4 +100,17 @@ public interface TaskService
      * @return
      */
     int updateByQuery(Task task, TaskQuery taskQuery);
+
+    /**
+     * 通过任务（结束）
+     * @param id
+     * @return
+     */
+    int passTask(Long id);
+
+    /**
+     * 更新任务状态为进行中
+     * @param taskId
+     */
+    int startTask(Long taskId);
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskAssemblerImpl.java

@@ -1,17 +1,24 @@
 package com.ruoyi.bst.task.service.impl;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.task.domain.TaskVO;
 import com.ruoyi.bst.task.service.TaskAssembler;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
+import com.ruoyi.bst.taskSubmit.domain.enums.TaskSubmitStatus;
 import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
 import com.ruoyi.common.utils.collection.CollectionUtils;
+import com.ruoyi.common.vo.LongIntegerVO;
+import com.ruoyi.system.user.domain.vo.SysUserNameVO;
+import com.ruoyi.system.user.service.UserService;
 
 @Service
 public class TaskAssemblerImpl implements TaskAssembler {
@@ -20,6 +27,9 @@ public class TaskAssemblerImpl implements TaskAssembler {
     @Autowired
     private TaskSubmitService taskSubmitService;
 
+    @Autowired
+    private UserService userService;
+
     @Override
     public void assembleSubmitList(List<TaskVO> list) {
         if (CollectionUtils.isEmptyElement(list)) {
@@ -39,4 +49,66 @@ public class TaskAssemblerImpl implements TaskAssembler {
         }
     }
     
+    @Override
+    public void assembleOwnerList(List<TaskVO> list) {
+        if (CollectionUtils.isEmptyElement(list)) {
+            return;
+        }
+        List<SysUserNameVO> userList = userService.selectAllUserNameList();
+        
+        for (TaskVO task : list) {
+            if (task.getOwnerIds() == null || task.getOwnerIds().isEmpty()) {
+                task.setOwnerList(Collections.emptyList());
+                continue;
+            }
+            List<SysUserNameVO> ownerList = userList.stream()
+                .filter(item -> task.getOwnerIds().contains(item.getUserId()))
+                .collect(Collectors.toList());
+            task.setOwnerList(ownerList);
+        }
+    }
+
+    @Override
+    public void assembleSubmitCount(List<TaskVO> list) {
+        if (CollectionUtils.isEmptyElement(list)) {
+            return;
+        }
+        
+        List<Long> taskIds = CollectionUtils.map(list, TaskVO::getId);
+        TaskQuery query = new TaskQuery();
+        query.setTaskIds(taskIds);
+        Map<Long, Integer> map = taskSubmitService.selectCountGroupByTaskId(query)
+            .stream().collect(Collectors.toMap(LongIntegerVO::getKey, LongIntegerVO::getValue));
+
+        for (TaskVO vo : list) {
+            Integer count = map.get(vo.getId());
+            if (count == null) {
+                count = 0;
+            }
+            vo.setSubmitCount(count);
+        }
+    }
+    
+
+    @Override
+    public void assemblePassCount(List<TaskVO> list) {
+        if (CollectionUtils.isEmptyElement(list)) {
+            return;
+        }
+        
+        List<Long> taskIds = CollectionUtils.map(list, TaskVO::getId);
+        TaskQuery query = new TaskQuery();
+        query.setTaskIds(taskIds);
+        query.setStatus(TaskSubmitStatus.PASS.getCode());
+        Map<Long, Integer> map = taskSubmitService.selectCountGroupByTaskId(query)
+            .stream().collect(Collectors.toMap(LongIntegerVO::getKey, LongIntegerVO::getValue));
+
+        for (TaskVO vo : list) {
+            Integer count = map.get(vo.getId());
+            if (count == null) {
+                count = 0;
+            }
+            vo.setSubmitCount(count);
+        }
+    }
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskConverterImpl.java

@@ -22,12 +22,12 @@ public class TaskConverterImpl implements TaskConverter {
         Task po = new Task();
         po.setProjectId(data.getProjectId());
         po.setType(data.getType());
-        po.setStatus(TaskStatus.WAIT_COMPLETED.getStatus());
+        po.setStatus(TaskStatus.PROCESSING.getStatus());
         po.setLevel(data.getLevel());
         po.setPicture(data.getPicture());
         po.setCreateId(SecurityUtils.getUserId());
         po.setExpireTime(data.getExpireTime());
-        po.setOwnerId(data.getOwnerId());
+        po.setOwnerIds(data.getOwnerIds());
         po.setDescription(data.getDescription());
         return po;
     }
@@ -44,7 +44,7 @@ public class TaskConverterImpl implements TaskConverter {
         po.setLevel(data.getLevel());
         po.setPicture(data.getPicture());
         po.setExpireTime(data.getExpireTime());
-        po.setOwnerId(data.getOwnerId());
+        po.setOwnerIds(data.getOwnerIds());
         po.setDescription(data.getDescription());
 
         return po;

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskServiceImpl.java

@@ -11,24 +11,28 @@ import com.ruoyi.bst.task.domain.Task;
 import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.task.domain.TaskVO;
 import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
-import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
 import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
 import com.ruoyi.bst.task.domain.enums.TaskStatus;
 import com.ruoyi.bst.task.mapper.TaskMapper;
 import com.ruoyi.bst.task.service.TaskService;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
+import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
+import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
+import com.ruoyi.bst.taskSubmit.domain.enums.TaskSubmitStatus;
 import com.ruoyi.bst.taskSubmit.service.TaskSubmitConverter;
 import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
 import com.ruoyi.bst.verify.service.VerifyConverter;
 import com.ruoyi.bst.verify.service.VerifyService;
 import com.ruoyi.common.core.redis.RedisLock;
-import com.ruoyi.common.core.redis.enums.RedisLockKey;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServiceUtil;
+import com.ruoyi.common.utils.collection.CollectionUtils;
 import com.ruoyi.common.vo.LongIntegerVO;
 import com.ruoyi.common.vo.StringIntegerVO;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * 任务Service业务层处理
  *
@@ -36,6 +40,7 @@ import com.ruoyi.common.vo.StringIntegerVO;
  * @date 2025-01-22
  */
 @Service
+@Slf4j
 public class TaskServiceImpl implements TaskService
 {
     @Autowired
@@ -147,57 +152,20 @@ public class TaskServiceImpl implements TaskService
         ServiceUtil.assertion(old == null, "ID为%s的任务不存在", dto.getId());
         ServiceUtil.assertion(!TaskStatus.canSubmit().contains(old.getStatus()), "ID为%s的任务当前状态不允许提交", dto.getId());
 
-        // 加锁
-        Long lockKey = dto.getId();
-        ServiceUtil.assertion(!redisLock.lock(RedisLockKey.TASK_SUBMIT, lockKey), "ID为%s的任务正在提交，请稍后再试", dto.getId());
-        try {
-            // 更新任务状态
-            Integer result = transactionTemplate.execute(status -> {
-                // 更新状态
-                Task data = new Task();
-                data.setStatus(TaskStatus.WAIT_CONFIRM.getStatus());
-                TaskQuery query = new TaskQuery();
-                query.setId(dto.getId());
-                query.setStatusList(TaskStatus.canSubmit());
-                int update = this.updateByQuery(data, query);
-                ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
-
-                // 新增提交记录
-                TaskSubmit submit = taskSubmitConverter.toPo(dto);
-                int insertSubmit = taskSubmitService.insertTaskSubmit(submit);
-                ServiceUtil.assertion(insertSubmit != 1, "新增提交记录失败");
-
-                return update;
-            });
-
-            return result == null ? 0 : result;
-        } finally {
-            redisLock.unlock(RedisLockKey.TASK_SUBMIT, lockKey);
-        }
-
-    }
-
-    @Override
-    public int startTask(TaskStartDTO dto) {
-        // 校验
-        ServiceUtil.assertion(dto == null, "参数不允许为空");
-        ServiceUtil.assertion(dto.getId() == null, "任务ID不允许为空");
-
-        TaskVO old = this.selectTaskById(dto.getId());
-        ServiceUtil.assertion(old == null, "ID为%s的任务不存在", dto.getId());
-        ServiceUtil.assertion(!TaskStatus.canStart().contains(old.getStatus()), "ID为%s的任务当前状态不允许开始", dto.getId());
-
         Integer result = transactionTemplate.execute(status -> {
-            Task data = new Task();
+            // 新增提交记录
-            data.setStatus(TaskStatus.PROCESSING.getStatus());
+            TaskSubmit submit = taskSubmitConverter.toPo(dto);
-            data.setExpectFinishTime(dto.getExpectFinishTime());
+            int insertSubmit = taskSubmitService.insertTaskSubmit(submit);
-            TaskQuery query = new TaskQuery();
+            ServiceUtil.assertion(insertSubmit != 1, "新增提交记录失败");
-            query.setId(dto.getId());
-            query.setStatusList(TaskStatus.canStart());
-            int update = this.updateByQuery(data, query);
-            ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
 
-            return update;
+            // 尝试更新状态为结束
+            try {
+                this.passTask(dto.getId());
+            } catch (Exception e) {
+                log.error("更新ID为{}的任务状态为结束失败:{}", dto.getId(), e.getMessage());
+            }
+
+            return insertSubmit;
         });
 
         return result == null ? 0 : result;
@@ -208,8 +176,40 @@ public class TaskServiceImpl implements TaskService
         return taskMapper.updateByQuery(data, query);
     }
 
+
     @Override
-    public int cancelTask(TaskCancelDTO dto) {  
+    public int passTask(Long id) {
+        // 校验
+        ServiceUtil.assertion(id == null, "任务ID不允许为空");
+
+        TaskVO old = this.selectTaskById(id);
+        ServiceUtil.assertion(old == null, "ID为%s的任务不存在", id);
+        ServiceUtil.assertion(!TaskStatus.canPass().contains(old.getStatus()), "ID为%s的任务当前状态不允许完成", id);
+
+
+        // 查询提交记录，判断是否所有负责人都已经通过了
+        if (old.getOwnerIds().size() > 0) {
+            TaskSubmitQuery submitQuery = new TaskSubmitQuery();
+            submitQuery.setTaskId(id);
+            submitQuery.setStatus(TaskSubmitStatus.PASS.getCode());
+            List<TaskSubmitVO> submitList = taskSubmitService.selectTaskSubmitList(submitQuery);
+            List<Long> passedOwnerIds = CollectionUtils.map(submitList, TaskSubmitVO::getUserId);
+            ServiceUtil.assertion(!CollectionUtils.equals(old.getOwnerIds(), passedOwnerIds),
+            "ID为%s的任务当前状态不允许完成,还有%s个负责人未提交", id, old.getOwnerIds().size() - passedOwnerIds.size());
+        }
+
+        // 更新任务状态
+        Task data = new Task();
+        data.setStatus(TaskStatus.PASS.getStatus());
+        data.setPassTime(LocalDateTime.now());
+        TaskQuery query = new TaskQuery();
+        query.setId(id);
+        query.setStatusList(TaskStatus.canPass());
+        return this.updateByQuery(data, query);
+    }
+
+    @Override
+    public int cancelTask(TaskCancelDTO dto) {
 
         // 校验
         ServiceUtil.assertion(dto == null, "参数不允许为空");
@@ -220,21 +220,31 @@ public class TaskServiceImpl implements TaskService
         ServiceUtil.assertion(!TaskStatus.canCancel().contains(old.getStatus()), "ID为%s的任务当前状态不允许取消", dto.getId());
 
         // 更新任务状态
-        Integer result = transactionTemplate.execute(status -> {
+        Task data = new Task();
-            Task data = new Task();
+        data.setStatus(TaskStatus.CANCEL.getStatus());
-            data.setStatus(TaskStatus.CANCEL.getStatus());
+        data.setCancelTime(LocalDateTime.now());
-            data.setCancelTime(LocalDateTime.now());
+        data.setCancelRemark(dto.getCancelRemark());
-            data.setCancelRemark(dto.getCancelRemark());
+        data.setCancelUserId(SecurityUtils.getUserId());
-            data.setCancelUserId(SecurityUtils.getUserId());
+        TaskQuery query = new TaskQuery();
-            TaskQuery query = new TaskQuery();
+        query.setId(dto.getId());
-            query.setId(dto.getId());
+        query.setStatusList(TaskStatus.canCancel());
-            query.setStatusList(TaskStatus.canCancel());
+        return this.updateByQuery(data, query);
-            int update = this.updateByQuery(data, query);
+    }
-            ServiceUtil.assertion(update != 1, "更新ID为%s的任务状态失败", dto.getId());
 
-            return update;
+    @Override
-        });
+    public int startTask(Long taskId) {
+        // 校验
+        ServiceUtil.assertion(taskId == null, "任务ID不允许为空");
+        TaskVO old = this.selectTaskById(taskId);
+        ServiceUtil.assertion(old == null, "ID为%s的任务不存在", taskId);
+        ServiceUtil.assertion(!TaskStatus.canStart().contains(old.getStatus()), "ID为%s的任务当前状态不允许开始", taskId);
 
-        return result == null ? 0 : result;
+        // 更新任务状态
+        Task data = new Task();
+        data.setStatus(TaskStatus.PROCESSING.getStatus());
+        TaskQuery query = new TaskQuery();
+        query.setId(taskId);
+        query.setStatusList(TaskStatus.canStart());
+        return this.updateByQuery(data, query);
     }
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/task/service/impl/TaskValidatorImpl.java

@@ -34,6 +34,6 @@ public class TaskValidatorImpl implements TaskValidator{
 
     // 校验当前用户是否是任务的负责人
     private boolean isOwner(Task task, Long userId) {
-        return task != null && task.getOwnerId() != null && task.getOwnerId().equals(userId);
+        return task != null && task.getOwnerIds() != null && task.getOwnerIds().contains(userId);
     }
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/TaskSubmit.java

@@ -1,5 +1,7 @@
 package com.ruoyi.bst.taskSubmit.domain;
 
+import java.time.LocalDateTime;
+
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -39,4 +41,8 @@ public class TaskSubmit extends BaseEntity
     @ApiModelProperty("状态")
     private String status;
 
+    @Excel(name = "审核时间")
+    @ApiModelProperty("审核时间")
+    private LocalDateTime verifyTime;
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/TaskSubmitVO.java

@@ -20,5 +20,4 @@ public class TaskSubmitVO extends TaskSubmit {
     @ApiModelProperty("任务状态")
     private String taskStatus;
 
-
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/dto/TaskSubmitRejectDTO.java

@@ -0,0 +1,20 @@
+package com.ruoyi.bst.taskSubmit.domain.dto;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TaskSubmitRejectDTO {
+    
+    @ApiModelProperty("提交ID")
+    @NotNull(message = "提交ID不能为空")
+    private Long id;
+
+    @ApiModelProperty("驳回备注")
+    @Size(max = 200, message = "驳回备注长度不能超过200个字符")
+    private String remark;
+
+}

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/domain/enums/TaskSubmitStatus.java

@@ -11,7 +11,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum TaskSubmitStatus {
     
-    WAIT_CONFIRM("1", "待审核"),
+    WAIT_CONFIRM("1", "待审核（弃用）"),
     PASS("2", "通过"),
     REJECT("3", "驳回");
 
@@ -19,8 +19,13 @@ public enum TaskSubmitStatus {
     private String name;
 
     // 允许审核的状态列表
-    public static List<String> canVerify() {
+    // public static List<String> canVerify() {
-        return CollectionUtils.map(TaskSubmitStatus::getCode, WAIT_CONFIRM);
+    //     return CollectionUtils.map(TaskSubmitStatus::getCode, WAIT_CONFIRM);
+    // }
+
+    // 允许驳回的状态列表
+    public static List<String> canReject() {
+        return CollectionUtils.map(TaskSubmitStatus::getCode, PASS);
     }
 
 

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/mapper/TaskSubmitMapper.java

@@ -4,9 +4,11 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
+import com.ruoyi.common.vo.LongIntegerVO;
 
 /**
  * 任务提交记录Mapper接口
@@ -71,4 +73,11 @@ public interface TaskSubmitMapper
      * @return 结果
      */
     int updateByQuery(@Param("data") TaskSubmit data, @Param("query") TaskSubmitQuery query);
+
+    /**
+     * 根据任务ID分组统计提交数量
+     * @param query 查询条件
+     * @return 任务ID和对应的提交数量
+     */
+    List<LongIntegerVO> selectCountGroupByTaskId(@Param("query") TaskQuery query);
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/mapper/TaskSubmitMapper.xml

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bts.remark,
             bts.verify_id,
             bts.status,
+            bts.verify_time,
             bt.status as task_status,
             su.nick_name as user_name,
             su.avatar as user_avatar
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="verifyId != null">verify_id,</if>
             <if test="status != null">status,</if>
+            <if test="verifyTime != null">verify_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="taskId != null">#{taskId},</if>
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="verifyId != null">#{verifyId},</if>
             <if test="status != null">#{status},</if>
+            <if test="verifyTime != null">#{verifyTime},</if>
          </trim>
     </insert>
 
@@ -95,6 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="data.remark != null">remark = #{data.remark},</if>
         <if test="data.verifyId != null">verify_id = #{data.verifyId},</if>
         <if test="data.status != null">status = #{data.status},</if>
+        <if test="data.verifyTime != null">verify_time = #{data.verifyTime},</if>
     </sql>
 
     <delete id="deleteTaskSubmitById" parameterType="Long">
@@ -119,5 +123,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="searchCondition"/>
         </where>
     </update>
-    
+
+    <!-- selectCountGroupByTaskId --> 
+
+    <select id="selectCountGroupByTaskId">
+        SELECT 
+            task_id as `key`,
+            COUNT(*) as `value`
+        FROM bst_task_submit
+        <where>
+            <include refid="searchCondition"/>
+        </where>
+        GROUP BY task_id
+    </select>    
 </mapper>

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/TaskSubmitService.java

@@ -2,10 +2,12 @@ package com.ruoyi.bst.taskSubmit.service;
 
 import java.util.List;
 
+import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
+import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitRejectDTO;
+import com.ruoyi.common.vo.LongIntegerVO;
 
 /**
  * 任务提交记录Service接口
@@ -75,5 +77,12 @@ public interface TaskSubmitService
      * @param dto
      * @return
      */
-    int verify(TaskSubmitVerifyDTO dto);
+    int reject(TaskSubmitRejectDTO dto);
+
+    /**
+     * 根据任务id查询提交数量
+     * @param query
+     * @return
+     */
+    List<LongIntegerVO> selectCountGroupByTaskId(TaskQuery query);
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/impl/TaskSubmitConverterImpl.java

@@ -21,7 +21,7 @@ public class TaskSubmitConverterImpl implements TaskSubmitConverter {
         submit.setUserId(SecurityUtils.getUserId());
         submit.setAttaches(dto.getSubmitAttaches());
         submit.setRemark(dto.getSubmitRemark());
-        submit.setStatus(TaskSubmitStatus.WAIT_CONFIRM.getCode());
+        submit.setStatus(TaskSubmitStatus.PASS.getCode());
         return submit;
     }
     

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/taskSubmit/service/impl/TaskSubmitServiceImpl.java

@@ -8,14 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import com.ruoyi.bst.task.domain.Task;
 import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.task.domain.enums.TaskStatus;
 import com.ruoyi.bst.task.service.TaskService;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmit;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
+import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitRejectDTO;
 import com.ruoyi.bst.taskSubmit.domain.enums.TaskSubmitStatus;
 import com.ruoyi.bst.taskSubmit.mapper.TaskSubmitMapper;
 import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
@@ -25,6 +24,7 @@ import com.ruoyi.bst.verify.service.VerifyService;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServiceUtil;
 import com.ruoyi.common.utils.collection.CollectionUtils;
+import com.ruoyi.common.vo.LongIntegerVO;
 
 /**
  * 任务提交记录Service业务层处理
@@ -135,45 +135,34 @@ public class TaskSubmitServiceImpl implements TaskSubmitService
     }
 
     @Override
-    public int verify(TaskSubmitVerifyDTO dto) {
+    public int reject(TaskSubmitRejectDTO dto) {
         // 校验
         ServiceUtil.assertion(dto == null, "参数不允许为空");
         ServiceUtil.assertion(dto.getId() == null, "提交ID不允许为空");
         TaskSubmitVO old = this.selectTaskSubmitById(dto.getId());
         ServiceUtil.assertion(old == null, "ID为%s的提交不存在", dto.getId());
-        ServiceUtil.assertion(!TaskSubmitStatus.canVerify().contains(old.getStatus()), "ID为%s的提交状态不允许审核", dto.getId());
+        ServiceUtil.assertion(!TaskSubmitStatus.canReject().contains(old.getStatus()), "ID为%s的提交状态不允许驳回", dto.getId());
-        ServiceUtil.assertion(!TaskStatus.canVerify().contains(old.getTaskStatus()), "ID为%s的任务状态不允许审核", old.getTaskId());
 
-        Integer result = transactionTemplate.execute(status -> { 
+        Integer result = transactionTemplate.execute(status -> {
             // 创建审核记录
             Verify verify = verifyConverter.toPo(dto);
             int insertVerify = verifyService.insertVerify(verify);
-            ServiceUtil.assertion(insertVerify != 1, "为ID为%s的提交创建审核记录失败", dto.getId());
 
             // 更新提交数据
             TaskSubmit submit = new TaskSubmit();
             submit.setVerifyId(verify.getId());
-            submit.setStatus(dto.getPass() ? TaskSubmitStatus.PASS.getCode() : TaskSubmitStatus.REJECT.getCode());
+            submit.setVerifyTime(LocalDateTime.now());
+            submit.setStatus(TaskSubmitStatus.REJECT.getCode());
             TaskSubmitQuery query = new TaskSubmitQuery();
             query.setId(dto.getId());
-            query.setStatusList(TaskSubmitStatus.canVerify());
+            query.setStatusList(TaskSubmitStatus.canReject());
             int updateTaskSubmit = this.updateByQuery(submit, query);
             ServiceUtil.assertion(updateTaskSubmit != 1, "更新ID为%s的提交数据失败", dto.getId());
 
-            // 更新任务状态
+            // 若任务状态不是进行中，更新任务状态为进行中
-            Task task = new Task();
+            if (!TaskStatus.PROCESSING.getStatus().equals(old.getTaskStatus())) {
-            if (dto.getPass()) {
+                taskService.startTask(old.getTaskId());
-                task.setStatus(TaskStatus.PASS.getStatus());
-                task.setPassTime(LocalDateTime.now());
-            } else {
-                task.setStatus(TaskStatus.REJECT.getStatus());
             }
-            TaskQuery taskQuery = new TaskQuery();
-            taskQuery.setId(old.getTaskId());
-            taskQuery.setStatusList(TaskStatus.canVerify());
-            int updateTask = taskService.updateByQuery(task, taskQuery);
-
-            ServiceUtil.assertion(updateTask != 1, "更新ID为%s的任务状态失败", old.getTaskId());
 
             return updateTaskSubmit;
         });
@@ -185,4 +174,9 @@ public class TaskSubmitServiceImpl implements TaskSubmitService
         return taskSubmitMapper.updateByQuery(data, query);
     }
 
+    @Override
+    public List<LongIntegerVO> selectCountGroupByTaskId(TaskQuery query) {
+        return taskSubmitMapper.selectCountGroupByTaskId(query);
+    }
+
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/verify/service/VerifyConverter.java

@@ -1,6 +1,6 @@
 package com.ruoyi.bst.verify.service;
 
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
+import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitRejectDTO;
 import com.ruoyi.bst.verify.domain.Verify;
 
 public interface VerifyConverter {
@@ -10,6 +10,6 @@ public interface VerifyConverter {
      * @param dto
      * @return
      */
-    Verify toPo(TaskSubmitVerifyDTO dto);
+    Verify toPo(TaskSubmitRejectDTO dto);
     
 }

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/bst/verify/service/impl/VerifyConverterImpl.java

@@ -2,7 +2,7 @@ package com.ruoyi.bst.verify.service.impl;
 
 import org.springframework.stereotype.Service;
 
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
+import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitRejectDTO;
 import com.ruoyi.bst.verify.domain.Verify;
 import com.ruoyi.bst.verify.domain.enums.VerifyBstType;
 import com.ruoyi.bst.verify.domain.enums.VerifyStatus;
@@ -13,14 +13,14 @@ import com.ruoyi.common.utils.SecurityUtils;
 public class VerifyConverterImpl implements VerifyConverter {
 
     @Override
-    public Verify toPo(TaskSubmitVerifyDTO dto) {
+    public Verify toPo(TaskSubmitRejectDTO dto) {
         if (dto == null) {
             return null;
         }
         Verify verify = new Verify();
         verify.setBstType(VerifyBstType.TASK.getType());
         verify.setBstId(dto.getId());
-        verify.setStatus(dto.getPass() != null && dto.getPass() ? VerifyStatus.PASS.getStatus() : VerifyStatus.REJECT.getStatus());
+        verify.setStatus(VerifyStatus.REJECT.getStatus());
         verify.setRemark(dto.getRemark());
         verify.setUserId(SecurityUtils.getUserId());
         return verify;

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/mapper/typehandler/FileNameJsonTypeHandler.java

@@ -0,0 +1,8 @@
+package com.ruoyi.common.mapper.typehandler;
+
+import com.ruoyi.common.mybatis.typehandler.AbstractJsonListTypeHandler;
+import com.ruoyi.common.vo.FileNameVO;
+
+public class FileNameJsonTypeHandler extends AbstractJsonListTypeHandler<FileNameVO> {
+    
+}

common-ruoyi/ruoyi-system/src/main/java/com/ruoyi/common/vo/FileNameVO.java

@@ -0,0 +1,15 @@
+package com.ruoyi.common.vo;
+
+import lombok.Data;
+
+/**
+ * 文件名VO
+ * 用于前端可改名称的文件展示
+ */
+@Data
+public class FileNameVO {
+
+    private String name; // 文件名
+    private String url; // 文件url
+    
+}

ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskController.java

@@ -21,13 +21,11 @@ import com.ruoyi.bst.task.domain.Task;
 import com.ruoyi.bst.task.domain.TaskQuery;
 import com.ruoyi.bst.task.domain.TaskVO;
 import com.ruoyi.bst.task.domain.dto.TaskCancelDTO;
-import com.ruoyi.bst.task.domain.dto.TaskStartDTO;
 import com.ruoyi.bst.task.domain.dto.TaskSubmitDTO;
 import com.ruoyi.bst.task.service.TaskAssembler;
 import com.ruoyi.bst.task.service.TaskConverter;
 import com.ruoyi.bst.task.service.TaskService;
 import com.ruoyi.bst.task.service.TaskValidator;
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -68,6 +66,7 @@ public class TaskController extends BaseController
         startPage();
         startOrderBy();
         List<TaskVO> list = taskService.selectTaskList(query);
+        taskAssembler.assembleOwnerList(list);
         return getDataTable(list);
     }
 
@@ -94,6 +93,7 @@ public class TaskController extends BaseController
         TaskVO task = taskService.selectTaskById(id);
         List<TaskVO> list = Collections.singletonList(task);
         taskAssembler.assembleSubmitList(list);
+        taskAssembler.assembleOwnerList(list);
         return success(task);
     }
 
@@ -132,22 +132,6 @@ public class TaskController extends BaseController
         return toAjax(taskService.logicDel(ids));
     }
 
-    /**
-     * 开始任务
-     * @param dto
-     * @return
-     */
-    @PreAuthorize("@ss.hasPermi('bst:task:start')")
-    @Log(title = "任务", businessType = BusinessType.UPDATE)
-    @PutMapping("/start")
-    public AjaxResult start(@RequestBody @Validated TaskStartDTO dto) {
-        // 校验当前用户能否开始任务
-        if (!taskValidator.allowStart(dto.getId(), getUserId())) {
-            return error("您不是任务的负责人，不能开始任务");
-        }
-        return toAjax(taskService.startTask(dto));
-    }
-
     /**
      * 提交任务
      */
@@ -159,7 +143,6 @@ public class TaskController extends BaseController
         if (!taskValidator.allowSubmit(dto.getId(), getUserId())) {
             return error("您不是任务的负责人，不能提交任务");
         }
-
         return toAjax(taskService.submitTask(dto));
     }
 
@@ -172,4 +155,14 @@ public class TaskController extends BaseController
     public AjaxResult cancel(@RequestBody @Validated TaskCancelDTO dto) {
         return toAjax(taskService.cancelTask(dto));
     }
+
+    /**
+     * 通过任务（结束）
+     */
+    @PreAuthorize("@ss.hasPermi('bst:task:pass')")
+    @Log(title = "任务", businessType = BusinessType.UPDATE)
+    @PutMapping("/pass/{id}")
+    public AjaxResult pass(@PathVariable Long id) {
+        return toAjax(taskService.passTask(id));
+    }
 }

ruoyi-web/src/main/java/com/ruoyi/web/bst/TaskSubmitController.java

@@ -7,11 +7,17 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitQuery;
 import com.ruoyi.bst.taskSubmit.domain.TaskSubmitVO;
-import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitVerifyDTO;
+import com.ruoyi.bst.taskSubmit.domain.dto.TaskSubmitRejectDTO;
 import com.ruoyi.bst.taskSubmit.service.TaskSubmitService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -71,12 +77,12 @@ public class TaskSubmitController extends BaseController
     }
 
     /**
-     * 审核提交记录
+     * 驳回提交记录
      */
-    @PreAuthorize("@ss.hasPermi('bst:taskSubmit:verify')")
+    @PreAuthorize("@ss.hasPermi('bst:taskSubmit:reject')")
     @Log(title = "任务提交记录", businessType = BusinessType.UPDATE)
-    @PutMapping("/verify")
+    @PutMapping("/reject")
-    public AjaxResult verify(@RequestBody @Validated TaskSubmitVerifyDTO dto){
+    public AjaxResult reject(@RequestBody @Validated TaskSubmitRejectDTO dto){
-        return toAjax(taskSubmitService.verify(dto));
+        return toAjax(taskSubmitService.reject(dto));
     }
 }