From 8bf5842859c1db2268184a23669dd472b9c341a2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 28 Oct 2022 10:06:12 +0800
Subject: [PATCH] 任务page接口调整
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 11 +++++++++--
src/main/java/org/springblade/modules/task/vo/TaskVO.java | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index b2b206a..7d1aba6 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -26,11 +26,18 @@
<select id="selectTaskPage" resultMap="taskResultMap">
- select t.*, l.land_name as landname,f.agricultural_name as argname,
+ select t.*, l.land_name as landname,
+ f.agricultural_name as argname,
+ s.specs1,
+ d.dict_value specsVal1,
+ c.dict_value specsVal2,
u.real_name as reaname
from sys_task t
LEFT JOIN sys_land l ON t.land_id = l.id
- LEFT JOIN sys_stockfactory f ON f.id=t.stock_id
+ LEFT JOIN sys_soldr s ON s.id = t.stock_id
+ LEFT JOIN sys_stockfactory f ON f.id = s.stock_id1
+ LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs1' AND is_deleted = 0) d ON d.dict_key = s.specs_val1
+ LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'stockSpecs2' AND is_deleted = 0) c ON c.dict_key = s.specs_val2
LEFT JOIN blade_user u ON u.id=t.task_user
where t.is_deleted = 0
<if test="task.taskUser!=null and task.taskUser!=''">
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index 0461185..e94f664 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -31,7 +31,24 @@
public class TaskVO extends Task {
private static final long serialVersionUID = 1L;
private String landname;
+ /**
+ * 农资名
+ */
private String argname;
+
+ /**
+ * 规格
+ */
+ private String specs1;
+
+ /**
+ * 规格值（0：克 1：斤 2：公斤 3：吨 4：毫升 5：升 ）
+ */
+ private String specsVal1;
+ /**
+ * 规格值2( 0:袋 1：包 2：瓶 3：盒 4：箱 5：桶 6:支)
+ */
+ private String specsVal2;
private String reaname;
private String User;
private int sta;
--
Gitblit v1.9.3