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/dto/LaborIssueDto.java | 30 +++++++++++++++
src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java | 8 ++--
src/main/resources/mapper/lavorissue/LaborConfMapper.xml | 12 ++++++
src/main/resources/mapper/lavorissue/LavorIssueMapper.xml | 4 +-
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 8 +++
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 35 ++++++++++-------
src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java | 3 +
src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java | 13 +++---
8 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java b/src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java
index 0fb84ac..14f5559 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/DeptPositionController.java
@@ -56,9 +56,9 @@
* @return
*/
@GetMapping("/getDeptPositionByDeptId")
- @Log(title = "閫氳繃閮ㄩ棬id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅", businessType = BusinessType.OTHER)
- @ApiOperation("閫氳繃閮ㄩ棬id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅")
- public AjaxResult getDeptPositionByDeptId(@RequestBody DeptPosition deptPosition) {
+ @Log(title = "閫氳繃閮ㄩ棬id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅,鍦ㄩ�氳繃宀椾綅鏌ヨ瀵瑰簲浜哄憳", businessType = BusinessType.OTHER)
+ @ApiOperation("閫氳繃閮ㄩ棬id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅,鍦ㄩ�氳繃宀椾綅鏌ヨ瀵瑰簲浜哄憳")
+ public AjaxResult getDeptPositionByDeptId(DeptPosition deptPosition) {
return AjaxResult.success(deptPositionService.getDeptPositionByDeptId(deptPosition));
}
@@ -70,7 +70,7 @@
@GetMapping("/getDeptPositionByDeptIdLabor")
@Log(title = "閫氳繃id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅,鍦ㄩ�氳繃宀椾綅鏌ヨ瀵瑰簲鍔充繚鐢ㄥ搧", businessType = BusinessType.OTHER)
@ApiOperation("閫氳繃id閫掑綊鏌ヨ鎵�鏈夌殑宀椾綅,鍦ㄩ�氳繃宀椾綅鏌ヨ瀵瑰簲鍔充繚鐢ㄥ搧")
- public AjaxResult getDeptPositionByDeptIdLabor(@RequestBody DeptPosition deptPosition) {
+ public AjaxResult getDeptPositionByDeptIdLabor(DeptPosition deptPosition) {
return AjaxResult.success(deptPositionService.getDeptPositionByDeptIdLabor(deptPosition));
}
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")
diff --git a/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java b/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java
new file mode 100644
index 0000000..ab25418
--- /dev/null
+++ b/src/main/java/com/ruoyi/lavorissue/dto/LaborIssueDto.java
@@ -0,0 +1,30 @@
+package com.ruoyi.lavorissue.dto;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author :yys
+ * @date : 2025/11/20 10:21
+ */
+@Data
+@ApiModel
+public class LaborIssueDto {
+
+ /**
+ * 棰嗙敤鏁伴噺
+ */
+ @ApiModelProperty("棰嗙敤鏁伴噺")
+ private Long num;
+
+
+ /**
+ * 鍛樺伐id
+ */
+ @ApiModelProperty("鍛樺伐id")
+ private Long staffId;
+
+
+}
diff --git a/src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java b/src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java
index abbf8bb..69adea0 100644
--- a/src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java
+++ b/src/main/java/com/ruoyi/lavorissue/mapper/LaborConfMapper.java
@@ -6,10 +6,13 @@
import com.ruoyi.lavorissue.pojo.LaborConf;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @author :yys
* @date : 2025/11/19 14:00
*/
public interface LaborConfMapper extends BaseMapper<LaborConf> {
IPage<LaborConf> listPage(Page page,@Param("req") LaborConf laborConf);
+ List<LaborConf> list(@Param("req")List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 89b1f6a..0ddda5b 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -4,6 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.lavorissue.dto.LaborIssueDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,6 +12,7 @@
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* @author :yys
@@ -37,7 +39,7 @@
* 閮ㄩ棬宀椾綅id
*/
@ApiModelProperty("閮ㄩ棬宀椾綅id")
- private Integer deptPositionName;
+ private Integer deptPositionId;
/**
* 閮ㄩ棬宀椾綅鍚嶇О
@@ -54,6 +56,10 @@
@Excel(name = "鍔充繚鍗曞彿")
private String orderNo;
+ @TableField(exist = false)
+ @ApiModelProperty("鎵归噺鍙戞斁")
+ private List<LaborIssueDto> laborIssueList;
+
/**
* 鍛樺伐id
*/
diff --git a/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java b/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java
index 49441b6..44a4498 100644
--- a/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java
+++ b/src/main/java/com/ruoyi/lavorissue/service/impl/DeptPositionServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.lavorissue.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -115,8 +116,9 @@
throw new IllegalArgumentException("鏃犳晥鐨勯儴闂ㄦ垨宀椾綅ID");
}
if(dept.getType() == 2){
- return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
- .eq(LaborConf::getDeptPositionId, deptId));
+ List<Long> ids = new ArrayList<>();
+ ids.add(deptId);
+ return laborConfMapper.list(ids);
}
// 2. 閫掑綊鑾峰彇褰撳墠閮ㄩ棬鍙婃墍鏈夊瓙閮ㄩ棬鐨処D闆嗗悎
@@ -139,10 +141,9 @@
if(CollectionUtils.isEmpty(deptPositions)){
return Collections.emptyList();
}
- return laborConfMapper.selectList(Wrappers.lambdaQuery(LaborConf.class)
- .in(LaborConf::getDeptPositionId, deptPositions.stream()
- .map(DeptPosition::getId)
- .collect(Collectors.toSet())));
+ return laborConfMapper.list(deptPositions.stream()
+ .map(DeptPosition::getId)
+ .collect(Collectors.toList()));
}
/**
diff --git a/src/main/resources/mapper/lavorissue/LaborConfMapper.xml b/src/main/resources/mapper/lavorissue/LaborConfMapper.xml
index 7e32fea..4310d61 100644
--- a/src/main/resources/mapper/lavorissue/LaborConfMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LaborConfMapper.xml
@@ -14,4 +14,16 @@
</if>
</where>
</select>
+ <select id="list" resultType="com.ruoyi.lavorissue.pojo.LaborConf">
+ SELECT
+ t1.*,
+ t3.dict_label as dictName
+ FROM labor_conf t1
+ left join sys_dict_data t3 on t1.dict_id = t3.dict_value
+ <where>
+ <if test="req != null and req.size() > 0">
+ AND t1.dept_position_id in(<foreach collection="req" item="item" separator=",">#{item}</foreach>)
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
index dfe8270..3f466d9 100644
--- a/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
+++ b/src/main/resources/mapper/lavorissue/LavorIssueMapper.xml
@@ -11,7 +11,7 @@
t4.dict_label as dictTypeName,
t5.name as deptName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
left join dept_position t5 on t1.dept_position_id = t5.id
@@ -48,7 +48,7 @@
t4.dict_label as dictTypeName,
t5.name as deptName
from labor_issue t1
- left join staff_join_leave_record t2 on t1.staff_id = t2.id
+ left join staff_on_job t2 on t1.staff_id = t2.id
left join sys_dict_data t3 on t1.dict_id = t3.dict_value
left join sys_dict_data t4 on t1.dict_type = t4.dict_value
left join dept_position t5 on t1.dept_position_id = t5.id
--
Gitblit v1.9.3