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

# Conflicts:
#	yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java

@@ -346,4 +346,20 @@ public class TEmployeeProject extends BaseEntity {
 	@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
 	private Integer contractStatus;
 
+	@Schema(description = "社保状态多个")
+	@TableField(exist = false)
+	private String[] socialStatusArray;
+	@Schema(description = "公积金状态多个")
+	@TableField(exist = false)
+	private String[] fundStatusArray;
+	@Schema(description = "商险状态多个")
+	@TableField(exist = false)
+	private String[] insuranceStatusArray;
+	@Schema(description = "合同状态多个")
+	@TableField(exist = false)
+	private String[] contractStatusArray;
+	@Schema(description = "员工类型多个")
+	@TableField(exist = false)
+	private String[] empNatureArray;
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml

@@ -383,6 +383,41 @@
 			<if test="tEmployeeProject.fileTown != null">
 				AND a.SOCIAL_TOWN = #{tEmployeeProject.socialTown}
 			</if>
+			<if test="tEmployeeProject.empNatureArray != null">
+				AND a.EMP_NATRUE in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.empNatureArray" open="(" separator=","
+						 close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.contractStatusArray != null">
+				AND a.CONTRACT_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.contractStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.insuranceStatusArray != null">
+				AND a.INSURANCE_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.insuranceStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.socialStatusArray != null">
+				AND a.SOCIAL_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.socialStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.fundStatusArray != null">
+				AND a.FUND_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.fundStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
 		</if>
 	</sql>
 
@@ -505,6 +540,41 @@
 					#{idStr}
 				</foreach>
 			</if>
+			<if test="tEmployeeProject.empNatureArray != null">
+				AND a.EMP_NATRUE in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.empNatureArray" open="(" separator=","
+						 close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.contractStatusArray != null">
+				AND a.CONTRACT_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.contractStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.insuranceStatusArray != null">
+				AND a.INSURANCE_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.insuranceStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.socialStatusArray != null">
+				AND a.SOCIAL_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.socialStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
+			<if test="tEmployeeProject.fundStatusArray != null">
+				AND a.FUND_STATUS in
+				<foreach item="idStr" index="index" collection="tEmployeeProject.fundStatusArray" open="("
+						 separator="," close=")">
+					#{idStr}
+				</foreach>
+			</if>
 		</if>
 	</sql>
 

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class UpmsDaprUtils {
 
 	@Autowired
-	private static DaprUpmsProperties daprUpmsProperties;
+	private DaprUpmsProperties daprUpmsProperties;
 
 	/**
 	 * 获取所有区域数据
@@ -31,8 +31,8 @@ public class UpmsDaprUtils {
 	 * @Date 2022-07-18
 	 * @return
 	 **/
-	public static R<List<SysArea>> getAreaListR() {
-		R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", List.class, SecurityConstants.FROM_IN);
+	public R<AreaVo> getAreaListR() {
+		R<AreaVo> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getAreaVo","", AreaVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(areaListR)){
 			return R.failed("获取所有区域数据失败！");
 		}

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

@@ -27,6 +27,7 @@ public class InsurancesConstants {
 	 * 非投保退回状态，无法删除
 	 */
 	public static final String DELETE_ERROR = "非投保退回状态，无法删除";
+
 	/**
 	 * 不允许编辑
 	 */
@@ -184,4 +185,51 @@ public class InsurancesConstants {
 	 */
 	public static final String POLICY_NO_EXIST= "保单号不存在";
 
+	/***********************减员办理错误码********************************/
+
+	/**
+	 * 已被替换，不允许减员
+	 */
+	public static final String IS_EFFECT_ERROR = "已被替换，不允许减员";
+
+	/**
+	 * 已超出保单截止日期，不允许减员
+	 */
+	public static final String IS_OVERDUE_ERROR = "已超出保单截止日期，不允许减员";
+
+	/**
+	 * 已出险的，不允许减员
+	 */
+	public static final String IS_USE_ERROR = "已出险的，不允许减员";
+
+	/**
+	 * 非已投保状态，无法减员
+	 */
+	public static final String REFUND_ERROR = "非已投保状态，无法减员";
+
+	/**
+	 * 替换结算月份和原有结算月份相同
+	 */
+	public static final String SETTLE_MONTH_IDENTICAL = "替换结算月份和原有结算月份相同";
+
+	/**
+	 * 当前保单已处于减员流程，无法变更结算月
+	 */
+	public static final String SETTLE_MONTH_CHANGE_REDUCE_HANDLE_STATUS_ERROR = "当前保单已处于减员流程，无法变更结算月";
+
+	/**
+	 * 当前保单已结算，无法变更结算月
+	 */
+	public static final String SETTLE_MONTH_CHANGE_SETTLE_HANDLE_STATUS_ERROR = "前保单已结算，无法变更结算月";
+
+	/**
+	 * 替换项目ID和原有项目ID相同
+	 */
+	public static final String DEPT_NO_IDENTICAL = "替换项目ID和原有项目ID相同";
+
+	/**
+	 * 重复数据
+	 */
+	public static final String DUPLICATE_DATA_ERROR = "重复数据";
+
 }

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

@@ -3,6 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -257,6 +258,13 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "备注")
     private String remark;
 
+	/**
+	 * 减员派单日期
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "减员派单日期")
+	private LocalDate refundCreateTime;
+
     /**
      * 是否删除 0未删除/1删除
      */

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 变更所属项目
+ * @date 2022-07-21 15:35:49
+ */
+@Data
+@Tag(name = "变更所属项目")
+public class DeptChangeCheckParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+	//姓名+身份证号+原项目编码+保险公司+险种+保单开始时间+保单结束时间+保单结束时间+标准+有效+未减员 是否存在校验
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+	/**
+	 * 员工身份证号码
+	 */
+	@Schema(description = "员工身份证号码")
+	private String empIdCardNo;
+
+	/**
+	 * 原项目编码
+	 */
+	@Schema(description = "原项目编码")
+	private String oldDeptNo;
+
+	/**
+	 * 新项目编码
+	 */
+	@Schema(description = "新项目编码")
+	private String newDeptNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 保单开始日期
+	 */
+	@Schema(description = "保单开始日期")
+	private String policyStart;
+
+	/**
+	 * 保单结束日期
+	 */
+	@Schema(description = "保单结束日期")
+	private String policyEnd;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 错误信息
+	 */
+	@Schema(description = "错误信息")
+	private String errorMessage;
+
+	/**
+	 * 结算方式
+	 */
+	@Schema(description = "结算方式")
+	private Integer settleType;
+
+}

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

@@ -156,4 +156,5 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = "备注")
 	private String remark;
 
+
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * @author zhaji
  * @description 减员办理返回类
  * @date 2022-07-21 11:47:16
  */
+@Data
+@Tag(name ="减员办理返回类")
 public class InsuranceRefundHandlingListVo implements Serializable {
 
 	private static final long serialVersionUID = -2689686777914935788L;
+
+	/**
+	 * 主键
+	 */
+	private String id;
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String projectName;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 投保类型， 1新增、3批增、4替换
+	 */
+	@Schema(description = " 投保类型， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	/**
+	 * 投保岗位
+	 */
+	@Schema(description = "投保岗位")
+	private String post;
+
+
+	/**
+	 * 商险购买地省code
+	 */
+	@Schema(description = "商险购买地省code")
+	private Integer insuranceProvince;
+
+	/**
+	 * 商险购买地省
+	 */
+	@Schema(description = "商险购买地省")
+	private String insuranceProvinceName;
+
+	/**
+	 * 商险购买地市code
+	 */
+	@Schema(description = "商险购买地市code")
+	private Integer insuranceCity;
+
+	/**
+	 * 商险购买地市
+	 */
+	@Schema(description = "商险购买地市")
+	private String insuranceCityName;
+
+	/**
+	 * 商险办理省code
+	 */
+	@Schema(description = "商险办理省code")
+	private Integer insuranceHandleProvince;
+
+	/**
+	 * 商险办理省
+	 */
+	@Schema(description = "商险办理省")
+	private String insuranceHandleProvinceName;
+
+	/**
+	 * 商险办理城市code
+	 */
+	@Schema(description = "商险办理城市code")
+	private Integer insuranceHandleCity;
+
+	/**
+	 * 商险办理城市
+	 */
+	@Schema(description = "商险办理城市")
+	private String insuranceHandleCityName;
+
+	/**
+	 * 保单开始时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单开始时间")
+	private LocalDate policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单结束时间")
+	private LocalDate policyEnd;
+
+	/**
+	 * 保险公司名称(冗余字段)
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 医疗额度
+	 */
+	@Schema(description = "医疗额度")
+	private String medicalQuota;
+
+	/**
+	 * 身故或残疾额度
+	 */
+	@Schema(description = "身故或残疾额度")
+	private String dieDisableQuota;
+
+	/**
+	 * 结算月
+	 */
+	@Schema(description = "结算月")
+	private String settleMonth;
+
+	/**
+	 * 结算类型 (0、与薪资合并结算 1、单独结算)
+	 */
+	@Schema(description = "结算类型 (0、预估 1、实缴)")
+	private Integer settleType;
+
+	/**
+	 * 创建人姓名
+	 */
+	@Schema(description = "创建人(派单人)")
+	private String createName;
+
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+
+
 }

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

@@ -17,6 +17,18 @@ public class InsuranceRefundHandlingParam implements Serializable {
 
 	private static final long serialVersionUID = -2689686777914935788L;
 
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 减员状态 1待减员 2减员中 3减员退回 4减员成功
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中 3减员退回 4减员成功")
+	private Integer reduceHandleStatus;
+
 	/**
 	 * 员工姓名
 	 */
@@ -30,14 +42,40 @@ public class InsuranceRefundHandlingParam implements Serializable {
 	private String empIdcardNo;
 
 	/**
-	 * 项目编码
+	 * 保险公司id
 	 */
-	@Schema(description = "项目编码")
-	private String deptNo;
+	@Schema(description = "保险公司id")
+	private String insuranceCompanyId;
 
 	/**
-	 * 减员状态 1待减员 2减员中3减员退回
+	 * 保险公司名称
 	 */
-	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
-	private Integer reduceHandleStatus;
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 是否出险 0未出险 1已出险
+	 */
+	@Schema(description = "是否出险 0未出险 1已出险")
+	private Integer isUse;
+
+	/**
+	 * 是否有效 0有效 1无效
+	 */
+	@Schema(description = "是否有效 0有效 1无效")
+	private Integer isEffect;
+
+	/**
+	 * 是否过期 0未过期 1已过期
+	 */
+	@Schema(description = "是否过期 0未过期 1已过期")
+	private Integer isOverdue;
+
+
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -25,7 +26,16 @@ public class InsuranceRefundListParam implements Serializable {
 
 	@Schema(name = "办理列表")
 	@NotBlank(message = "办理列表不能为空")
-	private List<TInsuranceDetail> insuranceRefundList;
+	private String [] idList;
+
+	@Schema(name = "办理人")
+	@NotBlank(message = "办理类型不能为空")
+	private String updateBy;
+
+	@Schema(name = "办理时间")
+	@NotBlank(message = "办理类型不能为空")
+	private LocalDateTime refundCreateTime;
+
 
 
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * @author zhaji
@@ -15,5 +18,152 @@ import java.io.Serializable;
 public class InsuranceRefundListVo implements Serializable {
 	private static final long serialVersionUID = -2689686777914935788L;
 
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String projectName;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 投保类型， 1新增、3批增、4替换
+	 */
+	@Schema(description = " 投保类型， 1新增、3批增、4替换")
+	private Integer buyType;
+
+	/**
+	 * 投保岗位
+	 */
+	@Schema(description = "投保岗位")
+	private String post;
+
+	/**
+	 * 商险购买地省code
+	 */
+	@Schema(description = "商险购买地省code")
+	private Integer insuranceProvince;
+
+	/**
+	 * 商险购买地省
+	 */
+	@Schema(description = "商险购买地省")
+	private String insuranceProvinceName;
+
+	/**
+	 * 商险购买地市code
+	 */
+	@Schema(description = "商险购买地市code")
+	private Integer insuranceCity;
+
+	/**
+	 * 商险购买地市
+	 */
+	@Schema(description = "商险购买地市")
+	private String insuranceCityName;
+
+	/**
+	 * 商险办理省code
+	 */
+	@Schema(description = "商险办理省code")
+	private Integer insuranceHandleProvince;
+
+	/**
+	 * 商险办理省
+	 */
+	@Schema(description = "商险办理省")
+	private String insuranceHandleProvinceName;
+
+	/**
+	 * 商险办理城市code
+	 */
+	@Schema(description = "商险办理城市code")
+	private Integer insuranceHandleCity;
+
+	/**
+	 * 商险办理城市
+	 */
+	@Schema(description = "商险办理城市")
+	private String insuranceHandleCityName;
+
+	/**
+	 * 保单开始时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单开始时间")
+	private LocalDate policyStart;
+
+	/**
+	 * 保单结束时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "保单结束时间")
+	private LocalDate policyEnd;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 医疗额度
+	 */
+	@Schema(description = "医疗额度")
+	private String medicalQuota;
+
+	/**
+	 * 身故或残疾额度
+	 */
+	@Schema(description = "身故或残疾额度")
+	private String dieDisableQuota;
+
+	/**
+	 * 减员派单日期
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "减员派单日期")
+	private LocalDate refundCreateTime;
+
 
 }

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

@@ -34,17 +34,6 @@ public class InsuranceRefundParam implements Serializable {
 	@Schema(description = "项目编码")
 	private String deptNo;
 
-	/**
-	 * 保单号
-	 */
-	@Schema(description = "保单号")
-	private String policyNo;
-
-	/**
-	 * 保险公司ID
-	 */
-	@Schema(description = "保险公司ID")
-	private String insuranceCompanyId;
 
 	/**
 	 * 保险公司名称
@@ -52,6 +41,13 @@ public class InsuranceRefundParam implements Serializable {
 	@Schema(description = "保险公司名称")
 	private String insuranceCompanyName;
 
+	/**
+	 * 保单号
+	 */
+	@Schema(description = "保单号")
+	private String policyNo;
+
+
 	/**
 	 * 保单开始时间
 	 */

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,7 +10,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  * @author zhaji
@@ -58,7 +63,7 @@ public class InsuredListVo implements Serializable {
 	/**
 	 * 项目编码
 	 */
-	@JsonIgnore
+	@Schema(description = "项目编码")
 	private String deptNo;
 
 	/**
@@ -100,30 +105,126 @@ public class InsuredListVo implements Serializable {
 	private String buyStandard;
 
 	/**
-	 * 创建人姓名
+	 * 医疗额度
 	 */
-	@Schema(description = "创建人(派单人)")
-	private String createName;
+	@Schema(description = "医疗额度")
+	private String medicalQuota;
+
+	/**
+	 * 身故或残疾额度
+	 */
+	@Schema(description = "身故或残疾额度")
+	private String dieDisableQuota;
+
+	/**
+	 * 预估保费
+	 */
+	@Schema(description = "预估保费")
+	private BigDecimal estimatePremium;
+
+	/**
+	 * 实际保费
+	 */
+	@Schema(description = "实际保费")
+	private BigDecimal actualPremium;
+
+	/**
+	 * 保单号
+	 */
+	@Schema(description = "保单号")
+	private String policyNo;
+
+	/**
+	 * 发票号
+	 */
+	@Schema(description = "发票号")
+	private String invoiceNo;
+
+	/**
+	 * 保单生效日期
+	 */
+	@Schema(description = "保单生效日期")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	private LocalDate policyEffect;
+
+	/**
+	 * 商险购买地省code
+	 */
+	@Schema(description = "商险购买地省code")
+	private Integer insuranceProvince;
+
+	/**
+	 * 商险购买地省
+	 */
+	@Schema(description = "商险购买地省")
+	private String insuranceProvinceName;
+
+	/**
+	 * 商险购买地市code
+	 */
+	@Schema(description = "商险购买地市code")
+	private Integer insuranceCity;
+
+	/**
+	 * 商险购买地市
+	 */
+	@Schema(description = "商险购买地市")
+	private String insuranceCityName;
+
+	/**
+	 * 商险办理省code
+	 */
+	@Schema(description = "商险办理省code")
+	private Integer insuranceHandleProvince;
+
+	/**
+	 * 商险办理省
+	 */
+	@Schema(description = "商险办理省")
+	private String insuranceHandleProvinceName;
 
 	/**
-	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 * 商险办理城市code
 	 */
-	@Schema(description = "投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员")
-	private Integer buyHandleStatus;
+	@Schema(description = "商险办理城市code")
+	private Integer insuranceHandleCity;
 
 	/**
-	 * 结算类型 (0、预估 1、实缴)
+	 * 商险办理城市
 	 */
-	@Schema(description = "结算类型 (0、预估 1、实缴)")
-	private Integer settleType;
+	@Schema(description = "商险办理城市")
+	private String insuranceHandleCityName;
 
 	/**
-	 * 结算月
+	 * 是否出险 0未出险 1已出险
 	 */
-	@Schema(description = "结算月")
-	private String settleMonth;
+	@Schema(description = "是否出险 0未出险 1已出险")
+	private Integer isUse;
 
+	/**
+	 * 是否有效 0有效 1无效
+	 */
+	@Schema(description = "是否有效 0有效 1无效")
+	private Integer isEffect;
 
+	/**
+	 * 是否过期 0未过期 1已过期
+	 */
+	@Schema(description = "是否过期 0未过期 1已过期")
+	private Integer isOverdue;
+
+	/**
+	 * 派单日期
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd")
+	@Schema(description = "派单日期")
+	private LocalDate createTime;
+
+	/**
+	 * 派单人
+	 */
+	@Schema(description = "创建人(派单人)")
+	private String createName;
 
 	//订单编号、姓名、身份证号、投保类型、项目、岗位、保单开始日期、保单结束日期、保险公司、险种、购买标准、医保、身故或残疾、预估保费、实际保费、保单号、发票号、保单生效日期、商险购买地、商险办理地、是否出险、是否过期、是否失效、派单日期、派单人
 

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 结算月变更
+ * @date 2022-07-21 15:38:13
+ */
+@Data
+@Tag(name = "结算月变更")
+public class SettleMonthChangeCheckParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+	//姓名+身份证号+原项目编码+保险公司+险种+保单开始时间+保单结束时间+保单结束时间+标准+有效+未减员 是否存在校验
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+	/**
+	 * 员工身份证号码
+	 */
+	@Schema(description = "员工身份证号码")
+	private String empIdCardNo;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 保险公司名称
+	 */
+	@Schema(description = "保险公司名称")
+	private String insuranceCompanyName;
+
+	/**
+	 * 险种名称
+	 */
+	@Schema(description = "险种名称")
+	private String insuranceTypeName;
+
+	/**
+	 * 保单开始日期
+	 */
+	@Schema(description = "保单开始日期")
+	private String policyStart;
+
+	/**
+	 * 保单结束日期
+	 */
+	@Schema(description = "保单结束日期")
+	private String policyEnd;
+
+	/**
+	 * 购买标准
+	 */
+	@Schema(description = "购买标准")
+	private String buyStandard;
+
+	/**
+	 * 结算月
+	 */
+	@Schema(description = "结算月")
+	private String settleMonth;
+
+	/**
+	 * 错误信息
+	 */
+	@Schema(description = "错误信息")
+	private String errorMessage;
+
+}

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

@@ -34,12 +34,12 @@ public class TInsuranceCompanyController {
 	private TInsuranceCompanyService insuranceCompanyService;
 
 	/**
-	 * 分页查询
+	 * 保险公司分页查询
 	 * @param page 分页对象
 	 * @param insuranceCompany 保险公司
 	 * @return
 	 */
-	//@Operation(summary = "分页查询", description = "分页查询")
+	@Operation(summary = "保险公司分页查询", description = "保险公司分页查询")
 	@GetMapping("/page" )
 	public R<IPage<TInsuranceCompany>> getInsuranceCompanyPage(Page page, TInsuranceCompany insuranceCompany) {
 		return R.ok(insuranceCompanyService.pageDiy(page, insuranceCompany));
@@ -51,6 +51,7 @@ public class TInsuranceCompanyController {
 	 * @return R
 	 */
 	@GetMapping("/{id}" )
+	@Operation(summary = "通过id查询保险公司详情", description = "通过id查询保险公司详情")
 	public R<TInsuranceCompany> getById(@PathVariable("id" ) String id) {
 		return R.ok(insuranceCompanyService.getById(id));
 	}
@@ -61,7 +62,7 @@ public class TInsuranceCompanyController {
 	 * @param insuranceCompany 保险公司明细
 	 * @return R
 	 */
-	//@Operation(summary = "新增保险公司", description = "新增保险公司：hasPermission('demo_insuranceCompany_add')")
+	@Operation(summary = "新增保险公司", description = "新增保险公司：hasPermission('demo_insuranceCompany_add')")
 	@SysLog("新增保险公司" )
 	@PostMapping("/save")
 	//@PreAuthorize("@pms.hasPermission('demo_insuranceCompany_add')" )
@@ -74,7 +75,7 @@ public class TInsuranceCompanyController {
 	 * @param insuranceCompany 修改实体类
 	 * @return R
 	 */
-	//@Operation(summary = "修改保险公司", description = "修改保险公司：hasPermission('demo_insuranceCompany_update')")
+	@Operation(summary = "修改保险公司", description = "修改保险公司：hasPermission('demo_insuranceCompany_update')")
 	@SysLog("修改保险公司" )
 	@PostMapping("/update")
 	//@PreAuthorize("@pms.hasPermission('demo_insuranceCompany_update')" )
@@ -86,7 +87,7 @@ public class TInsuranceCompanyController {
 	 * 查询保险公司列表（不分页）
 	 * @return
 	 */
-	@Operation(summary = "分页查询", description = "分页查询")
+	@Operation(summary = "查询保险公司列表（不分页）", description = "查询保险公司列表（不分页）")
 	@GetMapping("/list" )
 	public R<List<TInsuranceCompany>> getInsuranceCompanyList() {
 		return R.ok(insuranceCompanyService.getInsuranceCompanyList());

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

@@ -200,12 +200,37 @@ public class TInsuranceDetailController {
 	 * @date 2022-07-19
 	 * @since v1.0
 	 */
-	@PostMapping("/checkPayRollList")
+	@PostMapping("/checkInsuranceRefundList")
 	public R checkInsuranceRefundList(@RequestBody List<InsuranceRefundCheck> insuranceRefundCheckList){
-
 		return tInsuranceDetailService.checkInsuranceRefundList(insuranceRefundCheckList);
 	}
 
+	/**
+	 * 变更结算月
+	 * @param settleMonthCheckList 变更结算月
+	 * @author zhaji
+	 * @date 2022-07-21
+	 * @since v1.0
+	 */
+	@PostMapping("/settleMonthChange")
+	@Operation(summary = "变更结算月", description = "变更结算月")
+	public R settleMonthChange(@RequestBody List<SettleMonthChangeCheckParam> settleMonthCheckList){
+		return tInsuranceDetailService.settleMonthChange(settleMonthCheckList);
+	}
+
+	/**
+	 * 变更所属项目
+	 * @param deptChangeCheckList 变更所属项目
+	 * @author zhaji
+	 * @date 2022-07-21
+	 * @since v1.0
+	 */
+	@PostMapping("/deptChange")
+	@Operation(summary = "变更所属项目", description = "变更所属项目")
+	public R deptChange(@RequestBody List<DeptChangeCheckParam> deptChangeCheckList){
+		return tInsuranceDetailService.deptChange(deptChangeCheckList);
+	}
+
 	/**
 	 * 已投保列表分页查询
 	 *

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

@@ -84,4 +84,51 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @return {@link List<InsuredListVo>}
 	 */
 	List<InsuredListVo> getInsuredList(@Param("param") InsuredParam param);
+
+	/**
+	 * 已减员列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuranceRefundListVo>}
+	 */
+	IPage<InsuranceRefundListVo> getInsuranceRefundPageList(Page<InsuranceRefundParam> page,  @Param("param")InsuranceRefundParam param);
+
+	/**
+	 * 已减员列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuranceRefundListVo>}
+	 */
+	List<InsuranceRefundListVo> getInsuranceRefundList( @Param("param") InsuranceRefundParam param);
+
+	/**
+	 * 减员列表分页查询
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param param 查询参数
+	 * @return {@link IPage< InsuranceRefundHandlingListVo>}
+	 */
+	IPage<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingPageList(Page<InsuranceRefundHandlingParam> page, @Param("param") InsuranceRefundHandlingParam param);
+
+	/**
+	 * 减员列表不分页查询
+	 *
+	 * @author zhaji
+	 * @param param 查询参数
+	 * @return {@link List< InsuranceRefundHandlingListVo>}
+	 */
+	List<InsuranceRefundHandlingListVo> getInsuranceRefundHandlingList(@Param("param")InsuranceRefundHandlingParam param);
+
+	/**
+	 * 减员办理
+	 *
+	 * @author zhaji
+	 * @param insuranceDetail
+	 * @return {@link boolean}
+	 */
+	Integer updateInsuranceRefund(@Param("param") InsuranceRefundListParam insuranceDetail);
 }

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

@@ -127,6 +127,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	R<List<InsuranceRegisterParam>> registeredPolicyPremium(List<InsuranceRegisterParam> paramList);
 
 	/***********************减员办理********************************/
+
 	/**
 	 * 减员导入校验
 	 *
@@ -201,4 +202,23 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @return {@link R}
 	 */
 	R updateInsuranceRefund(InsuranceRefundListParam insuranceDetail);
+
+	/**
+	 * 变更结算月
+	 *
+	 * @author zhaji
+	 * @param settleMonthCheckList 变更列表
+	 * @return {@link R}
+	 */
+	R settleMonthChange(List<SettleMonthChangeCheckParam> settleMonthCheckList);
+
+	/**
+	 * 变更所属项目
+	 *
+	 * @author zhaji
+	 * @param deptChangeCheckList 变更列表
+	 * @return {@link R}
+	 */
+	R deptChange(List<DeptChangeCheckParam> deptChangeCheckList);
+
 }

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/entity/SysArea.java

 package com.yifu.cloud.plus.v1.yifu.admin.api.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -23,6 +24,7 @@ public class SysArea {
 
     private Integer parentId;
 
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
     private LocalDateTime updateDate;
 
     private Integer status;

yifu-upms/yifu-upms-api/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/api/vo/AreaVo.java

+/*
+ * Copyright (c) 2020 yifu4cloud Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.yifu.cloud.plus.v1.yifu.admin.api.vo;
+
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author lengleng
+ * @date 2020/2/10
+ */
+@Data
+@Schema(description = "区域Vo")
+public class AreaVo {
+
+	/**
+	 * 角色id
+	 */
+	private List<SysArea> sysAreaList;
+
+}

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/AreaController.java

@@ -18,12 +18,14 @@ package com.yifu.cloud.plus.v1.yifu.admin.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
 import com.yifu.cloud.plus.v1.yifu.admin.service.SysAreaService;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -84,5 +86,20 @@ public class AreaController {
 		return sysAreaService.list(Wrappers.<SysArea>query().lambda()
 				.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
 	}
+	/**
+	 * @param
+	 * @Description: 获取所有区域list
+	 * @Author: hyc
+	 * @Date: 2022-7-21 19:45:24
+	 **/
+	@Inner
+	@PostMapping("/inner/getAreaVo")
+	public AreaVo getAreaVo() {
+		List<SysArea> aList = sysAreaService.list(Wrappers.<SysArea>query().lambda()
+				.eq(SysArea::getStatus, CommonConstants.ZERO_INT).orderByAsc(SysArea::getParentId));
+		AreaVo vo = new AreaVo();
+		vo.setSysAreaList(aList);
+		return vo;
+	}
 
 }