From c816f2b9c72ed329fa9e6dbe8db1a0fcdcb3ac91 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 14 八月 2025 15:40:26 +0800
Subject: [PATCH] yys 新增劳保统计
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 3ff5216..0c86dc8 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -1,13 +1,18 @@
package com.ruoyi.lavorissue.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.approve.utils.DailyRedisCounter;
+import com.ruoyi.approve.utils.StartAndEndDateDto;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
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.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
import com.ruoyi.lavorissue.service.LavorIssueService;
@@ -16,9 +21,12 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.List;
/**
@@ -50,7 +58,15 @@
@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);
boolean save = laborIssueService.save(laborIssue);
return save ? AjaxResult.success() : AjaxResult.error();
}
@@ -58,6 +74,7 @@
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
@ApiOperation("鍔充繚鍙戞斁-淇敼")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
return update ? AjaxResult.success() : AjaxResult.error();
@@ -66,10 +83,19 @@
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
@ApiOperation("鍔充繚鍙戞斁-鍒犻櫎")
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
return delete ? AjaxResult.success() : AjaxResult.error();
}
+
+ @GetMapping("/statistics")
+ @ApiOperation("鍔充繚鍙戞斁-缁熻")
+ public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
+ StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
+ return AjaxResult.success(statisticsLaborIssue);
+ }
+
/**
@@ -81,7 +107,7 @@
public void export(HttpServletResponse response) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
ExcelUtil<LaborIssue> util = new ExcelUtil<LaborIssue>(LaborIssue.class);
- List<LaborIssue> list = lavorIssueMapper.list();
+ List<LaborIssue> list = lavorIssueMapper.list(new LaborIssue());
SysDept sysDept = sysDeptMapper.selectDeptById(tenantId);
if(sysDept == null){
throw new RuntimeException("閮ㄩ棬涓嶅瓨鍦�!");
--
Gitblit v1.9.3