From 70a0b21595941890a9d26cfde01ff17e3427214a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 七月 2026 09:24:41 +0800
Subject: [PATCH] 修改工资计算
---
src/main/resources/mapper/technology/TechnologyOperationMapper.xml | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
index 2039849..8181f39 100644
--- a/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
+++ b/src/main/resources/mapper/technology/TechnologyOperationMapper.xml
@@ -11,6 +11,8 @@
<result column="no" property="no" />
<result column="remark" property="remark" />
<result column="salary_quota" property="salaryQuota" />
+ <result column="standard_quantity" property="standardQuantity" />
+ <result column="conversion_factor" property="conversionFactor" />
<result column="is_quality" property="isQuality" />
<result column="type" property="type" />
<result column="device_ledger_id" property="deviceLedgerId" />
@@ -18,4 +20,20 @@
<result column="dept_id" property="deptId" />
</resultMap>
+ <select id="listPage" resultType="com.ruoyi.technology.bean.vo.TechnologyOperationVo">
+ select *
+ from technology_operation t
+ <where>
+ <if test="c.name != null and c.name != ''">
+ and t.name like concat('%', #{c.name}, '%')
+ </if>
+ <if test="c.no != null and c.no != ''">
+ and t.no like concat('%', #{c.no}, '%')
+ </if>
+ <if test="c.type != null">
+ and t.type = #{c.type}
+ </if>
+ </where>
+ order by t.id desc
+ </select>
</mapper>
--
Gitblit v1.9.3