Merge remote-tracking branch 'origin/develop' into develop

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

@@ -139,4 +139,13 @@ public class InsuranceListVO implements Serializable {
 	 */
 	@Schema(description = "错误信息")
 	private String errorMessage;
+
+	/**
+	 * 审批意见
+	 */
+	@Schema(description = "审批意见")
+	private String remark;
+
+	@Schema(description = "退回原因")
+	private String backRemark;
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -187,4 +191,9 @@ public class InsuranceRefundListVo implements Serializable {
 	 */
 	@Schema(description = "封面抬头")
 	private String invoiceTitle;
+
+	@Schema(description = "派单人")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单人")
+	private String createName;
 }

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

@@ -233,5 +233,11 @@ public class InsuredListVo implements Serializable {
 	@Schema(description = "创建人所在部门名称")
 	private String createUserDeptName;
 
+	/**
+	 * 封面抬头
+	 */
+	@Schema(description = "封面抬头")
+	private String invoiceTitle;
+
 
 }

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

@@ -234,6 +234,19 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			insuranceList.stream().forEach(e ->{
 				e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
 			});
+			for (InsuranceListVO listVO : insuranceList) {
+				if (CommonConstants.FOUR_INT == listVO.getBuyHandleStatus()) {
+					TInsuranceOperate tInsuranceOperate = tInsuranceOperateService.getOne(Wrappers.<TInsuranceOperate>query().lambda()
+							.eq(TInsuranceOperate::getInsuranceDetailId,listVO.getId())
+							.eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT)
+							.orderByDesc(TInsuranceOperate::getCreateTime)
+							.last(CommonConstants.LAST_ONE_SQL)
+					);
+					if (Common.isNotNull(tInsuranceOperate)) {
+						listVO.setRemark(tInsuranceOperate.getRemark());
+					}
+				}
+			}
 		}
 		return R.ok(insuranceList);
 	}
@@ -843,7 +856,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				ProjectSetInfoVo jsonObject = data.get(insuranceDetailVO.getDeptNo());
 				if (null != jsonObject){
-					insuranceDetailVO.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 					insuranceDetailVO.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 				}
 			}
@@ -914,7 +926,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}
@@ -974,6 +985,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							vo.setBuyDay(LocalDateUtil.betweenDay(vo.getPolicyStart().toString(),vo.getPolicyEnd().toString()));
 							vo.setRemark(InsurancesConstants.QUIT);
 							vo.setBuyType(CommonConstants.FOUR_INT);
+							vo.setProjectName(vo.getProjectName());
 							list.add(vo);
 						}
 					}
@@ -989,7 +1001,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								for (InsuranceExportListVO record : list) {
 									ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 									if (null != jsonObject) {
-										record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 										record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 									}
 								}
@@ -1023,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<>();
 
@@ -1082,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);
 				}
 			}
@@ -3351,23 +3370,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		insuranceList = this.baseMapper.getInsuredListPage(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceList.getRecords().stream().map(InsuredListVo::getDeptNo).distinct().collect(Collectors.toList());
-			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-				Map<String, ProjectSetInfoVo>  data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 			for (InsuredListVo record : insuranceList.getRecords()) {
 				//购买月数
 				record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
-					if (data != null) {
-						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 			}
 		}
-				}
-			}
-
-		}
 		return insuranceList;
 	}
 
@@ -3401,7 +3408,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 						if (data != null) {
 							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
+								record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 							}
 						}
 					}
@@ -3434,26 +3441,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		IPage<InsuranceRefundListVo> insuranceRefundPageList = this.baseMapper.getInsuranceRefundPageList(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundPageList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceRefundPageList.getRecords().stream().map(InsuranceRefundListVo::getDeptNo).distinct().collect(Collectors.toList());
 			try {
-				R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-				if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-					Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				for (InsuranceRefundListVo record : insuranceRefundPageList.getRecords()) {
 					//购买月数
 					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
-						if (data != null) {
-							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
-							}
-						}
-					}
 				}
 			}catch (Exception e){
 				log.error(InsurancesConstants.GET_DEPT_DETAIL_ERROR+e);
 			}
-
 		}
 		return R.ok(insuranceRefundPageList);
 	}
