From 262b4063acf621895f92627b397627fa7faa067f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 14:37:00 +0800
Subject: [PATCH] yys 劳保自动统计，劳保库存
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 130 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 114 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 966516f..120f75f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -12,14 +12,18 @@
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;
import com.ruoyi.lavorissue.service.LavorIssueService;
import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.service.ISysDictDataService;
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;
@@ -27,9 +31,14 @@
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -49,6 +58,9 @@
@Autowired
private SysDeptMapper sysDeptMapper;
+ @Autowired
+ private ISysDictDataService iSysDictDataService;
+
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
@@ -57,26 +69,91 @@
return AjaxResult.success(listPage);
}
+ @GetMapping("/statisticsList")
+ @Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
+ @ApiOperation("鍔充繚鍙戞斁-缁熻鏌ヨ")
+ public AjaxResult statisticsList(LaborIssue laborIssue){
+ List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
+ return AjaxResult.success(listPage);
+ }
+
+ /**
+ * 鏍规嵁 dictId 鍒嗙粍缁熻棰嗙敤鏁伴噺锛坣um锛夋�诲拰
+ * @param laborIssueList 鍘熷鏁版嵁鍒楄〃
+ * @return key: dictId, value: 璇ュ瓧鍏镐笅鐨勬�婚鐢ㄦ暟閲�
+ */
+ public Map<String, Long> statisticsByDictId(List<LaborIssueDto> laborIssueList) {
+ // 绌哄�兼牎楠岋紝閬垮厤绌烘寚閽堝紓甯�
+ if (laborIssueList == null || laborIssueList.isEmpty()) {
+ return new HashMap<>(); // 浣庣増鏈彲鐢� new HashMap<>()
+ }
+
+ // 鏍稿績鍒嗙粍缁熻閫昏緫
+ return laborIssueList.stream()
+ // 杩囨护鎺夋棤鏁堟暟鎹紙dictId涓虹┖ 鎴� num涓虹┖/灏忎簬0鐨勬儏鍐碉級
+ .filter(dto -> dto.getDictId() != null && !dto.getDictId().isEmpty())
+ .filter(dto -> dto.getNum() != null && dto.getNum() >= 0)
+ // 鎸� dictId 鍒嗙粍锛岀疮鍔� num 鏁伴噺
+ .collect(Collectors.groupingBy(
+ LaborIssueDto::getDictId, // 鍒嗙粍渚濇嵁锛歞ictId
+ Collectors.summingLong(LaborIssueDto::getNum) // 姹傚拰锛歯um
+ ));
+ }
+
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
@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));
+ SysDictData dictData = new SysDictData();
+ dictData.setDictType("sys_lavor_issue");
+ List<SysDictData> sysDictData = iSysDictDataService.selectDictDataList(dictData);
+ Map<String, Long> stringLongMap = statisticsByDictId(laborIssue.getLaborIssueList());
+ // 鍒ゆ柇搴撳瓨鏄惁鍏呰冻
+ for (SysDictData sysDictDatum : sysDictData) {
+ Long aLong = stringLongMap.get(sysDictDatum.getDictValue());
+ if (aLong != null && aLong > sysDictDatum.getNum()) {
+ throw new RuntimeException("搴撳瓨涓嶈冻");
+ }
}
- boolean save = laborIssueService.save(laborIssue);
- return save ? AjaxResult.success() : AjaxResult.error();
+ 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)
+ .orderByDesc(LaborIssue::getOrderNo)
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(laborIssues)){
+ LaborIssue laborIssue2 = laborIssues.get(0);
+ // 褰搇aborIssue2鐨勭紪鍙峰ぇ浜巐aborIssue1鐨勭紪鍙凤紝鍒欎娇鐢╨aborIssue2鐨勭紪鍙峰姞1
+ long l = Long.parseLong(laborIssue2.getOrderNo());
+ long l1 = Long.parseLong(laborIssue1.getOrderNo());
+ if(l >= l1){
+ laborIssue1.setOrderNo(l + 1 + "");
+ }
+
+ }
+ laborIssueService.save(laborIssue1);
+ // 鍑忓簱瀛�
+ List<SysDictData> collect = sysDictData
+ .stream()
+ .filter(item -> item.getDictValue().equals(issue.getDictId()))
+ .collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(collect)){
+ SysDictData sysDictData1 = collect.get(0);
+ sysDictData1.setNum(sysDictData1.getNum() - issue.getNum());
+ iSysDictDataService.updateDictData(sysDictData1);
+ }
+ }
+ return AjaxResult.success();
}
@PostMapping("/update")
@@ -102,6 +179,27 @@
public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
return AjaxResult.success(statisticsLaborIssue);
+ }
+
+ @ApiOperation("鍙戞斁杩涘害-鎬昏")
+ @GetMapping("/progressTotal")
+ public AjaxResult progressTotal(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressTotal(laborIssue);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("棰嗗彇杩涘害鍗犳瘮")
+ @GetMapping("/progressPercent")
+ public AjaxResult progressPercent(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressPercent(laborIssue);
+ return AjaxResult.success(list);
+ }
+
+ @ApiOperation("杩涘害鍒嗗竷")
+ @GetMapping("/progressDistribution")
+ public AjaxResult progressDistribution(LaborIssue laborIssue) throws Exception {
+ Map<String, Object> list = laborIssueService.progressDistribution(laborIssue);
+ return AjaxResult.success(list);
}
@@ -132,8 +230,8 @@
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/exportCopy")
@ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
- public void exportCopy(HttpServletResponse response) throws UnsupportedEncodingException {
- laborIssueService.exportCopy(response);
+ public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
+ laborIssueService.exportCopy(response,laborIssue);
}
}
--
Gitblit v1.9.3