From 228d63dfa0a3dd4d085c5dc1476c5a629fe998b3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 18 Feb 2022 16:06:49 +0800
Subject: [PATCH] 任务管理
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java | 2 +-
src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java | 2 ++
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java | 2 +-
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 31 +++++++++++++++----------------
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 5 ++---
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index ae49e7a..3e2f23e 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -216,8 +216,8 @@
* @return
*/
@PostMapping("/selectLi")
- public R selectLi(String type, String serid) {
- List<TaskqdVO> list = taskqdService.selectLi(type, serid);
+ public R selectLi(String type, String serid,String jurisdiction) {
+ List<TaskqdVO> list = taskqdService.selectLi(type, serid,jurisdiction);
for (int i = 0; i < list.size(); i++) {
Integer nums = list.get(i).getNums();
@@ -225,7 +225,6 @@
if (isteam) {
list.get(i).setIscation("0");
} else {
- System.out.println(list.get(i).getSerid().split(",")[0]);
if (list.get(i).getSerid().split(",")[0].equals(serid)) {
list.get(i).setIscation("1");
} else {
diff --git a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
index 020e40a..b5eb526 100644
--- a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
+++ b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
@@ -148,5 +148,7 @@
*/
@ApiModelProperty(value = "发布人")
private String publisher;
+ private String jurisdiction;
+ private String fid;
}
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
index bc6c679..3add60f 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -38,5 +38,5 @@
void updatet(Integer id, Integer num, String serid,String captain,String team);
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
- List<TaskqdVO> selectLi(String type, String serid);
+ List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
}
diff --git a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
index 8332f23..0d2d028 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -27,42 +27,41 @@
<update id="updatet">
update sys_taskqd
SET serid=#{serid},
- num=#{num}
- <if test="param4!='' and param4!=null">
- ,captain =#{param4}
- </if>
- <if test="param5!='' and param5!=null">
- ,team =#{param5}
- </if>
+ num=#{num}
+ <if test="param4!='' and param4!=null">
+ ,captain =#{param4}
+ </if>
+ <if test="param5!='' and param5!=null">
+ ,team =#{param5}
+ </if>
where id = #{id}
</update>
<!--日常任务列表-->
<select id="selectList" resultMap="taskResultMap">
- select jnum, num, serid,team
+ select jnum, num, serid, team
from sys_taskqd
where id = #{id}
</select>
<select id="queryReceiver" resultType="java.util.HashMap">
- SELECT
- *
- FROM
- blade_user
- WHERE
- id in ( ${serid} )
+ SELECT *
+ FROM blade_user
+ WHERE id in (${serid})
</select>
<select id="selectLi" resultMap="taskResultMap">
SELECT A.*,IFNULL(B.num,0) as nums FROM (
- select * from sys_taskqd where 1=1
+ select qd.* from sys_taskqd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1
<if test="type==0">
and find_in_set(#{serid}, serid)) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid FROM sys_taskfk WHERE
serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
- and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid ))) A LEFT JOIN (SELECT COUNT(*)
+ and id NOT IN ( SELECT id FROM sys_taskqd WHERE find_in_set(#{serid}, serid )) and (j.id =#{jurisdiction} or
+ j.parent_id = #{jurisdiction}) AND qd.jnum!=qd.num ) A LEFT JOIN (SELECT
+ COUNT(*)
as num,hdid,serid FROM sys_taskfk WHERE serid=#{serid} GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
</select>
diff --git a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
index a6032d4..183b377 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -37,5 +37,5 @@
void updatet(Integer id, Integer num, String serid,String captain,String team);
List<Taskqd> selectList(Integer id);
List<Map<String, Object>> queryReceiver(String serid);
- List<TaskqdVO> selectLi(String type, String serid);
+ List<TaskqdVO> selectLi(String type, String serid,String jurisdiction);
}
diff --git a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
index b878ea9..b467c08 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java
@@ -52,7 +52,7 @@
}
@Override
- public List<TaskqdVO> selectLi(String type, String serid) {
- return baseMapper.selectLi(type, serid);
+ public List<TaskqdVO> selectLi(String type, String serid,String jurisdiction) {
+ return baseMapper.selectLi(type, serid,jurisdiction);
}
}
--
Gitblit v1.9.3