Commit f01bebd7 authored by hongguangwu's avatar hongguangwu

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

parents a4448ab5 da329395
spring.ldap.urls=ldap://192.168.0.240:389 spring.ldap.urls=ldap://192.168.1.65:389
spring.ldap.username=cn=admin,dc=worfu,dc=com spring.ldap.username=cn=admin,dc=worfu,dc=com
spring.ldap.password=Yifu123456! spring.ldap.password=yifu123456!
spring.ldap.base=dc=worfu,dc=com spring.ldap.base=dc=worfu,dc=com
\ No newline at end of file
ldap.url=192.168.0.240 ldap.url=192.168.1.65
ldap.port=389 ldap.port=389
ldap.userName=cn=admin,dc=worfu,dc=com ldap.userName=cn=admin,dc=worfu,dc=com
ldap.password=Yifu123456! ldap.password=yifu123456!
ldap.dn=dc=worfu,dc=com ldap.dn=dc=worfu,dc=com
ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
...@@ -1753,7 +1753,7 @@ ...@@ -1753,7 +1753,7 @@
and (1 = 2 and (1 = 2
<if test="param.insuranceProvinces != null"> <if test="param.insuranceProvinces != null">
<if test="param.insuranceProvinces.size() > 0"> <if test="param.insuranceProvinces.size() > 0">
or a.INSURANCE_PROVINCE in or a.INSURANCE_HANDLE_PROVINCE in
<foreach collection="param.insuranceProvinces" item="param" index="index" open="(" close=")" <foreach collection="param.insuranceProvinces" item="param" index="index" open="(" close=")"
separator=","> separator=",">
#{param} #{param}
...@@ -1763,7 +1763,7 @@ ...@@ -1763,7 +1763,7 @@
</if> </if>
<if test="param.insuranceCitys != null"> <if test="param.insuranceCitys != null">
<if test="param.insuranceCitys.size() > 0"> <if test="param.insuranceCitys.size() > 0">
or a.INSURANCE_CITY in or a.INSURANCE_HANDLE_CITY in
<foreach collection="param.insuranceCitys" item="param" index="index" open="(" close=")" <foreach collection="param.insuranceCitys" item="param" index="index" open="(" close=")"
separator=","> separator=",">
#{param} #{param}
......
...@@ -63,6 +63,15 @@ public class TDispatchInfo extends BaseEntity { ...@@ -63,6 +63,15 @@ public class TDispatchInfo extends BaseEntity {
@ExcelProperty("派单申请编码" ) @ExcelProperty("派单申请编码" )
private String dispatchCode; private String dispatchCode;
/**
* 重新派单号
*/
@ExcelAttribute(name = "重新派单号", maxLength = 30)
@Schema(description = "重新派单号" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("重新派单号" )
private String againDispatchCode;
/** /**
* 员工ID * 员工ID
*/ */
......
...@@ -110,4 +110,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable { ...@@ -110,4 +110,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
@ExcelProperty("委托备注" ) @ExcelProperty("委托备注" )
private String trustRemark; private String trustRemark;
/**
* 是否是失败项重新派单 0 是
*/
@ExcelAttribute(name = "是否是失败项重新派单")
@Schema(description = "是否是失败项重新派单" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否是失败项重新派单" )
private String isAgainFlag;
} }
...@@ -2724,6 +2724,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2724,6 +2724,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
try { try {
dispatch.setOrderId(orderId); dispatch.setOrderId(orderId);
dispatch.setApplyNo(getApplyCode()); dispatch.setApplyNo(getApplyCode());
if (CommonConstants.ZERO_STRING.equals(excel.getIsAgainFlag())) {
dispatch.setAgainDispatchCode(dispatch.getApplyNo());
}
dispatch.setStatus(CommonConstants.ONE_STRING); dispatch.setStatus(CommonConstants.ONE_STRING);
baseMapper.insert(dispatch); baseMapper.insert(dispatch);
socialFundMapper.updateById(socialFund); socialFundMapper.updateById(socialFund);
......
...@@ -701,7 +701,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -701,7 +701,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info.setPreStatus(CommonConstants.ONE_STRING); info.setPreStatus(CommonConstants.ONE_STRING);
} }
int finalI = i; int finalI = i;
if (!errList.stream().anyMatch(e-> hasError(e, finalI))) { if (errList.stream().noneMatch(e-> hasError(e, finalI))) {
baseMapper.insert(info); baseMapper.insert(info);
} }
} }
...@@ -2266,7 +2266,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2266,7 +2266,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
* @Date 2022-07-18 * @Date 2022-07-18
**/ **/
private R<Boolean> handleDispatchAddRes(TPreDispatchInfo preInfo, List<ErrorMessage> errorMessageList) { private R<Boolean> handleDispatchAddRes(TPreDispatchInfo preInfo, List<ErrorMessage> errorMessageList) {
if (errorMessageList.size() == CommonConstants.ZERO_INT) { if (errorMessageList.size() == CommonConstants.ZERO_INT ||
errorMessageList.stream().allMatch(e-> CommonConstants.SAVE_SUCCESS.equals(e.getMessage()))) {
preInfo.setPreStatus(CommonConstants.TWO_STRING); preInfo.setPreStatus(CommonConstants.TWO_STRING);
preInfo.setExceptionContent(CommonConstants.EMPTY_STRING); preInfo.setExceptionContent(CommonConstants.EMPTY_STRING);
baseMapper.updatePreStatusById(preInfo); baseMapper.updatePreStatusById(preInfo);
...@@ -2282,36 +2283,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -2282,36 +2283,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
} }
} }
private R<Boolean> handleBatchSocialFundReduce(TPreDispatchInfo preInfo,
TDispatchInfo dispatchInfo, TSocialInfo social, TProvidentFund fund) {
if (Common.isEmpty(preInfo.getSocialProvince()) && Common.isEmpty(preInfo.getFundProvince())) {
return R.failed("请检查派减缴纳地是否准确!");
}
if (Common.isNotNull(preInfo.getSocialProvince())) {
if (null != social) {
dispatchInfo.setSettleDomain(social.getSettleDomain());
dispatchInfo.setBelongUnit(social.getBelongUnit());
} else {
preInfo.setPreStatus(CommonConstants.ONE_STRING);
preInfo.setExceptionContent(PreDispatchConstants.NO_SOCIAL_CAN_REDUCE);
baseMapper.updatePreStatusById(preInfo);
return R.failed(PreDispatchConstants.NO_SOCIAL_CAN_REDUCE);
}
}
if (Common.isNotNull(preInfo.getFundProvince())) {
if (null != fund) {
dispatchInfo.setSettleDomain(fund.getSettleDomain());
dispatchInfo.setBelongUnit(fund.getBelongUnit());
} else {
preInfo.setPreStatus(CommonConstants.ONE_STRING);
preInfo.setExceptionContent(PreDispatchConstants.NO_FUND_CAN_REDUCE);
baseMapper.updatePreStatusById(preInfo);
return R.failed(PreDispatchConstants.NO_FUND_CAN_REDUCE);
}
}
return null;
}
/** /**
* 派减派单时间处理 * 派减派单时间处理
* @param dispatchInfo * @param dispatchInfo
......
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/> <result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
<result property="belongUnitName" column="BELONG_UNIT_NAME"/> <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
<result property="dispatchCode" column="DISPATCH_CODE"/> <result property="dispatchCode" column="DISPATCH_CODE"/>
<result property="againDispatchCode" column="AGAIN_DISPATCH_CODE"/>
<result property="contractSubName" column="CONTRACT_SUB_NAME"/> <result property="contractSubName" column="CONTRACT_SUB_NAME"/>
<result property="contractId" column="CONTRACT_ID"/> <result property="contractId" column="CONTRACT_ID"/>
<result property="educationName" column="EDUCATION_NAME"/> <result property="educationName" column="EDUCATION_NAME"/>
...@@ -280,6 +281,7 @@ ...@@ -280,6 +281,7 @@
a.SETTLE_DOMAIN_NAME, a.SETTLE_DOMAIN_NAME,
a.BELONG_UNIT_NAME, a.BELONG_UNIT_NAME,
a.DISPATCH_CODE, a.DISPATCH_CODE,
a.AGAIN_DISPATCH_CODE,
a.SETTLE_DOMAIN_CODE, a.SETTLE_DOMAIN_CODE,
a.CONTRACT_SUB_NAME, a.CONTRACT_SUB_NAME,
a.CONTRACT_ID, a.CONTRACT_ID,
......
...@@ -187,7 +187,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl ...@@ -187,7 +187,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
user.setPassword(ENCODER.encode(password)); user.setPassword(ENCODER.encode(password));
}else { }else {
// 登录失败,随机密码,保证用户密码不一致 // 登录失败,随机密码,保证用户密码不一致
user.setPassword(password+RandomUtil.getSix()); user = null;
//user.setPassword(password+RandomUtil.getSix());
throw new RuntimeException("LDAP登录失败:"+ username);
} }
} catch (Exception e) { } catch (Exception e) {
log.error("LDAP登录异常",e); log.error("LDAP登录异常",e);
......
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