Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:新增订单入口 新增 批增 替换 减员 导入接口"

See merge request fangxinjiang/yifu!207

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -1009,6 +1009,11 @@ public class InsurancesConstants {
 	 */
 	public static final String SETTLE_THREE = "无需结算";
 
+	/**
+	 * 订单编号不能为空
+	 */
+	public static final String ORDER_NO_IS_EMPTY = "订单编号不能为空";
+
 
 
 

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

@@ -22,6 +22,12 @@ public class InsuranceListParam implements Serializable {
 	@Schema(description = "项目编码")
 	private String deptNo;
 
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
 	/**
 	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
 	 */

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

@@ -104,6 +104,12 @@ public class InsuranceListVO implements Serializable {
 	@Schema(description = "创建人(派单人)")
 	private String createName;
 
+	/**
+	 * 创建人部门名称
+	 */
+	@Schema(description = "创建人部门名称(派单人)")
+	private String createUserDeptName;
+
 	/**
 	 * 创建者
 	 */

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -118,8 +118,8 @@ public class TInsuranceDetailController {
 	 */
 	@Operation(summary = "投保新增", description = "投保新增")
 	@PostMapping("/addInsurance")
-	public R<List<InsuranceAddParam>> addInsurance(@RequestBody InsuranceListOrderParam paramList ){
-		return tInsuranceDetailService.addInsurance(paramList);
+	public R<List<InsuranceAddParam>> addInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceAddParam> paramList){
+		return tInsuranceDetailService.addInsurance(paramList,null);
 	}
 
 	/**
@@ -131,8 +131,8 @@ public class TInsuranceDetailController {
 	 */
 	@Operation(summary = "投保批增", description = "投保批增")
 	@PostMapping("/batchInsurance")
-	public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody InsuranceOrderBatchParam paramList){
-		return tInsuranceDetailService.batchInsurance(paramList);
+	public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceBatchParam> paramList){
+		return tInsuranceDetailService.batchInsurance(paramList,null);
 	}
 
 	/**
@@ -144,8 +144,8 @@ public class TInsuranceDetailController {
 	 */
 	@Operation(summary = "投保替换", description = "投保替换")
 	@PostMapping("/replaceInsurance")
-	public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody InsuranceOrderReplaceParam paramList){
-		return tInsuranceDetailService.replaceInsurance(paramList);
+	public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceReplaceParam> paramList){
+		return tInsuranceDetailService.replaceInsurance(paramList,null);
 	}
 
 	/**
@@ -280,15 +280,15 @@ public class TInsuranceDetailController {
 	}
 	/***********************减员办理********************************/
 	/**
-	 * 导入减员
-	 * @param param 导入减员校验
+	 * 导入减员校验
+	 * @param insuranceRefundCheckList 导入减员校验
 	 * @author zhaji
 	 * @date 2022-07-19
 	 * @since v1.0
 	 */
 	@PostMapping("/saveInsuranceRefund")
-	public R saveInsuranceRefund(@RequestBody InsuranceOrderRefundParam param){
-		return tInsuranceDetailService.saveInsuranceRefund(param);
+	public R saveInsuranceRefund(@RequestBody @Valid @Size(min = 1,message = "导入减员列表不能为空") List<InsuranceRefundCheck> insuranceRefundCheckList){
+		return tInsuranceDetailService.saveInsuranceRefund(insuranceRefundCheckList,null);
 	}
 
 	/**
@@ -524,4 +524,57 @@ public class TInsuranceDetailController {
 	public R<IPage<InsuranceListByIdCardVo>> getInsuranceListByIdCard(Page page, String idCard,String deptNo) {
 		return new R<>(tInsuranceDetailService.getInsuranceListByIdCard(page, idCard,deptNo));
 	}
+
+	/**
+	 * 商险新增
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceAddParam>>}
+	 */
+	@Operation(summary = "投保新增", description = "投保新增")
+	@PostMapping("/addOrderInsurance")
+	public R<List<InsuranceAddParam>> addOrderInsurance(@RequestBody InsuranceListOrderParam paramList ){
+		return tInsuranceDetailService.addOrderInsurance(paramList);
+	}
+
+	/**
+	 * 商险批增
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceBatchParam>>}
+	 */
+	@Operation(summary = "投保批增", description = "投保批增")
+	@PostMapping("/batchOrderInsurance")
+	public R<List<InsuranceBatchParam>> batchOrderInsurance(@RequestBody InsuranceOrderBatchParam paramList){
+		return tInsuranceDetailService.batchOrderInsurance(paramList);
+	}
+
+	/**
+	 * 商险替换
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceReplaceParam>>}
+	 */
+	@Operation(summary = "投保替换", description = "投保替换")
+	@PostMapping("/replaceOrderInsurance")
+	public R<List<InsuranceReplaceParam>> replaceOrderInsurance(@RequestBody InsuranceOrderReplaceParam paramList){
+		return tInsuranceDetailService.replaceOrderInsurance(paramList);
+	}
+
+	/**
+	 * 导入减员校验
+	 * @param paramList 导入减员校验
+	 * @author zhaji
+	 * @date 2022-07-19
+	 * @since v1.0
+	 */
+	@PostMapping("/refundOrderInsurance")
+	public R refundOrderInsurance(@RequestBody InsuranceOrderRefundParam paramList){
+		return tInsuranceDetailService.refundOrderInsurance(paramList);
+	}
+
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

@@ -197,7 +197,22 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, @Param("idCard") String idCard, @Param("deptNo")String deptNo);
 
+	/**
+	 * 查询所有在保，未出险，未过期，未失效，未减员的保单信息
+	 *
+	 * @author zhaji
+	 * @param empIdcardNo
+	 * @return {@link List< TInsuranceDetail>}
+	 */
 	List<TInsuranceDetail> selectListByempIdcardNo(String empIdcardNo);
 
+	/**
+	 * 	查数据是否存在权限范围内
+	 *
+	 * @author zhaji
+	 * @param regionSQL
+	 * @param id
+	 * @return {@link TInsuranceDetail}
+	 */
 	TInsuranceDetail selectByregionSQL(@Param("regionSql") String regionSQL,@Param("id") String id);
 }

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

@@ -75,7 +75,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceAddParam>>}
 	 */
