Commit b7188b5a authored by hongguangwu's avatar hongguangwu

MVP1.6.10社保士兵改token

parent db2ecbf2
...@@ -70,6 +70,8 @@ import java.util.ArrayList; ...@@ -70,6 +70,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* 薪酬人员表 * 薪酬人员表
...@@ -488,6 +490,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -488,6 +490,21 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
} }
} }
} }
for (TSalaryEmployee employee : updateEmployeeBankList) {
if (Common.isNotNull(employee.getBankProvince()) && !regNumber(employee.getBankProvince())) {
areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankProvince().trim());
if (Common.isNotNull(areaProvince)) {
if (Common.isNotNull(employee.getBankCity()) && !regNumber(employee.getBankCity())) {
areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + employee.getBankProvince().trim());
if (Common.isNotNull(areaCity)) {
employee.setBankCity(areaCity);
}
}
employee.setBankProvince(areaProvince);
}
}
}
if (isFalse) { if (isFalse) {
return null; return null;
} }
...@@ -499,6 +516,16 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -499,6 +516,16 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
return null; return null;
} }
private static boolean regNumber(String content) {
boolean flag = false;
Pattern p = Pattern.compile("^[0-9]*$");
Matcher m = p.matcher(content);
if (m.matches()) {
flag = true;
}
return flag;
}
/** /**
* @param employee * @param employee
* @Description: 校验卡号与手机号 * @Description: 校验卡号与手机号
......
...@@ -774,7 +774,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -774,7 +774,7 @@ public class SalaryAccountUtil implements Serializable {
} else { } else {
emp.setBankProvince(entity.getBankProvince()); emp.setBankProvince(entity.getBankProvince());
} }
if (Common.isEmpty(emp.getBankCity())) { if (Common.isEmpty(entity.getBankCity())) {
if (Common.isEmpty(emp.getBankCity())) { if (Common.isEmpty(emp.getBankCity())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行市-为空,请在工资模板正确填写!"; error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-开户行市-为空,请在工资模板正确填写!";
errorList.add(new ErrorMessage(i, error)); errorList.add(new ErrorMessage(i, error));
......
...@@ -263,6 +263,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -263,6 +263,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this.getOneAppGetModuleDetail(socialIdList, file, socialType); this.getOneAppGetModuleDetail(socialIdList, file, socialType);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("提交社保士兵异常2:",e);
if (!logList.isEmpty()) { if (!logList.isEmpty()) {
for (TSocialSoldierLog logTemp : logList) { for (TSocialSoldierLog logTemp : logList) {
logTemp.setRemark("提交社保士兵异常!"); logTemp.setRemark("提交社保士兵异常!");
...@@ -330,6 +331,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -330,6 +331,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
this.getOneAppGetModuleDetail(socialIdList, file, socialType); this.getOneAppGetModuleDetail(socialIdList, file, socialType);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("提交社保士兵异常1:",e);
if (!logList.isEmpty()) { if (!logList.isEmpty()) {
for (TSocialSoldierLog logTemp : logList) { for (TSocialSoldierLog logTemp : logList) {
logTemp.setRemark("提交社保士兵异常!"); logTemp.setRemark("提交社保士兵异常!");
...@@ -486,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -486,6 +488,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try { try {
this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName); this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName);
} catch (Exception e) { } catch (Exception e) {
log.error(errorRemark +"2:",e);
if (!logList.isEmpty()) { if (!logList.isEmpty()) {
// 异常时,更新日志 // 异常时,更新日志
for (TSocialSoldierLog logTemp : logList) { for (TSocialSoldierLog logTemp : logList) {
...@@ -524,6 +527,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -524,6 +527,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try { try {
this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName); this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName);
} catch (Exception e) { } catch (Exception e) {
log.error(errorRemark +"1:",e);
if (!logList.isEmpty()) { if (!logList.isEmpty()) {
// 异常时,更新日志 // 异常时,更新日志
for (TSocialSoldierLog logTemp : logList) { for (TSocialSoldierLog logTemp : logList) {
...@@ -563,6 +567,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -563,6 +567,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
try { try {
this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName); this.getOneAppGetModuleDetailByAudit(socialIdList, file, sheetName);
} catch (Exception e) { } catch (Exception e) {
log.error(errorRemark +"3:",e);
if (!logList.isEmpty()) { if (!logList.isEmpty()) {
// 异常时,更新日志 // 异常时,更新日志
for (TSocialSoldierLog logTemp : logList) { for (TSocialSoldierLog logTemp : logList) {
......
...@@ -56,5 +56,6 @@ soldier: ...@@ -56,5 +56,6 @@ soldier:
authorizations : Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M authorizations : Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
urlPre : http://172.16.24.66:55555 urlPre : http://172.16.24.66:55555
#线上社保士兵,一般不允许用,用之前要清理测试环境当月的社保自动化数据,否则有可能产生费用 #线上社保士兵,一般不允许用,用之前要清理测试环境当月的社保自动化数据,否则有可能产生费用
#authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M #原先的老的 : authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M
#authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ZmRjOGJmYWM0Yjg0NTkzYmMzNjllYzAwN2ExODgzZCIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcyNjcxMjQzOSwiZXhwIjo1NTExMDMyNDM5LCJpYXQiOjE3MjY3MTI0Mzl9.o91Ay4hRJofg76WCColUaixuyOyWvsuMDTWZMKSThc0
#urlPre: http://60.168.131.18:55555 #urlPre: http://60.168.131.18:55555
\ No newline at end of file
...@@ -53,5 +53,5 @@ spring: ...@@ -53,5 +53,5 @@ spring:
password: '@yf_2022' password: '@yf_2022'
#社保士兵相关属性配置 #社保士兵相关属性配置
soldier: soldier:
authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MzcwYWIyZDRhZTI0NjQ2YTg0MTE0Mzk1Y2M2MTkzMiIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcxNjE3OTIxOSwiZXhwIjoxNzI2NTQ3MjE5LCJpYXQiOjE3MTYxNzkyMTl9.Ei-52hRlfMLXLzpzmbP2xCVFZKE5sHHexzfX5PtmZ_M authorizations: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ZmRjOGJmYWM0Yjg0NTkzYmMzNjllYzAwN2ExODgzZCIsInN1YiI6IjQiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLlkIjogqXnpL7kv53lo6vlhbVBUEkiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiNCIsIm5iZiI6MTcyNjcxMjQzOSwiZXhwIjo1NTExMDMyNDM5LCJpYXQiOjE3MjY3MTI0Mzl9.o91Ay4hRJofg76WCColUaixuyOyWvsuMDTWZMKSThc0
urlPre: http://60.168.131.18:55555 urlPre: http://60.168.131.18:55555
\ No newline at end of file
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