From cf4a5deced71464d424ce5931774f6df0c4c6bb3 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 26 十一月 2025 16:30:07 +0800
Subject: [PATCH] 修改新增
---
multi-system/src/main/resources/mapper/system/AnnualReportMapper.xml | 78 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/multi-system/src/main/resources/mapper/system/AnnualReportMapper.xml b/multi-system/src/main/resources/mapper/system/AnnualReportMapper.xml
index 592ecf9..29aec7f 100644
--- a/multi-system/src/main/resources/mapper/system/AnnualReportMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/AnnualReportMapper.xml
@@ -4,45 +4,49 @@
<select id="selectAnnualList" resultType="com.gkhy.exam.system.domain.AnnualReport">
SELECT
- ar.`id`,
- ar.`company_id`,
- sc.`name` AS company_name,
- ar.`report_name`,
- ar.`number`,
- ar.`dept_id`,
- sd.dept_name,
- ar.`end_time`,
- ar.`grant_amount`,
- ar.`recycle_amount`,
- ar.`recycle_rate`,
- ar.`check_amount`,
- ar.`year_rate`,
- ar.`anciently_rate`,
- ar.`research_satisficing`,
- ar.`delivery_satisficing`,
- ar.`sum_satisficing`,
- ar.`suggest`,
- ar.`agent_id`,
- su1.`name` AS agent_name,
- ar.`dept_user`,
- su2.`name` AS dept_user_name,
- ar.`del_flag`,
- ar.`create_by`,
- ar.`create_time`,
- ar.`update_by`,
- ar.`update_time`
+ ar.`id`,
+ ar.`company_id`,
+ sc.`name` AS company_name,
+ ar.`report_name`,
+ ar.`number`,
+ ar.`dept_id`,
+ sd.dept_name,
+ ar.`end_time`,
+ ar.`grant_amount`,
+ ar.`recycle_amount`,
+ ar.`recycle_rate`,
+ ar.`check_amount`,
+ ar.`year_rate`,
+ ar.`anciently_rate`,
+ ar.`research_satisficing`,
+ ar.`delivery_satisficing`,
+ ar.`sum_satisficing`,
+ ar.`suggest`,
+ ar.`agent_id`,
+ su1.`name` AS agent_name,
+ ar.`dept_user`,
+ su2.`name` AS dept_user_name,
+ ar.`del_flag`,
+ ar.`create_by`,
+ ar.`create_time`,
+ ar.`update_by`,
+ ar.`update_time`,
+ ar.`year`
FROM
- `annual_report` ar
- LEFT JOIN sys_company sc ON ar.company_id = sc.id
- LEFT JOIN sys_user su1 ON ar.agent_id = su1.id
- LEFT JOIN sys_user su2 ON ar.dept_user = su2.id
- LEFT JOIN sys_dept sd ON ar.dept_id = sd.dept_id
+ `annual_report` ar
+ LEFT JOIN sys_company sc ON ar.company_id = sc.id
+ LEFT JOIN sys_user su1 ON ar.agent_id = su1.id
+ LEFT JOIN sys_user su2 ON ar.dept_user = su2.id
+ LEFT JOIN sys_dept sd ON ar.dept_id = sd.dept_id
WHERE
- ar.del_flag = 1
- <if test="companyId!=null">
- AND ar.company_id = 24
- </if>
+ ar.del_flag = 1
+ <if test="companyId!=null">
+ AND ar.company_id = 24
+ </if>
+ <if test="year!=null">
+ AND ar.year = #{year}
+ </if>
ORDER BY
- ar.create_time DESC
+ ar.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.2