Commit 22ae8556 authored by hongguangwu's avatar hongguangwu

1.7.21-减员时间

parent 2e1abc96
...@@ -236,4 +236,7 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -236,4 +236,7 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty("医保推送类型") @ExcelProperty("医保推送类型")
private String isSingleYsdPush; private String isSingleYsdPush;
// 减员年月,取派单审核月的最后一天
private String auditLastDay;
} }
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
,idt.AREA_NAME idCardTown ,idt.AREA_NAME idCardTown
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush ,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush ,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay
</sql> </sql>
...@@ -356,6 +357,7 @@ ...@@ -356,6 +357,7 @@
,s.SOCIAL_HOUSEHOLD huId ,s.SOCIAL_HOUSEHOLD huId
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush ,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush ,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
,LAST_DAY(a.AUDIT_TIME) auditLastDay
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
/*派单推的,有ID,则查单个推送的,立即推*/ /*派单推的,有ID,则查单个推送的,立即推*/
......
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