From 7f616cfc0eeb35dd08cbd070b81661d351386c95 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 17:36:56 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index ffaed68..120f75f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -18,7 +18,9 @@
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;
@@ -33,8 +35,10 @@
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
@@ -54,6 +58,9 @@
@Autowired
private SysDeptMapper sysDeptMapper;
+ @Autowired
+ private ISysDictDataService iSysDictDataService;
+
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
@@ -70,11 +77,45 @@
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){
+ 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("搴撳瓨涓嶈冻");
+ }
+ }
for (LaborIssueDto issue : laborIssue.getLaborIssueList()) {
LaborIssue laborIssue1 = new LaborIssue();
BeanUtils.copyProperties(laborIssue, laborIssue1);
@@ -101,6 +142,16 @@
}
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();
}
@@ -130,6 +181,27 @@
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);
+ }
+
/**
--
Gitblit v1.9.3