Skip to content

Y
yifu-mvp
Commit caf18b91 authored by 李灿灿's avatar 李灿灿
Browse files
Options

Merge branch 'feature-licancan' into 'develop' 

商险操作记录调整

See merge request fangxinjiang/yifu!184
parents 818acaa0 81c4eeff
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 26 deletions
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @ caf18b91
......@@ -10,7 +10,7 @@ public class InsurancesConstants {
/**
* 新增
*/
public static final String ADD = "新增";
public static final String ADD = "”新增“提交申请";
/**
* 离职
*/
......@@ -18,11 +18,11 @@ public class InsurancesConstants {
/**
* 批增
*/
public static final String BATCH = "批增";
public static final String BATCH = "”批增“提交申请";
/**
* 替换
*/
public static final String REPLACE = "替换";
public static final String REPLACE = "“替换”提交申请";
/**
* 删除
*/
......@@ -38,15 +38,15 @@ public class InsurancesConstants {
/**
* 投保导出办理
*/
public static final String EXPORT = "投保导出办理";
public static final String EXPORT = "投保中";
/**
* 投保退回
*/
public static final String ROLLBACK = "投保退回";
/**
* 投保办理成功
* 投保成功
*/
public static final String SUCCESSFUL = "投保办理成功";
public static final String SUCCESSFUL = "投保成功";
/**
* 登记保单保费
*/
......@@ -701,23 +701,23 @@ public class InsurancesConstants {
/**
* 导入减员数据
*/
public static final String INSURANCE_REFUND_IMPORT = "减员提交申请";
public static final String INSURANCE_REFUND_IMPORT = "“减员”提交申请";
/**
* 减员导出办理
*/
public static final String INSURANCE_REFUND_EXPORT = "减员办理中";
public static final String INSURANCE_REFUND_EXPORT = "减员中";
/**
* 减员办理成功
* 减员成功
*/
public static final String INSURANCE_REFUND_SUCCESS = "减员办理成功";
public static final String INSURANCE_REFUND_SUCCESS = "减员成功";
/**
* 减员退回成功
* 减员退回
*/
public static final String INSURANCE_REFUND_FAILED = "减员办理退回";
public static final String INSURANCE_REFUND_FAILED = "减员退回";
/**
* 变更所属项目
......
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceOperate.java
View file @ caf18b91
......@@ -42,6 +42,12 @@ public class TInsuranceOperate implements Serializable {
@Schema(description = "备注(审核意见)")
private String remark;
/**
* 是否显示 0不显示/1显示
*/
@Schema(description = "是否显示 0不显示/1显示")
private Integer displayFlag;
/**
* 创建者
*/
......
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @ caf18b91
......@@ -299,7 +299,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
this.saveBatch(detailList);
}
//操作记录
addOperate(detailList,user,InsurancesConstants.ADD,null);
addOperate(detailList,user,InsurancesConstants.ADD,null,CommonConstants.ONE_INT);
return R.ok(listResult,InsurancesConstants.ADD_SUCCESS);
}
......@@ -344,7 +344,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
this.saveBatch(detailList);
}
//操作记录
addOperate(detailList,user,InsurancesConstants.BATCH,null);
addOperate(detailList,user,InsurancesConstants.BATCH,null,CommonConstants.ONE_INT);
return R.ok(listResult,InsurancesConstants.BATCH_SUCCESS);
}
......@@ -444,7 +444,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//操作记录
addOperate(detailList,user,InsurancesConstants.REPLACE,null);
addOperate(detailList,user,InsurancesConstants.REPLACE,null,CommonConstants.ONE_INT);
return R.ok(listResult,InsurancesConstants.REPLACE_SUCCESS);
}
......@@ -476,7 +476,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
byId.setDeleteFlag(CommonConstants.ONE_INT);
this.updateById(byId);
//操作记录
addOperate(Arrays.asList(byId),user,InsurancesConstants.DELETE,null);
addOperate(Arrays.asList(byId),user,InsurancesConstants.DELETE,null,CommonConstants.ONE_INT);
return R.ok(InsurancesConstants.OPERATE_SUCCESS);
}
......@@ -735,7 +735,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
return R.failed(InsurancesConstants.EDIT_NOT_ALLOW);
}
//操作记录
addOperate(Arrays.asList(byId),user,InsurancesConstants.EDIT,null);
addOperate(Arrays.asList(byId),user,getOperateDescByBuyType(byId.getBuyType()),null,CommonConstants.ONE_INT);
return R.ok(InsurancesConstants.OPERATE_SUCCESS);
}
......@@ -805,6 +805,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public List<TInsuranceOperate> getInsuranceOperateList(String id) {
List<TInsuranceOperate> list = tInsuranceOperateService.list(Wrappers.<TInsuranceOperate>query().lambda()
.eq(TInsuranceOperate::getInsuranceDetailId,id)
.eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT)
.orderByDesc(TInsuranceOperate::getCreateTime)
);
return list;
......@@ -877,7 +878,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
this.saveOrUpdateBatch(detailList);
}
//操作记录
addOperate(detailList,user,InsurancesConstants.EXPORT,null);
addOperate(detailList,user,InsurancesConstants.EXPORT,null,CommonConstants.ONE_INT);
//针对是替换类型的做处理,每一条替换数据对应一条被替换数据
List<InsuranceExportListVO> listVOS = insuranceExportList.stream().filter(e -> e.getBuyType() == CommonConstants.FOUR_INT).collect(Collectors.toList());
......@@ -1365,7 +1366,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//操作记录
addOperate(detailList,user,InsurancesConstants.REGISTERED,null);
addOperate(detailList,user,InsurancesConstants.REGISTERED,null,CommonConstants.ONE_INT);
return R.ok(listResult,InsurancesConstants.OPERATE_SUCCESS);
}
......@@ -2722,15 +2723,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param detailList 商险明细集合
* @param user 登录用户
* @param operateDesc 操作描述
* @param displayFlag 是否显示 0不显示/1显示
* @return void
*/
private void addOperate(List<TInsuranceDetail> detailList,YifuUser user,String operateDesc,String remark){
private void addOperate(List<TInsuranceDetail> detailList,YifuUser user,String operateDesc,String remark,Integer displayFlag){
if (CollectionUtils.isNotEmpty(detailList)){
try {
List<TInsuranceOperate> operateList = new ArrayList<>();
for (TInsuranceDetail detail : detailList) {
TInsuranceOperate operate = new TInsuranceOperate();
operate.setRemark(remark);
operate.setDisplayFlag(displayFlag);
operate.setInsuranceDetailId(detail.getId());
operate.setOperateDesc(operateDesc);
operate.setCreateBy(user.getId());
......@@ -2761,6 +2764,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
for (InsuranceHandleParam param : paramList) {
TInsuranceOperate operate = new TInsuranceOperate();
operate.setRemark(param.getRemark());
operate.setDisplayFlag(CommonConstants.ONE_INT);
operate.setInsuranceDetailId(param.getId());
operate.setOperateDesc(operateDesc);
operate.setCreateBy(user.getId());
......@@ -2775,6 +2779,31 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
/**
* 根据购买类型获取操作类型
*
* @author licancan
* @param buyType
* @return {@link String}
*/
private String getOperateDescByBuyType(Integer buyType){
String result;
switch (buyType){
case 1:
result = InsurancesConstants.ADD;
break;
case 3:
result = InsurancesConstants.BATCH;
break;
case 4:
result = InsurancesConstants.REPLACE;
break;
default:
result = "";
}
return result;
}
/**
* 将集合交叉合并，list1 是第一个顺序 list2 是第二个顺序
*
......@@ -2849,6 +2878,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceOperate.setCreateBy(user.getId());
insuranceOperate.setCreateName(user.getNickname());
insuranceOperate.setCreateTime(LocalDateTime.now());
insuranceOperate.setDisplayFlag(CommonConstants.ONE_INT);
insuranceOperate.setOperateDesc(InsurancesConstants.INSURANCE_REFUND_IMPORT);
operateList.add(insuranceOperate);
}
......@@ -3116,7 +3146,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
}
}
//操作记录
addOperate(detailList,user,InsurancesConstants.INSURANCE_REFUND_EXPORT,null);
addOperate(detailList,user,InsurancesConstants.INSURANCE_REFUND_EXPORT,null,CommonConstants.ONE_INT);
}
return R.ok(refundExportList);
}
......@@ -3192,9 +3222,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
updateBatchById(successList);
//操作记录
if(CommonConstants.FOUR_INT == refundType){
addOperate(successList,user,InsurancesConstants.INSURANCE_REFUND_SUCCESS,remark);
addOperate(successList,user,InsurancesConstants.INSURANCE_REFUND_SUCCESS,remark,CommonConstants.ONE_INT);
}else{
addOperate(successList,user,InsurancesConstants.INSURANCE_REFUND_FAILED,remark);
addOperate(successList,user,InsurancesConstants.INSURANCE_REFUND_FAILED,remark,CommonConstants.ONE_INT);
}
return R.ok(errorList,InsurancesConstants.OPERATE_SUCCESS);
}
......@@ -3240,13 +3270,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
tInsuranceRefundService.update(refund);
operate.setInsuranceDetailId(param.getId());
operate.setRemark(param.getRemark());
operate.setDisplayFlag(CommonConstants.ONE_INT);
operate.setCreateName(user.getNickname());
operate.setCreateTime(LocalDateTime.now());
operate.setCreateBy(user.getId());
if(InsurancesConstants.SUCCESS.equals(param.getHandType())){
operate.setOperateDesc("减员成功");
operate.setOperateDesc(InsurancesConstants.INSURANCE_REFUND_SUCCESS);
}else{
operate.setOperateDesc("减员退回");
operate.setOperateDesc(InsurancesConstants.INSURANCE_REFUND_FAILED);
}
}
}
......@@ -3289,6 +3320,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceOperate.setCreateName(user.getNickname());
insuranceOperate.setCreateTime(LocalDateTime.now());
insuranceOperate.setOperateDesc(InsurancesConstants.MONTH_CHANGE);
insuranceOperate.setDisplayFlag(CommonConstants.ZERO_INT);
tInsuranceOperateService.save(insuranceOperate);
TInsuranceDetail byId = getById(settleMonthChangeCheckParam.getId());
String defaultSettleId = byId.getDefaultSettleId();
......@@ -3312,6 +3344,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceOperate.setCreateName(user.getNickname());
insuranceOperate.setCreateTime(LocalDateTime.now());
insuranceOperate.setOperateDesc(InsurancesConstants.MONTH_CHANGE);
insuranceOperate.setDisplayFlag(CommonConstants.ZERO_INT);
tInsuranceOperateService.save(insuranceOperate);
} else {
for (SettleMonthChangeCheckParam success : successList) {
......@@ -3696,6 +3729,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceOperate.setCreateBy(user.getId());
insuranceOperate.setCreateName(user.getNickname());
insuranceOperate.setCreateTime(LocalDateTime.now());
insuranceOperate.setDisplayFlag(CommonConstants.ZERO_INT);
insuranceOperate.setOperateDesc(InsurancesConstants.DEPT_CHANGE);
operateList.add(insuranceOperate);
}
......@@ -4305,7 +4339,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
errorList.add(param);
continue;
}
if(StringUtils.isNotBlank(remark) && ValidityUtil.validate50(remark)){
if(StringUtils.isNotBlank(remark) && !ValidityUtil.validate50(remark)){
param.setErrorMessage(InsurancesConstants.HAND_REMARK_NOT_MORE_THAN_50);
errorList.add(param);
continue;
......
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml
View file @ caf18b91
......@@ -9,6 +9,7 @@
<result property="insuranceDetailId" column="INSURANCE_DETAIL_ID" jdbcType="VARCHAR"/>
<result property="operateDesc" column="OPERATE_DESC" jdbcType="VARCHAR"/>
<result property="remark" column="REMARK" jdbcType="VARCHAR"/>
<result property="displayFlag" column="DISPLAY_FLAG" jdbcType="TINYINT"/>
<result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
<result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
......
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