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

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 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.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
@@ -110,12 +111,14 @@ public class TEmployeeContractInfo extends BaseEntity {
 	@NotBlank(message = "合同起始时间不能为空")
 	@ExcelAttribute(name = "合同起始时间", needExport = true)
 	@Schema(description = "合同起始时间", name = "contractStart")
+	@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 	private Date contractStart;
 	/**
 	 * 合同到期时间
 	 */
 	@ExcelAttribute(name = "合同到期时间", needExport = true)
 	@Schema(description = "合同到期时间", name = "contractEnd")
+	@JsonFormat(shape= JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
 	private Date contractEnd;
 	/**
 	 * 项目名称
@@ -204,6 +207,7 @@ public class TEmployeeContractInfo extends BaseEntity {
 	 */
 	@ExcelAttribute(name = "入职日期")
 	@Schema(description = "入职日期", name = "enjoinDate")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private LocalDateTime enjoinDate;
 
 	/**
@@ -291,12 +295,14 @@ public class TEmployeeContractInfo extends BaseEntity {
 	 */
 	@ExcelAttribute(name = "试用期开始时间")
 	@Schema(description = "合同试用期开始时间", name = "periodStart")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private Date periodStart;
 	/**
 	 * 合同试用期结束时间
 	 */
 	@ExcelAttribute(name = "试用期结束时间")
 	@Schema(description = "合同试用期结束时间", name = "periodEnd")
+	@JsonFormat(pattern = "yyyy-MM-dd  HH:mm:ss")
 	private Date periodEnd;
 	/**
 	 * 试用期工资元/月

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpContractDispatchVo.java

@@ -160,4 +160,44 @@ public class EmpContractDispatchVo implements Serializable {
 	@ExcelAttribute(name = "备注", maxLength = 200)
 	@Schema(description = "备注", name = "remark")
 	private String remark;
+
+	/**
+	 * 档案-省
+	 */
+	@ExcelAttribute(name = "档案-省", maxLength = 32, isDataId = true, isArea = true, parentField = "")
+	@Schema(description = "档案-省", name = "fileProvince")
+	private Integer fileProvince;
+	/**
+	 * 档案-市
+	 */
+	@ExcelAttribute(name = "档案-市", maxLength = 32, isDataId = true, isArea = true, parentField = "fileProvince")
+	@Schema(description = "档案-市", name = "fileCity")
+	private Integer fileCity;
+	/**
+	 * 档案-县
+	 */
+	@ExcelAttribute(name = "档案-县", maxLength = 32, isDataId = true, isArea = true, parentField = "fileCity")
+	@Schema(description = "档案-县", name = "fileTown")
+	private Integer fileTown;
+
+	/**
+	 * 客户id
+	 */
+	@Schema(description = "客户id")
+	private String customerId;
+
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String unitNo;
+
+	/**
+	 * 项目
+	 */
+	@NotBlank(message = "项目不能为空")
+	@Length(max = 32, message = "项目不能超过32个字符")
+	@ExcelAttribute(name = "项目", errorInfo = "项目不能为空", isOrgan = true, maxLength = 32)
+	@Schema(description = "项目", name = "settleDomain")
+	private String settleDomain;
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmpProjectDispatchVo.java

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 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.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -9,6 +13,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * @Author fxj
@@ -97,4 +102,73 @@ public class EmpProjectDispatchVo implements Serializable {
 	@Schema(description ="员工项目编码")
 	@Size(max = 20, message = "员工项目编码不可超过20位")
 	private String empNo;
+
+	/**
+	 * 创建者-姓名
+	 */
+	@Schema(description = "创建人-姓名")
+	@TableField(fill = FieldFill.INSERT)
+	@ExcelProperty("创建人")
+	private String createName;
+
+	/**
+	 * 创建者
+	 */
+	@Schema(description = "创建人")
+	@TableField(fill = FieldFill.INSERT)
+	@ExcelIgnore
+	private String createBy;
+
+	/**
+	 * 业务类型一级分类
+	 */
+	@Schema(description ="业务类型一级分类")
+	private String businessPrimaryType;
+
+	/**
+	 * 业务类型二级分类
+	 */
+	@Schema(description ="业务类型二级分类")
+	private String businessSecondType;
+
+	/**
+	 * 业务类型三级分类
+	 */
+	@Schema(description ="业务类型三级分类")
+	private String businessThirdType;
+	/**
+	 * 客户id
+	 */
+	@Schema(description ="客户id")
+	private String unitId;
+
+	/**
+	 * 客户名称
+	 */
+	@Schema(description ="客户名称")
+	private String unitName;
+
+	/**
+	 * 客户编码
+	 */
+	@Schema(description ="客户编码")
+	private String unitNo;
+
+	/**
+	 * 社保-省
+	 */
+	@Schema(description = "社保-省")
+	private Integer socialProvince;
+
+	/**
+	 * 社保-市
+	 */
+	@Schema(description = "社保-市")
+	private Integer socialCity;
+
+	/**
+	 * 社保-县
+	 */
+	@Schema(description = "社保-县")
+	private Integer socialTown;
 }

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ProjectSetInfoVo.java

@@ -60,5 +60,27 @@ public class ProjectSetInfoVo implements Serializable {
 	@Schema(description = "商险结算类型")
 	private String insuranceSettleType = CommonConstants.ONE_STRING;
 
+	/**
+	 * 业务类型一级分类
+	 */
+	@Schema(description ="业务类型一级分类")
+	private String businessPrimaryType;
+
+	/**
+	 * 业务类型二级分类
+	 */
+	@Schema(description ="业务类型二级分类")
+	private String businessSecondType;
 
+	/**
+	 * 业务类型三级分类
+	 */
+	@Schema(description ="业务类型三级分类")
+	private String businessThirdType;
+
+	/**
+	 * 服务状态：0正常 1停止服务
+	 */
+	@Schema(description = "服务状态：0正常 1停止服务")
+	private String stopFlag;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java

@@ -291,7 +291,7 @@ public class TEmployeeContractInfoController {
 	@Operation(summary = "通过id查询", description = "通过id查询员工合同")
 	@Inner
 	@PostMapping("/getContractById")
-	public R<TEmployeeContractInfo> getContractById(@RequestBody String id) {
-		return R.ok(tEmployeeContractInfoService.getById(id));
+	public TEmployeeContractInfo getContractById(@RequestBody String id) {
+		return tEmployeeContractInfoService.getById(id);
 	}
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -2106,6 +2106,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							emp = empAddsMap.get(contract.getEmpIdcard());
 							if (Common.isNotNull(emp)){
 								contract.setEmpId(emp.getId());
+								contract.setEmpNatrue(emp.getEmpNatrue());
+								contract.setFileProvince(emp.getFileProvince());
+								contract.setFileCity(emp.getFileCity());
+								contract.setFileTown(emp.getFileTown());
 							}
 						}
 						contractMapper.insert(contract);

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

@@ -198,7 +198,11 @@
 		a.INSURANCE_SETTLE_TYPE,
 		c.ID AS 'customerId',
 		c.CUSTOMER_NAME as 'customerName',
-			   c.CUSTOMER_CODE as 'customerCode'
+		c.CUSTOMER_CODE as 'customerCode',
+		a.BUSINESS_PRIMARY_TYPE,
+		a.BUSINESS_SECOND_TYPE,
+		a.BUSINESS_THIRD_TYPE,
+		a.STOP_FLAG
 		FROM t_settle_domain a
 				 LEFT JOIN t_customer_info c ON a.CUSTOMER_ID = c.ID
 		where 1=1

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

@@ -420,6 +420,8 @@ public interface CommonConstants {
 
 	public static final int TWENTY_INT = 20;
 
+	public static final int TWENTY_ONE_STRING = 21;
+
 	public static final String ERROR_MSG_PRFIX = "error=";
 
 	public static final String SUCCESS_MSG_PREFIX = "success=";

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

@@ -185,6 +185,12 @@ public @interface ExcelAttribute {
      */
     public abstract  boolean isOrgan() default  false;
 
+	/**
+	 * 是否转义，默认 true 如果是字典会转义， false不会转义值
+	 * @return
+	 */
+	public abstract  boolean isConvert() default  true;
+
     /**
      * 是否为区域数据   前提：isDataId = true
      * @Author fxj

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -448,4 +448,24 @@ public interface ErrorCodes {
 	 * 派增异常： 社保各项起缴日不一致，委托备注必填
 	 */
 	String EMP_DISPATCH_SOCIAL_DATE_LIMIT_ERROR = "emp.dispatch.social.date.limit.error";
+	/**
+	 * 派增异常： 社保各项起缴月份需为可补缴月份，请确认后操作
+	 */
+	String EMP_DISPATCH_SOCIAL_START_IS_ERROR = "emp.dispatch.social.start.is.error";
+	/**
+	 * 派增异常： 公积金起缴月份需为可补缴月份，请确认后操作
+	 */
+	String EMP_DISPATCH_FUND_DATE_LIMIT_ERROR = "emp.dispatch.fund.start.is.error";
+	/**
+	 * 派增异常： 合同相关信息不可为空
+	 */
+	String EMP_DISPATCH_EMP_CONTRACT_NOT_EMPTY = "emp.dispatch.emp.contract.not.empty";
+	/**
+	 * 派增异常： 系统无对应项目档案，档案相关同色字段必填
+	 */
+	String EMP_DISPATCH_EMP_NOT_EMPTY = "emp.dispatch.emp.not.empty";
+	/**
+	 * 派增异常： 对应项目编码已停止合作
+	 */
+	String EMP_DISPATCH_SETTLEDOMAIN_STOP = "emp.dispatch.settleDomain.stop";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java

@@ -475,7 +475,11 @@ public class ExcelUtil <T> implements Serializable {
 		boolean flag = true;
 		for (Map.Entry<String,String> entry:dicObj.entrySet()){
 			if (Common.isNotNull(entry.getValue()) && entry.getValue().equals(c.trim())){
+				if (attr.isConvert()){
 					tempStr = entry.getKey();
+				}else {
+					tempStr = c;
+				}
 				flag = false;
 				break;
 			}

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -167,6 +167,15 @@ emp.dispatch.social.base.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD
 
 emp.dispatch.social.date.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u65E5\u4E0D\u4E00\u81F4\uFF0C\u59D4\u6258\u5907\u6CE8\u5FC5\u586B
 
+emp.dispatch.social.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u5404\u9879\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
+
+emp.dispatch.fund.start.is.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u8D77\u7F34\u6708\u4EFD\u9700\u4E3A\u53EF\u8865\u7F34\u6708\u4EFD\uFF0C\u8BF7\u786E\u8BA4\u540E\u64CD\u4F5C\uFF01
+
+emp.dispatch.emp.contract.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5408\u540C\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
+
+emp.dispatch.emp.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u7CFB\u7EDF\u65E0\u5BF9\u5E94\u9879\u76EE\u6863\u6848\uFF0C\u6863\u6848\u76F8\u5173\u540C\u8272\u5B57\u6BB5\u5FC5\u586B
+
+emp.dispatch.settleDomain.stop=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u5DF2\u505C\u6B62\u5408\u4F5C
 
 
 

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

@@ -156,7 +156,7 @@ public class ArchivesDaprUtil {
 	public R<TEmployeeContractInfo> getContractById(String id) {
 		R<TEmployeeContractInfo> res = HttpDaprUtil.invokeMethodPost(
 				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
-				,"/temployeeinfo/inner/getContractById" , id, TEmployeeContractInfo.class, SecurityConstants.FROM_IN);
+				,"/temployeecontractinfo/getContractById" , id, TEmployeeContractInfo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){
 			return R.failed("获取档案信息失败！");
 		}

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

@@ -76,6 +76,14 @@ public class InsurancesConstants {
 	 * 投保信息不存在
 	 */
 	public static final String DATA_IS_NOT_EXIST = "投保信息不存在";
+	/**
+	 * 结算信息不存在
+	 */
+	public static final String SETTLE_DATA_IS_NOT_EXIST = "结算信息不存在";
+	/**
+	 * 推送信息不存在
+	 */
+	public static final String PUSH_DATA_IS_NOT_EXIST = "推送信息不存在";
 	/**
 	 * 被替换员工投保记录不存在
 	 */
@@ -253,21 +261,21 @@ public class InsurancesConstants {
 	 */
 	public static final String INSURANCE_CITY_NAME_NOT_EXIST = "商险购买地市不存在";
 	/**
-	 * 商险办理省名称不能为空
+	 * 商险办理地省名称不能为空
 	 */
-	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EMPTY = "商险办理省名称不能为空";
+	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EMPTY = "商险办理地省名称不能为空";
 	/**
-	 * 商险办理省不存在
+	 * 商险办理地省不存在
 	 */
-	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST = "商险办理省不存在";
+	public static final String INSURANCE_HANDLE_PROVINCE_NAME_NOT_EXIST = "商险办理地省不存在";
 	/**
-	 * 商险办理城市名称不能为空
+	 * 商险办理地城市名称不能为空
 	 */
-	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EMPTY = "商险办理城市名称不能为空";
+	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EMPTY = "商险办理地城市名称不能为空";
 	/**
-	 * 商险办理城市不存在
+	 * 商险办理地城市不存在
 	 */
-	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EXIST = "商险办理城市不存在";
+	public static final String INSURANCE_HANDLE_CITY_NAME_NOT_EXIST = "商险办理地城市不存在";
 	/**
 	 * 结算月不能为空
 	 */
@@ -565,6 +573,12 @@ public class InsurancesConstants {
 	 * 修改保险公司
 	 */
 	public static final String UPDATE_INSURANCE_COMPANY = "修改保险公司";
+
+	/**
+	 * 删除保险公司
+	 */
+	public static final String DELETE_INSURANCE_COMPANY = "删除保险公司";
+
 	/**
 	 * 新增险种
 	 */
@@ -591,6 +605,38 @@ public class InsurancesConstants {
 	public static final String DELETE_INSURANCE_TYPE_STANDARD = "删除购买标准";
 
 
+	/**
+	 * 导入减员数据
+	 */
+	public static final String INSURANCE_REFUND_IMPORT = "导入减员数据";
+
+	/**
+	 * 导出待减员数据
+	 */
+	public static final String INSURANCE_REFUND_EXPORT = "导出待减员数据";
+
+	/**
+	 * 减员成功
+	 */
+	public static final String INSURANCE_REFUND_SUCCESS = "减员成功";
+
+
+	/**
+	 * 减员退回
+	 */
+	public static final String INSURANCE_REFUND_FAILED = "减员退回";
+
+	/**
+	 * 变更所属项目
+	 */
+	public static final String DEPT_CHANGE = "变更所属项目";
+
+	/**
+	 * 变更结算月
+	 */
+	public static final String MONTH_CHANGE = "变更结算月";
+
+
 
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/Dept.java → yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/Dept.java

-package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+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;
@@ -8,7 +8,7 @@ import java.io.Serializable;
 
 /**
  * @author zhaji
- * @description 项目
+ * @description 项目信息
  * @date 2022-07-29 09:35:31
  */
 @Data
@@ -26,4 +26,9 @@ public class Dept implements Serializable {
 	 */
 	@Schema(description = "项目名称")
 	private String projectName;
+
+	public Dept(String departNo, String departName) {
+		this.deptNo =departNo;
+		this.projectName =departName;
+	}
 }

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

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author licancan
+ * @description EKP2INSURANCES 更新结算请求参数
+ * @date 2022-08-01 09:50:33
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "EKP2INSURANCES 更新结算请求参数")
+public class UpdateInsuranceSettleParam implements Serializable {
+	private static final long serialVersionUID = 1459385763943903153L;
+	/**
+	 * 结算信息
+	 */
+	@Schema(description = "结算信息")
+	private List<SettleData> settleData;
+	/**
+	 * 推送信息
+	 */
+	@Schema(description = "推送信息")
+	private PushData  pushData;
+
+
+	@Data
+	@Builder
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class SettleData implements Serializable {
+		private static final long serialVersionUID = 4572786452410956413L;
+		/**
+		 * 结算单号（唯一标识） 生成规则：商险明细id + "_" + 结算id
+		 */
+		@Schema(description = "结算单号（唯一标识）")
+		private String sn;
+		/**
+		 * 	结算状态
+		 */
+		@Schema(description = "结算状态")
+		private String settleStatus;
+	}
+
+	@Data
+	@Builder
+	@NoArgsConstructor
+	@AllArgsConstructor
+	public static class PushData implements Serializable {
+		private static final long serialVersionUID = 4572786452410956413L;
+		/**
+		 * 推送时间
+		 */
+		@Schema(description = "推送时间")
+		private LocalDateTime pushTime;
+	}
+
+}

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

@@ -3,7 +3,7 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.Dept;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import io.swagger.v3.oas.annotations.Operation;
@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,6 +36,20 @@ public class TInsuranceDetailController {
 	private TInsuranceDetailService tInsuranceDetailService;
 
 	/***********************商险办理********************************/
+
+	/**
+	 * EKP2INSURANCES 更新结算状态
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<String>}
+	 */
+	@Operation(summary = "更新结算状态", description = "更新结算状态")
+	@PostMapping("/updateInsuranceSettle")
+	public R<String> updateInsuranceSettle(@RequestBody UpdateInsuranceSettleParam param) {
+		return tInsuranceDetailService.updateInsuranceSettle(param);
+	}
+
 	/**
 	 * 投保办理分页查询
 	 *
@@ -390,4 +405,18 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.getDeptList();
 	}
 
+	/**
+	 * 出险
+	 *
+	 * @author zhaji
+	 * @param userName 姓名
+	 * @param empIdcardNo 身份证
+	 * @return {@link R<List<  RefundExportListVo  >>}
+	 */
+	@Operation(summary = "紧急出险", description = "紧急出险")
+	@GetMapping("/urgentUpdateIsUse")
+	public R urgentUpdateIsUse(String userName,String empIdcardNo) {
+		return tInsuranceDetailService.urgentUpdateIsUse(userName,empIdcardNo);
+	}
+
 }

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

@@ -18,6 +18,16 @@ import java.util.List;
 public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 
 	/***********************商险办理********************************/
+
+	/**
+	 * EKP2INSURANCES 更新结算状态
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<String>}
+	 */
+	R<String> updateInsuranceSettle(UpdateInsuranceSettleParam param);
+
 	/**
 	 * 投保办理分页查询
 	 *
@@ -266,4 +276,14 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 */
 	R getDeptList();
 
+	/**
+	 * EKP紧急出险
+	 *
+	 * @author zhaji
+	 * @param userName
+	 * @param empIdcardNo
+	 * @return {@link R}
+	 */
+	R urgentUpdateIsUse(String userName, String empIdcardNo);
+
 }

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

@@ -5,23 +5,24 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -35,15 +36,34 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 
 
 	@Resource
-	private TInsuranceDetailService insuranceDetailService;
+	private TInsuranceDetailService tInsuranceDetailService;
 
+	@Resource
+	private TInsuranceOperateService tInsuranceOperateService;
+
+	/**
+	 * 分页查询保险公司
+	 *
+	 * @author zhaji
+	 * @param page 分页参数
+	 * @param insuranceCompany 查询类
+	 * @return {@link IPage< TInsuranceCompany>}
+	 */
 	@Override
 	public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) {
 		LambdaQueryWrapper<TInsuranceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.orderByDesc(TInsuranceCompany::getCreateTime);
-		return this.baseMapper.selectPage(page,wrapper);
+		IPage<TInsuranceCompany> list = this.baseMapper.selectPage(page, wrapper);
+		return list;
 	}
 
+	/**
+	 * 新增保险公司
+	 *
+	 * @author zhaji
+	 * @param insuranceCompany 新增类
+	 * @return {@link R}
+	 */
 	@Override
 	public R saveInsuranceCompany(TInsuranceCompany insuranceCompany) {
 		if(Common.isEmpty(insuranceCompany)){
@@ -63,9 +83,11 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 			insuranceCompany.setCreateName(user.getNickname());
 			insuranceCompany.setCreateTime(LocalDateTime.now());
 			insuranceCompany.setDeleteFlag(CommonConstants.ZERO_INT);
-			return R.ok(save(insuranceCompany),"新增成功");
+			save(insuranceCompany);
+			addOperate(insuranceCompany,user, InsurancesConstants.DELETE_INSURANCE_COMPANY);
+			return R.ok("新增成功");
 		}else{
-			return R.failed("当前保险公司已存在");
+			return R.failed("保险公司名称不能重复添加");
 		}
 	}
 
@@ -104,7 +126,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 			LambdaQueryWrapper<TInsuranceDetail> detailQueryWrapper = new LambdaQueryWrapper<>();
 			detailQueryWrapper.eq(TInsuranceDetail::getInsuranceCompanyName,companyName)
 					.eq(TInsuranceDetail::getDeleteFlag,CommonConstants.ZERO_INT);
-			List<TInsuranceDetail> list = insuranceDetailService.list(detailQueryWrapper);
+			List<TInsuranceDetail> list = tInsuranceDetailService.list(detailQueryWrapper);
 			if (Common.isNotEmpty(list)){
 				return R.failed("当前保险公司的名称已存在对应的商险信息，不能进行修改");
 			}else{
@@ -119,7 +141,9 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 		}else{
 			insuranceCompany.setUpdateBy(user.getId());
 			insuranceCompany.setUpdateTime(LocalDateTime.now());
-			return R.ok(updateById(insuranceCompany));
+			updateById(insuranceCompany);
+			addOperate(one,user, InsurancesConstants.UPDATE_INSURANCE_COMPANY);
+			return R.ok("修改保险信息公司成功");
 		}
 	}
 	/**
@@ -143,10 +167,36 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 						 .set(TInsuranceCompany::getDeleteFlag, CommonConstants.ZERO_INT)
 						 .set(TInsuranceCompany :: getUpdateBy,user.getId())
 						 .set(TInsuranceCompany :: getUpdateTime,LocalDateTime.now());
-			return R.ok(update(updateWrapper));
+			update(updateWrapper);
+			addOperate(one,user, InsurancesConstants.DELETE_INSURANCE_COMPANY);
+			return R.ok("删除成功");
+		}
+	}
+
+	/**
+	 * 操作记录
+	 *
+	 * @author zhaji
+	 * @param insuranceCompany 保险公司
+	 * @param user 登录用户
+	 * @param operateDesc 操作描述
+	 * @return void
+	 */
+	private void addOperate(TInsuranceCompany insuranceCompany,YifuUser user,String operateDesc){
+		try {
+			TInsuranceOperate operate = new TInsuranceOperate();
+			operate.setInsuranceDetailId(insuranceCompany.getId());
+			operate.setOperateDesc(operateDesc);
+			operate.setCreateBy(user.getId());
+			operate.setCreateName(user.getNickname());
+			operate.setCreateTime(LocalDateTime.now());
+			tInsuranceOperateService.save(operate);
+		}catch (Exception e){
+				e.getStackTrace();
 		}
 	}
 
+
 	/**
 	 * 查询当前保险公司列表
 	 *

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

@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,19 +10,15 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
+import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
 import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
-import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -39,7 +34,10 @@ import java.util.List;
 public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper, TInsuranceType> implements TInsuranceTypeService {
 
 	@Resource
-	private TInsuranceCompanyService insuranceCompanyService;
+	private TInsuranceCompanyService tInsuranceCompanyService;
+
+	@Resource
+	private TInsuranceOperateService tInsuranceOperateService;
 
 	/**
 	 * 险种分页查询
@@ -85,22 +83,23 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 		}
 		LambdaQueryWrapper<TInsuranceCompany> companyWrapper = new LambdaQueryWrapper<>();
 		companyWrapper.eq(TInsuranceCompany::getId,companyId).eq(TInsuranceCompany::getDeleteFlag, CommonConstants.ZERO_INT);
-		TInsuranceCompany insuranceCompany = insuranceCompanyService.getOne(companyWrapper);
+		TInsuranceCompany insuranceCompany = tInsuranceCompanyService.getOne(companyWrapper);
 		if(Common.isEmpty(insuranceCompany)){
 			return R.failed("所属保险公司不存在或已被删除");
 		}
-
 		LambdaQueryWrapper<TInsuranceType> typeWrapper = new LambdaQueryWrapper<>();
 		typeWrapper.eq(TInsuranceType :: getInsuranceCompanyId ,companyId).eq(TInsuranceType::getName,insuranceType.getName()).eq(TInsuranceType::getDeleteFlag, CommonConstants.ZERO_INT);
 		TInsuranceType type = getOne(typeWrapper);
 		if (!Common.isEmpty(type)){
-			return R.failed("当前险种已存在");
+			return R.failed("当前保险公司已存在该险种");
 		}else{
 			insuranceType.setDeleteFlag(CommonConstants.ZERO_INT);
 			insuranceType.setCreateBy(user.getId());
 			insuranceType.setCreateName(user.getNickname());
 			insuranceType.setCreateTime(LocalDateTime.now());
-			return R.ok(save(insuranceType));
+			save(insuranceType);
+			addOperate(insuranceType,user, InsurancesConstants.NEW_INSURANCE_TYPE);
+			return R.ok("新增险种信息成功");
 		}
 	}
 
@@ -136,6 +135,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 */
 	@Override
 	public R updateInsuranceType(TInsuranceType insuranceType) {
+		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceType.getId())){
 			return R.failed("险种ID不能为空");
 		}
@@ -144,7 +144,11 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 			return R.failed("当前险种信息不存在或已被删除");
 		}
 		if(byId.getName().equals(insuranceType.getName())){
-			return R.ok(this.updateById(insuranceType),"修改险种信息成功");
+			insuranceType.setUpdateBy(user.getId());
+			insuranceType.setUpdateTime(LocalDateTime.now());
+			updateById(insuranceType);
+			addOperate(insuranceType,user, InsurancesConstants.UPDATE_INSURANCE_TYPE);
+			return R.ok("修改险种信息成功");
 		}else{
 			LambdaQueryWrapper<TInsuranceType> queryWrapper = new LambdaQueryWrapper<>();
 			queryWrapper.eq(TInsuranceType::getName,insuranceType.getName())
@@ -152,13 +156,40 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 					.eq(TInsuranceType::getDeleteFlag,CommonConstants.ZERO_INT);
 			TInsuranceType one = this.getOne(queryWrapper);
 			if (Common.isEmpty(one)){
-				return R.ok(this.updateById(insuranceType),"修改险种信息成功");
+				insuranceType.setUpdateBy(user.getId());
+				insuranceType.setUpdateTime(LocalDateTime.now());
+				updateById(insuranceType);
+				addOperate(insuranceType,user, InsurancesConstants.UPDATE_INSURANCE_TYPE);
+				return R.ok("修改险种信息成功");
 			}else{
 				return R.failed("当前险种名称已存在");
 			}
 		}
 	}
 
+	/**
+	 * 操作记录
+	 *
+	 * @author zhaji
+	 * @param insuranceType 险种信息
+	 * @param user 登录用户
+	 * @param operateDesc 操作描述
+	 * @return void
+	 */
+	private void addOperate(TInsuranceType insuranceType,YifuUser user,String operateDesc){
+		try {
+			TInsuranceOperate operate = new TInsuranceOperate();
+			operate.setInsuranceDetailId(insuranceType.getId());
+			operate.setOperateDesc(operateDesc);
+			operate.setCreateBy(user.getId());
+			operate.setCreateName(user.getNickname());
+			operate.setCreateTime(LocalDateTime.now());
+			tInsuranceOperateService.save(operate);
+		}catch (Exception e){
+			e.getStackTrace();
+		}
+	}
+
 	/**
 	 * 查询险种列表
 	 *
@@ -178,7 +209,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 		}else{
 			LambdaQueryWrapper<TInsuranceCompany> companyWrapper = new LambdaQueryWrapper<>();
 			companyWrapper.eq(TInsuranceCompany::getId,companyId).eq(TInsuranceCompany::getDeleteFlag, CommonConstants.ZERO_INT);
-			TInsuranceCompany insuranceCompany = insuranceCompanyService.getOne(companyWrapper);
+			TInsuranceCompany insuranceCompany = tInsuranceCompanyService.getOne(companyWrapper);
 			if(Common.isEmpty(insuranceCompany)){
 				return R.failed("所属保险公司不存在或已被删除");
 			}else{

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

@@ -107,7 +107,7 @@
 				 #{item}
 			</foreach>
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
 	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
@@ -152,7 +152,7 @@
 				#{item}
 			</foreach>
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
@@ -284,7 +284,8 @@
 			detail.POLICY_END as policyEnd,
 			detail.POLICY_EFFECT as policyEffect,
 			detail.IS_USE as isUse,
-			detail.INVOICE_NO as isOverdue,
+			detail.IS_EFFECT as isEffect,
+			detail.IS_OVERDUE as isOverdue,
 			detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 			detail.BUY_STANDARD as buyStandard

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

@@ -69,7 +69,7 @@
 			a.INSURANCE_COMPANY_ID = b.ID
 		  and
 			a.DELETE_FLAG = 0
-
+		ORDER BY a.create_time DESC
 	</select>
     <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
 		select

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -148,22 +148,6 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("锁定状态 0 未锁定 1 锁定")
     private String lockStatus;
 
-    /**
-     * 社保结算状态  0: 未结算  1: 待结算  2: 已结算
-     */
-    @ExcelAttribute(name = "社保结算状态  0: 未结算  1: 待结算  2: 已结算" )
-    @Schema(description ="社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-    @ExcelProperty("社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-    private String socialSettlementFlag;
-
-    /**
-     * 公积金结算状态
-     */
-    @ExcelAttribute(name = "公积金结算状态" )
-    @Schema(description ="公积金结算状态")
-    @ExcelProperty("公积金结算状态")
-    private String fundSettlementFlag;
-
     /**
      * 总合计
      */
@@ -316,22 +300,6 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("公积金核准表ID")
     private String fundSettlementId;
 
-    /**
-     * 工资社保结算状态  0: 未结算  1:  已结算
-     */
-    @ExcelAttribute(name = "工资社保结算状态  0: 未结算  1:  已结算" )
-    @Schema(description ="工资社保结算状态  0: 未结算  1:  已结算")
-    @ExcelProperty("工资社保结算状态  0: 未结算  1:  已结算")
-    private String salarySocialFlag;
-
-    /**
-     * 工资公积金结算状态  0: 未结算  1: 已结算
-     */
-    @ExcelAttribute(name = "工资公积金结算状态  0: 未结算  1: 已结算" )
-    @Schema(description ="工资公积金结算状态  0: 未结算  1: 已结算")
-    @ExcelProperty("工资公积金结算状态  0: 未结算  1: 已结算")
-    private String salaryFundFlag;
-
     /**
      * 就职班组
      */
@@ -372,6 +340,14 @@ public class TPaymentInfo extends BaseEntity {
     @ExcelProperty("财务账单ID")
     private String financeBillId;
 
+	/**
+	 * 财务账单ID
+	 */
+	@ExcelAttribute(name = "推送状态 0已推送 1未推送" )
+	@Schema(description ="推送状态 0已推送 1未推送")
+	@ExcelProperty("推送状态 0已推送 1未推送")
+	private String pushStatus;
+
 	/**
 	 * 单位社保补缴利息
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFundInfo.java

@@ -553,12 +553,12 @@ public class TSocialFundInfo extends BaseEntity {
 	@ExcelProperty("补缴是否采用最新基数0是1否" )
 	private String latestCardinality;
 	/**
-	 * 大病是否收费：0否 1 是
+	 * 大病是否收费：0收取；1不收取
 	 */
-	@Length(max = 1, message = "大病是否收费：0否 1 是 不能超过1个字符" )
-	@ExcelAttribute(name = "大病是否收费：0否 1 是", maxLength = 1)
-	@Schema(description = "大病是否收费：0否 1 是" )
-	@ExcelProperty("大病是否收费：0否 1 是" )
+	@Length(max = 1, message = "大病是否收费：0收取；1不收取 不能超过1个字符" )
+	@ExcelAttribute(name = "大病是否收费：0收取；1不收取", maxLength = 1)
+	@Schema(description = "大病是否收费：0收取；1不收取" )
+	@ExcelProperty("大病是否收费：0收取；1不收取" )
 	private String isIllness;
 	/**
 	 * 大病缴纳周期：0按年1按月

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java

@@ -392,12 +392,12 @@ public class TSocialInfo extends BaseEntity {
 	@ExcelProperty("个人大病金额" )
 	private BigDecimal personalBigailmentMoney;
 	/**
-	 * 大病取值方式0 按比例 1按定值
+	 * 大病取值方式 0.按定值1比例
 	 */
-	@Length(max = 1, message = "大病取值方式0 按比例 1按定值 不能超过1个字符" )
-	@ExcelAttribute(name = "大病取值方式0 按比例 1按定值", maxLength = 1)
-	@Schema(description = "大病取值方式0 按比例 1按定值" )
-	@ExcelProperty("大病取值方式0 按比例 1按定值" )
+	@Length(max = 1, message = "大病取值方式 0.按定值1比例 不能超过1个字符" )
+	@ExcelAttribute(name = "大病取值方式 0.按定值1比例", maxLength = 1)
+	@Schema(description = "大病取值方式 0.按定值1比例" )
+	@ExcelProperty("大病取值方式 0.按定值1比例" )
 	private String valueType;
 	/**
 	 * 个人大病比例
@@ -414,12 +414,12 @@ public class TSocialInfo extends BaseEntity {
 	@ExcelProperty("单位大病救助比例" )
 	private BigDecimal unitBigailmentPer;
 	/**
-	 * 是否收取大病费用0否 1 是
+	 * 是否收取大病费用: 0收取；1不收取
 	 */
-	@Length(max = 1, message = "是否收取大病费用0否 1 是 不能超过1个字符" )
-	@ExcelAttribute(name = "是否收取大病费用0否 1 是", maxLength = 1)
-	@Schema(description = "是否收取大病费用0否 1 是" )
-	@ExcelProperty("是否收取大病费用0否 1 是" )
+	@Length(max = 1, message = "是否收取大病费用0收取；1不收取 不能超过1个字符" )
+	@ExcelAttribute(name = "是否收取大病费用0收取；1不收取", maxLength = 1)
+	@Schema(description = "是否收取大病费用0收取；1不收取" )
+	@ExcelProperty("是否收取大病费用0收取；1不收取" )
 	private String isIllness;
 	/**
 	 * 大病按年收收取月份1-12月

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java

@@ -54,7 +54,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 身份证号
 	 */
 	@Length(max = 20, message = "身份证号 不能超过20 个字符" )
-	@ExcelAttribute(name = "身份证号", maxLength = 20, isNotEmpty = true)
+	@ExcelAttribute(name = "身份证号", maxLength = 20)
 	@Schema(description = "身份证号" )
 	@ExcelProperty("身份证号" )
 	private String empIdcard;
@@ -62,7 +62,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 员工类型
 	 */
 	@Length(max = 32, message = "员工类型 不能超过32 个字符" )
-	@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE, isNotEmpty = true)
+	@ExcelAttribute(name = "员工类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@Schema(description = "员工类型" )
 	@ExcelProperty("员工类型" )
 	private String empType;
@@ -70,7 +70,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 手机号码
 	 */
 	@Length(max = 32, message = "手机号码 不能超过32 个字符" )
-	@ExcelAttribute(name = "手机号码", maxLength = 32, isNotEmpty = true)
+	@ExcelAttribute(name = "手机号码", maxLength = 32)
 	@Schema(description = "手机号码" )
 	@ExcelProperty("手机号码" )
 	private String empMobile;
@@ -123,7 +123,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 档案-市
 	 */
-	@ExcelAttribute(name = "档案-市" ,isArea = true,parentField = "fileProvince", isNotEmpty = true)
+	@ExcelAttribute(name = "档案-市" ,isArea = true,parentField = "fileProvince")
 	@Schema(description = "档案-市" )
 	@ExcelProperty("档案-市" )
 	private String fileCity;
@@ -191,7 +191,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	 * 合同类型
 	 */
 	@Length(max = 32, message = "合同类型 不能超过32 个字符" )
-	@ExcelAttribute(name = "合同类型", maxLength = 32, isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
+	@ExcelAttribute(name = "合同类型", maxLength = 32, isDataId = true,isConvert = false,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
 	@Schema(description = "合同类型" )
 	@ExcelProperty("合同类型" )
 	private String contractName;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPageVo.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 派单信息记录表
+ *
+ * @author fxj
+ * @date 2022-07-15 11:38:05
+ */
+@Data
+public class TDispatchInfoPageVo extends TDispatchInfo {
+
+	/**
+	 * 社保户名称
+	 */
+	@ExcelAttribute(name = "社保户名称", maxLength = 32)
+	@Schema(description = "社保户名称" )
+	@ExcelProperty("社保户名称" )
+	private String socialHouseholdName;
+
+	/**
+	 * 公积金户名称
+	 */
+	@ExcelAttribute(name = "公积金户名称", maxLength = 32)
+	@Schema(description = "公积金户名称" )
+	@ExcelProperty("公积金户名称" )
+	private String providentHouseholdName;
+
+}

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoSearchVo.java

@@ -16,7 +16,9 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -64,4 +66,21 @@ public class TDispatchInfoSearchVo extends TDispatchInfo {
 	@Schema(description = "查询limit  数据条数")
 	private int limitEnd;
 
+
+	/**
+	 * 社保户名称
+	 */
+	@ExcelAttribute(name = "社保户名称", maxLength = 32)
+	@Schema(description = "社保户名称" )
+	@ExcelProperty("社保户名称" )
+	private String socialHouseholdName;
+
+	/**
+	 * 公积金户名称
+	 */
+	@ExcelAttribute(name = "公积金户名称", maxLength = 32)
+	@Schema(description = "公积金户名称" )
+	@ExcelProperty("公积金户名称" )
+	private String providentHouseholdName;
+
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoImportLogVo.java

@@ -40,7 +40,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
 	@NotBlank(message = "主键 不能为空")
-	@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空")
+	@ExcelAttribute(name = "id", isNotEmpty = true, errorInfo = "主键 不能为空")
 	@Schema(description = "主键")
 	@ExcelProperty("主键")
 	private Integer id;
@@ -48,7 +48,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 姓名
 	 */
 	@Length(max = 50, message = "姓名 不能超过50 个字符")
-	@ExcelAttribute(name = "姓名", maxLength = 50)
+	@ExcelAttribute(name = "empName", maxLength = 50)
 	@Schema(description = "姓名")
 	@ExcelProperty("姓名")
 	private String empName;
@@ -56,7 +56,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 身份证号
 	 */
 	@Length(max = 32, message = "身份证号 不能超过32 个字符")
-	@ExcelAttribute(name = "身份证号", maxLength = 32)
+	@ExcelAttribute(name = "idCard", maxLength = 32)
 	@Schema(description = "身份证号")
 	@ExcelProperty("身份证号")
 	private String idCard;
@@ -64,14 +64,14 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 错误信息
 	 */
 	@Length(max = 500, message = "错误信息 不能超过500 个字符")
-	@ExcelAttribute(name = "错误信息", maxLength = 500)
+	@ExcelAttribute(name = "errMsg", maxLength = 500)
 	@Schema(description = "错误信息")
 	@ExcelProperty("错误信息")
 	private String errMsg;
 	/**
 	 * 问题行数
 	 */
-	@ExcelAttribute(name = "问题行数")
+	@ExcelAttribute(name = "line")
 	@Schema(description = "问题行数")
 	@ExcelProperty("问题行数")
 	private Integer line;
@@ -79,7 +79,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 导入标识key
 	 */
 	@Length(max = 64, message = "导入标识key 不能超过64 个字符")
-	@ExcelAttribute(name = "导入标识key", maxLength = 64)
+	@ExcelAttribute(name = "randomKey", maxLength = 64)
 	@Schema(description = "导入标识key")
 	@ExcelProperty("导入标识key")
 	private String randomKey;

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java

@@ -145,22 +145,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@Schema(description = "锁定状态 0 未锁定 1 锁定")
 	@ExcelProperty("锁定状态 0 未锁定 1 锁定")
 	private String lockStatus;
-	/**
-	 * 社保结算状态  0: 未结算  1: 待结算  2: 已结算
-	 */
-	@Length(max = 1, message = "社保结算状态  0: 未结算  1: 待结算  2: 已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "社保结算状态  0: 未结算  1: 待结算  2: 已结算", maxLength = 1)
-	@Schema(description = "社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-	@ExcelProperty("社保结算状态  0: 未结算  1: 待结算  2: 已结算")
-	private String socialSettlementFlag;
-	/**
-	 * 公积金结算状态
-	 */
-	@Length(max = 1, message = "公积金结算状态 不能超过1 个字符")
-	@ExcelAttribute(name = "公积金结算状态", maxLength = 1)
-	@Schema(description = "公积金结算状态")
-	@ExcelProperty("公积金结算状态")
-	private String fundSettlementFlag;
 	/**
 	 * 总合计
 	 */
@@ -308,22 +292,6 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@Schema(description = "公积金核准表ID")
 	@ExcelProperty("公积金核准表ID")
 	private String fundSettlementId;
-	/**
-	 * 工资社保结算状态  0: 未结算  1:  已结算
-	 */
-	@Length(max = 1, message = "工资社保结算状态  0: 未结算  1:  已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "工资社保结算状态  0: 未结算  1:  已结算", maxLength = 1)
-	@Schema(description = "工资社保结算状态  0: 未结算  1:  已结算")
-	@ExcelProperty("工资社保结算状态  0: 未结算  1:  已结算")
-	private String salarySocialFlag;
-	/**
-	 * 工资公积金结算状态  0: 未结算  1: 已结算
-	 */
-	@Length(max = 1, message = "工资公积金结算状态  0: 未结算  1: 已结算 不能超过1 个字符")
-	@ExcelAttribute(name = "工资公积金结算状态  0: 未结算  1: 已结算", maxLength = 1)
-	@Schema(description = "工资公积金结算状态  0: 未结算  1: 已结算")
-	@ExcelProperty("工资公积金结算状态  0: 未结算  1: 已结算")
-	private String salaryFundFlag;
 	/**
 	 * 就职班组
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialInfoVo.java

@@ -409,12 +409,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("单位大病救助比例" )
 	private BigDecimal unitBigailmentPer;
 	/**
-	 * 是否收取大病费用0否 1 是
+	 * 是否收取大病费用0收取；1不收取
 	 */
-	@Length(max = 1, message = "是否收取大病费用0否 1 是 不能超过1 个字符" )
-	@ExcelAttribute(name = "是否收取大病费用0否 1 是", maxLength = 1)
-	@Schema(description = "是否收取大病费用0否 1 是" )
-	@ExcelProperty("是否收取大病费用0否 1 是" )
+	@Length(max = 1, message = "是否收取大病费用0收取；1不收取 不能超过1 个字符" )
+	@ExcelAttribute(name = "是否收取大病费用0收取；1不收取", maxLength = 1)
+	@Schema(description = "是否收取大病费用0收取；1不收取" )
+	@ExcelProperty("是否收取大病费用0收取；1不收取" )
 	private String isIllness;
 	/**
 	 * 大病按年收收取月份1-12月

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PaymentConstants.java

@@ -7,17 +7,6 @@ package com.yifu.cloud.plus.v1.yifu.social.constants;
  **/
 public class PaymentConstants {
 
-    public static  final  String saveFailExistsSocialSettlement = "社保数据已生成核准表，无法删除！";
-
-    public static  final  String saveFailExistsSalarySocialSettlement = "社保数据已工资结算，无法删除！";
-
-    public static  final  String saveFailExistsFundSettlement = "公积金数据已生成核准表，无法删除！";
-
-    public static  final  String saveFailExistsSalaryFundSettlement = "公积金数据已工资结算，无法删除！";
-
-    public static  final  String saveFailExistsAgentSettlement = "对应缴费库数据已生成代理类结算单，无法删除！";
-
-    public static  final  String saveFailExistsFinanceBillSettlement = "数据已生成财务账单，无法删除！";
     public static  final  String PENSION_RISK = "养老保险";
     public static  final  String PENSION = "养老";
     public static  final  String UNEMPLOYEEMENT_RISK = "失业保险";

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -28,10 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
-import com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleSearchVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -69,7 +66,7 @@ public class TDispatchInfoController {
      */
     @Operation(description = "简单分页查询")
     @GetMapping("/page")
-    public R<IPage<TDispatchInfo>> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
+    public R<IPage<TDispatchInfoPageVo>> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
 		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
         return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
     }
@@ -94,7 +91,7 @@ public class TDispatchInfoController {
 	 */
 	@Operation(description = "简单分页查询--申请")
 	@GetMapping("/pageApply")
-	public R<IPage<TDispatchInfo>> getTDispatchApplyPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
+	public R<IPage<TDispatchInfoPageVo>> getTDispatchApplyPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)){
 			return  R.failed(CommonConstants.USER_FAIL);
@@ -112,7 +109,7 @@ public class TDispatchInfoController {
 	 */
 	@Operation(description = "简单分页查询--审核")
 	@GetMapping("/pageAudit")
-	public R<IPage<TDispatchInfo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
+	public R<IPage<TDispatchInfoPageVo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
 		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		tDispatchInfo.setStatus(CommonConstants.ONE_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -96,24 +96,21 @@ public class TPaymentInfoController {
 	@SysLog("通过id删除缴费库" )
 	@DeleteMapping("/{id}" )
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')" )
-	public R<Boolean> removeById(@PathVariable String id) {
-		return R.ok(tPaymentInfoService.removeById(id));
+	public R removeById(@PathVariable String id) {
+		return tPaymentInfoService.removeInFoById(id);
 	}
 
 	/**
-	 * 按类型删除
-	 * @author huyc
-	 * @date 2022-07-22 17:01:22
-	 * @param id
-	 * @param type
-	 * @return
-	 **/
-	@Operation(summary = "按类型删除", description = "按类型删除：hasPermission('social_tpaymentinfo_del')")
-	@SysLog("按类型删除缴费库")
-	@GetMapping("/removeByIdAndType")
+	 * 通过ids删除一条记录
+	 * @param ids
+	 * @return R
+	 */
+	@Operation(summary = "通过ids删除缴费库", description = "通过ids删除缴费库：hasPermission('social_tpaymentinfo_del')")
+	@SysLog("删除缴费库")
+	@DeleteMapping("/removeBatchByIds")
 	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')")
-	public R<Boolean> removeByIdAndType(@RequestParam String id, @RequestParam String type) {
-		return tPaymentInfoService.removeByIdAndType(id,type);
+	public R<Boolean> removeBatchByIds(String ids) {
+		return tPaymentInfoService.removeAllInfoById(ids);
 	}
 
 	/**
@@ -177,31 +174,9 @@ public class TPaymentInfoController {
 	 **/
 	@Operation(description = "导出缴费库 hasPermission('social_tpaymentinfo_export')")
 	@PostMapping("/export")
-//	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
+	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_export')")
 	public void export(HttpServletResponse response, @RequestBody TPaymentInfoSearchVo searchVo) {
 		tPaymentInfoService.listExport(response,searchVo);
 	}
 
-	/**
-	 * 删除当前登录人当前月的社保或公积金数据
-	 * @param type 0 全部删除 1 删除社保 2 删除公积金 必填
-	 * @param settleDepartId 项目ID 可选
-	 * @param unitId 单位ID 可选
-	 * @param empIdCard 员工身份证 可选
-	 * @param socialHouseId 社保户 可选
-	 * @param fundHouseId  公积金户 可选
-	 * @return R
-	 */
-	@Operation(description = "删除(social_tpaymentinfo_del)")
-	@SysLog("删除缴费库")
-	@PostMapping("/removeBatchByIdsAndType")
-	@PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')")
-	public R removeBatchByIdsAndType(@RequestParam(name = "type",required = true) String type,
-									 @RequestParam(name = "settleDepartId",required = false) String settleDepartId,
-									 @RequestParam(name = "unitId",required = false) String unitId,
-									 @RequestParam(name = "empIdCard",required = false) String empIdCard,
-									 @RequestParam(name = "socialHouseId",required = false) String socialHouseId,
-									 @RequestParam(name = "fundHouseId",required = false) String fundHouseId) {
-		return tPaymentInfoService.removeBatchByIdsAndType(type,settleDepartId,unitId,empIdCard,socialHouseId,fundHouseId);
-	}
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TDispatchInfoMapper.java

@@ -22,12 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleSearchVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,7 +41,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
      * @param tDispatchInfo 派单信息记录表
      * @return
      */
-    IPage<TDispatchInfo> getTDispatchInfoPage(Page<TDispatchInfo> page, @Param("tDispatchInfo") TDispatchInfo tDispatchInfo);
+    IPage<TDispatchInfoPageVo> getTDispatchInfoPage(Page<TDispatchInfo> page, @Param("tDispatchInfo") TDispatchInfoSearchVo tDispatchInfo);
 
 	/**
 	 * @Description: 派单导出

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -86,12 +86,4 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	* */
 	List<TPaymentInfo> selectListForPaymentImport(@Param("months")List<String> months, @Param("idcards")List<String> idcards);
 
-	/*
-	 * 已存在社保缴费库数据  非删除状态
-	 * @param months
-	 * @param idcards
-	 * @return
-	 * */
-	List<TPaymentInfoVo> selectPaymentAllInfoByMonthAndIdCard(@Param("months")List<String> months, @Param("idcards")List<String> idcards);
-
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java

@@ -42,7 +42,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
      * @param tDispatchInfo 派单信息记录表
      * @return
      */
-    IPage<TDispatchInfo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfo tDispatchInfo);
+    IPage<TDispatchInfoPageVo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo);
 
     R<List<ErrorMessage>> importDiy(InputStream inputStream);
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java

@@ -71,36 +71,32 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 */
 	void listExport(HttpServletResponse response, TPaymentInfoSearchVo searchVo);
 
+
 	/**
-	 * 按类型删除
+	 * 删除缴费库数据 包括明细
 	 * @Author huyc
 	 * @Date 2022-07-24
 	 * @param id
-	 * @param type
 	 * @return
 	 **/
-	R<Boolean> removeByIdAndType(String id, String type);
+	R removeInFoById(String id);
 
 	/**
-	 * 通过ID获取缴费库 及社保、公积金明细
+	 * 删除缴费库数据 包括明细
 	 * @Author huyc
 	 * @Date 2022-07-24
-	 * @param id
+	 * @param ids
 	 * @return
 	 **/
-	R getAllInfoById(String id);
+	R<Boolean> removeAllInfoById(String ids);
 
 	/**
-	 * 删除当月 当前登录人的 指定类型的缴费库数据
+	 * 通过ID获取缴费库 及社保、公积金明细
 	 * @Author huyc
-	 * @Date 2022-07-27
-	 * @param type
-	 * @param settleDepartId
-	 * @param unitId
-	 * @param empIdCard
-	 * @param socialHouseId
-	 * @param fundHouseId
+	 * @Date 2022-07-24
+	 * @param id
 	 * @return
 	 **/
-	R removeBatchByIdsAndType(String type, String settleDepartId, String unitId, String empIdCard, String socialHouseId, String fundHouseId);
+	R getAllInfoById(String id);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoImportLogServiceImpl.java

@@ -86,7 +86,7 @@ public class TPaymentInfoImportLogServiceImpl extends ServiceImpl<TPaymentInfoIm
 			response.setCharacterEncoding("utf-8");
 			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
 			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-			EasyExcel.write(out, EmployeeProjectExportVO.class).includeColumnFiledNames(getExportFieldNameDetailByClass(TPaymentInfoImportLogVo.class)).sheet("社保导入日志")
+			EasyExcel.write(out, TPaymentInfoImportLogVo.class).includeColumnFiledNames(getExportFieldNameDetailByClass(TPaymentInfoImportLogVo.class)).sheet("社保导入日志")
 					.doWrite(list);
 			out.flush();
 		} catch (IOException e) {

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -1125,12 +1125,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddress())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddress())
 				&& CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派增的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派增的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddressReduce())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddressReduce())
 				&& CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派减的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派减的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		return null;
 	}
@@ -1190,7 +1190,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				return "公积金基数不可为空！";
 			}
 			if (Common.isNullOrZero(tPreDispatchInfo.getFundCompanyPer())) {
-				return "公积金单位比例不可为空！";
+				return "公积金企业比例不可为空！";
 			}
 			if (Common.isNullOrZero(tPreDispatchInfo.getFundPersonalPer())) {
 				return "公积个人比例不可为空！";

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/ServiceUtil.java

@@ -155,4 +155,31 @@ public class ServiceUtil {
 		}
 		return false;
 	}
+
+	/**
+	 * 查看社保公积金起缴日期是否符合补缴逻辑
+	 * @Author fxj
+	 * @Date 2020-09-07
+	 * @param socialStartDate  起缴日期
+	 * @param canOverpay  是否可补缴 0：是，1：否
+	 * @param overpayNumber  补缴期限 整数
+	 * @param haveThisMonth 是否含当月 0：是，1：否   如果无符合条件默认不含当月
+	 * @return 符合 false  不符合 true
+	 **/
+	public  static boolean checkDispatchDate(LocalDateTime socialStartDate,String canOverpay,Integer overpayNumber,String haveThisMonth){
+		if (null == socialStartDate){
+			return false;
+		}
+		LocalDateTime temp = null;
+		LocalDateTime now = LocalDateTime.now();
+		if (CommonConstants.ZERO_STRING.equals(canOverpay)){
+			temp = socialStartDate.plusMonths(CommonConstants.ZERO_STRING.equals(haveThisMonth)?(long)overpayNumber:(long)(overpayNumber+1));
+		}else if (CommonConstants.ONE_STRING.equals(canOverpay)){
+			temp = socialStartDate;
+		}
+		return (null != temp && (temp.getYear() < now.getYear() || isaBoolean(temp, now)));
+	}
+	private static boolean isaBoolean(LocalDateTime temp, LocalDateTime now) {
+		return temp.getYear() == now.getYear() && temp.getMonthValue() < now.getMonthValue();
+	}
 }

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -94,7 +94,10 @@
 	<result property="idCardTown" column="ID_CARD_TOWN"/>
 	<result property="idCardAddress" column="ID_CARD_ADDRESS"/>
   </resultMap>
-
+	<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
+		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
+		<result property="socialHouseholdName" column="SOCIAL_HOUSEHOLD_NAME"/>
+	</resultMap>
 	<!-- 派单导出vo -->
 	<resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo">
 		<id property="id" column="ID"/>
@@ -249,6 +252,13 @@
                     <if test="tDispatchInfo.settleDomain != null and tDispatchInfo.settleDomain.trim() != ''">
                         AND a.SETTLE_DOMAIN = #{tDispatchInfo.settleDomain}
                     </if>
+					<if test="tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''">
+						AND a.SETTLE_DOMAIN_NAME like CONCAT(CONCAT(#{tDispatchInfo.settleDomainName}), '%')
+					</if>
+					<if test="tDispatchInfo.settleDomainCode != null and tDispatchInfo.settleDomainCode.trim() != ''">
+						AND a.SETTLE_DOMAIN_CODE = #{tDispatchInfo.settleDomainCode}
+					</if>
+
                     <if test="tDispatchInfo.deleteFlag != null and tDispatchInfo.deleteFlag.trim() != ''">
                         AND a.DELETE_FLAG = #{tDispatchInfo.deleteFlag}
                     </if>
@@ -372,19 +382,27 @@
                     <if test="tDispatchInfo.dispatchItem != null and tDispatchInfo.dispatchItem.trim() != ''">
                         AND a.DISPATCH_ITEM = #{tDispatchInfo.dispatchItem}
                     </if>
-                    <if test="tDispatchInfo.settleDomainName != null and tDispatchInfo.settleDomainName.trim() != ''">
-                        AND a.SETTLE_DOMAIN_NAME = #{tDispatchInfo.settleDomainName}
-                    </if>
                     <if test="tDispatchInfo.belongUnitName != null and tDispatchInfo.belongUnitName.trim() != ''">
                         AND a.BELONG_UNIT_NAME = #{tDispatchInfo.belongUnitName}
                     </if>
+
+					<if test="tDispatchInfo.socialHouseholdName != null and tDispatchInfo.socialHouseholdName.trim() != ''">
+						AND s.SOCIAL_HOUSEHOLD_NAME = #{tDispatchInfo.socialHouseholdName}
+					</if>
+					<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
+						AND f.PROVIDENT_HOUSEHOLD_NAME = #{tDispatchInfo.providentHouseholdName}
+					</if>
         </if>
     </sql>
     <!--tDispatchInfo简单分页查询-->
-    <select id="getTDispatchInfoPage" resultMap="tDispatchInfoMap">
+    <select id="getTDispatchInfoPage" resultMap="dispatchPageMap">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,
+               s.SOCIAL_HOUSEHOLD_NAME,
+               f.PROVIDENT_HOUSEHOLD_NAME
         FROM t_dispatch_info a
+		left join t_social_info s on s.id=a.SOCIAL_ID
+		left join t_provident_fund f on f.id=a.FUND_ID
         <where>
             1=1
             <include refid="tDispatchInfo_where"/>
@@ -553,15 +571,17 @@
 	</select>
 
 	<!--tDispatchInfo 社保办理数据查询-->
-	<select id="getTDispatchSocialHandlePage" resultMap="tDispatchInfoMap">
+	<select id="getTDispatchSocialHandlePage" resultMap="dispatchPageMap">
 		SELECT
-		<include refid="Base_Column_List"/>
+		<include refid="Base_Column_List"/>,
+		       b.SOCIAL_HOUSEHOLD_NAME
 		<include refid="where_getSocialRecordRoster"/>
 	</select>
 	<!--tDispatchInfo 公积金办理数据查询-->
-	<select id="getTDispatchFundHandlePage" resultMap="tDispatchInfoMap">
+	<select id="getTDispatchFundHandlePage" resultMap="dispatchPageMap">
 		SELECT
-		<include refid="Base_Column_List"/>
+		<include refid="Base_Column_List"/>,
+		c.PROVIDENT_HOUSEHOLD_NAME
 		<include refid="where_getFundRecord"/>
 	</select>
 
@@ -712,7 +732,7 @@
 		FROM t_dispatch_info a
 		left join t_provident_fund c on a.FUND_ID = c.id
 		<where>
-			1=1 and b.DELETE_FLAG = 0
+			1=1 and a.DELETE_FLAG = 0
 			<if test="idsStr != null">
 				AND a.ID in
 				<foreach item="items" index="index" collection="idsStr" open="(" separator="," close=")">

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -36,8 +36,7 @@
 		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
 		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
 		<result property="lockStatus" column="LOCK_STATUS"/>
-		<result property="socialSettlementFlag" column="SOCIAL_SETTLEMENT_FLAG"/>
-		<result property="fundSettlementFlag" column="FUND_SETTLEMENT_FLAG"/>
+		<result property="pushStatus" column="PUSH_STATUS"/>
 		<result property="sumAll" column="SUM_ALL"/>
 		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
 		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
@@ -57,8 +56,6 @@
 		<result property="providentSum" column="PROVIDENT_SUM"/>
 		<result property="socialSettlementId" column="SOCIAL_SETTLEMENT_ID"/>
 		<result property="fundSettlementId" column="FUND_SETTLEMENT_ID"/>
-		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
-		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
 		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
 		<result property="telecomNumber" column="TELECOM_NUMBER"/>
 		<result property="sortTime" column="SORT_TIME"/>
@@ -120,8 +117,7 @@
                 a.SOCIAL_PAY_MONTH,
                 a.SOCIAL_CREATE_MONTH,
                 a.LOCK_STATUS,
-                a.SOCIAL_SETTLEMENT_FLAG,
-                a.FUND_SETTLEMENT_FLAG,
+                a.PUSH_STATUS,
                 a.SUM_ALL,
                 a.PROVIDENT_PAY_MONTH,
                 a.PROVIDENT_CREATE_MONTH,
@@ -141,8 +137,6 @@
                 a.PROVIDENT_SUM,
                 a.SOCIAL_SETTLEMENT_ID,
                 a.FUND_SETTLEMENT_ID,
-                a.SALARY_SOCIAL_FLAG,
-                a.SALARY_FUND_FLAG,
                 a.INAUGURAL_TEAM,
                 a.TELECOM_NUMBER,
                 a.SORT_TIME,
@@ -227,8 +221,6 @@
         a.PROVIDENT_SUM,
         a.INAUGURAL_TEAM,
         a.TELECOM_NUMBER,
-        a.SALARY_SOCIAL_FLAG,
-        a.SALARY_FUND_FLAG,
 
         a.COMPANY_ACCRUAL,
         a.PERSONAL_ACCRUAL,
@@ -310,11 +302,8 @@
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
 			</if>
-			<if test="tPaymentInfo.socialSettlementFlag != null and tPaymentInfo.socialSettlementFlag.trim() != ''">
-				AND a.SOCIAL_SETTLEMENT_FLAG = #{tPaymentInfo.socialSettlementFlag}
-			</if>
-			<if test="tPaymentInfo.fundSettlementFlag != null and tPaymentInfo.fundSettlementFlag.trim() != ''">
-				AND a.FUND_SETTLEMENT_FLAG = #{tPaymentInfo.fundSettlementFlag}
+			<if test="tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''">
+				AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
 			</if>
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
@@ -383,12 +372,6 @@
 			<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
 				AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
 			</if>
-			<if test="tPaymentInfo.salarySocialFlag != null and tPaymentInfo.salarySocialFlag.trim() != ''">
-				AND a.SALARY_SOCIAL_FLAG = #{tPaymentInfo.salarySocialFlag}
-			</if>
-			<if test="tPaymentInfo.salaryFundFlag != null and tPaymentInfo.salaryFundFlag.trim() != ''">
-				AND a.SALARY_FUND_FLAG = #{tPaymentInfo.salaryFundFlag}
-			</if>
 			<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
 				AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
 			</if>
@@ -578,12 +561,6 @@
 			<if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
 				AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
 			</if>
-			<if test="tPaymentInfo.socialSettlementFlag != null and tPaymentInfo.socialSettlementFlag.trim() != ''">
-				AND a.SOCIAL_SETTLEMENT_FLAG = #{tPaymentInfo.socialSettlementFlag}
-			</if>
-			<if test="tPaymentInfo.fundSettlementFlag != null and tPaymentInfo.fundSettlementFlag.trim() != ''">
-				AND a.FUND_SETTLEMENT_FLAG = #{tPaymentInfo.fundSettlementFlag}
-			</if>
 			<if test="tPaymentInfo.sumAll != null">
 				AND a.SUM_ALL = #{tPaymentInfo.sumAll}
 			</if>
@@ -651,12 +628,6 @@
 			<if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
 				AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
 			</if>
-			<if test="tPaymentInfo.salarySocialFlag != null and tPaymentInfo.salarySocialFlag.trim() != ''">
-				AND a.SALARY_SOCIAL_FLAG = #{tPaymentInfo.salarySocialFlag}
-			</if>
-			<if test="tPaymentInfo.salaryFundFlag != null and tPaymentInfo.salaryFundFlag.trim() != ''">
-				AND a.SALARY_FUND_FLAG = #{tPaymentInfo.salaryFundFlag}
-			</if>
 			<if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
 				AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
 			</if>
@@ -814,8 +785,6 @@
 		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
 		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
 		<result property="lockStatus" column="LOCK_STATUS"/>
-		<result property="socialSettlementFlag" column="SOCIAL_SETTLEMENT_FLAG"/>
-		<result property="fundSettlementFlag" column="FUND_SETTLEMENT_FLAG"/>
 		<result property="sumAll" column="SUM_ALL"/>
 		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
 		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
@@ -884,9 +853,6 @@
 		<result property="fundTown" column="FUND_TOWN"/>
 		<result property="inauguralTeam" column="INAUGURAL_TEAM"/>
 		<result property="telecomNumber" column="TELECOM_NUMBER"/>
-
-		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
-		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
 	</resultMap>
 	<!--tPaymentInfo简单分页查询-->
 	<select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">
@@ -986,15 +952,10 @@
 		FROM t_payment_info a
 		where 1=1
 		<if test="months != null and months.size > 0">
-			AND (a.SOCIAL_PAY_MONTH in
+			AND a.SOCIAL_PAY_MONTH in
 			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
 				#{item}
 			</foreach>
-			or a.PROVIDENT_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			)
 		</if>
 		<if test="idcards != null and idcards.size > 0">
 			AND a.EMP_IDCARD IN
@@ -1004,31 +965,6 @@
 		</if>
 	</select>
 
-	<!--tPaymentInfo 按ID查收缴费库包含社保和公积金明细的数据查询-->
-	<select id="selectPaymentAllInfoByMonthAndIdCard" resultMap="tPaymentAllInfoMap">
-		SELECT
-		<include refid="base_column_list_all"/>,
-		FROM t_payment_info a
-		where 1=1
-		<if test="months != null and months.size > 0">
-			AND (a.SOCIAL_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			or a.PROVIDENT_PAY_MONTH in
-			<foreach item="item" index="index" collection="months" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-			)
-		</if>
-		<if test="idcards != null and idcards.size > 0">
-			AND A.EMP_IDCARD IN
-			<foreach item="item" index="index" collection="idcards" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
-	</select>
-
 	<!--tPaymentInfo 查询缴费库要删除的数据-->
 	<select id="selectListForDelete" resultType="com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo">
 		select