Commit d5bbf273 authored by huyuchen's avatar huyuchen

huych-户名判空处理

parent 9e1e0d38
......@@ -503,13 +503,13 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
MybankEnterprisePayDowninstrRequestV1 request = new MybankEnterprisePayDowninstrRequestV1();
// 请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
bizContent.setTransCode("DOWNINSTR");
bizContent.setTranDate("20241204");
bizContent.setTranDate("20241216");
bizContent.setTranTime("103231001");
bizContent.setBeginDate("20241204");
bizContent.setEndDate("20241204");
bizContent.setPayeeAccNo("6222623470001851928");
bizContent.setBeginDate("20241216");
bizContent.setEndDate("20241216");
bizContent.setPayeeAccNo("6217788306000007495");
bizContent.setLanguage("zh_CN");
bizContent.setfSeqNo("WX1733276761404");
bizContent.setfSeqNo("WX1734341241340");
bizContent.setServiceCode("PAYENT");
// bizContent.setQryfSeqno("PAYENT411erji17023");
request.setServiceUrl("https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/downinstr/V1");
......@@ -538,8 +538,8 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
new MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1.MybankEnterpriseAccountDownebillRequesBizV1();
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1 request =
new MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1();
bizContent.setTransCode("DownEBill ");
bizContent.setBankCode("102");
bizContent.setTransCode("DownEBill");
bizContent.setBankCode("6217788306000007495");
bizContent.setCis("");
bizContent.setLoginId("");
bizContent.setTranDate("");
......
......@@ -272,10 +272,10 @@ public class SysHouseHoldInfo extends BaseEntity {
/**
* 医保单位编号
*/
@ExcelAttribute(name = "医保单位编号" )
@Schema(description ="医保单位编号")
@ExcelAttribute(name = "医保-单位编号" )
@Schema(description ="医保-单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保单位编号")
@ExcelProperty("医保-单位编号")
private String customerNoYsd;
/**
......
......@@ -143,10 +143,19 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty("单位统一信用代码")
private String unitCreditCode;
/**
* 医保单位编号
*/
@ExcelAttribute(name = "医保-单位编号", maxLength = 20 )
@Schema(description ="医保-单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-单位编号")
private String customerNoYsd;
/**
* 社保-登录账户
*/
@ExcelAttribute(name = "社保-登录账户" )
@ExcelAttribute(name = "社保-登录账户", maxLength = 50 )
@Schema(description ="社保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录账户")
......@@ -155,7 +164,7 @@ public class TSocialHouseholdExportVo implements Serializable {
/**
* 社保-登录密码
*/
@ExcelAttribute(name = "社保-登录密码" )
@ExcelAttribute(name = "社保-登录密码", maxLength = 50 )
@Schema(description ="社保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录密码")
......@@ -164,7 +173,7 @@ public class TSocialHouseholdExportVo implements Serializable {
/**
* 医保-登录账户
*/
@ExcelAttribute(name = "医保-登录账户" )
@ExcelAttribute(name = "医保-登录账户", maxLength = 50 )
@Schema(description ="医保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录账户")
......@@ -173,7 +182,7 @@ public class TSocialHouseholdExportVo implements Serializable {
/**
* 医保-登录密码
*/
@ExcelAttribute(name = "医保-登录密码" )
@ExcelAttribute(name = "医保-登录密码", maxLength = 50 )
@Schema(description ="医保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录密码")
......
......@@ -48,8 +48,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 缴纳地所在省
*/
@Length(max = 50, message = "缴纳地所在省不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在省", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "")
@Length(max = 32, message = "缴纳地所在省不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在省", maxLength = 32,isNotEmpty = true, isArea = true, parentField = "")
@Schema(description = "缴纳地所在省")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在省")
......@@ -58,8 +58,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 缴纳地所在市
*/
@Length(max = 50, message = "缴纳地所在市不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在市", maxLength = 50,isNotEmpty = true, isArea = true, parentField = "province")
@Length(max = 32, message = "缴纳地所在市不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在市", maxLength = 32,isNotEmpty = true, isArea = true, parentField = "province")
@Schema(description = "缴纳地所在市")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在市")
......@@ -68,8 +68,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 缴纳地所在县
*/
@Length(max = 50, message = "缴纳地所在县不能超过50个字符")
@ExcelAttribute(name = "缴纳地所在县", maxLength = 50, isArea = true, parentField = "city")
@Length(max = 32, message = "缴纳地所在县不能超过32个字符")
@ExcelAttribute(name = "缴纳地所在县", maxLength = 32, isArea = true, parentField = "city")
@Schema(description = "缴纳地所在县")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "缴纳地所在县")
......@@ -105,7 +105,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 手机号
*/
@ExcelAttribute(name = "手机号", maxLength = 50,isNotEmpty = true,isInteger = true )
@ExcelAttribute(name = "手机号", maxLength = 20,isNotEmpty = true,isInteger = true )
@Schema(description ="手机号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号")
......@@ -123,7 +123,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 单位编号
*/
@ExcelAttribute(name = "单位编号" )
@ExcelAttribute(name = "单位编号", maxLength = 20 )
@Length(max = 20, message = "单位编号不能超过20个字符")
@Schema(description ="单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位编号")
......@@ -132,16 +133,28 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 单位统一信用代码
*/
@ExcelAttribute(name = "单位统一信用代码" )
@ExcelAttribute(name = "单位统一信用代码", maxLength = 50 )
@Length(max = 50, message = "单位统一信用代码不能超过50个字符")
@Schema(description ="单位统一信用代码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位统一信用代码")
private String unitCreditCode;
/**
* 医保单位编号
*/
@ExcelAttribute(name = "医保-单位编号", maxLength = 20 )
@Length(max = 20, message = "医保-单位编号不能超过20个字符")
@Schema(description ="医保-单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-单位编号")
private String customerNoYsd;
/**
* 社保-登录账户
*/
@ExcelAttribute(name = "社保-登录账户" )
@Length(max = 50, message = "社保-登录账户不能超过50个字符")
@ExcelAttribute(name = "社保-登录账户", maxLength = 50 )
@Schema(description ="社保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录账户")
......@@ -150,7 +163,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 社保-登录密码
*/
@ExcelAttribute(name = "社保-登录密码" )
@ExcelAttribute(name = "社保-登录密码", maxLength = 50 )
@Length(max = 50, message = "社保-登录密码不能超过50个字符")
@Schema(description ="社保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录密码")
......@@ -159,7 +173,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 医保-登录账户
*/
@ExcelAttribute(name = "医保-登录账户" )
@ExcelAttribute(name = "医保-登录账户", maxLength = 50 )
@Length(max = 50, message = "医保-登录账户不能超过50个字符")
@Schema(description ="医保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录账户")
......@@ -168,7 +183,8 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
* 医保-登录密码
*/
@ExcelAttribute(name = "医保-登录密码" )
@ExcelAttribute(name = "医保-登录密码", maxLength = 50 )
@Length(max = 50, message = "医保-登录密码不能超过50个字符")
@Schema(description ="医保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录密码")
......
......@@ -104,7 +104,7 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 手机号
*/
@ExcelAttribute(name = "手机号", maxLength = 50,isInteger = true)
@ExcelAttribute(name = "手机号", maxLength = 20,isInteger = true)
@Schema(description ="手机号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("手机号")
......@@ -122,7 +122,8 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 单位编号
*/
@ExcelAttribute(name = "单位编号" )
@ExcelAttribute(name = "单位编号", maxLength = 20 )
@Length(max = 20, message = "单位编号不能超过20个字符")
@Schema(description ="单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位编号")
......@@ -131,16 +132,28 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 单位统一信用代码
*/
@ExcelAttribute(name = "单位统一信用代码" )
@ExcelAttribute(name = "单位统一信用代码", maxLength = 50 )
@Length(max = 50, message = "单位统一信用代码不能超过50个字符")
@Schema(description ="单位统一信用代码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("单位统一信用代码")
private String unitCreditCode;
/**
* 医保单位编号
*/
@ExcelAttribute(name = "医保-单位编号", maxLength = 20 )
@Length(max = 20, message = "医保-单位编号不能超过20个字符")
@Schema(description ="医保-单位编号")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-单位编号")
private String customerNoYsd;
/**
* 社保-登录账户
*/
@ExcelAttribute(name = "社保-登录账户" )
@ExcelAttribute(name = "社保-登录账户", maxLength = 50 )
@Length(max = 50, message = "社保-登录账户不能超过50个字符")
@Schema(description ="社保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录账户")
......@@ -149,7 +162,8 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 社保-登录密码
*/
@ExcelAttribute(name = "社保-登录密码" )
@ExcelAttribute(name = "社保-登录密码", maxLength = 50 )
@Length(max = 50, message = "社保-登录密码不能超过50个字符")
@Schema(description ="社保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("社保-登录密码")
......@@ -158,7 +172,8 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 医保-登录账户
*/
@ExcelAttribute(name = "医保-登录账户" )
@ExcelAttribute(name = "医保-登录账户", maxLength = 50 )
@Length(max = 50, message = "医保-登录账户不能超过50个字符")
@Schema(description ="医保-登录账户")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录账户")
......@@ -167,7 +182,8 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 医保-登录密码
*/
@ExcelAttribute(name = "医保-登录密码" )
@ExcelAttribute(name = "医保-登录密码", maxLength = 50 )
@Length(max = 50, message = "医保-登录密码不能超过50个字符")
@Schema(description ="医保-登录密码")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("医保-登录密码")
......
......@@ -33,5 +33,7 @@ public class HouseConfigConstants {
public static final String ERROR_TEMPLATE_SEVEN = "未找到模板中填写的所属机构";
public static final String ERROR_TEMPLATE_EIGHT = "手机号格式校验失败";
}
......@@ -66,6 +66,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 社保户公积金户数据
......@@ -399,11 +401,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
@Override
public void listExport(HttpServletResponse response, SysHouseHoldInfo sysHouseHoldInfo){
String fileName = "户配置信息批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
//账户性质是公积金导出空
//账户性质是公积金导出空 默认是社保
if (Common.isNotNull(sysHouseHoldInfo.getType())
&& CommonConstants.ONE_STRING.equals(sysHouseHoldInfo.getType())) {
sysHouseHoldInfo.setType(CommonConstants.THREE_STRING);
}
if (Common.isEmpty(sysHouseHoldInfo.getType())) {
sysHouseHoldInfo.setType(CommonConstants.ZERO_STRING);
}
//获取要导出的列表
List<TSocialHouseholdExportVo> list = new ArrayList<>();
long count = baseMapper.selectExportCount(sysHouseHoldInfo);
......@@ -532,12 +537,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_FOUR,excel));
continue;
}
//校验手机号准确性
errorMsg = checkMobile(excel.getPhone());
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
if(mobileCheck(excel.getPhone())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_EIGHT,excel));
continue;
}
//校验手机号准确性
// errorMsg = checkMobile(excel.getPhone());
// if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
// errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg,excel));
// continue;
// }
//封装和插入数据
household.setAreaCode(areaMap.get(household.getCity()).getAreaCode());
household.setAutoStatus(excel.getAutoStatus().equals(CommonConstants.IS_TRUE) ? "0" : "1");
......@@ -631,7 +640,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
}
//校验省市县
if (Common.isNotNull(excel.getProvince()) && Common.isEmpty(excel.getProvince())) {
if (Common.isNotNull(excel.getProvince()) && Common.isEmpty(excel.getCity())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_SIX,excel));
continue;
}
......@@ -671,15 +680,19 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_FOUR, excel));
continue;
}
if(Common.isNotNull(excel.getPhone()) && mobileCheck(excel.getPhone())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_EIGHT,excel));
continue;
}
//校验手机号准确性
if (Common.isNotNull(excel.getPhone())) {
errorMsg = checkMobile(excel.getPhone());
if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
continue;
}
}
// if (Common.isNotNull(excel.getPhone())) {
// errorMsg = checkMobile(excel.getPhone());
// if (!errorMsg.contains(HouseConfigConstants.SUCESS)) {
// errorMessageList.add(new ErrorMessage(excel.getRowIndex(), errorMsg, excel));
// continue;
// }
// }
// 新老数据审核人办理人不同,先删除,再添加
if (Common.isNotNull(excel.getAuditUserName()) && !excel.getAuditUserName().equals(info.getAuditUserName())) {
tSocialfundHouseResService.deleteAuditUser(info);
......@@ -738,6 +751,9 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getUnitCreditCode())) {
info.setUnitCreditCode(excel.getUnitCreditCode());
}
if (Common.isNotNull(excel.getCustomerNoYsd())) {
info.setCustomerNoYsd(excel.getCustomerNoYsd());
}
if (Common.isNotNull(excel.getSocialAccount())) {
info.setSocialAccount(excel.getSocialAccount());
}
......@@ -780,4 +796,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
}
return areaMap;
}
private boolean mobileCheck(String number) {
String regex = "^1[3-9]\\d{9}$";
// 编译正则表达式
Pattern pattern = Pattern.compile(regex);
// 匹配正则表达式
Matcher matcher = pattern.matcher(number);
// 返回是否匹配结果
return !matcher.matches();
}
}
......@@ -204,6 +204,7 @@
if(a.HOUSE_TYPE = '0','独立户','自有户') houseType,
a.CUSTOMER_NO customerNo,
a.UNIT_CREDIT_CODE unitCreditCode,
a.CUSTOMER_NO_YSD customerNoYsd,
a.SOCIAL_ACCOUNT socialAccount,
a.SOCIAL_PASSWORD socialPassword,
a.MEDICL_ACCOUNT mediclAccount,
......
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