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/resources/mapper/system/SysDictDataMapper.xml | 8 +++-
src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java | 7 +++
src/main/java/com/ruoyi/project/system/domain/SysDictData.java | 13 ++++++
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 51 +++++++++++++++++++++++++
4 files changed, 77 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 2fbb16f..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();
}
diff --git a/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java b/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java
index ab25418..421f3da 100644
--- a/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java
+++ b/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java
@@ -27,4 +27,11 @@
private Long staffId;
+ /**
+ * 闃插叿鍚嶇О-瀛楀吀
+ */
+ @ApiModelProperty("闃插叿鍚嶇О-瀛楀吀")
+ private String dictId;
+
+
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java b/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
index 7d72f89..f9d9a7a 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysDictData.java
@@ -9,6 +9,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
+import java.math.BigDecimal;
+
/**
* 瀛楀吀鏁版嵁琛� sys_dict_data
*
@@ -17,6 +19,14 @@
public class SysDictData extends BaseEntity
{
private static final long serialVersionUID = 1L;
+
+ public Long getNum() {
+ return num;
+ }
+
+ public void setNum(Long num) {
+ this.num = num;
+ }
/** 瀛楀吀缂栫爜 */
@Excel(name = "瀛楀吀缂栫爜", cellType = ColumnType.NUMERIC)
@@ -41,6 +51,9 @@
/** 鏍峰紡灞炴�э紙鍏朵粬鏍峰紡鎵╁睍锛� */
private String cssClass;
+ /** 鍔充繚鐢ㄥ搧鏁伴噺 */
+ private Long num;
+
/** 琛ㄦ牸瀛楀吀鏍峰紡 */
private String listClass;
diff --git a/src/main/resources/mapper/system/SysDictDataMapper.xml b/src/main/resources/mapper/system/SysDictDataMapper.xml
index 148b58e..84d3df2 100644
--- a/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -12,6 +12,7 @@
<result property="dictType" column="dict_type" />
<result property="cssClass" column="css_class" />
<result property="listClass" column="list_class" />
+ <result property="num" column="num" />
<result property="isDefault" column="is_default" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
@@ -21,7 +22,7 @@
</resultMap>
<sql id="selectDictDataVo">
- select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
+ select dict_code, dict_sort, dict_label,num, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark
from sys_dict_data
</sql>
@@ -81,6 +82,7 @@
<if test="cssClass != null">css_class = #{cssClass},</if>
<if test="listClass != null">list_class = #{listClass},</if>
<if test="isDefault != null and isDefault != ''">is_default = #{isDefault},</if>
+ <if test="num != null">num = #{num},</if>
<if test="status != null">status = #{status},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -102,6 +104,7 @@
<if test="cssClass != null and cssClass != ''">css_class,</if>
<if test="listClass != null and listClass != ''">list_class,</if>
<if test="isDefault != null and isDefault != ''">is_default,</if>
+ <if test="num != null">num,</if>
<if test="status != null">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@@ -114,7 +117,8 @@
<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
<if test="listClass != null and listClass != ''">#{listClass},</if>
<if test="isDefault != null and isDefault != ''">#{isDefault},</if>
- <if test="status != null">#{status},</if>
+ <if test="num != null">#{num},</if>
+ <if test="status != null">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
--
Gitblit v1.9.3