qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solve conflict

This commit is contained in:
Chengliang 2022-03-09 17:02:36 +08:00
parent 7d245e786e
commit 927b25908e
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ target/
/src/test
/src/META-INF
/log

26
src/com/engine/salary/mapper/datacollection/AddUpDeductionMapper.xml
View File

@ -274,11 +274,7 @@
d.DEPARTMENTNAME as deparmentName
from hrmresource e
left join hrmdepartment d on e.departmentid = d.id
<<<<<<< HEAD
where e.status not in (4, 5, 6, 7)
=======
where e.status not in (7)
>>>>>>> origin/develop
</select>
@ -484,19 +480,12 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
WHERE
t1.delete_type = 0 AND t2.delete_type = 0
<<<<<<< HEAD
=======
AND e.status not in (7)
>>>>>>> origin/develop
<include refid="paramSql"/>
ORDER BY t1.id DESC
</select>
<<<<<<< HEAD
<select id="list" resultType="com.engine.salary.entity.datacollection.dto.AddUpDeductionListDTO"
=======
<select id="list" resultType="com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO"
>>>>>>> origin/develop
databaseId="oracle">
SELECT
<include refid="addUpDeductionColumn"/>
@ -507,18 +496,11 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
WHERE
t1.delete_type = 0 AND t2.delete_type = 0
<<<<<<< HEAD
<include refid="paramSql"/>
ORDER BY t1.id DESC
</select>
<select id="list" resultType="com.engine.salary.entity.datacollection.dto.AddUpDeductionListDTO"
=======
AND e.status not in (7)
<include refid="paramSql"/>
ORDER BY t1.id DESC
</select>
<select id="list" resultType="com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO"
>>>>>>> origin/develop
databaseId="sqlserver">
SELECT
<include refid="addUpDeductionColumn"/>
@ -529,10 +511,7 @@
LEFT JOIN hrmdepartment d ON d.id = e.departmentid
WHERE
t1.delete_type = 0 AND t2.delete_type = 0
<<<<<<< HEAD
=======
AND e.status not in (7)
>>>>>>> origin/develop
<include refid="paramSql"/>
ORDER BY t1.id DESC
</select>
@ -544,7 +523,7 @@
FROM hrsa_add_up_deduction t
WHERE delete_type = 0
<if test="param.declareMonth != null">
and declare_month = #{param.declareMonth}
and declare_month = #{param.declareMonth}
</if>
</select>
@ -700,8 +679,6 @@
#{item.id}
</foreach>
</update>
<<<<<<< HEAD
=======
<select id="recordList" resultType="com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO">
SELECT
@ -716,7 +693,6 @@
<include refid="paramSql"/>
ORDER BY t1.declare_month DESC
</select>
>>>>>>> origin/develop
</mapper>