Merge branch 'feature-licancan' into 'develop'

替换结算方式

See merge request fangxinjiang/yifu!98

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

@@ -92,10 +92,18 @@ public class InsurancesConstants {
 	 * 项目编码不存在
 	 */
 	public static final String DEPT_NO_IS_NOT_EXIST = "项目编码不存在";
+	/**
+	 * 替换员工项目不存在
+	 */
+	public static final String REPLACE_DEPT_NO_IS_NOT_EXIST = "替换员工项目不存在";
 	/**
 	 * 未找到项目的结算方式
 	 */
 	public static final String PROJECT_NOT_FIND_SETTLE_TYPE = "未找到项目的结算方式";
+	/**
+	 * 根据替换员工的项目，未找到项目的结算方式
+	 */
+	public static final String REPLACE_PROJECT_NOT_FIND_SETTLE_TYPE = "根据替换员工的项目，未找到项目的结算方式";
 	/**
 	 * 替换员工投保记录已存在
 	 */

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

@@ -599,11 +599,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					one.setReplaceStatus(CommonConstants.ONE_INT);
 					tInsuranceReplaceService.updateById(one);
 
-					//替换状态下目前只能编辑姓名、身份证号
+					//替换状态下目前只能编辑姓名、身份证、岗位
 					//投保状态：待投保
 					byId.setBuyHandleStatus(CommonConstants.ONE_INT);
 					byId.setEmpName(param.getEmpName());
 					byId.setEmpIdcardNo(param.getEmpIdcardNo());
+					byId.setPost(param.getPost());
 					byId.setUpdateBy(user.getId());
 					byId.setUpdateTime(LocalDateTime.now());
 					this.updateById(byId);
@@ -1896,24 +1897,24 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 			//根据项目编码查询项目是否存在
-			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getDeptNo()));
+			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(param.getReplaceDeptNo()));
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				if (MapUtils.isEmpty(data)){
-					param.setErrorMessage(InsurancesConstants.DEPT_NO_IS_NOT_EXIST);
+					param.setErrorMessage(InsurancesConstants.REPLACE_DEPT_NO_IS_NOT_EXIST);
 					listResult.add(param);
 					continue;
 				}else {
-					ProjectSetInfoVo projectSetInfoVo = data.get(param.getDeptNo());
+					ProjectSetInfoVo projectSetInfoVo = data.get(param.getReplaceDeptNo());
 					if (null == projectSetInfoVo){
-						param.setErrorMessage(InsurancesConstants.DEPT_NO_IS_NOT_EXIST);
+						param.setErrorMessage(InsurancesConstants.REPLACE_DEPT_NO_IS_NOT_EXIST);
 						listResult.add(param);
 						continue;
 					}else {
 						//结算类型，根据项目编码获取，并冗余到明细记录中
 						String settleType = projectSetInfoVo.getInsuranceSettleType();
 						if (StringUtils.isEmpty(settleType)){
-							param.setErrorMessage(InsurancesConstants.PROJECT_NOT_FIND_SETTLE_TYPE);
+							param.setErrorMessage(InsurancesConstants.REPLACE_PROJECT_NOT_FIND_SETTLE_TYPE);
 							listResult.add(param);
 							continue;
 						}else {