Commit f2d9f0d9 authored by hongguangwu's avatar hongguangwu

Merge branch 'develop'

parents 7e49e6ac 3cdb899d
......@@ -153,5 +153,11 @@ public class TFascTemplateDetail extends BaseEntity {
@TableField(exist = false)
@Schema(description = "字段格式化或键值对")
private String fieldValue;
/**
* 公司主体Id
*/
@TableField(exist = false)
@Schema(description = "公司主体Id")
private String companyId;
}
......@@ -208,6 +208,8 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelProperty("备注")
private String remark;
@ExcelAttribute(name = "签署方式", maxLength = 32)
@ExcelProperty("签署方式")
@Schema(description = "签署方式1线下签0电子签")
private String signType;
......
......@@ -1597,8 +1597,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
sf.setEmpIdcard(insert.getEmpIdcard());
sf.setSettleDomain(insert.getSettleDomain());
if (!("合同未到期重新签订").equals(insert.getSituation())&&!("正常续签").equals(insert.getSituation())
&&!("离职再入职").equals(insert.getSituation()) &&!("商务合同更改").equals(insert.getSituation())) {
R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
&&!("离职再入职").equals(insert.getSituation()) &&!("商务合同更改").equals(insert.getSituation())
&&!("正常签订").equals(insert.getSituation())) {
R<Integer> socialFundR = HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsocialfundinfo/inner/selectSocialFoundByContract", sf, Integer.class, SecurityConstants.FROM_IN);
if (socialFundR != null && socialFundR.getData() != null && socialFundR.getData() > 0) {
insert.setAuditStatus(CommonConstants.TWO_INT);
......
......@@ -251,7 +251,16 @@ public class FascUtil {
pushLog.setTypeName("获取明细映射");
tFascPushLogService.save(pushLog);
res = templateClient.getSignTemplateDetail(signTemplateDetailReq);
try {
res = templateClient.getSignTemplateDetail(signTemplateDetailReq);
} catch (Exception e) {
try {
Thread.sleep(5000); // Wait 5 seconds
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
}
res = templateClient.getSignTemplateDetail(signTemplateDetailReq);
}
if (res != null) {
// 更新日志
......
......@@ -144,6 +144,9 @@
<if test="tFascTemplateDetail.contractType != null and tFascTemplateDetail.contractType.trim() != ''">
AND b.contract_type = #{tFascTemplateDetail.contractType}
</if>
<if test="tFascTemplateDetail.companyId != null and tFascTemplateDetail.companyId.trim() != ''">
AND b.company_id = #{tFascTemplateDetail.companyId}
</if>
</if>
</sql>
<!--tFascTemplateDetail简单分页查询-->
......
......@@ -410,6 +410,33 @@ public class SysHouseHoldInfo extends BaseEntity {
@ExcelProperty("医保减员花名册模板")
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
*/
......
......@@ -1150,6 +1150,15 @@ public class TSocialInfo extends BaseEntity {
private String sfqztb;
// 以上是转为自动化办理查询使用的
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelAttribute(name = "医保是否强制参保" )
@Schema(description ="医保是否强制参保")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
// 派单id,社保士兵使用
@TableField(exist = false)
private String dispatchId;
......
......@@ -218,4 +218,22 @@ public class SociaFriendYgsAddVo implements Serializable {
@ExcelProperty("身份证县" )
private String idCardTown;
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
/**
* 推送时,社保是否单个接口 0批量1单个(为空,则随isSingle)
*/
@ExcelProperty("社保推送类型")
private String isSingleYgsPush;
/**
* 推送时,医保是否单个接口 0批量1单个(为空,则随isSingleYsd)
*/
@ExcelProperty("医保推送类型")
private String isSingleYsdPush;
}
......@@ -188,4 +188,23 @@ public class SocialHandleSearchVo extends TDispatchInfo {
@ExcelIgnore
private String backFileFlag;
/**
* 养工失税友的任务ID
*/
@Length(max = 50, message = "养工失税友的任务ID 不能超过50个字符" )
@ExcelAttribute(name = "养工失税友的任务ID", maxLength = 50)
@Schema(description = "养工失税友的任务ID" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("养工失税友的任务ID" )
private String ygsRequestId;
/**
* 医生大税友的任务ID
*/
@Length(max = 50, message = "医生大税友的任务ID 不能超过50个字符" )
@ExcelAttribute(name = "医生大税友的任务ID", maxLength = 50)
@Schema(description = "医生大税友的任务ID" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医生大税友的任务ID" )
private String ysdRequestId;
}
......@@ -269,4 +269,23 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保仅补缴生成材料")
private String dataFlagYsd;
/**
* 推送时,社保是否单个接口 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;
}
......@@ -270,4 +270,22 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
@ExcelProperty("医保仅补缴生成材料")
private String dataFlagYsd;
/**
* 推送时,社保是否单个接口 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;
}
......@@ -142,4 +142,13 @@ public class TSocialSoldierPageVo extends TDispatchInfo {
@ExcelProperty("社保反馈文件下载标识" )
private String backFileFlag;
/**
* 医保是否强制参保:0否1是(空则取社保户里的,大多为是,除了芜湖)
*/
@ExcelAttribute(name = "医保是否强制参保" )
@Schema(description ="医保是否强制参保")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保是否强制参保")
private String ybsfqzcb;
}
......@@ -396,6 +396,9 @@ public class SocialFriendConfig {
xzlb = "企业职工养老,工伤保险,失业保险";
if (type > 2) {
xzlb = null;
// 2025-12-8 10:30:50 mvp1.7.18-shuiyou分支,
// 改为按单位+个人金额来判断是否需要这个险种,本次只改医疗+大病,生育没有个人金额,养工失没有浮动
// ,同全服福保专员陈红确认
if (Common.isNotNull(vo.getUnitMedicalMoney()) && CommonConstants.ONE_INTEGER.equals(vo.getUnitMedicalMoney())) {
xzlb = "职工基本医疗保险";
}
......@@ -468,16 +471,31 @@ public class SocialFriendConfig {
tszdxx.put("ybygxs", "原固定职工");
// 毕业院校
tszdxx.put("byyx", vo.getByyx());
if (Common.isNotNull(vo.getIsSingle()) && CommonConstants.ONE_STRING.equals(vo.getIsSingle())) {
tszdxx.put("sfpl", "否");
}
if (type < 3) {
// 企业职工社会保险增员花名册 安徽非必填!
// 社保增员必填
tszdxx.put("qyzgshbxzyhmc", vo.getQyzgshbxzyhmc());
// 社保是否批量
if (Common.isNotNull(vo.getIsSingleYgsPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYgsPush())) {
tszdxx.put("sfpl", "否");
}
} else {
if (Common.isNotNull(vo.getYbsfqzcb())) {
if (CommonConstants.ONE_STRING.equals(vo.getYbsfqzcb())) {
tszdxx.put("ybsfqzcb", "是");
} else if (CommonConstants.ZERO_STRING.equals(vo.getYbsfqzcb())) {
tszdxx.put("ybsfqzcb", "否");
}
}
// 增员、减员必填
tszdxx.put("qyzgjbylbxcbdjb", arr);
// 医保是否批量
if (Common.isNotNull(vo.getIsSingleYsdPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsdPush())) {
tszdxx.put("ybsfpl", "否");
}
}
cbrymdOne.put("tszdxx", tszdxx);
......@@ -571,6 +589,11 @@ public class SocialFriendConfig {
// 入狱/失踪/死亡日期 yyyy-MM-dd
tszdxx.put("ryszswrq", vo.getLeaveDay());
}
// 医保是否批量
if (Common.isNotNull(vo.getIsSingleYsdPush()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsdPush())) {
tszdxx.put("ybsfpl", "否");
}
} else {
// 是否强制停保:目前仅社保,税友暂不支持医保
if (Common.isNotNull(vo.getSfqztb()) && "是".equals(vo.getSfqztb())) {
......@@ -584,6 +607,11 @@ public class SocialFriendConfig {
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);
cbrymdArr.add(cbrymdOne);
......
......@@ -226,6 +226,7 @@ public class TSocialInfoController {
/**
* @param id
* @param isSocial 1 社保 2 医保 3 全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @Description:
* @Author: hgw
* @Date: 2024/8/1 18:12
......@@ -233,17 +234,19 @@ public class TSocialInfoController {
**/
@Operation(summary = "转自动化", description = "转自动化")
@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();
if (user == null || Common.isEmpty(user.getId())) {
return R.failed("请登录!");
}
return tSocialInfoService.doAuto(id, isSocial, user);
return tSocialInfoService.doAuto(id, isSocial, ybsfqzcb, user);
}
/**
* @param idList
* @param isSocial 1 社保 2 医保 3 全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @Description: 转人工-批量
* @Author: hgw
* @Date: 2024/8/1 18:12
......@@ -251,12 +254,13 @@ public class TSocialInfoController {
**/
@Operation(summary = "转自动化-批量", description = "转自动化-批量")
@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();
if (user == null || Common.isEmpty(user.getId())) {
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> {
/**
* @param idList 社保IDlist
* @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人
* @Description: 批量转自动化
* @Author: hgw
* @Date: 2025/4/25 17:24
* @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 isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人
* @Description: 转自动化
* @Author: hgw
* @Date: 2025/4/25 17:24
* @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);
}
......@@ -933,6 +933,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household.setHouseType(excel.getHouseType().equals(HouseConfigConstants.HOUSE_TYPE_ONE) ? "1" : "0");
household.setAuditUser(null == auditUser.getUserId() ? "" : auditUser.getUserId());
household.setHandleUser(null == handlerUser.getUserId() ? "" :handlerUser.getUserId());
// 初始化
household.setIsSingleYgsPush(null);
//如果社保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if (CommonConstants.ZERO_STRING.equals(household.getAutoStatus())){
if (Common.isNotNull(excel.getRosterAutoFlagYgs())){
......@@ -947,13 +949,26 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
if (Common.isNotNull(excel.getIsSingle())){
household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
if (excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO)) {
household.setIsSingle(CommonConstants.ZERO_STRING);
household.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else {
household.setIsSingle(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
household.setIsSingleYgsPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYgsPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
household.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
}
}
}
}else {
household.setRosterAutoFlagYgs(null);
household.setDataFlagYgs(null);
household.setIsSingle(null);
}
// 初始化
household.setIsSingleYsdPush(null);
//如果医保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if (CommonConstants.ZERO_STRING.equals(household.getAutoStatusYsd())){
if (Common.isNotNull(excel.getRosterAutoFlagYsd())){
......@@ -968,8 +983,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
if (Common.isNotNull(excel.getIsSingleYsd())){
household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
if (excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO)) {
household.setIsSingleYsd(CommonConstants.ZERO_STRING);
household.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else {
household.setIsSingleYsd(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
// 2025-12-10 11:06:25 用例评审,产品与测试要求默认单个,而不是空,错误的也是默认单个
household.setIsSingleYsdPush(CommonConstants.ONE_STRING);
if (Common.isNotNull(excel.getIsSingleYsdPush()) && HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
household.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
}
}
}
}else {
household.setRosterAutoFlagYsd(null);
household.setDataFlagYsd(null);
......@@ -1304,10 +1331,25 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getAutoStatusYsd())) {
info.setAutoStatusYsd(excel.getAutoStatusYsd().equals(CommonConstants.IS_TRUE) ? "0" : "1");
}
info.setIsSingleYgsPush(null);
if (CommonConstants.ZERO_STRING.equals(info.getAutoStatus())){
if (Common.isNotNull(excel.getIsSingle())) {
info.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
if (Common.isNotNull(excel.getIsSingle())){
if (excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO)) {
info.setIsSingle(CommonConstants.ZERO_STRING);
info.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else {
info.setIsSingle(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYgsPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYgsPush())) {
info.setIsSingleYgsPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYgsPush())) {
info.setIsSingleYgsPush(CommonConstants.ONE_STRING);
}
}
}
}
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYgs())){
if (Common.isNotNull(excel.getDataFlagYgs())) {
info.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
......@@ -1324,13 +1366,29 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info.setDataFlagYgs(null);
info.setRosterAutoFlagYgs(null);
}
info.setIsSingleYsdPush(null);
if (CommonConstants.ZERO_STRING.equals(info.getAutoStatusYsd())){
if (Common.isNotNull(excel.getIsSingleYsd())){
if (excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO)) {
info.setIsSingleYsd(CommonConstants.ZERO_STRING);
info.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else {
info.setIsSingleYsd(CommonConstants.ONE_STRING);
// MVP 1.7.18,单个里,加了接口通道:
if (Common.isNotNull(excel.getIsSingleYsdPush())) {
if (HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsdPush())) {
info.setIsSingleYsdPush(CommonConstants.ZERO_STRING);
} else if (HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYsdPush())) {
info.setIsSingleYsdPush(CommonConstants.ONE_STRING);
}
}
}
}
if (Common.isNotNull(excel.getRosterAutoFlagYsd())) {
info.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
if (Common.isNotNull(excel.getIsSingleYsd())) {
info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYsd())){
if (Common.isNotNull(excel.getDataFlagYsd())) {
info.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
......
......@@ -591,6 +591,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
/**
* @param idList 社保IDlist
* @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人
* @Description: 批量转自动化
* @Author: hgw
......@@ -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>
**/
@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) {
doAuto(id, isSocial, user);
doAuto(id, isSocial, ybsfqzcb, user);
}
return R.ok("成功!");
}
......@@ -608,6 +609,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
/**
* @param id 社保ID
* @param isSocial 1:社保 2:医保 3:全部
* @param ybsfqzcb 医保是否强制参保:0否1是
* @param user 当前登录人
* @Description: 转自动化
* @Author: hgw
......@@ -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>
**/
@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);
if (socialInfo == null || Common.isEmpty(socialInfo.getId())) {
return R.failed("未找到社保");
......@@ -672,6 +674,33 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
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);
}
......
......@@ -70,6 +70,9 @@
<result property="reduceRosterTempYgs" column="REDUCE_ROSTER_TEMP_YGS"/>
<result property="addRosterTempYsd" column="ADD_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 id="sysHouseHoldSingleInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo">
......@@ -124,6 +127,10 @@
a.REDUCE_ROSTER_TEMP_YGS,
a.ADD_ROSTER_TEMP_YSD,
a.REDUCE_ROSTER_TEMP_YSD
,a.YBSFQZCB
,a.IS_SINGLE_YGS_PUSH
,a.IS_SINGLE_YSD_PUSH
</sql>
<sql id="sysHouseHoldInfo_where">
<if test="sysHouseHoldInfo != null">
......
......@@ -1554,6 +1554,7 @@
<result property="ygsSocialStartDateNext" column="YGS_SOCIAL_START_DATE_NEXT"/>
<result property="ysdSocialStartDateNext" column="YSD_SOCIAL_START_DATE_NEXT"/>
<result property="backFileFlag" column="BACK_FILE_FLAG"/>
<result property="ybsfqzcb" column="YBSFQZCB"/>
</resultMap>
<select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap">
......@@ -1654,7 +1655,8 @@
a.IS_SINGLE_YSD,
a.IS_AUTO_LEAVE_DOC,
a.ROSTER_AUTO_FLAG_YGS,
a.ROSTER_AUTO_FLAG_YSD
a.ROSTER_AUTO_FLAG_YSD,
s.YBSFQZCB
FROM t_dispatch_info a
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
......@@ -2221,6 +2223,13 @@
AND s.YSD_REMARK like concat('%',#{tDispatchInfo.ysdRemark},'%')
</if>
<if test="tDispatchInfo.ygsRequestId != null and tDispatchInfo.ygsRequestId.trim() != ''">
and if(a.type ='0' and s.add_ygs_Handle_Status != '0', s.add_YGS_REQUEST_ID, s.YGS_REQUEST_ID) = #{tDispatchInfo.ygsRequestId}
</if>
<if test="tDispatchInfo.ysdRequestId != null and tDispatchInfo.ysdRequestId.trim() != ''">
AND if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) = #{tDispatchInfo.ysdRequestId}
</if>
<if test="tDispatchInfo.ygsYsdHandleStatusArr != null and tDispatchInfo.ygsYsdHandleStatusArr.length > 0">
AND (
s.YGS_HANDLE_STATUS in
......@@ -2270,6 +2279,13 @@
AND s.YSD_REMARK like concat('%',#{tDispatchInfo.ysdRemark},'%')
</if>
<if test="tDispatchInfo.ygsRequestId != null and tDispatchInfo.ygsRequestId.trim() != ''">
AND s.YGS_REQUEST_ID = #{tDispatchInfo.ygsRequestId}
</if>
<if test="tDispatchInfo.ysdRequestId != null and tDispatchInfo.ysdRequestId.trim() != ''">
AND s.YSD_REQUEST_ID = #{tDispatchInfo.ysdRequestId}
</if>
<if test="tDispatchInfo.ygsYsdHandleStatusArr != null and tDispatchInfo.ygsYsdHandleStatusArr.length > 0">
AND (
s.YGS_HANDLE_STATUS in
......
......@@ -109,6 +109,8 @@
,idp.AREA_NAME idCardProvince
,idc.AREA_NAME idCardCity
,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>
......@@ -205,12 +207,16 @@
<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"), 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")
,''
,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
,ifnull(s.YBSFQZCB,shh.YBSFQZCB) ybsfqzcb
<include refid="getSocialSoldierBaseTwo"/>
<if test="idsStr != null and idsStr.size > 0">
......@@ -318,6 +324,8 @@
,DATE_FORMAT(now(),"%Y年%m月%d日") nowDay
,s.UNIT_MEDICAL_CARDINAL unitMedicalCardinal
,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"/>
<if test="idsStr != null and idsStr.size > 0">
/*派单推的,有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