From bdc97d7737fddcb3d8534a672a492a2e0cbcada0 Mon Sep 17 00:00:00 2001
From: ilal <lalqqhy@163.com>
Date: Tue, 3 Nov 2020 19:12:56 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java | 1 +
src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java b/src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java
index 31aace4..13e35b3 100644
--- a/src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java
+++ b/src/main/java/cn/timer/api/dto/xcgl/SalaryoptionsDto.java
@@ -15,4 +15,5 @@ public class SalaryoptionsDto {
* 状态 1：系统项；2：非系统项
*/
private Integer opttype;
+ private Integer zxzzid;
}
diff --git a/src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml b/src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml
index 2f7b6c8..2f2c010 100644
--- a/src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml
+++ b/src/main/resources/mapping/xcgl/XcglSalaryItemMapper.xml
@@ -44,6 +44,17 @@
<where>
<if test="opttype != null"> opt.type = #{opttype}</if>
</where>
+ UNION
+ select
+ 8 AS itid,
+ '自定义项' AS itname,
+ 0 AS optid,
+ zxz.salaryitem AS optname,
+ 8 AS optitemid,
+ 2 AS opttype
+ from xcgl_asso_jsgzzx zxz
+ where zxz.is_custom = 1
+ and zxz.xzzid = #{zxzzid}
</select>
--
libgit2 0.26.0