From 00b8031a96ac1b3210301789a8ef1fd50360538a Mon Sep 17 00:00:00 2001
From: 15856 <15856818120@163.com>
Date: Tue, 18 Jun 2024 14:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E6=8A=A5=E5=BA=9F=E5=9B=BE=E7=89=87=E5=92=8C=E6=8A=A5?=
=?UTF-8?q?=E5=BA=9F=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bonus/sgzb/app/domain/BackApplyInfo.java | 15 +++++++
.../mapper/app/BackReceiveMapper.xml | 41 ++++++++++++++++++-
.../resources/mapper/app/TmTaskMapper.xml | 4 +-
3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
index f83a8792..7a11cd94 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
@@ -198,4 +198,19 @@ public class BackApplyInfo {
* 报废数量
*/
private Integer bfNum;
+
+ /**
+ * 报废原因
+ */
+ private String scrapReason;
+
+ /**
+ * 报废类型0：自然报废，1人为报废
+ */
+ private String scrapType;
+
+ /**
+ * 图片地址
+ */
+ private String fileUrl;
}
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 3376d40a..05ad3d56 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -312,6 +312,15 @@
remark,
+
+ scrap_reason,
+
+
+ scrap_type,
+
+
+ file_url,
+
company_id,
@@ -343,6 +352,15 @@
#{remark},
+
+ #{scrapReason},
+
+
+ #{scrapType},
+
+
+ #{fileUrl},
+
#{companyId},
@@ -512,6 +530,15 @@
company_id,
+
+ audit_remark,
+
+
+ scrap_type,
+
+
+ file_url,
+
create_time
)
values (
@@ -538,6 +565,15 @@
#{companyId},
+
+ #{scrapReason},
+
+
+ #{scrapType},
+
+
+ #{fileUrl},
+
NOW()
)
@@ -749,7 +785,10 @@
bcd.parent_id as parentId,
bcd.create_by as createBy,
bcd.ma_id as maId,
- bai.company_id as companyId
+ bai.company_id as companyId,
+ bcd.scrap_reason as scrapReason,
+ bcd.scrap_type as scrapType,
+ bcd.file_url as fileUrl
FROM
back_check_details bcd
LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 17cb7e52..89a4678b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -669,7 +669,7 @@
tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
bpi.lot_id as proId, bpi.pro_id as projectId,bpi.lot_name as proName,
bui.unit_id as unitId,bui.unit_name as unitName,
- tt.create_by as applyFor,d.`name` as taskName,
+ su.nick_name as applyFor,d.`name` as taskName,
su2.user_name as companyAuditBy,
lai.company_audit_time as companyAuditTime,
@@ -691,7 +691,7 @@
bai.agreement_id as agreementId
FROM
tm_task tt
- LEFT JOIN sys_user su ON tt.create_by = su.user_name
+ LEFT JOIN sys_user su ON tt.create_by = su.user_id
LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id