-	R<List<InsuranceAddParam>> addInsurance(InsuranceListOrderParam paramList);
+	R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo);
 
 	/**
 	 * 商险批增
@@ -84,7 +84,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceBatchParam>>}
 	 */
-	R<List<InsuranceBatchParam>> batchInsurance(InsuranceOrderBatchParam paramList);
+	R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo);
 	/**
 	 * 商险替换
 	 *
@@ -92,7 +92,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceReplaceParam>>}
 	 */
-	R<List<InsuranceReplaceParam>> replaceInsurance(InsuranceOrderReplaceParam paramList);
+	R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo);
 
 	/**
 	 * 通过id删除
@@ -184,10 +184,10 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * 减员导入
 	 *
 	 * @author zhaji
-	 * @param param 减员表
+	 * @param insuranceRefundCheckList 减员表
 	 * @return {@link R}
 	 */
-	R saveInsuranceRefund(InsuranceOrderRefundParam param);
+	R saveInsuranceRefund(List<InsuranceRefundCheck> insuranceRefundCheckList,String orderNo);
 
 	/**
 	 * 已投保列表分页查询
@@ -354,4 +354,33 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @return {@link R}
 	 */
 	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard,String deptNo);
+
+	/**
+	 * 新增订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceReplaceParam>>}
+	 */
+	R<List<InsuranceAddParam>> addOrderInsurance(InsuranceListOrderParam paramList);
+
+	/**
+	 * 批增订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceBatchParam>>}
+	 */
+	R<List<InsuranceBatchParam>> batchOrderInsurance(InsuranceOrderBatchParam paramList);
+
+	/**
+	 * 替换订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceReplaceParam>>}
+	 */
+	R<List<InsuranceReplaceParam>> replaceOrderInsurance(InsuranceOrderReplaceParam paramList);
+
+	R refundOrderInsurance(InsuranceOrderRefundParam paramList);
 }

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

