Commit 226c8cc9 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15

parents 873704b9 3828d26b
......@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurRuleInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
......@@ -35,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
......@@ -152,4 +154,6 @@ public class TAutoInsurRuleInfoController {
public void export(HttpServletResponse response, @RequestBody TAutoInsurRuleInfoSearchVo searchVo) {
tAutoInsurRuleInfoService.listExport(response,searchVo);
}
}
......@@ -31,6 +31,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
......@@ -42,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
......@@ -183,4 +185,15 @@ public class TAutoMainRelController {
menuUtil.setAuthSql(user, tAutoMainRel);
tAutoMainRelService.listExport(response,tAutoMainRel);
}
/**
* @Author fxj
* @Description 远程接口获取项目对应商险的自动化配置信息,有商险自动化且配置为启用的
* @Date 11:20 2025/9/17
**/
@Inner
@PostMapping("/inner/getProjectAutoSetMap")
public Map<String,String> getProjectAutoSetMap(@RequestBody List<String> departNos) {
return tAutoMainRelService.getProjectAutoSetMap(departNos);
}
}
......@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
/**
* 商险购买规则配置表
......@@ -48,4 +49,5 @@ public interface TAutoInsurRuleInfoService extends IService<TAutoInsurRuleInfo>
void listExport(HttpServletResponse response, TAutoInsurRuleInfoSearchVo searchVo);
List<TAutoInsurRuleInfo> noPageDiy(TAutoInsurRuleInfoSearchVo searchVo);
}
......@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
/**
* 项目配置表主表
......@@ -62,4 +63,6 @@ public interface TAutoMainRelService extends IService<TAutoMainRel> {
R<TAutoMainRelDetailVo> getProjectRule(String deptId, String deptNo);
IPage<TAutoContractScheme> getContractSchemePage(Page<TAutoContractScheme> page, TAutoContractScheme search);
Map<String, String> getProjectAutoSetMap(List<String> departNos);
}
......@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAutoInsurRuleInfo;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TAutoInsurRuleInfoMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAutoInsurRuleInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.vo.MSetttleCustomerUserVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurRuleInfoSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TAutoInsurRuleInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
......@@ -47,7 +48,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 商险购买规则配置表
*
......@@ -244,4 +248,6 @@ public class TAutoInsurRuleInfoServiceImpl extends ServiceImpl<TAutoInsurRuleInf
BeanUtil.copyProperties(excel, insert);
this.save(insert);
}
}
......@@ -1112,4 +1112,21 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
}
return wrapper;
}
/**
* @Author fxj
* @Description 远程接口获取项目对应商险的自动化配置信息,有商险自动化且配置为启用的
* @Date 11:26 2025/9/17
**/
@Override
public Map<String, String> getProjectAutoSetMap(List<String> departNos) {
Map<String,String> map = new HashMap<>();
//和产品确认了只要有配置的,则限制商险派单,不看配置是否可用,不看是否配置了商险自动化
List<TAutoMainRel> list = baseMapper.selectList(Wrappers.<TAutoMainRel>query().lambda());
if(Common.isNotNull(list)){
for(TAutoMainRel vo :list){
map.put(vo.getDeptNo(),vo.getDeptNo());
}
}
return map;
}
}
......@@ -36,6 +36,20 @@ public class ArchivesDaprUtil {
@Autowired
private DaprArchivesProperties daprArchivesProperties;
/**
* @Author fxj
* @Description 获取项目自动化设置信息,只返回配置了自动化且商险自动化为是的信息
* @Date 11:16 2025/9/17
**/
public R<Map<String,String>> getProjectAutoSetMap(List<String> departNos){
R<Map> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/tautomainrel/inner/getProjectAutoSetMap" , JSON.toJSONString(departNos), Map.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
return R.failed("获取项目商险自动化信息失败!");
}
Map<String,String> map = JSON.parseObject(JSON.toJSONString(res.getData()),new TypeReference<HashMap<String,String>>(){});
return R.ok(map);
}
public R<Map<String,String>> getCustomerUserMap(List<String> userList){
R<Map> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/msetttlecustomeruser/inner/getCustomerUserMap" , JSON.toJSONString(userList), Map.class, SecurityConstants.FROM_IN);
if (Common.isEmpty(res)){
......
......@@ -1341,4 +1341,6 @@ public class InsurancesConstants {
*
*/
public static final String IMPORT_POLICY_REMARK = "保单号维护模版导入";
public static final String INSURANCE_AUTO_FLAG_IS_ENABLE = "该项目已纳入自动化,请至作业自动化模块入职登记-接收确认后自动派单";
}
......@@ -2675,6 +2675,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceAddParam> listResult = new ArrayList<>();
List<InsuranceAddParam> listSuccess = new ArrayList<>();
List<InsuranceAddParam> distinctList = paramList.stream().distinct().collect(Collectors.toList());
// 查询是否配置了自动化配置,如果有项目权限 有自动化配置就限制提交
Map<String, String> insurAutoMap = getInsurAutoMap(paramList);
//派单前系统已有在途/在保数据的人员明细
// List<InsuredListVo> listInProgress = new ArrayList<>();
//定义外层循环标识,方便去重的时候跳出
......@@ -2779,7 +2781,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param);
continue;
}
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param);
continue;
}
}
if (StringUtils.isBlank(param.getInsuranceCompanyName())) {
param.setErrorMessage(InsurancesConstants.INSURANCE_COMPANY_NAME_NOT_EMPTY);
listResult.add(param);
......@@ -3066,6 +3075,55 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return map;
}
private Map<String, String> getInsurAutoMap(List<InsuranceAddParam> paramList) {
Map<String, String> insurAutoMap = null;
List<String> departNos = null;
if (Common.isNotNull(paramList)){
departNos = paramList.stream().map(InsuranceAddParam::getDeptNo).collect(Collectors.toList());
}
if (Common.isNotNull(departNos)){
R<Map<String, String>> resR = archivesDaprUtil.getProjectAutoSetMap(departNos);
if (Common.isNotNull(resR) && Common.isNotNull(resR.getData())){
insurAutoMap = resR.getData();
}else {
throw new RuntimeException("获取商险自动化配置失败");
}
}
return null==insurAutoMap?new HashMap<>():insurAutoMap;
}
private Map<String, String> getBatchInsurAutoMap(List<InsuranceBatchParam> paramList) {
Map<String, String> insurAutoMap = null;
List<String> departNos = null;
if (Common.isNotNull(paramList)){
departNos = paramList.stream().map(InsuranceBatchParam::getDeptNo).collect(Collectors.toList());
}
if (Common.isNotNull(departNos)){
R<Map<String, String>> resR = archivesDaprUtil.getProjectAutoSetMap(departNos);
if (Common.isNotNull(resR) && Common.isNotNull(resR.getData())){
insurAutoMap = resR.getData();
}else {
throw new RuntimeException("获取商险自动化配置失败");
}
}
return null==insurAutoMap?new HashMap<>():insurAutoMap;
}
private Map<String, String> getReplaceInsurAutoMap(List<InsuranceReplaceParam> paramList) {
Map<String, String> insurAutoMap = null;
List<String> departNos = null;
if (Common.isNotNull(paramList)){
departNos = paramList.stream().map(InsuranceReplaceParam::getReplaceDeptNo).collect(Collectors.toList());
}
if (Common.isNotNull(departNos)){
R<Map<String, String>> resR = archivesDaprUtil.getProjectAutoSetMap(departNos);
if (Common.isNotNull(resR) && Common.isNotNull(resR.getData())){
insurAutoMap = resR.getData();
}else {
throw new RuntimeException("获取商险自动化配置失败");
}
}
return null==insurAutoMap?new HashMap<>():insurAutoMap;
}
/**
* 商险批增校验
*
......@@ -3083,6 +3141,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceBatchParam> listResult = new ArrayList<>();
List<InsuranceBatchParam> listSuccess = new ArrayList<>();
List<InsuranceBatchParam> distinctList = paramList.stream().distinct().collect(Collectors.toList());
// 查询是否配置了自动化配置,如果有项目权限 有自动化配置就限制提交
Map<String, String> insurAutoMap = getBatchInsurAutoMap(paramList);
//定义外层循环标识,方便去重的时候跳出
outer:
for (int i = 0; i < distinctList.size(); i++) {
......@@ -3168,7 +3228,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param);
continue;
}
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param);
continue;
}
}
if (StringUtils.isBlank(param.getEmpName())){
param.setErrorMessage(InsurancesConstants.EMP_NAME_NOT_EMPTY);
listResult.add(param);
......@@ -3494,6 +3561,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<InsuranceReplaceParam> distinctList = paramList.stream().distinct().collect(Collectors.toList());
TInsuranceType insuranceType;
TInsuranceCompany insuranceCompany;
// 查询是否配置了自动化配置,如果有项目权限 有自动化配置就限制提交
Map<String, String> insurAutoMap = getReplaceInsurAutoMap(paramList);
//定义外层循环标识,方便去重的时候跳出
outer:
for (int i = 0; i < distinctList.size(); i++) {
......@@ -3769,7 +3838,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
listResult.add(param);
continue;
}
// 存在自动化配置且是启用的直接限制MVPV1.7.15 fxj 2025-09-17
if (null != insurAutoMap.get(param.getReplaceDeptNo())){
param.setErrorMessage(InsurancesConstants.INSURANCE_AUTO_FLAG_IS_ENABLE);
listResult.add(param);
continue;
}
}
// 投保状态 待投保 不能替换
if (detail.getBuyHandleStatus() == CommonConstants.ONE_INT){
param.setErrorMessage(InsurancesConstants.ONE_REPLACE_IS_NOT_ALLOW);
......
......@@ -181,7 +181,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
* 单位编号
*/
@ExcelAttribute(name = "单位编号" )
@ExcelAttribute(name = "单位编号" , maxLength = 50)
@Schema(description ="单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位编号")
......@@ -217,7 +217,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
* 社保-登录账户
*/
@ExcelAttribute(name = "社保-登录账户" )
@ExcelAttribute(name = "社保-登录账户" , maxLength = 50)
@Schema(description ="社保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录账户")
......@@ -235,7 +235,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
* 医保-登录账户
*/
@ExcelAttribute(name = "医保-登录账户" )
@ExcelAttribute(name = "医保-登录账户" , maxLength = 50)
@Schema(description ="医保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录账户")
......@@ -280,7 +280,7 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
* 医保单位编号
*/
@ExcelAttribute(name = "医保-单位编号" )
@ExcelAttribute(name = "医保-单位编号" , maxLength = 50)
@Schema(description ="医保-单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-单位编号")
......
......@@ -219,7 +219,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute(name = "社保推送类型" ,readConverterExp = "0=批量,1=单个",errorInfo = "社保推送类型不能为空")
@ExcelAttribute(name = "社保推送类型" ,errorInfo = "社保推送类型不能为空")
@Schema(description ="社保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保推送类型")
......@@ -228,7 +228,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute(name = "医保推送类型",readConverterExp = "0=批量,1=单个",errorInfo = "医保推送类型不能为空")
@ExcelAttribute(name = "医保推送类型",errorInfo = "医保推送类型不能为空")
@Schema(description ="医保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保推送类型")
......
......@@ -219,7 +219,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 社保推送类型(是否单个接口) 0否1是(税友接口走单个还是批量,审核是否立即推送税友) MVP1.7.15 调整为社保推送类型 0批量 1单个
*/
@ExcelAttribute(name = "社保推送类型" ,readConverterExp = "0=批量,1=单个",errorInfo = "社保推送类型不能为空")
@ExcelAttribute(name = "社保推送类型" ,errorInfo = "社保推送类型不能为空")
@Schema(description ="社保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保推送类型")
......@@ -228,7 +228,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 医保推送类型 0否1是 MVP1.7.15 新增医保推送类型 0批量 1单个
*/
@ExcelAttribute(name = "医保推送类型" ,readConverterExp = "0=批量,1=单个",errorInfo = "医保推送类型不能为空")
@ExcelAttribute(name = "医保推送类型" ,errorInfo = "医保推送类型不能为空")
@Schema(description ="医保推送类型")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保推送类型")
......
......@@ -70,5 +70,8 @@ public class HouseConfigConstants {
public static final String ERROR_TEMPLATE_TWENTY_ONE = "医保自动化不可为空";
public static final String IS_SINGLE_YES = "单个";
public static final String IS_SINGLE_NO = "批量";
}
......@@ -807,7 +807,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue;
}
//判断推送类型是否准确
if (!CommonConstants.ZERO_STRING.equals(excel.getIsSingle()) && !CommonConstants.ONE_STRING.equals(excel.getIsSingle())) {
if (!HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingle()) && !HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingle())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE,excel));
continue;
}
......@@ -845,7 +845,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
continue;
}
//判断推送类型是否准确
if (!CommonConstants.ZERO_STRING.equals(excel.getIsSingleYsd()) && !CommonConstants.ONE_STRING.equals(excel.getIsSingleYsd())) {
if (!HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsd()) && !HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE_TWO,excel));
continue;
}
......@@ -871,12 +871,15 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功--》MVP1.7.15 选择是 社保信息必填
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if (CommonConstants.IS_TRUE.equals(excel.getAutoStatus()) && Common.isEmpty(excel.getSocialAccount())){
if (CommonConstants.IS_TRUE.equals(excel.getAutoStatus())
&&(Common.isEmpty(excel.getSocialAccount())
|| Common.isEmpty(excel.getSocialPassword())) ){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO,excel));
continue;
}
//MVP1.7.15 医保是否自动办理,选择是时,医保信息必须填写,否则导入不成功
if (CommonConstants.IS_TRUE.equals(excel.getAutoStatusYsd()) && Common.isEmpty(excel.getMediclAccount())){
if (CommonConstants.IS_TRUE.equals(excel.getAutoStatusYsd())
&& (Common.isEmpty(excel.getMediclAccount()) || Common.isEmpty(excel.getMediclPassword())) ){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO_TWO,excel));
continue;
}
......@@ -940,7 +943,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
if (Common.isNotNull(excel.getIsSingle())){
household.setIsSingle(excel.getIsSingle());
household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (Common.isNotNull(excel.getRosterAutoFlagYsd())){
household.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
......@@ -949,7 +952,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
if (Common.isNotNull(excel.getIsSingleYsd())){
household.setIsSingleYsd(excel.getIsSingleYsd());
household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
household.setOrganId(dicMap.get(household.getOrganName()));
......@@ -1014,6 +1017,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
.eq(SysHouseHoldInfo::getType,CommonConstants.ZERO_STRING)
.eq(SysHouseHoldInfo::getName,excel.getName())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isEmpty(info)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_NOT_EXIT,excel));
continue;
}
if (Common.isNotNull(excel.getProvince()) && Common.isNotNull(excel.getCity())) {
info.setProvince(excel.getProvince());
info.setCity(excel.getCity());
......@@ -1033,10 +1040,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getTown())) {
excel.setTown(areaMap.get(excel.getTown()).getAreaName());
}
if (Common.isEmpty(info)){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_NOT_EXIT,excel));
continue;
}
if (Common.isNotNull(excel.getOrganName())) {
excel.setOrganName(excel.getOrganName().replace(" ",""));
if (Common.isNotNull(dicMap) && Common.isEmpty(dicMap.get(excel.getOrganName()))) {
......@@ -1086,14 +1090,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
//判断推送类型是否准确
if (Common.isNotNull(excel.getIsSingle())
&& !CommonConstants.ZERO_STRING.equals(excel.getIsSingle())
&& !CommonConstants.ONE_STRING.equals(excel.getIsSingle())) {
&& !HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingle())
&& !HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingle())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE,excel));
continue;
}
if (Common.isNotNull(excel.getIsSingleYsd())
&& !CommonConstants.ZERO_STRING.equals(excel.getIsSingleYsd())
&& !CommonConstants.ONE_STRING.equals(excel.getIsSingleYsd())) {
&& !HouseConfigConstants.IS_SINGLE_NO.equals(excel.getIsSingleYsd())
&& !HouseConfigConstants.IS_SINGLE_YES.equals(excel.getIsSingleYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE_TWO,excel));
continue;
}
......@@ -1269,10 +1273,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
info.setAutoStatusYsd(excel.getAutoStatusYsd().equals(CommonConstants.IS_TRUE) ? "0" : "1");
}
if (Common.isNotNull(excel.getIsSingle())) {
info.setIsSingle(excel.getIsSingle());
info.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (Common.isNotNull(excel.getIsSingleYsd())) {
info.setIsSingleYsd(excel.getIsSingleYsd());
info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (Common.isNotNull(excel.getRosterAutoFlagYgs())) {
info.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
......
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