From a94970c6150d0072d800390fd735b459b3f0def3 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Wed, 20 Dec 2023 19:47:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/app/domain/BackApplyInfo.java     | 5 +++++
 .../src/main/resources/mapper/app/BackApplyMapper.xml     | 8 ++++++--
 2 files changed, 11 insertions(+), 2 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 87618774..6c6e55c3 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
@@ -81,4 +81,9 @@ public class BackApplyInfo {
      * 审核备注
      */
     private String directAuditRemark;
+    private String code;
+    private String backPerson;
+    private String lotId;
+    private String unitId;
+    private String backTime;
 }
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
index f067c8a7..a41bc8b8 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml
@@ -305,12 +305,16 @@
   <select id="getbackList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
     SELECT
       bai.id,
-      us.user_name as userName,
+      bai.`code`,
+      bai.back_person as backPerson,
       bai.phone,
+      bpl.lot_id,
       bpl.lot_name as lotName,
+      bui.unit_id as unitId,
       bui.unit_name as unitName,
-      bagi.plan_start_time as planStartTime,
+      bai.back_time as backTime,
       tt.task_status as taskStatus,
+      tta.agreement_id as agreementId,
       GROUP_CONCAT(DISTINCT bad.type_id) as typeId,
       GROUP_CONCAT(CONCAT_WS('/',  IFNULL(mt3.type_name, ''))) AS typeName
     FROM

From f5d0deb4c8ef20508791cab204786af5ce1eb972 Mon Sep 17 00:00:00 2001
From: sliang <1589399930@qq.com>
Date: Wed, 20 Dec 2023 19:59:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9B=E7=BB=B4=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/service/impl/AgreementInfoServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
index 215777f5..7245eb52 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java
@@ -62,8 +62,9 @@ public class AgreementInfoServiceImpl implements AgreementInfoService {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date nowDate = DateUtils.getNowDate();
         String format = dateFormat.format(nowDate);
+        String result = format.replace("-", "");
         int num = agreementInfoMapper.selectNumByMonth(nowDate) + 1;
-        String code = "XY" + format + "-000" + num;
+        String code = "XY" + result + "000" + num;
         return code;
     }
 }