@@ -267,15 +267,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 */
 	@Override
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
-	public R<List<InsuranceAddParam>> addInsurance(InsuranceListOrderParam paramList) {
-		if (CollectionUtils.isEmpty(paramList.getData())){
+	public R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo) {
+		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList.getData(),user);
+		Map<String, List<InsuranceAddParam>> map = addInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceAddParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -286,7 +286,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				TInsuranceDetail detail = new TInsuranceDetail();
 				BeanCopyUtils.copyProperties(success,detail);
 				//购买类型，默认为「新增」
-				detail.setOrderNo(paramList.getOrderNo());
+				detail.setOrderNo(orderNo);
 				detail.setBuyType(CommonConstants.ONE_INT);
 				detail.setCreateUserDeptId(user.getDeptId().toString());
 				detail.setCreateUserDeptName(user.getDeptName());
@@ -317,15 +317,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 */
 	@Override
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
-	public R<List<InsuranceBatchParam>> batchInsurance(InsuranceOrderBatchParam paramList) {
-		if (CollectionUtils.isEmpty(paramList.getData())){
+	public R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo) {
+		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList.getData(),user);
+		Map<String, List<InsuranceBatchParam>> map = batchInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceBatchParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -340,7 +340,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				//投保状态：待投保
 				detail.setBuyHandleStatus(CommonConstants.ONE_INT);
 				//保费都默认是0
-				detail.setOrderNo(paramList.getOrderNo());
+				detail.setOrderNo(orderNo);
 				detail.setCreateUserDeptId(user.getDeptId().toString());
 				detail.setCreateUserDeptName(user.getDeptName());
 				detail.setActualPremium(new BigDecimal("0.00"));
@@ -365,15 +365,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 */
 	@Override
 	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
-	public R<List<InsuranceReplaceParam>> replaceInsurance(InsuranceOrderReplaceParam paramList) {
-		if (CollectionUtils.isEmpty(paramList.getData())){
+	public R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo) {
+		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
 		}
 		YifuUser user = SecurityUtils.getUser();
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
-		Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList.getData(),user);
+		Map<String, List<InsuranceReplaceParam>> map = replaceInsuranceCheck(paramList,user);
 		//返回给前端的结果
 		List<InsuranceReplaceParam> listResult = map.get("listResult");
 		//保存到数据库中的结果
@@ -403,7 +403,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				this.updateById(detail);
 				//新数据置为待办理
 				newDetail.setId(null);
-				newDetail.setOrderNo(paramList.getOrderNo());
+				newDetail.setOrderNo(orderNo);
 				newDetail.setBuyHandleStatus(CommonConstants.ONE_INT);
 				newDetail.setBuyType(CommonConstants.FOUR_INT);
 				newDetail.setEmpName(success.getReplaceEmpName());
@@ -2887,16 +2887,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * 减员导入
 	 *
 	 * @author zhaji
-	 * @param param 减员表
+	 * @param insuranceRefundCheckList 减员表
 	 * @return {@link R}
 	 */
 	@Override
-	public R saveInsuranceRefund(InsuranceOrderRefundParam param) {
+	public R saveInsuranceRefund(List<InsuranceRefundCheck> insuranceRefundCheckList,String orderNo) {
 		YifuUser user = SecurityUtils.getUser();
-		if(!Common.isNotEmpty(param.getData())){
+		if(!Common.isNotEmpty(insuranceRefundCheckList)){
 			return R.failed("当前导入的减员信息为空");
 		}
-		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(param.getData(),user);
+		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(insuranceRefundCheckList,user);
 		List<InsuranceRefundCheck> successList = refundMap.get("successList");
 		List<TInsuranceOperate> operateList = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(successList)){
@@ -2910,7 +2910,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				insuranceRefund.setCreateTime(LocalDateTime.now());
 				insuranceRefund.setUpdateTime(LocalDateTime.now());
 				insuranceRefund.setUpdateBy(user.getId());
-				insuranceRefund.setOrderNo(param.getOrderNo());
+				insuranceRefund.setOrderNo(orderNo);
 				insuranceRefund.setCreateUserDeptId(user.getDeptId().toString());
 				insuranceRefund.setCreateUserDeptName(user.getDeptName());
 				if(StringUtils.isNotBlank(refund.getRemark())){
@@ -5162,6 +5162,42 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 
 	}
 
+	@Override
+	public R<List<InsuranceAddParam>> addOrderInsurance(InsuranceListOrderParam paramList) {
+		String orderNo = paramList.getOrderNo();
+		if (StringUtils.isBlank(orderNo)) {
+			return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
+		}
+		return addInsurance(paramList.getData(),paramList.getOrderNo());
+	}
+
+	@Override
+	public R<List<InsuranceBatchParam>> batchOrderInsurance(InsuranceOrderBatchParam paramList) {
+		String orderNo = paramList.getOrderNo();
+		if (StringUtils.isBlank(orderNo)) {
+			return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
+		}
+		return batchInsurance(paramList.getData(),paramList.getOrderNo());
+	}
+
+	@Override
+	public R<List<InsuranceReplaceParam>> replaceOrderInsurance(InsuranceOrderReplaceParam paramList) {
+		String orderNo = paramList.getOrderNo();
+		if (StringUtils.isBlank(orderNo)) {
+			return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
+		}
+		return replaceInsurance(paramList.getData(),paramList.getOrderNo());
+	}
+
+	@Override
+	public R refundOrderInsurance(InsuranceOrderRefundParam paramList) {
+		String orderNo = paramList.getOrderNo();
+		if (StringUtils.isBlank(orderNo)) {
+			return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
+		}
+		return saveInsuranceRefund(paramList.getData(),paramList.getOrderNo());
+	}
+
 	/**
 	 * 获取项目权限
 	 *

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

@@ -90,12 +90,16 @@
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,
+		detail.CREATE_USER_DEPT_NAME as createUserDeptName,
 		detail.SETTLE_MONTH as settleMonth
 		from t_insurance_detail detail
 		where detail.DELETE_FLAG = 0
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
+		<if test="param.orderNo != null and param.orderNo.trim() != ''">
+			and detail.DEPT_NO = #{param.orderNo}
+		</if>
 		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">