Commit e9fccd06 authored by hongguangwu's avatar hongguangwu

MVP1.7.17-商险续签待办3

parent 22481684
...@@ -43,6 +43,8 @@ public interface TInsuranceWarnMapper extends BaseMapper<TInsuranceAlert> { ...@@ -43,6 +43,8 @@ public interface TInsuranceWarnMapper extends BaseMapper<TInsuranceAlert> {
// 查找ID与状态,用作忽略等 // 查找ID与状态,用作忽略等
List<TInsuranceAlert> selectInsuranceAlertList(@Param("idList") List<String> idList); List<TInsuranceAlert> selectInsuranceAlertList(@Param("idList") List<String> idList);
// 查找ID与状态,用作确认等(与忽略不同的地方:返回的ID不同,更新不同的表数据
List<TInsuranceAlert> selectInsuranceAlertListBySure(@Param("idList") List<String> idList);
TInsuranceAlert selectInsuranceAlertOne(@Param("id") String id); TInsuranceAlert selectInsuranceAlertOne(@Param("id") String id);
} }
...@@ -147,7 +147,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -147,7 +147,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
return R.failed(CommonConstants.PARAM_IS_NOT_ERROR); return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
} }
// 先查再更新 // 先查再更新
List<TInsuranceAlert> alertList = tInsuranceWarnMapper.selectInsuranceAlertList(ids); List<TInsuranceAlert> alertList = tInsuranceWarnMapper.selectInsuranceAlertListBySure(ids);
if (alertList != null && !alertList.isEmpty()) { if (alertList != null && !alertList.isEmpty()) {
List<String> successList = new ArrayList<>(); List<String> successList = new ArrayList<>();
Map<String, TInsuranceAlert> alertMap = new HashMap<>(); Map<String, TInsuranceAlert> alertMap = new HashMap<>();
...@@ -389,8 +389,8 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -389,8 +389,8 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
Map<String, String> errorMessageMap = new HashMap<>(); Map<String, String> errorMessageMap = new HashMap<>();
for (InsuranceAutoParam info : autoAddParamList) { for (InsuranceAutoParam info : autoAddParamList) {
autoAddParamSet.add(info.getInsurancePreId()); autoAddParamSet.add(info.getInsurancePreRenewId());
errorMessageMap.put(info.getInsurancePreId(), info.getErrorMessage()); errorMessageMap.put(info.getInsurancePreRenewId(), info.getErrorMessage());
} }
Map<String, Set<String>> deptNumMap = new HashMap<>(); Map<String, Set<String>> deptNumMap = new HashMap<>();
...@@ -540,13 +540,13 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -540,13 +540,13 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
private List<InsuranceAutoParam> getInsuranceAutoParamList(List<InsuranceAddParam> addParamList, List<InsuranceBatchParam> batchParamList private List<InsuranceAutoParam> getInsuranceAutoParamList(List<InsuranceAddParam> addParamList, List<InsuranceBatchParam> batchParamList
, List<InsuranceReplaceParam> replaceParamList) { , List<InsuranceReplaceParam> replaceParamList) {
if (addParamList != null) { if (addParamList == null) {
addParamList = new ArrayList<>(); addParamList = new ArrayList<>();
} }
if (batchParamList != null) { if (batchParamList == null) {
batchParamList = new ArrayList<>(); batchParamList = new ArrayList<>();
} }
if (replaceParamList != null) { if (replaceParamList == null) {
replaceParamList = new ArrayList<>(); replaceParamList = new ArrayList<>();
} }
// 使用Stream合并三个列表 // 使用Stream合并三个列表
...@@ -576,7 +576,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -576,7 +576,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
autoParam.setPost(addParam.getPost()); autoParam.setPost(addParam.getPost());
autoParam.setRemark(addParam.getRemark()); autoParam.setRemark(addParam.getRemark());
autoParam.setErrorMessage(addParam.getErrorMessage()); autoParam.setErrorMessage(addParam.getErrorMessage());
autoParam.setInsurancePreRenewId(addParam.getInsurancePreId()); autoParam.setInsurancePreRenewId(addParam.getInsurancePreRenewId());
autoParam.setCustomerUserName(addParam.getCustomerUserName()); autoParam.setCustomerUserName(addParam.getCustomerUserName());
autoParam.setIsExit(addParam.getIsExit()); autoParam.setIsExit(addParam.getIsExit());
autoParam.setDeptName(addParam.getDeptName()); autoParam.setDeptName(addParam.getDeptName());
...@@ -601,7 +601,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -601,7 +601,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
autoParam.setPost(batchParam.getPost()); autoParam.setPost(batchParam.getPost());
autoParam.setRemark(batchParam.getRemark()); autoParam.setRemark(batchParam.getRemark());
autoParam.setErrorMessage(batchParam.getErrorMessage()); autoParam.setErrorMessage(batchParam.getErrorMessage());
autoParam.setInsurancePreRenewId(batchParam.getInsurancePreId()); autoParam.setInsurancePreRenewId(batchParam.getInsurancePreRenewId());
autoParam.setCustomerUserName(batchParam.getCustomerUserName()); autoParam.setCustomerUserName(batchParam.getCustomerUserName());
autoParam.setIsExit(batchParam.getIsExit()); autoParam.setIsExit(batchParam.getIsExit());
autoParam.setDeptName(batchParam.getDeptName()); autoParam.setDeptName(batchParam.getDeptName());
...@@ -628,7 +628,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -628,7 +628,7 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
autoParam.setReplaceDeptNo(replaceParam.getReplaceDeptNo()); autoParam.setReplaceDeptNo(replaceParam.getReplaceDeptNo());
autoParam.setReplaceEmpIdcardNo(replaceParam.getReplaceEmpIdcardNo()); autoParam.setReplaceEmpIdcardNo(replaceParam.getReplaceEmpIdcardNo());
autoParam.setErrorMessage(replaceParam.getErrorMessage()); autoParam.setErrorMessage(replaceParam.getErrorMessage());
autoParam.setInsurancePreRenewId(replaceParam.getInsurancePreId()); autoParam.setInsurancePreRenewId(replaceParam.getInsurancePreRenewId());
autoParam.setCustomerUserName(replaceParam.getCustomerUserName()); autoParam.setCustomerUserName(replaceParam.getCustomerUserName());
autoParam.setIsExit(replaceParam.getIsExit()); autoParam.setIsExit(replaceParam.getIsExit());
autoParam.setDeptName(replaceParam.getDeptName()); autoParam.setDeptName(replaceParam.getDeptName());
......
...@@ -265,7 +265,15 @@ ...@@ -265,7 +265,15 @@
<where> <where>
b.EXPIRE_IGNORE_FLAG = '1' and b.DELETE_FLAG=0 and a.is_leave = '0' and b.IS_OVERDUE = 0 b.EXPIRE_IGNORE_FLAG = '1' and b.DELETE_FLAG=0 and a.is_leave = '0' and b.IS_OVERDUE = 0
AND a.process_status in ('1','2','5') AND a.process_status in ('1','2','5')
<include refid="tInsurancePreRenewDetail_where"/> <if test="idList != null and idList.size() > 0">
and a.id in
<foreach collection="idList" item="param" index="index" open="(" close=")" separator=",">
#{param}
</foreach>
</if>
<if test="idList == null or idList.size() == 0">
and a.id = '-1'
</if>
</where> </where>
order by b.POLICY_END asc,b.id asc order by b.POLICY_END asc,b.id asc
</select> </select>
......
...@@ -500,6 +500,21 @@ ...@@ -500,6 +500,21 @@
</if> </if>
</select> </select>
<select id="selectInsuranceAlertListBySure" resultMap="BaseResultMap">
SELECT
b.ID,
b.process_status
FROM t_insurance_alert a
JOIN t_insurance_pre_renew_detail b ON a.INSURANCES_PRE_RENEW_DETAIL_ID = b.ID
where a.EXPIRE_IGNORE_FLAG = '1' and a.DELETE_FLAG=0 and b.is_leave = '0' and a.IS_OVERDUE = 0
<if test="idList != null">
AND b.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
</select>
<select id="selectInsuranceAlertOne" resultMap="BaseResultMap"> <select id="selectInsuranceAlertOne" resultMap="BaseResultMap">
SELECT SELECT
a.ID, a.ID,
......
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