商险加-退回原因

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -334,5 +334,8 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description ="客户编码")
 	private String unitNo;
 
+	@Schema(description = "退回原因")
+	private String backRemark;
+
 	private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

@@ -145,4 +145,7 @@ public class InsuranceListVO implements Serializable {
 	 */
 	@Schema(description = "审批意见")
 	private String remark;
+
+	@Schema(description = "退回原因")
+	private String backRemark;
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -1034,7 +1034,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<InsuranceListVO>> rollBackInsurance(YifuUser user, List<InsuranceHandleParam> paramList) {
 		//解析参数里的商险id
-		List<String> idList = paramList.stream().map(e -> e.getId()).distinct().collect(Collectors.toList());
+		List<String> idList = new ArrayList<>();
+		Map<String,String> remarkMap = new HashMap<>();
+		if (paramList != null) {
+			for (InsuranceHandleParam param : paramList) {
+				idList.add(param.getId());
+				remarkMap.put(param.getId(), param.getRemark());
+			}
+		}
 		//操作日志对象
 		List<InsuranceHandleParam> operateList = new ArrayList<>();
 
@@ -1093,6 +1100,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					}
 					detail.setUpdateBy(user.getId());
 					detail.setUpdateTime(LocalDateTime.now());
+					detail.setBackRemark(remarkMap.get(detail.getId()));
 					successList.add(detail);
 				}
 			}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -170,7 +170,8 @@
 		a.SETTLE_TYPE as settleType,
 		a.SETTLE_MONTH as settleMonth,
 		a.DEPT_NAME as projectName,
-		a.REDUCE_HANDLE_STATUS as reduceHandleStatus
+		a.REDUCE_HANDLE_STATUS as reduceHandleStatus,
+		if(a.BUY_HANDLE_STATUS=4,a.BACK_REMARK,'') as backRemark
 		from t_insurance_detail a
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			left join t_insurance_area_res p on p.USER_ID = #{param.createBy}