From 37d57abd8bc8aa69a2518f693a2c971de8a08859 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Sep 2023 19:26:43 +0800
Subject: [PATCH] 任务查询报错修改
---
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java | 17 ++++++++
src/main/resources/application-dev.yml | 4 +-
src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java | 4 +-
src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java | 12 +++++
src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml | 42 +++++++++++---------
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 12 +++--
src/main/java/org/springblade/modules/taskqd/service/impl/TaskqdServiceImpl.java | 11 +++++
7 files changed, 71 insertions(+), 31 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 147b0b1..dce7f5d 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -292,14 +292,16 @@
/**
- * 查询任务
- *
- * @param type
- * @param serid
+ * 任务查询
+ * @param type 任务状态 0：未开始 1：正在进行 2：已完成
+ * @param serid 用户id
+ * @param jurisdiction 辖区id
+ * @param workjurisdiction 工作辖区
+ * @param tasktype 任务状态
* @return
*/
@PostMapping("/selectLi")
- public R selectLi(String type, String serid, String jurisdiction, String workjurisdiction, String tasktype) {
+ public R selectLi(Integer type, String serid, String jurisdiction, String workjurisdiction, String tasktype) {
List<TaskqdVO> list = taskqdService.selectLi(type, serid, jurisdiction, workjurisdiction, tasktype);
for (int i = 0; i < list.size(); i++) {
Integer nums = list.get(i).getNums();
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 6d25274..fe9408a 100644
--- a/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
+++ b/src/main/java/org/springblade/modules/taskqd/entity/Taskqd.java
@@ -123,9 +123,9 @@
private String raddress;
/**
- * 任务类型
+ * 任务状态( 0:正在进行、1:已结束、2:任务未开始)
*/
- @ApiModelProperty(value = "任务类型")
+ @ApiModelProperty(value = "任务状态( 0:正在进行、1:已结束、2:任务未开始)")
private String rtype;
/**
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 02d1e27..09fc749 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.java
@@ -46,7 +46,22 @@
List<Map<String, Object>> taskCount(String id,String type);
List<Map<String, Object>> allTask();
List<TaskqdVO> getlist(String id,String type);
- List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
+
+ /**
+ * 任务查询
+ * @param type 任务状态 0：未开始 1：正在进行 2：已完成
+ * @param serid 用户id
+ * @param jurisdiction 辖区id
+ * @param workjurisdiction 工作辖区
+ * @param tasktype 任务状态
+ * @return
+ */
+ List<TaskqdVO> selectLi(@Param("type") Integer type,
+ @Param("serid")String serid,
+ @Param("jurisdiction")String jurisdiction,
+ @Param("workjurisdiction")String workjurisdiction,
+ @Param("tasktype")String tasktype);
+
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
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 02fc93a..7656e8d 100644
--- a/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
+++ b/src/main/java/org/springblade/modules/taskqd/mapper/TaskqdMapper.xml
@@ -115,26 +115,30 @@
<select id="selectLi" resultMap="taskResultMap">
SELECT A.*,IFNULL(B.num,0) as nums FROM (
- select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1 AND
+ select qd.* from sys_taskqd qd LEFT JOIN sys_jurisdiction j ON j.id = qd.jurisdiction where 1=1
<if test="type==0">
- (qd.rtype = "2" or qd.rtype = "0") AND
<if test="serid != '1123598821738675201'">
- find_in_set(#{serid}, serid) and
+ AND find_in_set(#{serid}, serid)
</if>
- qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
- FROM
- sys_taskfk WHERE 1 = 1
- <if test="serid != '1123598821738675201'">
- and serid=#{serid}
- </if>
- GROUP BY hdid,serid) B ON A.id=B.hdid
+ AND (qd.rtype = "2" or qd.rtype = "0")
+ AND qd.tasktype=#{tasktype}
+ ) A LEFT JOIN (
+ SELECT COUNT(*) as num,hdid,serid
+ FROM
+ sys_taskfk WHERE 1 = 1
+ <if test="serid != '1123598821738675201'">
+ and serid=#{serid}
+ </if>
+ GROUP BY hdid,serid
+ ) B ON A.id=B.hdid
</if>
<if test="type==2">
- qd.rtype = "1" AND
<if test="serid != '1123598821738675201'">
- find_in_set(#{serid}, serid) and
+ AND find_in_set(#{serid}, serid)
</if>
- qd.tasktype=#{tasktype}) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
+ AND qd.rtype = "1"
+ and qd.tasktype=#{tasktype}
+ ) A LEFT JOIN (SELECT COUNT(*) as num,hdid,serid
FROM
sys_taskfk WHERE 1 = 1
<if test="serid != '1123598821738675201'">
@@ -143,12 +147,12 @@
GROUP BY hdid,serid) B ON A.id=B.hdid
</if>
<if test="type==1">
+ and qd.tasktype=#{tasktype}
<if test="jurisdiction!='1372091709474910209'">
+ AND qd.rtype = "2"
<if test="tasktype !=2">
- qd.jnum!=qd.num AND
+ AND qd.jnum!=qd.num
</if>
- qd.rtype = "2"
- and qd.tasktype=#{tasktype}
<if test="serid != '1123598821738675201'">
and (!find_in_set(#{serid}, serid) OR serid IS NULL )
</if>
@@ -157,9 +161,9 @@
j.parent_id = #{jurisdiction}) or (j.id =#{workjurisdiction} or
j.parent_id = #{workjurisdiction}))
</if>
- ) A LEFT JOIN (SELECT
- COUNT(*)
- as num,hdid FROM sys_taskfk GROUP BY hdid) B ON A.id=B.hdid
+ ) A LEFT JOIN (
+ SELECT COUNT(*) as num,hdid FROM sys_taskfk GROUP BY hdid
+ ) 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 6ba4674..347b01b 100644
--- a/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
+++ b/src/main/java/org/springblade/modules/taskqd/service/ITaskqdService.java
@@ -41,7 +41,17 @@
List<Map<String, Object>> taskCount(String id,String type);
List<Map<String, Object>> allTask();
List<TaskqdVO> getlist(String id,String type);
- List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
+ /**
+ * 任务查询
+ * @param type 任务状态 0：未开始 1：正在进行 2：已完成
+ * @param serid 用户id
+ * @param jurisdiction 辖区id
+ * @param workjurisdiction 工作辖区
+ * @param tasktype 任务状态
+ * @return
+ */
+ List<TaskqdVO> selectLi(Integer type, String serid,String jurisdiction,String workjurisdiction,String tasktype);
+
List<Map<String, Object>> selectNum(String serid,String jurisdiction,String workjurisdiction);
String querySerid(String rid);
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 f7a8d0f..2d5ba6a 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
@@ -77,8 +77,17 @@
return baseMapper.getlist(id,type);
}
+ /**
+ * 任务查询
+ * @param type 任务状态 0：未开始 1：正在进行 2：已完成
+ * @param serid 用户id
+ * @param jurisdiction 辖区id
+ * @param workjurisdiction 工作辖区
+ * @param tasktype 任务状态
+ * @return
+ */
@Override
- public List<TaskqdVO> selectLi(String type, String serid,String jurisdiction,String workjurisdiction,String tasktype) {
+ public List<TaskqdVO> selectLi(Integer type, String serid,String jurisdiction,String workjurisdiction,String tasktype) {
return baseMapper.selectLi(type, serid,jurisdiction,workjurisdiction,tasktype);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index fba27f5..e2d8803 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -29,9 +29,9 @@
# username: root
# password: ZHba@0112
- url: jdbc:mysql://127.0.0.1:3306/qfqkpublic?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
+ url: jdbc:mysql://60.220.177.113:3308/jbld?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&allowMultiQueries=true
username: root
- password: HCyj@2022
+ password: Zhba@jc@2023
# PostgreSQL
--
Gitblit v1.9.3