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

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

@@ -130,6 +130,12 @@ public interface CommonConstants {
 
 	String THIRTEEN_STRING = "13";
 
+	String FOURTEEN_STRING = "14";
+
+	String FIFTEEN_STRING = "15";
+
+	String SIXTEEN_STRING = "16";
+
 	/**
 	 * number 0
 	 */

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

@@ -11,6 +11,10 @@ public class InsurancesConstants {
 	 * 新增
 	 */
 	public static final String ADD = "新增";
+	/**
+	 * 离职
+	 */
+	public static final String QUIT = "离职";
 	/**
 	 * 批增
 	 */
@@ -69,13 +73,13 @@ public class InsurancesConstants {
 	 */
 	public static final String EDIT_NOT_ALLOW = "不允许编辑";
 	/**
-	 * 投保信息已存在
+	 * 投保记录已存在
 	 */
-	public static final String DATA_IS_EXIST = "投保信息已存在";
+	public static final String DATA_IS_EXIST = "投保记录已存在";
 	/**
-	 * 投保信息不存在
+	 * 投保记录不存在
 	 */
-	public static final String DATA_IS_NOT_EXIST = "投保信息不存在";
+	public static final String DATA_IS_NOT_EXIST = "投保记录不存在";
 	/**
 	 * 结算信息不存在
 	 */
@@ -560,7 +564,12 @@ public class InsurancesConstants {
 	/**
 	 * 替换项目不存在
 	 */
-	public static final String DEPT_NO_CHANGE_IS_NOT_EXIST = "替换项目不存在";
+	public static final String DEPT_NO_CHANGE_NEW_IS_NOT_EXIST = "替换项目不存在";
+
+	/**
+	 * 被替换的项目不存在
+	 */
+	public static final String DEPT_NO_CHANGE_OLD_IS_NOT_EXIST = "被替换的项目不存在";
 
 
 	/**
@@ -771,5 +780,10 @@ public class InsurancesConstants {
 	 */
 	public static final String NOT_CREATE_USER_DELETE_ERROR = "非创建人无法删除保单信息";
 
+	/**
+	 * 无更新当前保单信息的权限
+	 */
+	public static final String NO_UPDATE_DETAIL_JURISDICTION = "无更新当前保单信息的权限";
+
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -121,6 +121,7 @@ public class TInsuranceDetail extends BaseEntity {
      * 保单生效日期
      */
 	@Schema(description = "保单生效日期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private LocalDate policyEffect;
 
     /**
@@ -255,6 +256,7 @@ public class TInsuranceDetail extends BaseEntity {
      * 是否过期 0未过期 1已过期
      */
 	@Schema(description = "是否过期 0未过期 1已过期")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer isOverdue;
 
 	/**

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

@@ -45,4 +45,10 @@ public class InsuranceExportListParam implements Serializable {
 	 */
 	@Schema(description = "商险id集合")
 	private List<String> idList;
+
+	/**
+	 * 办理地分流sql
+	 */
+	@Schema(description = "办理地分流sql")
+	private String regionSql;
 }

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

@@ -63,4 +63,16 @@ public class InsuranceListParam implements Serializable {
 	 */
 	@Schema(description = "项目编码列表")
 	private List<String> deptNoList;
+
+	/**
+	 * 办理地分流sql
+	 */
+	@Schema(description = "办理地分流sql")
+	private String regionSql;
+
+	/**
+	 * 保单办理人
+	 */
+	@Schema(description = "保单办理人")
+	private String updateBy;
 }

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

@@ -76,6 +76,19 @@ public class TInsuranceDetailController {
 		return R.ok(tInsuranceDetailService.getInsuranceHandleListPage(page, 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));
+	}
+
 	/**
 	 * 投保分页查询
 	 *
@@ -103,18 +116,7 @@ public class TInsuranceDetailController {
 		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));
-	}
+
 
 	/**
 	 * 商险新增

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

@@ -168,6 +168,12 @@
 				#{item}
 			</foreach>
 		</if>
+		<if test="param.regionSql != null and param.regionSql.trim() != ''">
+			and  ${param.regionSql}
+		</if>
+		<if test="param.updateBy != null and param.updateBy.trim() != ''">
+			and detail.UPDATE_BY = #{param.updateBy}
+		</if>
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
@@ -272,6 +278,7 @@
 				#{item}
 			</foreach>
 		</if>
+
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
@@ -342,13 +349,13 @@
 		detail.CREATE_NAME as createName,
 		detail.REMARK as remark
 		from t_insurance_detail detail
-		where detail.id in
+		where detail.DELETE_FLAG = 0 and detail.BUY_HANDLE_STATUS = 1 and detail.id in
 		<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
-
+	<!--出办理非勾选查询结果-->
 	<select id="getInsuranceExportList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select detail.id as id,
 			detail.DEPT_NO as deptNo,
@@ -385,6 +392,9 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME like concat('%',replace(replace(#{param.insuranceCompanyName},'_','\_'),'%','\%'),'%')
 		</if>
+		<if test="param.regionSql != null and param.regionSql.trim() != ''">
+			and  ${param.regionSql}
+		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
 

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/package-info.java

-package com.yifu.cloud.plus.v1.yifu.salary;
\ No newline at end of file

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/package-info.java

-package com.yifu.cloud.plus.v1.yifu.salary.controller;
\ No newline at end of file

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/package-info.java

-package com.yifu.cloud.plus.v1.yifu.salary.service;
\ No newline at end of file

yifu-visual/yifu-codegen/src/main/resources/template/ServiceImpl.java.vm

@@ -79,7 +79,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
      */
     @Override
     public void listExport(HttpServletResponse response, ${className}SearchVo searchVo){
-        String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
+        String fileName = "${comments}批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<${className}> list = new ArrayList<>();
         long count = noPageCountDiy(searchVo);