Commit b0ea3de8 authored by hongguangwu's avatar hongguangwu

MVP1.7.18-税友分支(强制参保+是否批量+医疗金额判断)

parent 009b6122
...@@ -410,6 +410,33 @@ public class SysHouseHoldInfo extends BaseEntity { ...@@ -410,6 +410,33 @@ public class SysHouseHoldInfo extends BaseEntity {
@ExcelProperty("医保减员花名册模板") @ExcelProperty("医保减员花名册模板")
private String reduceRosterTempYsd; private String reduceRosterTempYsd;
/**
* 医保是否强制参保:0否1是(默认是)
*/
@ExcelAttribute(name = "医保是否强制参保" )
@Schema(description ="医保是否强制参保")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
/**
* 推送时,社保是否单个接口 0批量1单个(为空,则随isSingle)
*/
@ExcelAttribute(name = "社保推送类型" )
@Schema(description ="社保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保推送类型")
private String isSingleYgsPush;
/**
* 推送时,医保是否单个接口 0批量1单个(为空,则随isSingleYsd)
*/
@ExcelAttribute(name = "医保推送类型" )
@Schema(description ="医保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保推送类型")
private String isSingleYsdPush;
/** /**
* 户与失败原因关联list * 户与失败原因关联list
*/ */
......
...@@ -1150,6 +1150,15 @@ public class TSocialInfo extends BaseEntity { ...@@ -1150,6 +1150,15 @@ public class TSocialInfo extends BaseEntity {
private String sfqztb; private String sfqztb;
// 以上是转为自动化办理查询使用的 // 以上是转为自动化办理查询使用的
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelAttribute(name = "医保是否强制参保" )
@Schema(description ="医保是否强制参保")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
// 派单id,社保士兵使用 // 派单id,社保士兵使用
@TableField(exist = false) @TableField(exist = false)
private String dispatchId; private String dispatchId;
......
...@@ -218,4 +218,22 @@ public class SociaFriendYgsAddVo implements Serializable { ...@@ -218,4 +218,22 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty("身份证县" ) @ExcelProperty("身份证县" )
private String idCardTown; private String idCardTown;
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
/**
* 推送时,社保是否单个接口 0批量1单个(为空,则随isSingle)
*/
@ExcelProperty("社保推送类型")
private String isSingleYgsPush;
/**
* 推送时,医保是否单个接口 0批量1单个(为空,则随isSingleYsd)
*/
@ExcelProperty("医保推送类型")
private String isSingleYsdPush;
} }
...@@ -142,4 +142,13 @@ public class TSocialSoldierPageVo extends TDispatchInfo { ...@@ -142,4 +142,13 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@ExcelProperty("社保反馈文件下载标识" ) @ExcelProperty("社保反馈文件下载标识" )
private String backFileFlag; private String backFileFlag;
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelAttribute(name = "医保是否强制参保" )
@Schema(description ="医保是否强制参保")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
} }
...@@ -396,6 +396,9 @@ public class SocialFriendConfig { ...@@ -396,6 +396,9 @@ public class SocialFriendConfig {
xzlb = "企业职工养老,工伤保险,失业保险"; xzlb = "企业职工养老,工伤保险,失业保险";
if (type > 2) { if (type > 2) {
xzlb = null; xzlb = null;
// 2025-12-8 10:30:50 mvp1.7.18-shuiyou分支,
// 改为按单位+个人金额来判断是否需要这个险种,本次只改医疗+大病,生育没有个人金额,养工失没有浮动
// ,同全服福保专员陈红确认
if (Common.isNotNull(vo.getUnitMedicalMoney()) && CommonConstants.ONE_INTEGER.equals(vo.getUnitMedicalMoney())) { if (Common.isNotNull(vo.getUnitMedicalMoney()) && CommonConstants.ONE_INTEGER.equals(vo.getUnitMedicalMoney())) {
xzlb = "职工基本医疗保险"; xzlb = "职工基本医疗保险";
} }
...@@ -468,16 +471,27 @@ public class SocialFriendConfig { ...@@ -468,16 +471,27 @@ public class SocialFriendConfig {
tszdxx.put("ybygxs", "原固定职工"); tszdxx.put("ybygxs", "原固定职工");
// 毕业院校 // 毕业院校
tszdxx.put("byyx", vo.getByyx()); tszdxx.put("byyx", vo.getByyx());
if (Common.isNotNull(vo.getIsSingle()) && CommonConstants.ONE_STRING.equals(vo.getIsSingle())) {
tszdxx.put("sfpl", "否");
}
if (type < 3) { if (type < 3) {
// 企业职工社会保险增员花名册 安徽非必填! // 企业职工社会保险增员花名册 安徽非必填!
// 社保增员必填 // 社保增员必填
tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc()); tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc());
// 社保是否批量
if (Common.isNotNull(vo.getIsSingleYgsPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYgsPush())) {
tszdxx.put("sfpl", "否");
}
} else { } else {
if (Common.isNotNull(vo.getYbsfqzcb())) {
tszdxx.put("ybsfqzcb", vo.getYbsfqzcb());
}
// 增员、减员必填 // 增员、减员必填
tszdxx.put("qyzgjbylbxcbdjb", arr); tszdxx.put("qyzgjbylbxcbdjb", arr);
// 医保是否批量
if (Common.isNotNull(vo.getIsSingleYsdPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsdPush())) {
tszdxx.put("ybsfpl", "否");
}
} }
cbrymdOne.put("tszdxx", tszdxx); cbrymdOne.put("tszdxx", tszdxx);
...@@ -571,6 +585,11 @@ public class SocialFriendConfig { ...@@ -571,6 +585,11 @@ public class SocialFriendConfig {
// 入狱/失踪/死亡日期 yyyy-MM-dd // 入狱/失踪/死亡日期 yyyy-MM-dd
tszdxx.put("ryszswrq", vo.getLeaveDay()); tszdxx.put("ryszswrq", vo.getLeaveDay());
} }
// 医保是否批量
if (Common.isNotNull(vo.getIsSingleYsdPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsdPush())) {
tszdxx.put("ybsfpl", "否");
}
} else { } else {
// 是否强制停保:目前仅社保,税友暂不支持医保 // 是否强制停保:目前仅社保,税友暂不支持医保
if (Common.isNotNull(vo.getSfqztb()) && "是".equals(vo.getSfqztb())) { if (Common.isNotNull(vo.getSfqztb()) && "是".equals(vo.getSfqztb())) {
...@@ -584,6 +603,11 @@ public class SocialFriendConfig { ...@@ -584,6 +603,11 @@ public class SocialFriendConfig {
tszdxx.put("shjycl", vo.getImgListYgs().get(0)); tszdxx.put("shjycl", vo.getImgListYgs().get(0));
} }
} }
// 社保是否批量
if (Common.isNotNull(vo.getIsSingleYgsPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYgsPush())) {
tszdxx.put("sfpl", "否");
}
} }
cbrymdOne.put("tszdxx", tszdxx); cbrymdOne.put("tszdxx", tszdxx);
cbrymdArr.add(cbrymdOne); cbrymdArr.add(cbrymdOne);
......
...@@ -226,6 +226,7 @@ public class TSocialInfoController { ...@@ -226,6 +226,7 @@ public class TSocialInfoController {
/** /**
* @param id * @param id
* @param isSocial 1 社保 2 医保 3 全部 * @param isSocial 1 社保 2 医保 3 全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @Description: * @Description:
* @Author: hgw * @Author: hgw
* @Date: 2024/8/1 18:12 * @Date: 2024/8/1 18:12
...@@ -233,17 +234,19 @@ public class TSocialInfoController { ...@@ -233,17 +234,19 @@ public class TSocialInfoController {
**/ **/
@Operation(summary = "转自动化", description = "转自动化") @Operation(summary = "转自动化", description = "转自动化")
@GetMapping("/doAuto" ) @GetMapping("/doAuto" )
public R<String> doAuto(@RequestParam String id, @RequestParam String isSocial) { public R<String> doAuto(@RequestParam String id, @RequestParam String isSocial
, @RequestParam(required = false) String ybsfqzcb) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) { if (user == null || Common.isEmpty(user.getId())) {
return R.failed("请登录!"); return R.failed("请登录!");
} }
return tSocialInfoService.doAuto(id, isSocial, user); return tSocialInfoService.doAuto(id, isSocial, ybsfqzcb, user);
} }
/** /**
* @param idList * @param idList
* @param isSocial 1 社保 2 医保 3 全部 * @param isSocial 1 社保 2 医保 3 全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @Description: 转人工-批量 * @Description: 转人工-批量
* @Author: hgw * @Author: hgw
* @Date: 2024/8/1 18:12 * @Date: 2024/8/1 18:12
...@@ -251,12 +254,13 @@ public class TSocialInfoController { ...@@ -251,12 +254,13 @@ public class TSocialInfoController {
**/ **/
@Operation(summary = "转自动化-批量", description = "转自动化-批量") @Operation(summary = "转自动化-批量", description = "转自动化-批量")
@PostMapping("/doAutoBatch" ) @PostMapping("/doAutoBatch" )
public R<String> doAutoBatch(@RequestBody List<String> idList, @RequestParam String isSocial) { public R<String> doAutoBatch(@RequestBody List<String> idList, @RequestParam String isSocial
, @RequestParam(required = false) String ybsfqzcb) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || Common.isEmpty(user.getId())) { if (user == null || Common.isEmpty(user.getId())) {
return R.failed("请登录!"); return R.failed("请登录!");
} }
return tSocialInfoService.doAutoBatch(idList, isSocial, user); return tSocialInfoService.doAutoBatch(idList, isSocial, ybsfqzcb, user);
} }
} }
...@@ -116,23 +116,25 @@ public interface TSocialInfoService extends IService<TSocialInfo> { ...@@ -116,23 +116,25 @@ public interface TSocialInfoService extends IService<TSocialInfo> {
/** /**
* @param idList 社保IDlist * @param idList 社保IDlist
* @param isSocial 1:社保 2:医保 3:全部 * @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人 * @param user 当前登录人
* @Description: 批量转自动化 * @Description: 批量转自动化
* @Author: hgw * @Author: hgw
* @Date: 2025/4/25 17:24 * @Date: 2025/4/25 17:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
R<String> doAutoBatch(List<String> idList, String isSocial, YifuUser user); R<String> doAutoBatch(List<String> idList, String isSocial, String ybsfqzcb, YifuUser user);
/** /**
* @param id 社保ID * @param id 社保ID
* @param isSocial 1:社保 2:医保 3:全部 * @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人 * @param user 当前登录人
* @Description: 转自动化 * @Description: 转自动化
* @Author: hgw * @Author: hgw
* @Date: 2025/4/25 17:24 * @Date: 2025/4/25 17:24
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
R<String> doAuto(String id, String isSocial, YifuUser user); R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user);
} }
...@@ -591,6 +591,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -591,6 +591,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
/** /**
* @param idList 社保IDlist * @param idList 社保IDlist
* @param isSocial 1:社保 2:医保 3:全部 * @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人 * @param user 当前登录人
* @Description: 批量转自动化 * @Description: 批量转自动化
* @Author: hgw * @Author: hgw
...@@ -598,9 +599,9 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -598,9 +599,9 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@Override @Override
public R<String> doAutoBatch(List<String> idList, String isSocial, YifuUser user) { public R<String> doAutoBatch(List<String> idList, String isSocial, String ybsfqzcb, YifuUser user) {
for (String id : idList) { for (String id : idList) {
doAuto(id, isSocial, user); doAuto(id, isSocial, ybsfqzcb, user);
} }
return R.ok("成功!"); return R.ok("成功!");
} }
...@@ -608,6 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -608,6 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
/** /**
* @param id 社保ID * @param id 社保ID
* @param isSocial 1:社保 2:医保 3:全部 * @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人 * @param user 当前登录人
* @Description: 转自动化 * @Description: 转自动化
* @Author: hgw * @Author: hgw
...@@ -615,7 +617,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -615,7 +617,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@Override @Override
public R<String> doAuto(String id, String isSocial, YifuUser user) { public R<String> doAuto(String id, String isSocial, String ybsfqzcb, YifuUser user) {
TSocialInfo socialInfo = this.getById(id); TSocialInfo socialInfo = this.getById(id);
if (socialInfo == null || Common.isEmpty(socialInfo.getId())) { if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
return R.failed("未找到社保"); return R.failed("未找到社保");
...@@ -672,6 +674,33 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci ...@@ -672,6 +674,33 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
return R.failed("当前医疗生育大病-办理状态不可以转自动化!"); return R.failed("当前医疗生育大病-办理状态不可以转自动化!");
} }
} }
// 医保强制参保:
//推送时,如果社保本身有值,用社保的,如果没有,用户的。
//转自动化时,可选:
//空(非必填项)(不改变社保的值,社保是空(取户),否,是,都不产生变化,也不加这块的日志)
//是(改社保为是)(若社保原先为 空或否,加日志)
//否(改社保为否)(若社保原先为 空或是,加日志)
String oldYbsfqzcb = socialInfo.getYbsfqzcb();
if (Common.isNotNull(ybsfqzcb) && !ybsfqzcb.equals(oldYbsfqzcb)) {
socialInfo.setYbsfqzcb(ybsfqzcb);
if (Common.isNotNull(handleRemark)) {
handleRemark += ";";
}
handleRemark += "改变了医保强制参保的值:";
String oldYbsfqzcbValue = "“空”";
if (Common.isNotNull(oldYbsfqzcb)) {
if (CommonConstants.ZERO_STRING.equals(oldYbsfqzcb)) {
oldYbsfqzcbValue = "“否”";
} else if (CommonConstants.ONE_STRING.equals(oldYbsfqzcb)) {
oldYbsfqzcbValue = "“是”";
}
}
String newYbsfqzcbValue = "“否”";
if (CommonConstants.ONE_STRING.equals(ybsfqzcb)) {
newYbsfqzcbValue = "“是”";
}
handleRemark += oldYbsfqzcbValue+"→"+ newYbsfqzcbValue;
}
// 更新社保和加日志 // 更新社保和加日志
return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist); return doUpdateCoreAndLog(user, socialInfo, handleRemark, canUpdate, disExist);
} }
......
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
<result property="reduceRosterTempYgs" column="REDUCE_ROSTER_TEMP_YGS"/> <result property="reduceRosterTempYgs" column="REDUCE_ROSTER_TEMP_YGS"/>
<result property="addRosterTempYsd" column="ADD_ROSTER_TEMP_YSD"/> <result property="addRosterTempYsd" column="ADD_ROSTER_TEMP_YSD"/>
<result property="reduceRosterTempYsd" column="REDUCE_ROSTER_TEMP_YSD"/> <result property="reduceRosterTempYsd" column="REDUCE_ROSTER_TEMP_YSD"/>
<result property="ybsfqzcb" column="YBSFQZCB"/>
<result property="isSingleYgsPush" column="IS_SINGLE_YGS_PUSH"/>
<result property="isSingleYsdPush" column="IS_SINGLE_YSD_PUSH"/>
</resultMap> </resultMap>
<resultMap id="sysHouseHoldSingleInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo"> <resultMap id="sysHouseHoldSingleInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo">
...@@ -124,6 +127,10 @@ ...@@ -124,6 +127,10 @@
a.REDUCE_ROSTER_TEMP_YGS, a.REDUCE_ROSTER_TEMP_YGS,
a.ADD_ROSTER_TEMP_YSD, a.ADD_ROSTER_TEMP_YSD,
a.REDUCE_ROSTER_TEMP_YSD a.REDUCE_ROSTER_TEMP_YSD
,a.YBSFQZCB
,a.IS_SINGLE_YGS_PUSH
,a.IS_SINGLE_YSD_PUSH
</sql> </sql>
<sql id="sysHouseHoldInfo_where"> <sql id="sysHouseHoldInfo_where">
<if test="sysHouseHoldInfo != null"> <if test="sysHouseHoldInfo != null">
......
...@@ -1554,6 +1554,7 @@ ...@@ -1554,6 +1554,7 @@
<result property="ygsSocialStartDateNext" column="YGS_SOCIAL_START_DATE_NEXT"/> <result property="ygsSocialStartDateNext" column="YGS_SOCIAL_START_DATE_NEXT"/>
<result property="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/> <result property="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/>
<result property="backFileFlag" column="BACK_FILE_FLAG"/> <result property="backFileFlag" column="BACK_FILE_FLAG"/>
<result property="ybsfqzcb" column="YBSFQZCB"/>
</resultMap> </resultMap>
<select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap"> <select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap">
...@@ -1654,7 +1655,8 @@ ...@@ -1654,7 +1655,8 @@
a.IS_SINGLE_YSD, a.IS_SINGLE_YSD,
a.IS_AUTO_LEAVE_DOC, a.IS_AUTO_LEAVE_DOC,
a.ROSTER_AUTO_FLAG_YGS, a.ROSTER_AUTO_FLAG_YGS,
a.ROSTER_AUTO_FLAG_YSD a.ROSTER_AUTO_FLAG_YSD,
s.YBSFQZCB
FROM t_dispatch_info a FROM t_dispatch_info a
LEFT JOIN t_social_info s ON a.SOCIAL_ID = s.id LEFT JOIN t_social_info s ON a.SOCIAL_ID = s.id
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
......
...@@ -109,6 +109,8 @@ ...@@ -109,6 +109,8 @@
,idp.AREA_NAME idCardProvince ,idp.AREA_NAME idCardProvince
,idc.AREA_NAME idCardCity ,idc.AREA_NAME idCardCity
,idt.AREA_NAME idCardTown ,idt.AREA_NAME idCardTown
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
</sql> </sql>
...@@ -205,12 +207,16 @@ ...@@ -205,12 +207,16 @@
<include refid="getSocialSoldierBaseOne"/> <include refid="getSocialSoldierBaseOne"/>
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate ,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y-%m-%d"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y-%m-%d"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y-%m-%d"))) socialStartDate
,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth ,if(YSD_SOCIAL_START_DATE_NEXT is not null,DATE_FORMAT(s.YSD_SOCIAL_START_DATE_NEXT,"%Y%m"), if(s.MEDICAL_START is not null,DATE_FORMAT(s.MEDICAL_START,"%Y%m"),DATE_FORMAT(s.SOCIAL_START_DATE,"%Y%m"))) socialStartMonth
,if(s.UNIT_MEDICAL_MONEY != 0,1,0) unitMedicalMoney,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney,if(s.UNIT_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney
,if(s.UNIT_MEDICAL_MONEY != 0 or s.PERSONAL_MEDICAL_MONEY != 0,1,0) unitMedicalMoney
,if(s.UNIT_BIRTH_MONEY != 0,1,0) unitBirthMoney
,if(s.UNIT_BIGAILMENT_MONEY != 0 or s.PERSONAL_BIGAILMENT_MONEY != 0,1,0) unitBigailmentMoney
,if(DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m')>DATE_FORMAT(s.AUDIT_TIME,"%Y-%m") ,if(DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m')>DATE_FORMAT(s.AUDIT_TIME,"%Y-%m")
,'' ,''
,CONCAT('补缴',DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark ,CONCAT('补缴',DATE_FORMAT(if(YSD_SOCIAL_START_DATE_NEXT is not null,YSD_SOCIAL_START_DATE_NEXT,if(s.MEDICAL_START is not null,s.MEDICAL_START,s.SOCIAL_START_DATE)),'%Y-%m'))) buJiaoRemark
,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal ,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal
,ifnull(s.YBSFQZCB,shh.YBSFQZCB) ybsfqzcb
<include refid="getSocialSoldierBaseTwo"/> <include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0"> <if test="idsStr != null and idsStr.size > 0">
...@@ -318,6 +324,8 @@ ...@@ -318,6 +324,8 @@
,DATE_FORMAT(now(),"%Y年%m月%d日") nowDay ,DATE_FORMAT(now(),"%Y年%m月%d日") nowDay
,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal ,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal
,s.SOCIAL_HOUSEHOLD huId ,s.SOCIAL_HOUSEHOLD huId
,ifnull(shh.IS_SINGLE_YGS_PUSH,a.IS_SINGLE) isSingleYgsPush
,ifnull(shh.IS_SINGLE_YSD_PUSH,a.IS_SINGLE_YSD) isSingleYsdPush
<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