Commit a58d0328 authored by hongguangwu's avatar hongguangwu

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

parents dae4b7c3 60d8627a
......@@ -506,6 +506,8 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
autoInsurRuleOld = autoInsurRuleInfoMapper.selectOne(Wrappers.<TAutoInsurRuleInfo>query().lambda()
.eq(TAutoInsurRuleInfo::getMainId,autoMainRel.getId()).last(CommonConstants.LAST_ONE_SQL));
}
//商险购买标准是否更新标识 false 未更新 true 更新
boolean flag = false;
//保存商险规则
List<TAutoInsurStandard> insurStandardsOld = null;
List<TAutoInsurStandard> insurStandards = null;
......@@ -530,20 +532,18 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
//获取旧的购买标准
insurStandardsOld = autoInsurStandardMapper.selectList(Wrappers
.<TAutoInsurStandard>query().lambda().eq(TAutoInsurStandard::getMainId,autoInsurRuleNew.getId()));
}
//商险购买标准是否更新标识 false 未更新 true 更新
boolean flag = false;
//保存商险购买标准
//先删除再批增
autoInsurStandardMapper.delete(Wrappers.<TAutoInsurStandard>query().lambda().eq(TAutoInsurStandard::getMainId,autoInsurRuleNew.getId()));
if (Common.isNotNull(insurStandards)){
for (TAutoInsurStandard standard:insurStandards){
if (!Common.isNotNull(standard.getId())){
flag =true;
//先删除后面再批增
autoInsurStandardMapper.delete(Wrappers.<TAutoInsurStandard>query().lambda().eq(TAutoInsurStandard::getMainId,autoInsurRuleNew.getId()));
//保存商险购买标准
if (Common.isNotNull(insurStandards)){
for (TAutoInsurStandard standard:insurStandards){
if (!Common.isNotNull(standard.getId())){
flag =true;
}
standard.setMainId(autoInsurRuleNew.getId());
autoInsurStandardMapper.insert(standard);
saveStandard(standard);
}
standard.setMainId(autoInsurRuleNew.getId());
autoInsurStandardMapper.insert(standard);
saveStandard(standard);
}
}
// 更新岗位字典
......
......@@ -127,18 +127,21 @@
<where>
1=1
<if test="(tAutoInsurStandard.standardMin != null and tAutoInsurStandard.standardMin.trim() != '') or (tAutoInsurStandard.standardMax != null and tAutoInsurStandard.standardMax.trim() != '')">
and b.id is not null
</if>
<if test="tAutoInsurStandard != null">
<if test="tAutoInsurStandard.mainId != null and tAutoInsurStandard.mainId.trim() != ''">
AND a.MAIN_ID = #{tAutoInsurStandard.mainId}
</if>
<if test="tAutoInsurStandard.name != null and tAutoInsurStandard.name.trim() != ''">
AND a.NAME like concat(,'%',#{tAutoInsurStandard.name}, '%')
AND a.NAME like concat('%',#{tAutoInsurStandard.name}, '%')
</if>
<if test="tAutoInsurStandard.company != null">
AND a.COMPANY like concat(,'%',#{tAutoInsurStandard.company}, '%')
AND a.COMPANY like concat('%',#{tAutoInsurStandard.company}, '%')
</if>
<if test="tAutoInsurStandard.riskType != null">
AND a.RISK_TYPE like concat(,'%',#{tAutoInsurStandard.riskType}, '%')
AND a.RISK_TYPE like concat('%',#{tAutoInsurStandard.riskType}, '%')
</if>
</if>
</where>
......
......@@ -40,9 +40,6 @@ security:
- /actuator/**
- /swagger-ui/**
- /insuranceDetail/urgentUpdateIsUse
- /temployeeinsurancepre/page
- /temployeeinsurancepre/noPage
- /temployeeinsurancepre/{id} # 临时调试
# 文件上传相关 支持阿里云、华为云、腾讯、minio
......
......@@ -2410,7 +2410,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
if (Common.isNotNull(empVo)){
//有档案档案员工类型 和派单的员工类型不一致禁止派单,改一致后可派单
if (Common.isNotNull(empVo.getEmpNatrue()) && !empVo.getEmpNatrue().equals(excel.getEmpType())){
if (Common.isNotNull(empVo.getEmpNatrue()) && Common.isNotNull(excel.getEmpType()) && !empVo.getEmpNatrue().equals(excel.getEmpType())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_TYPE_ERROR)));
return true;
}
......
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