From 0e420d68f407fde240709ac1800da20b0bb99490 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 09 六月 2026 16:06:16 +0800
Subject: [PATCH] feat：反审核操作。可以对已审核的订单进行反审核，反审核的时候可以选择作废还是重新生成一条，并记录反审核描述。选择作废的话则不生成新增订单。选择重新生成的话则跳转到新增台账页面对反审核的销售产品进行编辑保存重新生成一条新增的订单。反审核的订单即使是发货了还是可以反审核，并且需要将对应的入库、出库、发货进行作废。
---
src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
index f15dd8c..a784c99 100644
--- a/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
+++ b/src/main/resources/mapper/compensationperformance/CompensationPerformanceMapper.xml
@@ -3,14 +3,35 @@
<mapper namespace="com.ruoyi.compensationperformance.mapper.CompensationPerformanceMapper">
<select id="listPage" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
- select * from compensation_performance
+ SELECT
+ cp.*,
+ soj.staff_name AS staffName,
+ sp.post_name AS postName,
+ sd.dept_name AS deptName
+ FROM compensation_performance cp
+ LEFT JOIN staff_on_job soj ON soj.id = cp.staff_id
+ LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
<where>
- <if test="req.name != null and req.name != ''">
- and `name` like concat('%',#{req.name},'%')
+ <if test="staffName != null and staffName != ''">
+ AND soj.staff_name LIKE CONCAT('%', #{staffName}, '%')
</if>
- <if test="req.payDateStr != null and req.payDateStr != ''">
- and pay_date like concat('%',#{req.payDateStr},'%')
+ <if test="payDateStr != null and payDateStr != ''">
+ AND DATE_FORMAT(cp.pay_date, '%Y-%m') = #{payDateStr}
</if>
</where>
+ ORDER BY cp.pay_date DESC, cp.id DESC
+ </select>
+
+ <select id="exportList" resultType="com.ruoyi.compensationperformance.pojo.CompensationPerformance">
+ SELECT cp.*,
+ soj.staff_name AS staffName,
+ sp.post_name AS postName,
+ sd.dept_name AS deptName
+ FROM compensation_performance cp
+ LEFT JOIN staff_on_job soj ON soj.id = cp.staff_id
+ LEFT JOIN sys_post sp ON sp.post_id = soj.sys_post_id
+ LEFT JOIN sys_dept sd ON sd.dept_id = soj.sys_dept_id
+ ORDER BY cp.pay_date DESC, cp.id DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3