提交

5358e61b · ilal · chenzg · fb031b9f · 5358e61b · 5358e61b
Commit 5358e61b authored 4 years ago by ilal Committed by chenzg 3 years ago
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 85 additions and 20 deletions

src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+83 -15

src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+2 -5

No files found.
--- a/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
--- a/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+++ b/src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
@@ -62,12 +62,9 @@


 	  <select id="selectxcglassoxzdazdy" resultMap="BaseResultMap">
-	    select * from xcgl_asso_xzdazdy xzzdy
+			select * from xcgl_asso_xzdazdy xzzdy
 			where xzzdy.qyid = #{qyid}
-			and xzzdy.zdmc = '基本工资'
-			or xzzdy.zdmc = '绩效工资'
-			or xzzdy.zdmc = '岗位津贴'
-			or xzzdy.zdmc = '加班工资'
+			and xzzdy.zdmc in ('底薪','岗位津贴')
 	  </select>

 	<select id="SalaryFixedWages" resultMap="BaseResultMap">