Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:新增查询列表的权限校验"

See merge request fangxinjiang/yifu!136

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -126,6 +126,10 @@ public interface CommonConstants {
 
 	String FIVE_STRING = "5";
 
+	String TWELVE_STRING = "12";
+
+	String THIRTEEN_STRING = "13";
+
 	/**
 	 * number 0
 	 */

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

@@ -542,6 +542,21 @@ public class InsurancesConstants {
 	 */
 	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 {
 	 */
 	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 {
 	public static final String NOT_CREATE_USER_DELETE_ERROR = "非创建人无法删除保单信息";
 
 
-	/**
-	 * 非创建人无法进行出险
-	 */
-	public static final String NOT_CREATE_USER_UPDATE_IS_USE_ERROR = "非创建人无法进行出险";
-
-
-
 }

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

@@ -71,24 +71,51 @@ public class TInsuranceDetailController {
 	 * @return {@link R<IPage<InsuranceListVO>>}
 	 */
 	@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")
 	public R<IPage<InsuranceListVO>> getInsuranceListPage(Page<InsuranceListVO> page, @RequestBody InsuranceListParam param) {
 		return R.ok(tInsuranceDetailService.getInsuranceListPage(page, param));
 	}
 
 	/**
-	 * 投保办理不分页查询
+	 * 投保不分页查询
 	 *
 	 * @author licancan
 	 * @param param
 	 * @return {@link R<List<InsuranceListVO>>}
 	 */
-	@Operation(summary = "投保办理不分页查询", description = "投保办理不分页查询")
+	@Operation(summary = "投保不分页查询", description = "投保不分页查询")
 	@PostMapping("/getInsuranceList")
 	public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam 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 {
 	@Operation(summary = "查询项目列表", description = "查询项目列表")
 	@GetMapping("/deptList")
 	public R getDeptList() {
-		return tInsuranceDetailService.getDeptList();
+		return tInsuranceDetailService.getDeptListByUser();
 	}
 
 	/**

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

@@ -20,7 +20,7 @@ import java.util.List;
 public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	/***********************商险办理********************************/
 	/**
-	 * 投保办理分页查询
+	 * 投保分页查询
 	 *
 	 * @author licancan
 	 * @param page
@@ -30,7 +30,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	IPage<InsuranceListVO> getInsuranceListPage(Page<InsuranceListVO> page, @Param("param") InsuranceListParam param);
 
 	/**
-	 * 投保办理不分页查询
+	 * 投保不分页查询
 	 *
 	 * @author licancan
 	 * @param param
@@ -38,6 +38,25 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	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);
+
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+	List<InsuranceListVO> getInsuranceHandleList(@Param("param") InsuranceListParam param);
+
 	/**
 	 * 通过id查询
 	 *

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

@@ -38,7 +38,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	R<String> updateInsuranceSettle(UpdateInsuranceSettleParam param);
 
 	/**
-	 * 投保办理分页查询
+	 * 投保分页查询
 	 *
 	 * @author licancan
 	 * @param page
@@ -48,7 +48,18 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	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
 	 * @param param
@@ -56,6 +67,15 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
 
+	/**
+	 * 投保办理不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List<InsuranceListVO>}
+	 */
+	List<InsuranceListVO> getInsuranceHandleList(InsuranceListParam param);
+
 	/**
 	 * 商险新增
 	 *