修改前台查询任务bug

research-system/src/main/java/com/research/system/domain/dto/MemberAduitDto.java

@@ -89,7 +89,7 @@ public class MemberAduitDto {
     public static class Query {
         private String username;
         private String phone;
-        private String type;
+        private Byte type;
         private Long id;
         private Long ktGroupId;
         private String memberName;

research-system/src/main/java/com/research/system/domain/dto/ShsResDeviceDto.java

@@ -22,7 +22,7 @@ public class ShsResDeviceDto {
     public static class Query {
         @ApiModelProperty("平台id")
         private Long platformId;
-        private String projOrgId;
+        private Long projOrgId;
         @ApiModelProperty("仪器名")
         private String deviceName;
     }

research-system/src/main/java/com/research/system/domain/dto/TaskDto.java

@@ -28,13 +28,17 @@ public class TaskDto {
         private Integer dateType;
 
         @ApiModelProperty("任务状态 0全部 1未完成 2已完成 3待审核")
-        private Integer status;
+        private Integer completedStatus;
         private Long groupId;
 
         private Date startTime;
         private Date endTime;
         @ApiModelProperty("是否我的任务 0全部 1我的")
         private Byte isMine;
+        private Long userId;
+//        private Long getUserId(){
+//            return SecurityUtils.getUserId();
+//        }
         private String getUserName(){
             return SecurityUtils.getUsername();
         }

research-system/src/main/java/com/research/system/domain/po/TaskDeliverable.java

@@ -6,7 +6,7 @@ import java.util.Date;
 public class TaskDeliverable implements Serializable {
     private Long id;
 
-    private String taskId;
+    private Long taskId;
 
     private String deliverableName;
 
@@ -44,12 +44,12 @@ public class TaskDeliverable implements Serializable {
         this.id = id;
     }
 
-    public String getTaskId() {
+    public Long getTaskId() {
         return taskId;
     }
 
-    public void setTaskId(String taskId) {
+    public void setTaskId(Long taskId) {
-        this.taskId = taskId == null ? null : taskId.trim();
+        this.taskId = taskId;
     }
 
     public String getDeliverableName() {

research-system/src/main/java/com/research/system/domain/po/TaskDeliverableExample.java

@@ -175,62 +175,52 @@ public class TaskDeliverableExample {
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdEqualTo(String value) {
+        public Criteria andTaskIdEqualTo(Long value) {
             addCriterion("task_id =", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotEqualTo(String value) {
+        public Criteria andTaskIdNotEqualTo(Long value) {
             addCriterion("task_id <>", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdGreaterThan(String value) {
+        public Criteria andTaskIdGreaterThan(Long value) {
             addCriterion("task_id >", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdGreaterThanOrEqualTo(String value) {
+        public Criteria andTaskIdGreaterThanOrEqualTo(Long value) {
             addCriterion("task_id >=", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLessThan(String value) {
+        public Criteria andTaskIdLessThan(Long value) {
             addCriterion("task_id <", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLessThanOrEqualTo(String value) {
+        public Criteria andTaskIdLessThanOrEqualTo(Long value) {
             addCriterion("task_id <=", value, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdLike(String value) {
+        public Criteria andTaskIdIn(List<Long> values) {
-            addCriterion("task_id like", value, "taskId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTaskIdNotLike(String value) {
-            addCriterion("task_id not like", value, "taskId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTaskIdIn(List<String> values) {
             addCriterion("task_id in", values, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotIn(List<String> values) {
+        public Criteria andTaskIdNotIn(List<Long> values) {
             addCriterion("task_id not in", values, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdBetween(String value1, String value2) {
+        public Criteria andTaskIdBetween(Long value1, Long value2) {
             addCriterion("task_id between", value1, value2, "taskId");
             return (Criteria) this;
         }
 
-        public Criteria andTaskIdNotBetween(String value1, String value2) {
+        public Criteria andTaskIdNotBetween(Long value1, Long value2) {
             addCriterion("task_id not between", value1, value2, "taskId");
             return (Criteria) this;
         }

research-system/src/main/java/com/research/system/domain/vo/HomeVo.java

@@ -1,5 +1,8 @@
 package com.research.system.domain.vo;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.StrUtil;
 import com.research.system.domain.dto.GroupDto;
 import com.research.system.domain.po.PrjProjInfo;
 import io.swagger.annotations.ApiModel;
@@ -53,6 +56,8 @@ public class HomeVo {
     public static class TaskResult {
         private Long id;
 
+        private String leader;
+
         private Long projId;
 
         private Long projOrgId;
@@ -99,6 +104,26 @@ public class HomeVo {
 
         private Date createTime;
         private String ktGroupName;
+
+        private Byte completedStatus = 0;
+
+        public List<String> getDeliverableList() {
+            if (StrUtil.isNotEmpty(deliverables)) {
+                return ListUtil.toList(deliverables.split(","));
+            }
+            return CollectionUtil.newArrayList();
+        }
+
+        public Long getDuration(){
+            if (startTime != null && endTime != null) {
+                return (endTime.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24) >= 0 ? (endTime.getTime() - startTime.getTime()) / (1000 * 60 * 60 * 24) : 0L;
+            }
+            return 0L;
+        }
+
+        public String getLeader() {
+            return initiator;
+        }
     }
 
     @Data

research-system/src/main/java/com/research/system/service/impl/ClientPrjProjInfoServiceImpl.java

@@ -100,7 +100,7 @@ public class ClientPrjProjInfoServiceImpl implements ClientPrjProjInfoService {
             for (ClientPrjProjInfoVo.Result result : results) {
                 //查询合作单位
                 PrjProjOrgExample prjProjOrgExample = new PrjProjOrgExample();
-                prjProjOrgExample.createCriteria().andProjIdEqualTo(result.getId());
+                prjProjOrgExample.createCriteria().andProjIdEqualTo(result.getId()).andCategoryEqualTo((byte) 1);
                 List<PrjProjOrg> prjProjOrgs = prjProjOrgMapper.selectByExample(prjProjOrgExample);
                 if (CollUtil.isNotEmpty(prjProjOrgs)) {
                     result.setPrjProjOrgList(BeanUtil.copyToList(prjProjOrgs, ClientPrjProjInfoVo.OrgVo.class));

research-system/src/main/java/com/research/system/service/impl/HomeServiceImpl.java

@@ -10,6 +10,7 @@ import com.research.system.persist.dao.HomeDao;
 import com.research.system.persist.mapper.KtsKtGroupMapper;
 import com.research.system.persist.mapper.PrjProjOrgMapper;
 import com.research.system.persist.mapper.ProProgressMapper;
+import com.research.system.persist.mapper.TaskDeliverableMapper;
 import com.research.system.service.HomeService;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,8 @@ public class HomeServiceImpl implements HomeService {
     private ProProgressMapper proProgressMapper;
     @Resource
     private KtsKtGroupMapper ktsKtGroupMapper;
+    @Resource
+    private TaskDeliverableMapper taskDeliverableMapper;
 
     @Override
     public HomeVo.Result queryHomeInfo() {
@@ -87,7 +90,25 @@ public class HomeServiceImpl implements HomeService {
 
     @Override
     public List<HomeVo.TaskResult> queryTaskList() {
-        return homeDao.queryTaskList(SecurityUtils.getUserId());
+        List<HomeVo.TaskResult> taskResults = homeDao.queryTaskList(SecurityUtils.getUserId());
+        if (CollUtil.isNotEmpty(taskResults)) {
+            //查询任务状态
+            for (HomeVo.TaskResult taskResult : taskResults) {
+                TaskDeliverableExample taskDeliverableExample = new TaskDeliverableExample();
+                taskDeliverableExample.createCriteria().andTaskIdEqualTo(taskResult.getId()).andAduitStatusEqualTo((byte) 1);
+                List<TaskDeliverable> taskDeliverables = taskDeliverableMapper.selectByExample(taskDeliverableExample);
+                if (CollUtil.isEmpty(taskDeliverables)) {
+                    taskResult.setCompletedStatus((byte) 1);
+                }else {
+                    if (taskDeliverables.size() >= taskResult.getDeliverableList().size()) {
+                        taskResult.setCompletedStatus((byte) 2);
+                    }else {
+                        taskResult.setCompletedStatus((byte) 1);
+                    }
+                }
+            }
+        }
+        return taskResults;
     }
 
     @Override
@@ -95,7 +116,14 @@ public class HomeServiceImpl implements HomeService {
         HomeVo.ProjressMemberResult projressMemberResult = new HomeVo.ProjressMemberResult();
         projressMemberResult.setOrgMemberList(homeDao.orgMemberList());
         projressMemberResult.setXlList(homeDao.resultList());
-        projressMemberResult.setTitleList(homeDao.titleList());
+        List<HomeVo.ProjressMemberResult.TitleResult> titleResults = homeDao.titleList();
+        if (CollUtil.isNotEmpty(titleResults)) {
+            HomeVo.ProjressMemberResult.TitleResult titleResult = new HomeVo.ProjressMemberResult.TitleResult();
+            titleResult.setTitle("其他");
+            titleResult.setNum(projressMemberResult.getOrgMemberList().stream().mapToInt(HomeVo.ProjressMemberResult.OrgMemberResult::getNum).sum() - titleResults.stream().mapToInt(HomeVo.ProjressMemberResult.TitleResult::getNum).sum());
+            titleResults.add(titleResult);
+        }
+        projressMemberResult.setTitleList(titleResults);
         return projressMemberResult;
     }
 

research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java

@@ -140,6 +140,7 @@ public class MemberAduitServiceImpl implements MemberAduitService {
                 addMember.setRoleIdList(Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList()));
             }
             BeanUtil.copyProperties(ktsKtGroupMemberAduit, addMember);
+            addMember.setId(null);
             ktsGroupService.addMember(addMember);
 
 //            //添加主库租户用户

research-system/src/main/java/com/research/system/service/impl/SysRoleServiceImpl.java

@@ -52,7 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色数据集合信息
      */
     @Override
-    @DataScope(deptAlias = "d")
+//    @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
         return roleMapper.selectRoleList(role);

research-system/src/main/java/com/research/system/service/impl/TaskServiceImpl.java

@@ -11,6 +11,7 @@ import com.research.system.domain.dto.TaskDto;
 import com.research.system.domain.po.*;
 import com.research.system.domain.vo.TaskVo;
 import com.research.system.persist.dao.TaskDao;
+import com.research.system.persist.mapper.KtsKtGroupMemberMapper;
 import com.research.system.persist.mapper.TaskDeliverableMapper;
 import com.research.system.persist.mapper.TaskExecutorMapper;
 import com.research.system.persist.mapper.TaskListMapper;
@@ -19,10 +20,7 @@ import com.research.system.service.TaskService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +41,8 @@ public class TaskServiceImpl implements TaskService {
     @Resource
     private ClientPrjProjInfoService clientPrjProjInfoService;
     @Resource
+    private KtsKtGroupMemberMapper ktsKtGroupMemberMapper;
+    @Resource
     private TaskDao taskDao;
 
     @Override
@@ -95,6 +95,14 @@ public class TaskServiceImpl implements TaskService {
                     query.setEndTime(DateUtil.endOfMonth(new Date()));
             }
         }
+        //获取课题组ID
+        Long userId = SecurityUtils.getUserId();
+        KtsKtGroupMemberExample ktsKtGroupMemberExample = new KtsKtGroupMemberExample();
+        ktsKtGroupMemberExample.createCriteria().andUserIdEqualTo(userId);
+        List<KtsKtGroupMember> ktsKtGroupMembers = ktsKtGroupMemberMapper.selectByExample(ktsKtGroupMemberExample);
+        if (CollectionUtil.isNotEmpty(ktsKtGroupMembers)) {
+            query.setUserId(ktsKtGroupMembers.get(0).getId());
+        }
         List<TaskVo.TaskResult> taskResults = taskDao.queryList(query);
         if (CollectionUtil.isNotEmpty(taskResults)) {
             Map<String, List<TaskVo.TaskResult>> collect = taskResults.stream().collect(Collectors.groupingBy(TaskVo.TaskResult::getMonth));
@@ -111,6 +119,7 @@ public class TaskServiceImpl implements TaskService {
                         dateResult.setDate(entry1.getKey());
                         dateResultList.add(dateResult);
                     }
+                    dateResultList.stream().sorted(Comparator.comparing(TaskVo.ClientList.DateResult::getDate)).collect(Collectors.toList());
                     clientList.setClientList(dateResultList);
                 }
                 result.add(clientList);
@@ -256,11 +265,11 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public void aduit(Long taskId, Long deliverableId, Byte status) {
         TaskList taskList = taskListMapper.selectByPrimaryKey(taskId);
-        if (taskList == null || taskList.getEndTime().getTime() <= System.currentTimeMillis()) {
+        if (taskList == null) {
             throw new RuntimeException("任务不存在或任务已结束");
         }
         TaskDeliverableWithBLOBs taskDeliverableWithBLOBs = taskDeliverableMapper.selectByPrimaryKey(deliverableId);
-        if (taskDeliverableWithBLOBs == null || taskDeliverableWithBLOBs.getDeliveryStatus() == 1) {
+        if (taskDeliverableWithBLOBs == null) {
             throw new RuntimeException("交付物不存在或已交付");
         }
         taskDeliverableWithBLOBs.setAduitStatus(status);

research-system/src/main/resources/mapper/dao/HomeDao.xml

@@ -48,10 +48,12 @@
             task_list t
         left join
             kts_kt_group g on t.kt_group_id = g.id and g.del_flag = 0
+        LEFT JOIN
+            task_executor e on e.task_id = t.id
         where
             t.del_flag = 0
             and
-            t.id in (select task_id from task_executor where del_flag = 0 and executor_id in (select id from kts_kt_group_member where user_id = #{userId}))
+            (t.id in (select task_id from task_executor where del_flag = 0 and executor_id in (select id from kts_kt_group_member where user_id = #{userId}) or e.id = #{userId}))
     </select>
 
     <select id="orgMemberList" resultType="com.research.system.domain.vo.HomeVo$ProjressMemberResult$OrgMemberResult">

research-system/src/main/resources/mapper/dao/MemberAduitDao.xml

@@ -68,17 +68,17 @@
         left join kts_kt_group g1 on g1.id = a.parent_kt_id
         WHERE
             a.del_flag = 0 and
-            a.reviewer like concat('%', #{userId}, '%')
+            a.reviewer = #{userId}
         <if test="dto.status != null">
             and a.status = #{dto.status}
         </if>
-        <if test="dto.username != null">
+        <if test="dto.username != null and dto.username != ''">
             and a.username like concat('%', #{dto.username}, '%')
         </if>
-        <if test="dto.memberName != null">
+        <if test="dto.memberName != null and dto.memberName != ''">
             and a.member_name like concat('%', #{dto.memberName}, '%')
         </if>
-        <if test="dto.memberPhone != null">
+        <if test="dto.memberPhone != null and dto.memberPhone != ''">
             and a.member_phone like concat('%', #{dto.memberPhone}, '%')
         </if>
         <if test="dto.type != null">

research-system/src/main/resources/mapper/dao/TaskDao.xml

@@ -50,17 +50,20 @@
         <if test="dto.endTime != null">
             and t.end_time between #{dto.startTime} and #{dto.endTime}
         </if>
-        <if test="dto.status != null and dto.status != 0">
+        <if test="dto.completedStatus != null and dto.completedStatus != 0">
-            <if test="dto.status != 2">
+            <if test="dto.completedStatus != 2">
-                and t.delivery_status = #{dto.status}
+                and t.delivery_status = #{dto.completedStatus}
             </if>
-        <if test="dto.status == 3">
+        <if test="dto.completedStatus == 3">
             and t.aduit_status = 0
         </if>
         </if>
         <if test="dto.isMine != null and dto.isMine == 1">
             and (t.create_by = #{dto.userName}
-                or e.id is not null )
+                or e.executor_id = #{dto.userId} )
+        </if>
+        <if test="dto.isMine == 0 ">
+            and e.executor_id = #{dto.userId}
         </if>
         group by t.id
         order by

research-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
 			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
-		<!-- 数据范围过滤 -->
+<!--		&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-		${params.dataScope}
+<!--		${params.dataScope}-->
 		order by r.role_sort
 	</select>
     

research-system/src/main/resources/mapper/system/TaskDeliverableMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.research.system.persist.mapper.TaskDeliverableMapper">
   <resultMap id="BaseResultMap" type="com.research.system.domain.po.TaskDeliverable">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="task_id" jdbcType="VARCHAR" property="taskId" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
     <result column="deliverable_name" jdbcType="VARCHAR" property="deliverableName" />
     <result column="deliverable_url" jdbcType="VARCHAR" property="deliverableUrl" />
     <result column="delivery_status" jdbcType="TINYINT" property="deliveryStatus" />
@@ -138,7 +138,7 @@
       create_time, update_by, update_time, 
       reference_materials, delivery_instructions
       )
-    values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=VARCHAR}, #{deliverableName,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=BIGINT}, #{taskId,jdbcType=BIGINT}, #{deliverableName,jdbcType=VARCHAR}, 
       #{deliverableUrl,jdbcType=VARCHAR}, #{deliveryStatus,jdbcType=TINYINT}, #{aduitStatus,jdbcType=TINYINT}, 
       #{submitterAccount,jdbcType=VARCHAR}, #{submissionTime,jdbcType=TIMESTAMP}, #{reviewerAccount,jdbcType=VARCHAR}, 
       #{reviewTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=TINYINT}, #{createBy,jdbcType=VARCHAR}, 
@@ -206,7 +206,7 @@
         #{id,jdbcType=BIGINT},
       </if>
       <if test="taskId != null">
-        #{taskId,jdbcType=VARCHAR},
+        #{taskId,jdbcType=BIGINT},
       </if>
       <if test="deliverableName != null">
         #{deliverableName,jdbcType=VARCHAR},
@@ -268,7 +268,7 @@
         id = #{record.id,jdbcType=BIGINT},
       </if>
       <if test="record.taskId != null">
-        task_id = #{record.taskId,jdbcType=VARCHAR},
+        task_id = #{record.taskId,jdbcType=BIGINT},
       </if>
       <if test="record.deliverableName != null">
         deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
@@ -323,7 +323,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update task_deliverable
     set id = #{record.id,jdbcType=BIGINT},
-      task_id = #{record.taskId,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=BIGINT},
       deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{record.deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{record.deliveryStatus,jdbcType=TINYINT},
@@ -346,7 +346,7 @@
   <update id="updateByExample" parameterType="map">
     update task_deliverable
     set id = #{record.id,jdbcType=BIGINT},
-      task_id = #{record.taskId,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=BIGINT},
       deliverable_name = #{record.deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{record.deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{record.deliveryStatus,jdbcType=TINYINT},
@@ -368,7 +368,7 @@
     update task_deliverable
     <set>
       <if test="taskId != null">
-        task_id = #{taskId,jdbcType=VARCHAR},
+        task_id = #{taskId,jdbcType=BIGINT},
       </if>
       <if test="deliverableName != null">
         deliverable_name = #{deliverableName,jdbcType=VARCHAR},
@@ -420,7 +420,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.research.system.domain.po.TaskDeliverableWithBLOBs">
     update task_deliverable
-    set task_id = #{taskId,jdbcType=VARCHAR},
+    set task_id = #{taskId,jdbcType=BIGINT},
       deliverable_name = #{deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{deliveryStatus,jdbcType=TINYINT},
@@ -440,7 +440,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.research.system.domain.po.TaskDeliverable">
     update task_deliverable
-    set task_id = #{taskId,jdbcType=VARCHAR},
+    set task_id = #{taskId,jdbcType=BIGINT},
       deliverable_name = #{deliverableName,jdbcType=VARCHAR},
       deliverable_url = #{deliverableUrl,jdbcType=VARCHAR},
       delivery_status = #{deliveryStatus,jdbcType=TINYINT},