From 07f085de4c97e3eee39dae3107780f46f894d675 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 04 一月 2026 16:45:49 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 7 ++-
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 19 +++++++++
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 7 ++-
src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml | 2
src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java | 2
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 7 +++
src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java | 13 ++++++
src/main/resources/mapper/system/SysUserMapper.xml | 2
src/main/java/com/ruoyi/production/service/SalesLedgerProductionAccountingService.java | 3 +
9 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
index ed7ac26..fb9ea56 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
@@ -13,8 +13,11 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
/**
* @author :yys
@@ -36,4 +39,14 @@
return AjaxResult.success(list);
}
+ /**
+ * 瀵煎嚭
+ * @param response
+ */
+ @PostMapping("/export")
+ @ApiOperation("鐢熶骇绠＄悊-鐢熶骇鏍哥畻-瀵煎嚭")
+ public void export(HttpServletResponse response) {
+ salesLedgerProductionAccountingService.export(response);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 297f6b9..7a5ae26 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +25,7 @@
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鐢熶骇浜哄悕绉�")
+ @Excel(name = "鐢熶骇浜哄悕绉�")
private String schedulingUserName;
@@ -31,29 +33,34 @@
* 宸ヨ祫
*/
@ApiModelProperty(value = "宸ヨ祫")
+ @Excel(name = "宸ヨ祫")
private BigDecimal wages;
/**
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
/**
* 宸ユ椂瀹氶
*/
@ApiModelProperty(value = "宸ユ椂瀹氶")
+ @Excel(name = "宸ユ椂瀹氶")
private BigDecimal workHours;
/**
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+ @Excel(name = "鎺掍骇鏃ユ湡")
private String schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
diff --git a/src/main/java/com/ruoyi/production/service/SalesLedgerProductionAccountingService.java b/src/main/java/com/ruoyi/production/service/SalesLedgerProductionAccountingService.java
index 11c62f4..50daae0 100644
--- a/src/main/java/com/ruoyi/production/service/SalesLedgerProductionAccountingService.java
+++ b/src/main/java/com/ruoyi/production/service/SalesLedgerProductionAccountingService.java
@@ -6,6 +6,8 @@
import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
+import javax.servlet.http.HttpServletResponse;
+
/**
* @author :yys
* @date : 2025/7/21 14:39
@@ -16,4 +18,5 @@
IPage<SalesLedgerProductionAccountingDto> listPage(Page page, SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto);
+ void export(HttpServletResponse response);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 3d510b8..ffefd66 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -1,15 +1,26 @@
package com.ruoyi.production.service.impl;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
+import com.ruoyi.production.dto.SalesLedgerSchedulingDto;
import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
+import com.ruoyi.production.pojo.SalesLedgerWork;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -27,4 +38,12 @@
IPage<SalesLedgerProductionAccountingDto> list = salesLedgerProductionAccountingMapper.listPage(page, salesLedgerProductionAccountingDto);
return list;
}
+
+ @Override
+ public void export(HttpServletResponse response) {
+ Page page = new Page(-1,-1);
+ IPage<SalesLedgerProductionAccountingDto> salesLedgerProductionAccountingDtoIPage = listPage(page, new SalesLedgerProductionAccountingDto());
+ ExcelUtil<SalesLedgerProductionAccountingDto> util = new ExcelUtil<>(SalesLedgerProductionAccountingDto.class);
+ util.exportExcel(response, salesLedgerProductionAccountingDtoIPage.getRecords(), "鐢熶骇璁㈠崟");
+ }
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index db79027..55be343 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -73,9 +73,12 @@
// @Excel(name = "宀椾綅")
private Long deptPositionId;
- @TableField(exist = false)
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
- private String deptPositionName;
+ private String postJob;
/**
* 瀹跺涵浣忓潃
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 2a88378..438857f 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -62,9 +62,12 @@
// @Excel(name = "宀椾綅")
private Integer deptPositionId;
- @TableField(exist = false)
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
- private String deptPositionName;
+ private String postJob;
/**
* 瀹跺涵浣忓潃
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
index 7368456..d00b3c4 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffJoinLeaveRecordServiceImpl.java
@@ -192,7 +192,7 @@
// 閫氳繃閮ㄩ棬鍚嶇О鏌ヨ閮ㄩ棬id
for (StaffJoinLeaveRecord staffJoinLeaveRecord : staffJoinLeaveRecords) {
staffJoinLeaveRecord.setStaffState(1);
- Optional<DeptPosition> deptPosition = deptPositions.stream().filter(deptPosition1 -> deptPosition1.getName().equals(staffJoinLeaveRecord.getDeptPositionName())).findFirst();
+ Optional<DeptPosition> deptPosition = deptPositions.stream().filter(deptPosition1 -> deptPosition1.getName().equals(staffJoinLeaveRecord.getPostJob())).findFirst();
deptPosition.ifPresent(position -> staffJoinLeaveRecord.setDeptPositionId(position.getId()));
add(staffJoinLeaveRecord);
}
diff --git a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
index d0e020a..ebfd98b 100644
--- a/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
+++ b/src/main/resources/mapper/production/SalesLedgerSchedulingMapper.xml
@@ -45,7 +45,7 @@
</select>
<select id="list" resultType="com.ruoyi.production.dto.SalesLedgerSchedulingDto">
SELECT
- T2.id,
+ T2.id as salesLedgerProductId,
ifNull(sum(t3.scheduling_num),0) AS schedulingNum,
T1.sales_contract_no,
T1.customer_contract_no,
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index f77e62c..4109530 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -88,7 +88,7 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d')
</if>
- <if test="params.deptId != null">
+ <if test="deptId != null">
AND u.user_id IN
(
SELECT user_id FROM sys_user_dept WHERE dept_id = #{deptId}
--
Gitblit v1.9.3