From 5c0bc75816a7b5fa348d658897a304f588d9d0ed Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 20 十一月 2025 14:50:47 +0800
Subject: [PATCH] yys 1.劳保修改
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index f0c861a..d94cb1a 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -12,6 +12,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.lavorissue.dto.LaborIssueDto;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
@@ -20,6 +21,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -73,21 +75,26 @@
@ApiOperation("鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(@RequestBody LaborIssue laborIssue){
- String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
- StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
- Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
- .gt(LaborIssue::getCreateTime, dateTime.getStartDate())
- .lt(LaborIssue::getCreateTime, dateTime.getEndDate()));
- String formattedCount = String.format("%03d", approveId + 1);
- laborIssue.setOrderNo(today + formattedCount);
- List<LaborIssue> laborIssues = lavorIssueMapper.selectList(new LambdaQueryWrapper<LaborIssue>()
- .like(LaborIssue::getOrderNo, today));
- if(!CollectionUtils.isEmpty(laborIssues)){
- long l = Long.parseLong(laborIssues.get(laborIssues.size() - 1).getOrderNo());
- laborIssue.setOrderNo(String.format("%03d", l + 1));
+ for (LaborIssueDto issue : laborIssue.getLaborIssueList()) {
+ LaborIssue laborIssue1 = new LaborIssue();
+ BeanUtils.copyProperties(laborIssue, laborIssue1);
+ BeanUtils.copyProperties(issue, laborIssue1);
+ String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
+ Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
+ .gt(LaborIssue::getCreateTime, dateTime.getStartDate())
+ .lt(LaborIssue::getCreateTime, dateTime.getEndDate()));
+ String formattedCount = String.format("%03d", approveId + 1);
+ laborIssue1.setOrderNo(today + formattedCount);
+// List<LaborIssue> laborIssues = lavorIssueMapper.selectList(new LambdaQueryWrapper<LaborIssue>()
+// .like(LaborIssue::getOrderNo, today));
+// if(!CollectionUtils.isEmpty(laborIssues)){
+// long l = Long.parseLong(laborIssues.get(laborIssues.size() - 1).getOrderNo());
+// issue.setOrderNo(String.format("%03d", l + 1));
+// }
+ laborIssueService.save(laborIssue1);
}
- boolean save = laborIssueService.save(laborIssue);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return AjaxResult.success();
}
@PostMapping("/update")
--
Gitblit v1.9.3