@@ -3486,7 +3481,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}
@@ -3521,22 +3515,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		IPage<RefundExportListVo> insuranceRefundHandlingPageList = this.baseMapper.getInsuranceRefundHandlingPageList(page, param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundHandlingPageList.getRecords())){
 			//根据项目编码获取项目名称
-			List<String> collect = insuranceRefundHandlingPageList.getRecords().stream().map(RefundExportListVo::getDeptNo).distinct().collect(Collectors.toList());
-			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
-			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
-				if (data != null) {
 			for (RefundExportListVo record : insuranceRefundHandlingPageList.getRecords()) {
 				//购买月数
 				record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(), record.getPolicyEnd().toString()));
-						if (data != null) {
-							ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
-							if (null != jsonObject) {
-								record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
-							}
-						}
-					}
-				}
 			}
 		}
 
@@ -3585,7 +3566,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (data != null) {
 						ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 						if (null != jsonObject) {
-							record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 							record.setInvoiceTitle(Optional.ofNullable(jsonObject.getInvoiceTitleInsurance()).orElse(""));
 						}
 					}

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}
@@ -291,6 +292,7 @@
 		a.EMP_IDCARD_NO as empIdcardNo,
 		a.BUY_TYPE as buyType,
 		a.DEPT_NO as deptNo,
+		a.DEPT_NAME as projectName,
 		a.POST as post,
 		a.POLICY_START as policyStart,
 		a.POLICY_END as policyEnd,
@@ -335,6 +337,7 @@
 	<select id="getInsuranceExportListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select a.id as id,
 		a.DEPT_NO as deptNo,
+		a.DEPT_NAME as projectName,
 		a.EMP_NAME as empName,
 		a.EMP_IDCARD_NO as empIdcardNo,
 		a.BUY_TYPE as buyType,
@@ -367,6 +370,7 @@
 	<select id="getInsuranceExportList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select a.id as id,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.EMP_NAME as empName,
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,
@@ -442,6 +446,7 @@
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.POST as post,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
@@ -519,6 +524,7 @@
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.POST as post,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
@@ -607,10 +613,12 @@
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.POST as post,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			a.POLICY_START as policyStart,
 			a.POLICY_END as policyEnd,
 			a.POLICY_NO as policyNo,
+			a.CREATE_NAME as createName,
 			refund.CREATE_USER_DEPT_NAME as createUserDeptName,
 			refund.CREATE_TIME as refundCreateTime
 		from
@@ -625,6 +633,9 @@
 			a.REFUND_ID = refund.ID
 		and
 			a.REDUCE_HANDLE_STATUS = 4
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -664,6 +675,7 @@
 		select
 			a.id as id,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.EMP_NAME as empName,
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,
@@ -679,6 +691,7 @@
 			a.BUY_STANDARD as buyStandard,
 			a.MEDICAL_QUOTA as medicalQuota,
 			a.DIE_DISABLE_QUOTA as dieDisableQuota,
+			a.CREATE_NAME as createName,
 			refund.CREATE_TIME as refundCreateTime
 		from
 			(t_insurance_detail a,
@@ -692,6 +705,9 @@
 			a.DELETE_FLAG = 0
 		and
 			a.REDUCE_HANDLE_STATUS = 4
+		<if test="param.createName != null and param.createName.trim() != ''">
+			and a.CREATE_NAME like concat('%',replace(replace(#{param.createName},'_','\_'),'%','\%'),'%')
+		</if>
 		<if test="param.empName != null and param.empName.trim() != ''">
 			and a.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
 		</if>
@@ -735,6 +751,7 @@
 		a.EMP_IDCARD_NO as empIdcardNo,
 		a.BUY_TYPE as buyType,
 		a.DEPT_NO as deptNo,
+		a.DEPT_NAME as projectName,
 		a.POST as post,
 		a.INSURANCE_PROVINCE_NAME as insuranceProvinceName,
 		a.INSURANCE_CITY_NAME as insuranceCityName,
@@ -841,6 +858,7 @@
 		select
 			a.id as id,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.EMP_NAME as empName,
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,
@@ -875,6 +893,7 @@
 		select
 		    a.id as id,
 			a.DEPT_NO as deptNo,
+			a.DEPT_NAME as projectName,
 			a.EMP_NAME as empName,
 			a.EMP_IDCARD_NO as empIdcardNo,
 			a.BUY_TYPE as buyType,