From a1602b3c19056986684e426b59474b94306b3ed4 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 17 Mar 2025 13:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E8=BF=98=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gzgqj/business/plan/entity/PlanDataDetailBean.java      | 6 ++++++
 .../business/plan/service/PlanApplicationServiceImp.java    | 6 +++---
 src/main/resources/mappers/plan/PlanApplicationMapper.xml   | 5 +++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
index 608e01e..283cb72 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
@@ -55,6 +55,12 @@ public class PlanDataDetailBean {
 	 */
 	@Excel(name = "需用天数", width = 10.0,height = 20.0, orderNum = "7")
 	private String times;
+
+	/**
+	 * 退还日期
+	 */
+	private String backDate;
+
 	/**
 	 * 备注
 	 */
diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java
index 111693e..f18b29b 100644
--- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java
+++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java
@@ -17,6 +17,7 @@ import com.alibaba.fastjson.JSON;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 
 /**
@@ -42,12 +43,11 @@ public class PlanApplicationServiceImp  implements PlanApplicationService {
 		try {
 			// shiro获取用户信息,shiro管理的session
 			SelfUserEntity  acount= UserUtil.getLoginUser();
-			String userName=UserUtil.getLoginUser().getUsername();
-
+			String userName= Objects.requireNonNull(UserUtil.getLoginUser()).getUsername();
 			o.setCreator(userName);
 			o.setUpdater(userName);
 			List<PlanDataDetailBean> details=JSON.parseArray(o.getJsonData(), PlanDataDetailBean.class);
-			if(details==null || details.size()<1) {
+			if(details==null || details.isEmpty()) {
 				return ServerResponse.createErroe("请填写机具明细");
 			}else {
 				int num=dao.getTodayPlanNum(o);
diff --git a/src/main/resources/mappers/plan/PlanApplicationMapper.xml b/src/main/resources/mappers/plan/PlanApplicationMapper.xml
index 363c835..a2202f8 100644
--- a/src/main/resources/mappers/plan/PlanApplicationMapper.xml
+++ b/src/main/resources/mappers/plan/PlanApplicationMapper.xml
@@ -98,13 +98,13 @@
 				insert  INTO t_plan_details(
 					apply_id,model_id,need_num,
 					need_day,remark,type,
-					name,module,unit
+					name,module,unit,back_date
 				) VALUES
 			<foreach collection="list" item="item" separator=",">
 				(
 					#{param.id},#{item.moduleId},#{item.needNum},
 					#{item.times},#{item.remarks},#{item.type},
-					#{item.typeName},#{item.module},#{item.unit}
+					#{item.typeName},#{item.module},#{item.unit},#{item.backDate}
 				)
 		</foreach>
 	</insert>
@@ -158,6 +158,7 @@
 		tpd.model_id moduleId,
 		tpd.need_num needNum,
 		tpd.need_day times,
+		tpd.back_date backDate,
 		tpd.remark remarks,
 		tpd.type,
 		tpd.NAME typeName,