Commit c0641660 authored by hongguangwu's avatar hongguangwu

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

parents 81f6ef12 c9338d95
...@@ -126,6 +126,10 @@ public interface CommonConstants { ...@@ -126,6 +126,10 @@ public interface CommonConstants {
String FIVE_STRING = "5"; String FIVE_STRING = "5";
String TWELVE_STRING = "12";
String THIRTEEN_STRING = "13";
/** /**
* number 0 * number 0
*/ */
......
...@@ -542,6 +542,21 @@ public class InsurancesConstants { ...@@ -542,6 +542,21 @@ public class InsurancesConstants {
*/ */
public static final String DEPT_NO_CHANGE_NOT_EMPTY = "替换项目编码不能为空"; public static final String DEPT_NO_CHANGE_NOT_EMPTY = "替换项目编码不能为空";
/**
* 无替换项目的操作权限
*/
public static final String NEW_DEPT_NO_NOT_IN_DEPT_LIST = "无替换项目的操作权限";
/**
* 无被替换项目的操作权限
*/
public static final String OLD_DEPT_NO_NOT_IN_DEPT_LIST = "无被替换项目的操作权限";
/**
* 无该项目的操作权限
*/
public static final String DEPT_NO_NOT_IN_USER_DEPT_LIST = "无该项目的操作权限";
/** /**
* 替换项目不存在 * 替换项目不存在
*/ */
...@@ -587,6 +602,11 @@ public class InsurancesConstants { ...@@ -587,6 +602,11 @@ public class InsurancesConstants {
*/ */
public static final String USER_DATA_IS_NOT_EXIST = "员工投保记录不存在"; public static final String USER_DATA_IS_NOT_EXIST = "员工投保记录不存在";
/**
* 无该投保记录的操作权限
*/
public static final String DEPT_NO_NOT_IN_DEPT_LIST = "无该投保记录的操作权限";
/** /**
* 存在多条在保记录 * 存在多条在保记录
*/ */
...@@ -752,11 +772,4 @@ public class InsurancesConstants { ...@@ -752,11 +772,4 @@ public class InsurancesConstants {
public static final String NOT_CREATE_USER_DELETE_ERROR = "非创建人无法删除保单信息"; public static final String NOT_CREATE_USER_DELETE_ERROR = "非创建人无法删除保单信息";
/**
* 非创建人无法进行出险
*/
public static final String NOT_CREATE_USER_UPDATE_IS_USE_ERROR = "非创建人无法进行出险";
} }
...@@ -71,24 +71,51 @@ public class TInsuranceDetailController { ...@@ -71,24 +71,51 @@ public class TInsuranceDetailController {
* @return {@link R<IPage<InsuranceListVO>>} * @return {@link R<IPage<InsuranceListVO>>}
*/ */
@Operation(summary = "投保办理分页查询", description = "投保办理分页查询") @Operation(summary = "投保办理分页查询", description = "投保办理分页查询")
@PostMapping("/getInsuranceHandleListPage")
public R<IPage<InsuranceListVO>> getInsuranceHandleListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, param));
}
/**
* 投保分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link R<IPage<InsuranceListVO>>}
*/
@Operation(summary = "投保分页查询", description = "投保分页查询")
@PostMapping("/getInsuranceListPage") @PostMapping("/getInsuranceListPage")
public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) { public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param)); return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
} }
/** /**
* 投保办理不分页查询 * 投保不分页查询
* *
* @author licancan * @author licancan
* @param param * @param param
* @return {@link R<List<InsuranceListVO>>} * @return {@link R<List<InsuranceListVO>>}
*/ */
@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询") @Operation(summary = "投保不分页查询", description = "投保不分页查询")
@PostMapping("/getInsuranceList") @PostMapping("/getInsuranceList")
public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) { public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceList(param)); return R.ok(tInsuranceDetailService.getInsuranceList(param));
} }
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link R<List<InsuranceListVO>>}
*/
@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询")
@PostMapping("/getInsuranceHandleList")
public R<List<InsuranceListVO>> getInsuranceHandleList(@RequestBody InsuranceListParam param) {
return R.ok(tInsuranceDetailService.getInsuranceHandleList(param));
}
/** /**
* 商险新增 * 商险新增
* *
...@@ -414,7 +441,7 @@ public class TInsuranceDetailController { ...@@ -414,7 +441,7 @@ public class TInsuranceDetailController {
@Operation(summary = "查询项目列表", description = "查询项目列表") @Operation(summary = "查询项目列表", description = "查询项目列表")
@GetMapping("/deptList") @GetMapping("/deptList")
public R getDeptList() { public R getDeptList() {
return tInsuranceDetailService.getDeptList(); return tInsuranceDetailService.getDeptListByUser();
} }
/** /**
......
...@@ -20,7 +20,7 @@ import java.util.List; ...@@ -20,7 +20,7 @@ import java.util.List;
public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> { public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
/***********************商险办理********************************/ /***********************商险办理********************************/
/** /**
* 投保办理分页查询 * 投保分页查询
* *
* @author licancan * @author licancan
* @param page * @param page
...@@ -29,6 +29,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> { ...@@ -29,6 +29,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
*/ */
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param); IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
/**
* 投保不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List<InsuranceListVO> getInsuranceList(@Param("param") InsuranceListParam param);
/**
* 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link IPage< InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
/** /**
* 投保办理不分页查询 * 投保办理不分页查询
* *
...@@ -36,7 +55,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> { ...@@ -36,7 +55,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
* @param param * @param param
* @return {@link List<InsuranceListVO>} * @return {@link List<InsuranceListVO>}
*/ */
List<InsuranceListVO> getInsuranceList(@Param("param") InsuranceListParam param); List<InsuranceListVO> getInsuranceHandleList(@Param("param") InsuranceListParam param);
/** /**
* 通过id查询 * 通过id查询
......
...@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
R<String> updateInsuranceSettle(UpdateInsuranceSettleParam param); R<String> updateInsuranceSettle(UpdateInsuranceSettleParam param);
/** /**
* 投保办理分页查询 * 投保分页查询
* *
* @author licancan * @author licancan
* @param page * @param page
...@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param); IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, InsuranceListParam param);
/** /**
* 投保办理不分页查询 * 投保办理分页查询
*
* @author licancan
* @param page
* @param param
* @return {@link IPage<InsuranceListVO>}
*/
IPage<InsuranceListVO> getInsuranceHandleListPage(Page<InsuranceListVO> page, InsuranceListParam param);
/**
* 投保不分页查询
* *
* @author licancan * @author licancan
* @param param * @param param
...@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> { ...@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
*/ */
List<InsuranceListVO> getInsuranceList(InsuranceListParam param); List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
/**
* 投保办理不分页查询
*
* @author licancan
* @param param
* @return {@link List<InsuranceListVO>}
*/
List<InsuranceListVO> getInsuranceHandleList(InsuranceListParam param);
/** /**
* 商险新增 * 商险新增
* *
......
...@@ -44,4 +44,6 @@ public class PreDispatchConstants { ...@@ -44,4 +44,6 @@ public class PreDispatchConstants {
public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"; public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!";
public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!"; public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减:养老城市和公积金城市不可同时为空,请确认表中有‘养老城市’和‘公积金城市’数据列及数据!";
public static final String GET_AREA_INFO = "获取区域数据失败!"; public static final String GET_AREA_INFO = "获取区域数据失败!";
public static final String TEL_NOT_EMPTY = "联系电话2不可为空!";
public static final String TEL_INVALID = "联系电话2无效!";
} }
...@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; ...@@ -32,6 +32,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants; import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.*; import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.mapper.*; import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
...@@ -547,6 +548,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -547,6 +548,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
if (x != null) { if (x != null) {
return x; return x;
} }
// 手机号码必填及格式校验
if (Common.isEmpty(tPreDispatchInfo.getTelTwo())){
return R.failed(PreDispatchConstants.TEL_NOT_EMPTY);
}
if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())){
return R.failed(PreDispatchConstants.TEL_INVALID);
}
} }
if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) { if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
initLeaveReason(tPreDispatchInfo); initLeaveReason(tPreDispatchInfo);
...@@ -592,6 +600,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -592,6 +600,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
int i = 1; int i = 1;
for (TPreDispatchInfo info : listInfo) { for (TPreDispatchInfo info : listInfo) {
i++; i++;
if (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
!CommonConstants.IS_FALSE.equals(info.getTelNotice())) {
errorList.add(new ErrorMessage(i,"是否电话通知不允许导入【是】和【否】之外的内容"));
continue;
}
// 1.验重 // 1.验重
if (checkAddRepeat(errorList, existsMap, i, info)) { if (checkAddRepeat(errorList, existsMap, i, info)) {
continue; continue;
...@@ -736,6 +749,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -736,6 +749,11 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
String str = null; String str = null;
for (TPreDispatchInfo info:listInfo){ for (TPreDispatchInfo info:listInfo){
i++; i++;
if (!CommonConstants.IS_TRUE.equals(info.getTelNotice()) &&
!CommonConstants.IS_FALSE.equals(info.getTelNotice())) {
errorList.add(new ErrorMessage(i,"是否电话通知不允许导入【是】和【否】之外的内容"));
continue;
}
// 重置异常状态 // 重置异常状态
info.setExceptionContent(""); info.setExceptionContent("");
info.setPreStatus(CommonConstants.ZERO_STRING); info.setPreStatus(CommonConstants.ZERO_STRING);
...@@ -1150,6 +1168,15 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap ...@@ -1150,6 +1168,15 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
private String checkAddPreDispatch(TPreDispatchInfo tPreDispatchInfo) { private String checkAddPreDispatch(TPreDispatchInfo tPreDispatchInfo) {
if (CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) { if (CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
if (Common.isEmpty(tPreDispatchInfo.getContractStart()) || Common.isEmpty(tPreDispatchInfo.getContractEnd())){
return "派增的合同开始日期和合同终止日期不可为空!";
}
if (Common.isEmpty(tPreDispatchInfo.getTelTwo())){
return PreDispatchConstants.TEL_NOT_EMPTY;
}
if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())){
return PreDispatchConstants.TEL_INVALID;
}
if (Common.isEmpty(tPreDispatchInfo.getPensionAddress()) && if (Common.isEmpty(tPreDispatchInfo.getPensionAddress()) &&
Common.isEmpty(tPreDispatchInfo.getFundAddress())) { Common.isEmpty(tPreDispatchInfo.getFundAddress())) {
return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_ADD; return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_ADD;
......
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