From 5a9cfd76e07bd434f5db24912c67b39b97a029af Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 20 May 2022 13:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E5=86=99=E5=8F=8D=E9=A6=88=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=20-=20=E7=94=9F=E6=88=90=E5=BA=8F=E5=8F=B7(=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7)=20=E6=9F=A5=E8=AF=A2=E5=8F=8D=E9=A6=88=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=8E=92=E5=BA=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FeedbackHistoryController.java |  3 +-
 .../ProjectTaskInventoryFeedbackEO.java       |  3 ++
 ...ProjectTaskInventoryFeedbackEOService.java |  2 ++
 ...ojectTaskInventoryDetailEOServiceImpl.java |  5 ++++
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 29 ++++++++++++++++++-
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
index c8c2f7328..67e9dfd93 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/FeedbackHistoryController.java
@@ -35,7 +35,7 @@ import com.jero.common.aspect.annotation.AutoLog;
 public class FeedbackHistoryController extends JeroController<FeedbackHistory, IFeedbackHistoryService> {
 	@Autowired
 	private IFeedbackHistoryService feedbackHistoryService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -54,6 +54,7 @@ public class FeedbackHistoryController extends JeroController<FeedbackHistory, I
 								   HttpServletRequest req) {
 		QueryWrapper<FeedbackHistory> queryWrapper = QueryGenerator.initQueryWrapper(feedbackHistory, req.getParameterMap());
 		Page<FeedbackHistory> page = new Page<FeedbackHistory>(pageNo, pageSize);
+		queryWrapper.orderByDesc("create_time");
 		IPage<FeedbackHistory> pageList = feedbackHistoryService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
index 5d5087d44..a7d172da4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryFeedbackEO.java
@@ -104,4 +104,7 @@ public class ProjectTaskInventoryFeedbackEO implements Serializable {
     /**待办、已办标识**/
     @TableField(exist = false)
     private String status;
+
+    @ApiModelProperty(value = "序号")
+    private String serialNumber;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
index b73956bf6..27013944a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskInventoryFeedbackEOService.java
@@ -65,4 +65,6 @@ public interface IProjectTaskInventoryFeedbackEOService extends IService<Project
 	 * @param projectTaskInventoryFeedbackEO
 	 */
     void dreSubmit(ProjectTaskInventoryFeedbackEO projectTaskInventoryFeedbackEO);
+
+    String createSerialNumber();
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
index a2aa07f22..f26e8c986 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java
@@ -80,6 +80,7 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 
 			List<ProjectTaskInventoryFeedbackEO> projectTaskInventoryFeedbackEOList = new ArrayList<>();
 
+			String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber();
 			for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) {
 				QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
 				sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId());
@@ -94,9 +95,13 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl<Project
 					projectTaskInventoryFeedbackEO.setProjectTaskInventoryId(projectTaskInventoryDetailEO.getId());
 					projectTaskInventoryFeedbackEO.setFlowType(projectTaskInventoryDetailEO.getFlowType());
 					projectTaskInventoryFeedbackEO.setDeliveryRequirements(projectTaskInventoryDetailEO.getDeliveryInstructions());
+					projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber);
 					projectTaskInventoryFeedbackEOList.add(projectTaskInventoryFeedbackEO);
 
 					createByList.add(userName);
+
+					long number = Long.parseLong(serialNumber) + 1;
+					serialNumber = String.valueOf(number);
 				}
 			}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index f3ef5040c..7fdcf6a2d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -16,6 +16,8 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Date;
 import java.util.Map;
@@ -50,7 +52,9 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
         Date now = new Date();
         projectTaskInventoryFeedbackEO.setCreateTime(now);
         projectTaskInventoryFeedbackEO.setUpdateTime(now);
-        save(projectTaskInventoryFeedbackEO);
+		String serialNumber = createSerialNumber();
+		projectTaskInventoryFeedbackEO.setSerialNumber(serialNumber);
+		save(projectTaskInventoryFeedbackEO);
     }
 
 	/**
@@ -162,4 +166,27 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 
 		this.baseMapper.updateById(projectTaskInventoryFeedbackEO);
 	}
+
+	/**
+	 * 创建序号
+	 *
+	 * @return  serialNumber : 生成规则
+	 * 				年 + 月 + 日 + 三位流水号
+	 */
+	@Override
+	public String createSerialNumber(){
+		String serialNumber = "001";
+		String currentDay = new SimpleDateFormat("yyyyMMdd").format(new Date());
+		QueryWrapper<ProjectTaskInventoryFeedbackEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().like(ProjectTaskInventoryFeedbackEO::getSerialNumber,currentDay);
+		Integer feedbackCount = this.baseMapper.selectCount(queryWrapper);
+
+		int serialNumberSize = 3;
+		if(feedbackCount > 0){
+			serialNumber = currentDay + String.format("%0" + serialNumberSize + "d", (Integer.parseInt(serialNumber) + feedbackCount));
+		}else {
+			serialNumber = currentDay + serialNumber;
+		}
+		return serialNumber;
+	}
 }