Commit a6688906 authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 7f3a7275
...@@ -1681,18 +1681,18 @@ ...@@ -1681,18 +1681,18 @@
<choose> <choose>
<when test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != '' and tPaymentInfo.socialHousehold == null"> <when test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != '' and tPaymentInfo.socialHousehold == null">
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup,
a.PROVIDENT_PAY_MONTH as SOCIAL_PAY_MONTH, IFNULL(a.PROVIDENT_PAY_MONTH,a.SOCIAL_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH as SOCIAL_CREATE_MONTH, IFNULL(a.PROVIDENT_CREATE_MONTH,a.SOCIAL_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</when> </when>
<when test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"> <when test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.SOCIAL_PAY_MONTH, IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH, IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</when> </when>
<otherwise> <otherwise>
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup, CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.SOCIAL_PAY_MONTH, IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH, IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as SOCIAL_CREATE_MONTH,
</otherwise> </otherwise>
</choose> </choose>
a.EMP_NAME, a.EMP_NAME,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment