Commit 873704b9 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-ysd

parent 7f83f4d4
...@@ -91,11 +91,18 @@ public class TDispatchInfoExportVo { ...@@ -91,11 +91,18 @@ public class TDispatchInfoExportVo {
/** /**
* 社保自动化标识 0 是 1 否 2 无 * 社保自动化标识 0 是 1 否 2 无
*/ */
@ExcelAttribute(name = "是否自动化审核",isNotEmpty = false,readConverterExp = "0=是,1=否,2=无") @ExcelAttribute(name = "是否自动化社保",isNotEmpty = false,readConverterExp = "0=是,1=否,2=无")
@Schema(description = "是否自动化审核:0 是 1 否2 无" ) @Schema(description = "是否自动化社保:0 是 1 否2 无" )
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="是否自动化审核") @ExcelProperty(value ="是否自动化社保")
private String autoFlag; private String autoFlag;/**
* 是否自动化医保 0 是 1 否 2 无
*/
@ExcelAttribute(name = "是否自动化医保",isNotEmpty = false,readConverterExp = "0=是,1=否,2=无")
@Schema(description = "是否自动化医保:0 是 1 否2 无" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="是否自动化医保")
private String autoFlagYsd;
/** /**
* 合同类型(字典值) * 合同类型(字典值)
......
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
<result property="graduationTime" column="GRADUATION_TIME"/> <result property="graduationTime" column="GRADUATION_TIME"/>
<result property="autoFlag" column="AUTO_FLAG"/> <result property="autoFlag" column="AUTO_FLAG"/>
<result property="autoFlagYsd" column="AUTO_FLAG_YSD"/>
<result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/> <result property="unitProvidentPer" column="UNIT_PROVIDENT_PER"/>
<result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/> <result property="personalProvidentPer" column="PERSONAL_PROVIDENT_PER"/>
...@@ -482,6 +483,9 @@ ...@@ -482,6 +483,9 @@
<if test="tDispatchInfo.autoFlag != null and tDispatchInfo.autoFlag.trim() != ''"> <if test="tDispatchInfo.autoFlag != null and tDispatchInfo.autoFlag.trim() != ''">
AND a.AUTO_FLAG = #{tDispatchInfo.autoFlag} AND a.AUTO_FLAG = #{tDispatchInfo.autoFlag}
</if> </if>
<if test="tDispatchInfo.autoFlagYsd != null and tDispatchInfo.autoFlagYsd.trim() != ''">
AND a.AUTO_FLAG_YSD = #{tDispatchInfo.autoFlagYsd}
</if>
<if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''"> <if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''">
AND a.ID = #{tDispatchInfo.id} AND a.ID = #{tDispatchInfo.id}
</if> </if>
...@@ -1000,7 +1004,10 @@ ...@@ -1000,7 +1004,10 @@
a.GRADUATION_TIME, a.GRADUATION_TIME,
case when a.AUTO_FLAG = 0 then "是" case when a.AUTO_FLAG = 0 then "是"
when a.AUTO_FLAG = 1 then "否" when a.AUTO_FLAG = 1 then "否"
else "无" end as "AUTO_FLAG" else "无" end as "AUTO_FLAG",
case when a.AUTO_FLAG_YSD = 0 then "是"
when a.AUTO_FLAG_YSD = 1 then "否"
else "无" end as "AUTO_FLAG_YSD"
from t_dispatch_info a from t_dispatch_info a
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
...@@ -1618,7 +1625,7 @@ ...@@ -1618,7 +1625,7 @@
a.SCHOOL_NAME, a.SCHOOL_NAME,
a.MAJOR, a.MAJOR,
a.FIRST_PAY_TIME, a.FIRST_PAY_TIME,
a.GRADUATION_TIME,a.AUTO_FLAG a.GRADUATION_TIME,a.AUTO_FLAG,a.AUTO_FLAG_YSD
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS ,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD ,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID ,s.YGS_REQUEST_ID,s.YSD_REQUEST_ID
...@@ -1715,7 +1722,7 @@ ...@@ -1715,7 +1722,7 @@
a.SCHOOL_NAME, a.SCHOOL_NAME,
a.MAJOR, a.MAJOR,
a.FIRST_PAY_TIME, a.FIRST_PAY_TIME,
a.GRADUATION_TIME,a.AUTO_FLAG a.GRADUATION_TIME,a.AUTO_FLAG,a.AUTO_FLAG_YSD
,a.SOCIAL_HOUSEHOLD_NAME ,a.SOCIAL_HOUSEHOLD_NAME
,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD ,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status ,if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_ygs_Handle_Status, s.ygs_Handle_Status) ygs_Handle_Status
...@@ -2127,7 +2134,7 @@ ...@@ -2127,7 +2134,7 @@
AND a.STATUS = "2" AND a.STATUS = "2"
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) )) and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) ))
and a.SOCIAL_HANDLE_STATUS in ('0','4') and a.SOCIAL_HANDLE_STATUS in ('0','4')
and (a.auto_flag='1' or s.YGS_HANDLE_STATUS ='5' or s.YSD_HANDLE_STATUS = '5' ) and (a.auto_flag='1' or a.auto_flag_ysd='1' or s.YGS_HANDLE_STATUS ='5' or s.YSD_HANDLE_STATUS = '5' )
<!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''"> <!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
/*待办理组合判断*/ /*待办理组合判断*/
...@@ -2158,7 +2165,7 @@ ...@@ -2158,7 +2165,7 @@
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
AND a.social_id is not null AND a.social_id is not null
and a.AUTO_FLAG = '0' and (a.AUTO_FLAG = '0' or a.AUTO_FLAG_YSD = '0')
<include refid="where_getSocialRecordRoster_base"/> <include refid="where_getSocialRecordRoster_base"/>
<if test="tDispatchInfo != null"> <if test="tDispatchInfo != null">
...@@ -2865,7 +2872,7 @@ ...@@ -2865,7 +2872,7 @@
<where> <where>
a.DELETE_FLAG = '0' a.DELETE_FLAG = '0'
AND a.social_id is not null AND a.social_id is not null
and a.AUTO_FLAG = '0' and (a.AUTO_FLAG = '0' or a.AUTO_FLAG_YSD = '0')
and a.type = '0' and a.type = '0'
<!-- 税友反馈接口目前只支持社保附件下载,必须是办理成功的 --> <!-- 税友反馈接口目前只支持社保附件下载,必须是办理成功的 -->
and s.ygs_Handle_Status = '6' and s.ygs_Handle_Status = '6'
......
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