Merge branch 'develop'

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

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

@@ -44,7 +44,7 @@ public class EmpProjectDispatchVo implements Serializable {
 	 * 员工类型（字典值，0外包1派遣2代理）
 	 */
 	@NotNull(message = "员工类型不能为空")
-	@ExcelAttribute(name = "员工类型",isNotEmpty = true, errorInfo = "员工类型不能为空",maxLength = 2,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
+	@ExcelAttribute(name = "员工类型",isNotEmpty = true, errorInfo = "员工类型不能为空",maxLength = 5,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="员工类型")
 	private String empNatrue;

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.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.archives.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+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;
+import lombok.Data;
+
+import javax.validation.constraints.Past;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 项目档案表excel导出对应的实体
+ *
+ * @author huyc
+ * @date 2022-06-23 10:54:40
+ */
+@Data
+@ColumnWidth(15)
+public class EmployeeProjectExportParamVO extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 档案员工类型（字典值，0外包1派遣2代理）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="档案员工类型")
+	@ExcelAttribute(name = "档案员工类型",isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
+	private String proEmpNatrue;
+
+	/**
+	 * 员工姓名
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="员工姓名")
+	private String empName;
+
+	/**
+	 * 身份证号码
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="身份证号")
+	private String empIdcard;
+
+	/**
+	 * 员工主码（系统自动生成：ZM+年月日+5位数字）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="员工主码")
+	private String empCode;
+
+	/**
+	 * 身份证有效期起
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "身份证开始日期")
+	@DateTimeFormat("yyyy-MM-dd")
+	private Date validityStart;
+
+	/**
+	 * 身份证有效期止
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "身份证截止日期")
+	@DateTimeFormat("yyyy-MM-dd")
+	private Date validityEnd;
+
+	/**
+	 * 婚姻状况
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "婚姻状况")
+	@ExcelAttribute(name = "婚姻状况", isDataId = true,dataType = ExcelAttributeConstants.EMP_MARRIED)
+	private String empMarriStatus;
+
+	/**
+	 * 民族
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "民族")
+	@ExcelAttribute(name = "民族", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATIONAL)
+	private String empNational;
+
+	/**
+	 * 政治面貌
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "政治面貌")
+	@ExcelAttribute(name = "政治面貌", isDataId = true,dataType = ExcelAttributeConstants.EMP_POLITICAL)
+	private String politicalStatus;
+
+	/**
+	 * 手机号码
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "手机号码")
+	private String empPhone;
+
+	/**
+	 * 邮箱
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "邮箱")
+	private String empEmail;
+
+	/**
+	 * 身份证-省
+	 */
+	@ExcelAttribute(name = "户籍所在省", isArea = true)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "户籍所在省")
+	private String idProvince;
+
+	/**
+	 * 身份证-市
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "户籍所在市")
+	@ExcelAttribute(name = "户籍所在市",  isArea = true, parentField = "idProvince")
+	private String idCity;
+
+	/**
+	 * 身份证-县
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "户籍所在县")
+	@ExcelAttribute(name = "户籍所在县",  isArea = true, parentField = "idCity")
+	private String idTown;
+
+	/**
+	 * 户口性质
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "户口性质")
+	@ExcelAttribute(name = "户口性质", isDataId = true,dataType = ExcelAttributeConstants.EMP_REGISTYPE)
+	private String empRegisType;
+
+	/**
+	 * 档案-省
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "档案所在省")
+	@ExcelAttribute(name = "档案所在省", isArea = true)
+	private String fileProvince;
+
+	/**
+	 * 档案-市
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "档案所在市")
+	@ExcelAttribute(name = "档案所在市", isArea = true, parentField = "fileProvince")
+	private String fileCity;
+
+	/**
+	 * 档案-县
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "档案所在县")
+	@ExcelAttribute(name = "档案所在县", isArea = true, parentField = "fileCity")
+	private String fileTown;
+
+	/**
+	 * 是否大专及以上（0否1是）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "是否大专及以上")
+	@ExcelAttribute(name = "是否大专及以上", readConverterExp = "0=否,1=是")
+	private String isCollege;
+
+	/**
+	 * 最高学历（字典值）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "最高学历")
+	@ExcelAttribute(name = "最高学历", isDataId = true,dataType = ExcelAttributeConstants.EDUCATION)
+	private String hignEducation;
+
+	/**
+	 * 学校
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "学校")
+	private String school;
+
+	/**
+	 * 专业
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "专业")
+	private String major;
+
+	/**
+	 * 入学时间
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "入学时间")
+	@DateTimeFormat("yyyy-MM-dd")
+	private LocalDateTime admissionDate;
+
+	/**
+	 * 毕业时间
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "毕业时间")
+	@DateTimeFormat("yyyy-MM-dd")
+	private LocalDateTime gradutionDate;
+
+	/**
+	 * 备注
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "档案备注")
+	private String remark;
+
+	/**
+	 * 人员档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "人员档案来源")
+	@ExcelAttribute(name = "人员档案来源", readConverterExp = "1=社保公积金,2=薪酬,3=商险,4=人员档案新建")
+	private String fileSource;
+
+	/**
+	 * 人员档案状态（0草稿、1已审核）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "人员档案状态")
+	@ExcelAttribute(name = "人员档案状态", readConverterExp = "0=草稿,1=已审核")
+	private String proStatus;
+
+	/**
+	 * 创建者-姓名
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "人员档案创建人")
+	private String proCreateName;
+
+	/**
+	 * 创建时间
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value = "人员档案创建时间")
+	@DateTimeFormat("yyyy-MM-dd")
+	private LocalDateTime proCreateTime;
+
+
+	/**
+	 * 开户行
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="开户行")
+	private String bankName;
+
+	/**
+	 * 支行
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="支行")
+	private String bankSubName;
+
+	/**
+	 * 银行卡号
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="银行卡号")
+	private String bankNo;
+
+	/**
+	 * 项目编码
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="项目编码")
+	private String deptNo;
+
+	/**
+	 * 合同类型（字典值）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="合同类型")
+	@ExcelAttribute(name = "合同类型", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE)
+	private String contractType;
+
+	/**
+	 * 工时制
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="工时制")
+	@ExcelAttribute(name = "工时制", isDataId = true,dataType = ExcelAttributeConstants.WORKING_HOURS)
+	private String workingHours;
+
+	/**
+	 * 就职岗位
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="就职岗位")
+	private String post;
+
+	/**
+	 * 入职日期
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="入职日期")
+	@DateTimeFormat("yyyy-MM-dd")
+	@Past
+	private Date enjoinDate;
+
+	/**
+	 * 试用期（单位月）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="试用期")
+	private String tryPeriod;
+
+	/**
+	 * 项目员工类型
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="项目员工类型")
+	@ExcelAttribute(name = "项目员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
+	private String empNatrue;
+
+	/**
+	 * 员工编码
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="员工编码")
+	private String empNo;
+
+	/**
+	 * 客户名称
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="客户名称")
+	private String unitName;
+
+	/**
+	 * 客户编码
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="客户编码")
+	private String unitNo;
+
+	/**
+	 * 项目名称
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="项目名称")
+	private String deptName;
+
+	/**
+	 * 员工合同状态（字典）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="合同状态")
+	@ExcelAttribute(name = "合同状态", isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_STATE)
+	private String contractStatus;
+
+	/**
+	 * 业务类型一级分类
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="业务类型一级分类")
+	@ExcelAttribute(name = "业务类型一级分类", isDataId = true,dataType = ExcelAttributeConstants.CUSTOMER_BUSSINESS_PARENT)
+	private String businessPrimaryType;
+
+	/**
+	 * 业务类型二级分类
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="业务类型二级分类")
+	@ExcelAttribute(name = "业务类型二级分类", isDataId = true,dataType = ExcelAttributeConstants.CUSTOMER_BUSSINESS_TYPE)
+	private String businessSecondType;
+
+	/**
+	 * 业务类型三级分类
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="业务类型三级分类")
+	@ExcelAttribute(name = "业务类型三级分类", isDataId = true,dataType = ExcelAttributeConstants.CUSTOMER_BUSSINESS_SUB_TYPE)
+	private String businessThirdType;
+
+	/**
+	 * 商险状态（字典）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="商险状态")
+	@ExcelAttribute(name = "商险状态", isDataId = true,dataType = ExcelAttributeConstants.COMMERCIAL_SATTE)
+	private String insuranceStatus;
+
+	/**
+	 * 社保状态（字典）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="社保状态")
+	@ExcelAttribute(name = "社保状态", isDataId = true,dataType = ExcelAttributeConstants.SOCIAL_ECURITY_STATE)
+	private String socialStatus;
+
+	/**
+	 * 公积金状态（字典）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="公积金状态")
+	@ExcelAttribute(name = "公积金状态", isDataId = true,dataType = ExcelAttributeConstants.FUND_STATUS)
+	private String fundStatus;
+
+	/**
+	 * 近3个月发薪（0否；1是）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="近3个月发薪")
+	@ExcelAttribute(name = "近3个月发薪", readConverterExp = "0=无,1=是,2=否")
+	private String salaryStatus;
+
+	/**
+	 * 项目档案来源（字典：4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬）
+	 */
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="项目档案来源")
+	@ExcelAttribute(name = "项目档案来源", isDataId = true,dataType = ExcelAttributeConstants.PROJECT_EMP_SOURCE)
+	private String projectSource;
+
+	/**
+	 * 项目档案状态（0草稿、1已审核）
+	 */
+	@ExcelAttribute(name ="项目档案状态", readConverterExp = "0=草稿,1=已审核")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="项目档案状态")
+	private String status;
+
+	/**
+	 * 社保-省
+	 */
+	@ExcelAttribute(name ="社保所在省")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="社保所在省")
+	private String socialProvince;
+
+	/**
+	 * 社保-市
+	 */
+	@ExcelAttribute(name ="社保所在市")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="社保所在市")
+	private String socialCity;
+
+	/**
+	 * 社保-县
+	 */
+	@ExcelAttribute(name ="社保所在县")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="社保所在县")
+	private String socialTown;
+
+	private String[] socialStatusArray;
+
+	private String[] fundStatusArray;
+
+	private String[] insuranceStatusArray;
+
+	private String[] contractStatusArray;
+
+	private String[] empNatureArray;
+
+	private List<String> idList;
+}

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

@@ -22,7 +22,6 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 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;
 import lombok.Data;
 
 import javax.validation.constraints.Past;
@@ -38,7 +37,7 @@ import java.util.List;
  */
 @Data
 @ColumnWidth(15)
-public class EmployeeProjectExportVO extends BaseEntity {
+public class EmployeeProjectExportVO {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -47,7 +47,7 @@ public class EmployeeProjectUpdateVO extends RowIndex implements Serializable {
      */
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="员工类型")
-	@ExcelAttribute(name = "员工类型",maxLength = 2,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
+	@ExcelAttribute(name = "员工类型",maxLength = 5,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
     private String empNatrue;
 
     /**

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

@@ -46,7 +46,7 @@ public class EmployeeProjectVO extends RowIndex implements Serializable {
      * 员工类型（字典值，0外包1派遣2代理）
      */
 	@NotNull(message = "员工类型不能为空")
-	@ExcelAttribute(name = "员工类型",isNotEmpty = true, errorInfo = "员工类型不能为空",maxLength = 2,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
+	@ExcelAttribute(name = "员工类型",isNotEmpty = true, errorInfo = "员工类型不能为空",maxLength = 5,isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="员工类型")
     private String empNatrue;

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

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author hgw
+ * @Date 2022-10-21 09:50:08
+ * @Description 通用Vo
+ * @Version 1.0
+ */
+@Data
+public class IdNameNoVo implements Serializable {
+	private String id;
+	private String name;
+	private String no;
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java

@@ -19,6 +19,7 @@ public class EmployeeConstants {
 	public static final String CONTACT_ADDRESS = "通信地址必填！";
 	public static final String EMP_NATRUE_ZERO = "派遣";
 	public static final String EMP_NATRUE_ONE = "外包";
+	public static final String EMP_NATRUE_THREE = "内部员工";
 	public static final String HIGN_EDUCATION = "最高学历必填";
 	public static final String SCHOOL = "学校必填";
 	public static final String MAJOR = "专业必填";

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

@@ -125,8 +125,9 @@ public class TEmpChangeInfoController {
 	 */
 	@Operation(description = "分页查询")
 	@GetMapping("/getAllDeptPage" )
-	public R<IPage<TSettleDomain>> getItemNamePage(Page page,String departName) {
-		return new R<>(tEmpChangeInfoService.getAllDeptPage(page, departName));
+	public R<IPage<TSettleDomain>> getItemNamePage(Page page,@RequestParam(required = false) String departName
+			, @RequestParam(required = false) String customerId) {
+		return new R<>(tEmpChangeInfoService.getAllDeptPage(page, departName, customerId));
 	}
 
 	/**

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

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -262,7 +262,7 @@ public class TEmployeeProjectController {
 	 **/
 	@PostMapping("/export")
 	public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr,
-					   @RequestBody List<String> exportFields, EmployeeProjectExportVO projectDTO) {
+					   @RequestBody List<String> exportFields, EmployeeProjectExportParamVO projectDTO) {
 		YifuUser user = SecurityUtils.getUser();
 		if (user != null && Common.isNotNull(user.getId())) {
 			menuUtil.setAuthSql(user, projectDTO);

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

@@ -21,10 +21,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TCustomerInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TDepartSettlementInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
@@ -272,4 +274,15 @@ public class TSettleDomainController {
 		return tSettleDomainService.updateProjectInfo(list);
 	}
 
+
+	/**
+	 * 分页查询 客户信息
+	 * @return
+	 */
+	@Operation(summary = "分页查询客户信息", description = "分页查询客户信息")
+	@GetMapping("/getUnitPage")
+	public R<IPage<IdNameNoVo>> getUnitPage(Page<IdNameNoVo> page, IdNameNoVo idNameNo) {
+		return R.ok(tSettleDomainService.getUnitPage(page, idNameNo));
+	}
+
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeProjectMapper.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,5 +58,5 @@ public interface TEmployeeProjectMapper extends BaseMapper<TEmployeeProject> {
 	 * @param tEmployeeProject
 	 * @return
 	 */
-	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject")EmployeeProjectExportVO tEmployeeProject);
+	List<EmployeeProjectExportVO> getTEmployeeProjectExportPage(@Param("tEmployeeProject") EmployeeProjectExportParamVO tEmployeeProject);
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TSettleDomainMapper.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -38,6 +39,8 @@ import java.util.List;
 public interface TSettleDomainMapper extends BaseMapper<TSettleDomain> {
 
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, @Param("tSettleDomain") TSettleDomain tSettleDomain);
+
+	IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, @Param("idNameNoVo") IdNameNoVo idNameNoVo);
 	/**
 	 * @param departNo
 	 * @Author: wangan

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

@@ -68,5 +68,5 @@ public interface TEmpChangeInfoService extends IService<TEmpChangeInfo> {
 	 */
 	R<List<TCustomerInfo>> getAllUint();
 
-	IPage<TSettleDomain> getAllDeptPage(Page page, String deptName);
+	IPage<TSettleDomain> getAllDeptPage(Page page, String deptName, String customerId);
 }

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

@@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportParamVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.UpProjectSocialFundVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -96,7 +96,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	R deleteEmpPro(TEmployeeProject tEmployeeProject);
 
 	/**
-	 * @param list
+	 * @param inputStream
 	 * @Description: 批量减项
 	 * @Author: huyc
 	 * @Date: 2022/6/21 10:30
@@ -163,7 +163,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	 * @Date: 2022/6/23 10:30
 	 * @return: R
 	 **/
-	void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO,
+	void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO,
 						   String idstr, List<String> exportFields);
 	/**
 	 * @param employeeInfo

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

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -38,6 +39,16 @@ public interface TSettleDomainService extends IService<TSettleDomain> {
 
 	IPage<TSettleDomain> getPage(Page<TSettleDomain> page, TSettleDomain tSettleDomain);
 
+	/**
+	 * @param page
+	 * @param idNameNoVo
+	 * @Description: 获取客户单位单位
+	 * @Author: hgw
+	 * @Date: 2022/10/21 10:01
+	 * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo>
+	 **/
+	IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, IdNameNoVo idNameNoVo);
+
 	/**
 	 * 清除userId的项目权限缓存
 	 *

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

@@ -304,16 +304,19 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 	 * @Date 2022-07-26
 	 */
 	@Override
-	public IPage<TSettleDomain> getAllDeptPage(Page page, String deptName) {
-		LambdaQueryWrapper<TSettleDomain> wrapper = buildQueryWrapper(deptName);
+	public IPage<TSettleDomain> getAllDeptPage(Page page, String deptName, String customerId) {
+		LambdaQueryWrapper<TSettleDomain> wrapper = buildQueryWrapper(deptName, customerId);
 		return tSettleDomainMapper.selectPage(page,wrapper);
 	}
 
-	private LambdaQueryWrapper buildQueryWrapper(String deptName) {
+	private LambdaQueryWrapper buildQueryWrapper(String deptName, String customerId) {
 		LambdaQueryWrapper<TSettleDomain> wrapper = Wrappers.lambdaQuery();
 		if (Common.isNotNull(deptName)) {
 			wrapper.like(TSettleDomain::getDepartName, deptName);
 		}
+		if (Common.isNotNull(customerId)) {
+			wrapper.eq(TSettleDomain::getCustomerId, customerId);
+		}
 		wrapper.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING);
 		wrapper.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING);
 		return wrapper;

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

@@ -293,7 +293,8 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
 					&& project.getProjectStatus().intValue()== CommonConstants.ONE_INT)
 					|| (
 					!CommonConstants.ZERO_STRING.equals(project.getEmpNatrue())
-							&& !CommonConstants.ONE_STRING.equals(project.getEmpNatrue()))
+							&& !CommonConstants.ONE_STRING.equals(project.getEmpNatrue())
+							&& !CommonConstants.THREE_STRING.equals(project.getEmpNatrue()))
 					)){
 				return;
 			}

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

@@ -793,8 +793,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 			errorMsg.add("员工类型必填！");
 			errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填！"));
 		} else if (EmployeeConstants.EMP_NATRUE_ZERO.equals(employeeInfo.getEmpNatrue())
-				|| EmployeeConstants.EMP_NATRUE_ONE.equals(employeeInfo.getEmpNatrue())) {
-			// 2.员工类型为外包和派遣，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
+				|| EmployeeConstants.EMP_NATRUE_ONE.equals(employeeInfo.getEmpNatrue())
+				|| EmployeeConstants.EMP_NATRUE_THREE.equals(employeeInfo.getEmpNatrue())) {
+			// 2.员工类型为外包和派遣和内部员工，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
 			if (Common.isEmpty(employeeInfo.getValidityStart())) {
 				errorMsg.add(EmployeeConstants.VALIDITY_START);
 				errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.VALIDITY_START));
@@ -1893,7 +1894,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 	private void judgeNull(Set<String> errorMsg, TEmployeeInfo employeeInfo) {
 		if (Common.isNotNull(employeeInfo.getEmpNatrue())
 				&& (CommonConstants.ZERO_STRING.equals(employeeInfo.getEmpNatrue())
-				|| CommonConstants.ONE_STRING.equals(employeeInfo.getEmpNatrue()))) {
+				|| CommonConstants.ONE_STRING.equals(employeeInfo.getEmpNatrue())
+				|| CommonConstants.THREE_STRING.equals(employeeInfo.getEmpNatrue()))) {
 			// 2.员工类型为外包和派遣，额外必填项有：身份证开始日期、身份证截止日期、民族、户籍所在（省市县）、户口性质、档案所在地（省市县）、是否大专及以上、通信地址
 			if (Common.isEmpty(employeeInfo.getValidityStart())) {
 				errorMsg.add(EmployeeConstants.VALIDITY_START);
@@ -2152,24 +2154,30 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							.eq(TEmployeeContractInfo::getDispatchFlag,CommonConstants.ONE_STRING)
 							.last(CommonConstants.LAST_ONE_SQL));
 					if (Common.isNotNull(c)){
+						TEmployeeContractAudit contractAudit = new TEmployeeContractAudit();
+						contractAudit.setLinkId(c.getId());
+						contractAudit.setLinkType(CommonConstants.ONE_INT);
+						contractAudit.setCreateBy(c.getCreateBy());
+						contractAudit.setCreateName(c.getCreateName());
+						contractAudit.setCreateTime(LocalDateTime.now());
 						//审核通过
 						if (CommonConstants.ZERO_STRING.equals(vo.getType())){
 							c.setAuditStatus(CommonConstants.TWO_INT);
 							c.setInUse(CommonConstants.ZERO_STRING);
 							c.setAuditTimeLast(LocalDateTime.now());
-							TEmployeeContractAudit contractAudit = new TEmployeeContractAudit();
 							contractAudit.setAuditStatus("审核通过");
 							contractAudit.setRemark("派单审核通过,同步审核通过合同");
-							contractAudit.setLinkId(c.getId());
-							contractAudit.setLinkType(CommonConstants.ONE_INT);
 							contractAudit.setRootName("合同审核-派单审核通过");
-							contractAuditMapper.insert(contractAudit);
 							contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
 							//审核不同
 						}else if (CommonConstants.ONE_STRING.equals(vo.getType())){
 							c.setAuditStatus(CommonConstants.THREE_INT);
 							c.setInUse(CommonConstants.ONE_STRING);
+							contractAudit.setAuditStatus("审核不通过");
+							contractAudit.setRemark("派单审核不通过,同步审核不通过合同");
+							contractAudit.setRootName("合同审核-派单审核不通过");
 						}
+						contractAuditMapper.insert(contractAudit);
 						contractServicer.updateById(c);
 					}
 

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

@@ -277,7 +277,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			//从剩下的项目档案中查找员工类型并更新
 			if (Common.isNotNull(list)) {
 				Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
-				if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
+				if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.THREE_STRING))) {
+					tEmployeeInfo.setEmpNatrue(CommonConstants.THREE_STRING);
+				} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
 				} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ONE_STRING))) {
 					tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
@@ -758,7 +760,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 			idCard = excel.getEmpIdcard();
 			deptNo = excel.getDeptNo();
-			if (excel.getEmpNatrue().equals(CommonConstants.ZERO_STRING) || excel.getEmpNatrue().equals(CommonConstants.ONE_STRING)) {
+			if (excel.getEmpNatrue().equals(CommonConstants.ZERO_STRING)
+					|| excel.getEmpNatrue().equals(CommonConstants.ONE_STRING)
+					|| excel.getEmpNatrue().equals(CommonConstants.THREE_STRING)) {
 				if (excel.getContractType().equals(CommonConstants.ONE_STRING) && Common.isEmpty(excel.getWorkingHours())) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "工时制不能为空！"));
 				}
@@ -1174,7 +1178,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	 * @Date 10:55 2022/6/23
 	 **/
 	@Override
-	public void listExportProject(HttpServletResponse response, EmployeeProjectExportVO projectDTO, String idstr, List<String> exportFields) {
+	public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO, String idstr, List<String> exportFields) {
 
 		String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		// 根据用户传入确定要导出的字段
@@ -1256,7 +1260,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	/**
 	 * 获取导出的项目档案列表
 	 */
-	private List<EmployeeProjectExportVO> gettEmpProInfoExportVos(String idstr, EmployeeProjectExportVO projectDTO) {
+	private List<EmployeeProjectExportVO> gettEmpProInfoExportVos(String idstr, EmployeeProjectExportParamVO projectDTO) {
 		List<EmployeeProjectExportVO> list;
 		if (!Common.isEmpty(idstr)) {
 			projectDTO.setIdList(Common.initStrToList(idstr, CommonConstants.COMMA_STRING));

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

@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TCutsomerDataPermissonMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TSettleDomainMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.SetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
@@ -71,6 +72,11 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 		return baseMapper.getPage(page, tSettleDomain);
 	}
 
+	@Override
+	public IPage<IdNameNoVo> getUnitPage(Page<IdNameNoVo> page, IdNameNoVo idNameNoVo) {
+		return baseMapper.getUnitPage(page, idNameNoVo);
+	}
+
 	/**
 	 * @Author fxj
 	 * @Description 清除项目缓存

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

@@ -217,6 +217,24 @@
 		</if>
 	</select>
 
+	<select id="getUnitPage" resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.IdNameNoVo">
+		SELECT
+			a.CUSTOMER_ID as id,
+			a.CUSTOMER_NAME as name,
+			a.CUSTOMER_NO as no
+		FROM t_settle_domain a
+		WHERE 1=1
+		<if test="idNameNoVo != null">
+			<if test="idNameNoVo.name != null and idNameNoVo.name.trim() != ''">
+				and a.CUSTOMER_NAME like concat('%', #{idNameNoVo.name} ,'%')
+			</if>
+			<if test="idNameNoVo.no != null and idNameNoVo.no.trim() != ''">
+				and a.CUSTOMER_NO = #{idNameNoVo.no}
+			</if>
+		</if>
+		group by a.CUSTOMER_ID
+	</select>
+
 	<select id="selectSettleDomainSelectVosById"
 			resultType="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">
 		SELECT

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -506,4 +506,15 @@ public class TSalaryAccount extends BaseEntity {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value = "年终奖单独扣税税费")
 	private BigDecimal annualBonusTax;
+
+	/**
+	 * 工资月份-起
+	 */
+	@TableField(exist = false)
+	private String salaryMonthStart;
+	/**
+	 * 工资月份-止
+	 */
+	@TableField(exist = false)
+	private String salaryMonthEnd;
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccountItem.java

@@ -107,4 +107,10 @@ public class TSalaryAccountItem extends Model<TSalaryAccountItem> {
     @TableField(exist = false)
     private String formType;
 
+	/**
+	 * 工资月
+	 */
+	@TableField(exist = false)
+	private String salaryMonth;
+
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -21,6 +21,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 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.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -395,4 +396,14 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelIgnore
 	private String bpoFlag;
 
+	/**
+	 * 工资月份-起
+	 */
+	@TableField(exist = false)
+	private String salaryMonthStart;
+	/**
+	 * 工资月份-止
+	 */
+	@TableField(exist = false)
+	private String salaryMonthEnd;
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java

@@ -108,6 +108,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
 	List<TSalaryAccount> noPageDiy(@Param("searchVo") TSalaryAccountSearchVo searchVo,
 								   @Param("idList") List<String> idList);
 
+	List<TSalaryAccount> getAccountListBySalaryId(@Param("searchVo") TSalaryAccountSearchVo searchVo);
+
 	/**
 	 * @Description: 根据工资id，返回报账明细（字段较少且有计算，其他地方勿用）
 	 * @Author: hgw

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

@@ -57,6 +57,15 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
 
     List<TSalaryAccount> noPageDiy(TSalaryAccountSearchVo searchVo);
 
+	/**
+	 * @param searchVo
+	 * @Description: 无需权限仅按照工资id查询报账
+	 * @Author: hgw
+	 * @Date: 2022/10/24 16:36
+	 * @return: java.util.List<com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount>
+	 **/
+	List<TSalaryAccount> getAccountListBySalaryId(TSalaryAccountSearchVo searchVo);
+
 	/**
 	 * @param settleId
 	 * @param settleMonth

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1376,22 +1376,19 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			List<TSalaryAtta> attaList = null;
 			if (salary.getType() == null || salary.getType() != CommonConstants.ONE_INT) {
 				//报账表
-				TSalaryAccount salaryAccount = new TSalaryAccount();
+				TSalaryAccountSearchVo salaryAccount = new TSalaryAccountSearchVo();
 				salaryAccount.setSalaryFormId(salaryFormId);
-				QueryWrapper<TSalaryAccount> queryWrapperSa = new QueryWrapper<>();
-				queryWrapperSa.setEntity(salaryAccount);
-				List<TSalaryAccount> salaryAccountList = tSalaryAccountService.list(queryWrapperSa);
+				salaryAccount.setSalaryMonthStart(salary.getSalaryMonth());
+				List<TSalaryAccount> salaryAccountList = tSalaryAccountService.getAccountListBySalaryId(salaryAccount);
 				//报账表明细
 				if (salaryAccountList != null && salaryAccountList.size() > CommonConstants.ZERO_INT) {
 					TSalaryAccountItem item;
-					QueryWrapper<TSalaryAccountItem> queryWrapperAi;
 					List<TSalaryAccountItem> itemList;
 					for (TSalaryAccount a : salaryAccountList) {
 						item = new TSalaryAccountItem();
 						item.setSalaryAccountId(a.getId());
-						queryWrapperAi = new QueryWrapper<>();
-						queryWrapperAi.setEntity(item);
-						itemList = tSalaryAccountItemService.list(queryWrapperAi);
+						item.setSalaryMonth(salary.getSalaryMonth());
+						itemList = tSalaryAccountItemService.getTSalaryAccountItemNoPage(item);
 						a.setSaiList(itemList);
 					}
 				}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java

@@ -35,6 +35,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.AccountCheckVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
 import lombok.extern.log4j.Log4j2;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
@@ -151,6 +152,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
 		return baseMapper.noPageDiy(searchVo,searchVo.getIdList());
 	}
 
+	@Override
+	public List<TSalaryAccount> getAccountListBySalaryId(TSalaryAccountSearchVo searchVo) {
+		return baseMapper.getAccountListBySalaryId(searchVo);
+	}
+
 	private int noPageCountDiy(TSalaryAccountSearchVo searchVo) {
 		return baseMapper.noPageCountDiy(searchVo,searchVo.getIdList());
 	}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryEmployeeServiceImpl.java

@@ -286,18 +286,19 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 				checkIdCard.setBankNo(employee.getBankNo());
 				R<CheckBankNoVo> checkListR = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
 						, "/tcheckbankno/inner/checkBankNo", checkIdCard, CheckBankNoVo.class, SecurityConstants.FROM_IN);
+				String pre = "姓名与卡号验证：";
 				if (checkListR != null && checkListR.getData() != null) {
 					CheckBankNoVo vo = checkListR.getData();
 					TCheckBankNo check = (null == vo.getRes()) ? null : vo.getRes().getData();
 					if (Common.isEmpty(vo)) {
-						return SalaryConstants.CHECK_NO_RESPONSE;
+						return pre + SalaryConstants.CHECK_NO_RESPONSE;
 					} else if (!CommonConstants.SUCCESS.equals(vo.getRes().getCode())) {
-						return vo.getRes().getMsg();
+						return pre + vo.getRes().getMsg();
 					} else if (check != null && !check.getResult().equals(CommonConstants.ZERO_ONE)) {
-						return check.getRemark();
+						return pre + check.getRemark();
 					}
 				} else {
-					return SalaryConstants.CHECK_NO_RESPONSE;
+					return pre + SalaryConstants.CHECK_NO_RESPONSE;
 				}
 			}
 //			if (Common.isNotNull(employee.getBankNo())) {
@@ -323,14 +324,15 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
 				checkMobile.setMobile(employee.getEmpPhone());
 				R<TCheckMobile> a = HttpDaprUtil.invokeMethodPost(checkProperties.getAppUrl(), checkProperties.getAppId()
 						, "/tcheckmobile/inner/checkOneMobile", checkMobile, TCheckMobile.class, SecurityConstants.FROM_IN);
+				String pre = "手机号验证：";
 				if (a != null && a.getData() != null) {
 					checkMobile = a.getData();
 					if (checkMobile != null && Common.isNotNull(checkMobile.getStatus())) {
 						if (!CommonConstants.ONE_STRING.equals(checkMobile.getStatus())) {
-							return checkMobile.getMessage();
+							return pre + checkMobile.getMessage();
 						}
 					} else {
-						return "校验服务未找到手机号，请联系管理员！";
+						return pre + "校验服务未找到手机号，请联系管理员！";
 					}
 				}
 			}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountItemMapper.xml

@@ -38,7 +38,13 @@
         SALARY_MONEY,
         TEXT_VALUE,
         IS_TAX
-        FROM t_salary_account_item
+        FROM
+			<if test="tSalaryAccountItem.salaryMonth == null or tSalaryAccountItem.salaryMonth.trim() >= '202201'">
+				t_salary_account_item a
+			</if>
+			<if test="tSalaryAccountItem.salaryMonth != null and tSalaryAccountItem.salaryMonth.trim() &lt; '202201' ">
+				t_salary_account_item_hro_2021 a
+			</if>
         <where>
             <if test="tSalaryAccountItem.id != null and tSalaryAccountItem.id.trim() != ''">
                 AND ID = #{tSalaryAccountItem.id}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -253,6 +253,12 @@
                     <if test="tSalaryAccount.salaryMonth != null and tSalaryAccount.salaryMonth.trim() != ''">
                         AND a.SALARY_MONTH = #{tSalaryAccount.salaryMonth}
                     </if>
+					<if test="tSalaryAccount.salaryMonthStart != null and tSalaryAccount.salaryMonthStart.trim() != ''">
+						AND a.SALARY_MONTH >= #{tSalaryAccount.salaryMonthStart}
+					</if>
+					<if test="tSalaryAccount.salaryMonthEnd != null and tSalaryAccount.salaryMonthEnd.trim() != ''">
+						AND a.SALARY_MONTH <![CDATA[<=]]> #{tSalaryAccount.salaryMonthEnd}
+					</if>
                     <if test="tSalaryAccount.empId != null and tSalaryAccount.empId.trim() != ''">
                         AND a.EMP_ID = #{tSalaryAccount.empId}
                     </if>
@@ -373,7 +379,13 @@
     <select id="getTSalaryAccountPage" resultMap="tSalaryAccountMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_salary_account a
+        FROM
+			<if test="tSalaryAccount.salaryMonthStart == null or tSalaryAccount.salaryMonthStart.trim() >= '202201' ">
+				t_salary_account a
+			</if>
+			<if test="tSalaryAccount.salaryMonthStart != null and tSalaryAccount.salaryMonthStart.trim() &lt; '202201' ">
+				t_salary_account_hro_2021 a
+			</if>
         <where>
 			a.DELETE_FLAG = 0
 			and not EXISTS (
@@ -605,7 +617,13 @@
 	<select id="noPageDiy" resultMap="tSalaryAccountMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount">
 		SELECT
 		<include refid="Base_Column_List"/>
-		FROM t_salary_account a
+		FROM
+			<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
+				t_salary_account a
+			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() &lt; '202201' ">
+				t_salary_account_hro_2021 a
+			</if>
 		<where>
 			a.DELETE_FLAG = 0 and not EXISTS (
 			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
@@ -624,6 +642,20 @@
 
 	</select>
 
+	<select id="getAccountListBySalaryId" resultMap="tSalaryAccountMap" parameterType="com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount">
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM
+			<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201'">
+				t_salary_account a
+			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() &lt; '202201' ">
+				t_salary_account_hro_2021 a
+			</if>
+		where a.SALARY_FORM_ID = #{searchVo.salaryFormId}
+		ORDER BY a.CREATE_TIME desc
+	</select>
+
 	<!-- 计算收入需要的报账明细 -->
 	<select id="getListByIncome" resultMap="tSalaryAccountMap">
 		SELECT
@@ -645,7 +677,13 @@
 	<select id="noPageCountDiy"  resultType="java.lang.Integer">
 		SELECT
 		count(1)
-		FROM t_salary_account a
+		FROM
+			<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201' ">
+				t_salary_account a
+			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() &lt; '202201' ">
+				t_salary_account_hro_2021 a
+			</if>
 		<where>
 			a.DELETE_FLAG = 0 and not EXISTS (
 			select 1 from t_dept_see d where a.DEPT_NO = d.DEPT_NO and d.CAN_SEE = 1
@@ -676,6 +714,12 @@
 			<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
 				AND a.SALARY_MONTH = #{searchVo.salaryMonth}
 			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() != ''">
+				AND a.SALARY_MONTH >= #{searchVo.salaryMonthStart}
+			</if>
+			<if test="searchVo.salaryMonthEnd != null and searchVo.salaryMonthEnd.trim() != ''">
+				AND a.SALARY_MONTH <![CDATA[<=]]> #{searchVo.salaryMonthEnd}
+			</if>
 			<if test="searchVo.empId != null and searchVo.empId.trim() != ''">
 				AND a.EMP_ID = #{searchVo.empId}
 			</if>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -169,6 +169,12 @@
                     <if test="tSalaryStandard.salaryMonth != null and tSalaryStandard.salaryMonth.trim() != ''">
                         AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
                     </if>
+					<if test="tSalaryStandard.salaryMonthStart != null and tSalaryStandard.salaryMonthStart.trim() != ''">
+						AND a.SALARY_MONTH >= #{tSalaryStandard.salaryMonthStart}
+					</if>
+					<if test="tSalaryStandard.salaryMonthEnd != null and tSalaryStandard.salaryMonthEnd.trim() != ''">
+						AND a.SALARY_MONTH <![CDATA[<=]]> #{tSalaryStandard.salaryMonthEnd}
+					</if>
                     <if test="tSalaryStandard.moneyFrom != null">
                         AND a.MONEY_FROM = #{tSalaryStandard.moneyFrom}
                     </if>
@@ -265,7 +271,13 @@
     <select id="getTSalaryStandardPage" resultMap="tSalaryStandardMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_salary_standard a
+        FROM
+		<if test="tSalaryStandard.salaryMonthStart == null or tSalaryStandard.salaryMonthStart.trim() >= '202201' ">
+			t_salary_standard a
+		</if>
+		<if test="tSalaryStandard.salaryMonthStart != null and tSalaryStandard.salaryMonthStart.trim() &lt; '202201' ">
+             t_salary_standard_hro_2021 a
+		</if>
         left join t_dept_see d on a.DEPT_NO = d.DEPT_NO
         <where>
             a.DELETE_FLAG = 0
@@ -282,7 +294,13 @@
 	<select id="getTSalaryStandardPageApply" resultMap="tSalaryStandardMap">
 		SELECT
 		<include refid="Base_Column_List"/>
-		FROM t_salary_standard a
+		FROM
+		<if test="tSalaryStandard.salaryMonthStart == null or tSalaryStandard.salaryMonthStart.trim() >= '202201' ">
+			t_salary_standard a
+		</if>
+		<if test="tSalaryStandard.salaryMonthStart != null and tSalaryStandard.salaryMonthStart.trim() &lt; '202201' ">
+			t_salary_standard_hro_2021 a
+		</if>
 		<where>
 			a.DELETE_FLAG = 0
 			<!-- 薪资是否可查看 0 是 1否-->
@@ -351,7 +369,13 @@
 		a.SALARY_MONTH,
 		a.FORM_TYPE,
 		a.CREATE_TIME
-		FROM t_salary_standard a
+		FROM
+		     <if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201' ">
+				t_salary_standard a
+			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() &lt; '202201' ">
+				t_salary_standard_hro_2021 a
+			</if>
 		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
 			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
@@ -371,7 +395,13 @@
 	<select id="getSalaryStandardExportCount"  resultType="java.lang.Integer">
 		SELECT
 		count(1)
-		FROM t_salary_standard a
+		FROM
+		<if test="searchVo.salaryMonthStart == null or searchVo.salaryMonthStart.trim() >= '202201' ">
+			t_salary_standard a
+		</if>
+		<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() &lt; '202201' ">
+			t_salary_standard_hro_2021 a
+		</if>
 		LEFT JOIN t_dept_see d ON a.DEPT_NO = d.DEPT_NO
 		<where>
 			a.DELETE_FLAG = 0 AND (d.CAN_SEE = 0 OR d.id is null)
@@ -417,6 +447,12 @@
 			<if test="searchVo.salaryMonth != null and searchVo.salaryMonth.trim() != ''">
 				AND a.SALARY_MONTH = #{searchVo.salaryMonth}
 			</if>
+			<if test="searchVo.salaryMonthStart != null and searchVo.salaryMonthStart.trim() != ''">
+				AND a.SALARY_MONTH >= #{searchVo.salaryMonthStart}
+			</if>
+			<if test="searchVo.salaryMonthEnd != null and searchVo.salaryMonthEnd.trim() != ''">
+				AND a.SALARY_MONTH <![CDATA[<=]]> #{searchVo.salaryMonthEnd}
+			</if>
 			<!--<if test="searchVo.status == null">
 				AND (a.STATUS = 1 OR a.STATUS = 2 OR a.STATUS = 5)
 			</if>-->

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

@@ -409,8 +409,8 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 员工类型
      */
-    @Length(max = 2, message = "员工类型不能超过2个字符")
-    @ExcelAttribute(name = "员工类型", maxLength = 2)
+    @Length(max = 5, message = "员工类型不能超过2个字符")
+    @ExcelAttribute(name = "员工类型", maxLength = 5)
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty(value ="员工类型")
     private String empTypeAdd;

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

@@ -116,7 +116,7 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证所在地")
 	private String idCardAddress;
 
-	@ExcelAttribute(name = "档案-省")
+	@ExcelAttribute(name = "档案-省", isArea = true)
 	@Schema(description = "档案-省")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("档案-省")
@@ -522,7 +522,7 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("公积金户")
 	private String providentHouseholdName;
 
-	@ExcelAttribute(name = "公积金缴纳地-省", maxLength = 32)
+	@ExcelAttribute(name = "公积金缴纳地-省", isArea = true, maxLength = 32)
 	@Schema(description = "公积金缴纳地-省")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("公积金缴纳地-省")

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

@@ -3139,7 +3139,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				StringBuilder temp = new StringBuilder();
 				// 预估库同步社保还是公积金的标志，0：全部；1仅社保；2仅公积金
 				int forecastFlag = CommonConstants.ZERO_INT;
+				// auditFlag 表示社保办理无办理项是不保存
+				boolean auditFlag = true;
 				for (TDispatchInfo dis : disList) {
+					auditFlag = true;
 					if (CommonConstants.ZERO_STRING.equals(typeSub)) {
 						forecastFlag = CommonConstants.ONE_INT;
 					} else if (CommonConstants.ONE_STRING.equals(typeSub)) {
@@ -3189,6 +3192,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
+								auditFlag = Common.isNotNull(Common.isNullToString(socialTypeRemark));
+								if (auditFlag){
 									auditInfo.setType(CommonConstants.ONE_STRING);
 									if (CommonConstants.ZERO_INT == flag) {
 										temp.setLength(CommonConstants.ZERO_INT);
@@ -3204,6 +3209,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark);
 									}
 									auditInfo.setSocialId(dis.getId());
+								}
 							} else {
 								errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName()));
 								continue;
@@ -3422,7 +3428,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//新增办理记录信息
 						auditInfo.setDispatchInfoId(dis.getId());
 						auditInfo.setEmpIdcard(dis.getEmpIdcard());
+						if (auditFlag){
 							auditInfoMapper.insert(auditInfo);
+						}
 						baseMapper.updateById(dis);
 						socialFundMapper.updateById(sf);
 						//1.派增办理失败 刷新预估数据

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

@@ -698,7 +698,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 										 ConcurrentHashMap<String, TPaymentInfo> paymentInfoInjuryMap,
 										 List<ErrorMessage> errorMessageList) {
 		if (Common.isNotNull(list)) {
-			TPaymentInfo paymentInfo = null;
+			TPaymentInfo paymentInfo;
 			TSocialFundInfo socialInfo;
 			TSocialInfo tSocialInfo;
 			String temp;
@@ -782,7 +782,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.YL);
-				}
+
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitPensionMoney()),
@@ -792,8 +792,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的养老缴费数据,请勿重复导入！"));
 						continue;
-				} else {
-					paymentInfo = null;
+					}
 				}
 
 				//判断是否存在失业缴费数据
@@ -808,7 +807,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.SY);
-				}
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitUnemploymentMoney()),
@@ -818,8 +816,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的失业缴费数据,请勿重复导入！"));
 						continue;
-				} else {
-					paymentInfo = null;
+					}
 				}
 
 				//判断是否存在医保缴费数据
@@ -834,7 +831,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.YB);
-				}
+
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
@@ -844,8 +841,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医保缴费数据,请勿重复导入！"));
 						continue;
-				} else {
-					paymentInfo = null;
+					}
 				}
 
 				//判断是否存在医疗救助金缴费数据
@@ -860,7 +856,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.DB);
-				}
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitBigmailmentMoney()),
@@ -870,8 +865,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医疗救助金缴费数据,请勿重复导入！"));
 						continue;
-				} else {
-					paymentInfo = null;
+					}
 				}
 
 				//判断是否存在工伤缴费数据
@@ -885,15 +879,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.GS);
-				}
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitInjuryMoney()),
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0) {
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的单位工伤缴费数据,请勿重复导入！"));
 						continue;
-				} else {
-					paymentInfo = null;
+					}
 				}
 
 				//判断是否存在生育缴费数据
@@ -907,7 +899,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ infoVo.getSocialCreateMonth().trim()
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.BIR);
-				}
 					//存在社保缴费数据
 					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitBirthMoney()),
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitBirthMoney())).compareTo(BigDecimal.ZERO) > 0) {
@@ -915,6 +906,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 								+ "的单位生育缴费数据,请勿重复导入！"));
 						continue;
 					}
+				}
 				tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
 						.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()).groupBy(TSocialInfo::getCreateTime)
 						.last(CommonConstants.LAST_ONE_SQL));
@@ -936,8 +928,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				paymentInfo.setSocialProvince(socialInfo.getSocialProvince());
 				paymentInfo.setSocialCity(socialInfo.getSocialCity());
 				paymentInfo.setSocialTown(socialInfo.getSocialTown());
-
-
 				paymentInfo.setSocialHousehold(socialInfo.getSocialHouseholdName());
 				paymentInfo.setSocialPayMonth(infoVo.getSocialPayMonth());
 
@@ -1005,22 +995,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				paymentInfo.setSumAll(paymentInfo.getSocialSum());
 				paymentInfo.setCreateBy(user.getId());
 				paymentInfo.setCreateName(user.getNickname());
-				if (Common.isEmpty(paymentInfo.getSocialId())) {
 				paymentInfo.setSocialId(UUID.randomUUID().toString());
-				}
-				if (Common.isNotNull(paymentInfo.getId())) {
-					res = baseMapper.updateById(paymentInfo);
-					if (res < 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpName() + "_缴费库更新失败！"));
-					}
-				} else {
 				res = insertAndSTimestamp(paymentInfo);
 				if (res < 0) {
 					errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpName() + "_缴费库保存失败！"));
 				}
 			}
 		}
-		}
 		return errorMessageList;
 	}
 
@@ -1289,7 +1270,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 									infoVo.getEmpName() + CommonConstants.DOWN_LINE_STRING + infoVo.getEmpIdcard()
 									+ "公积金缴费数据，禁止覆盖！"));
 							continue;
-
 						}
 
 						TProvidentFund tProvidentFund = providentFundMapper.selectOne(Wrappers.<TProvidentFund>query().lambda()
@@ -1345,24 +1325,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						paymentInfo.setUnitProvidentSum(null == infoVo.getUnitProvidentSum() ? BigDecimal.ZERO : infoVo.getUnitProvidentSum());
 						paymentInfo.setProvidentSum(null == infoVo.getProvidentSum() ? BigDecimal.ZERO : infoVo.getProvidentSum());
 						paymentInfo.setSumAll(paymentInfo.getProvidentSum());
-						if (Common.isEmpty(paymentInfo.getFundId())) {
 						paymentInfo.setFundId(UUID.randomUUID().toString());
-						}
-						if (Common.isNotNull(paymentInfo.getId())) {
-							res = baseMapper.updateById(paymentInfo);
-							if (res < 0) {
-								errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpName() +
-										infoVo.getEmpName() + "_缴费库覆盖更新失败！"));
-								continue;
-							}
-						} else {
 						res = insertAndSTimestamp(paymentInfo);
 						if (res < 0) {
 							errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpName()
 									+ "_缴费库保存失败！"));
 							continue;
 						}
-						}
 						if (Common.isNotNull(paymentInfo.getId()) && Common.isNotNull(paymentInfo.getFundId())) {
 							paymentInfoMap.put(paymentInfo.getProvidentPayAddr()
 									+ CommonConstants.DOWN_LINE_STRING
@@ -1620,8 +1589,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 											  ConcurrentHashMap<String, TPaymentInfo> paymentInfoBigMap,
 											  String type,List<ErrorMessage> errorMessageList) {
 		if (Common.isNotNull(list)) {
-			TPaymentInfo payExists = null;
+			TPaymentInfo payExists;
 			TSocialFundInfo socialInfo = null;
+			TSocialInfo tSocialInfo;
 			String temp;
 			int res = -1;
 
@@ -1631,12 +1601,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//已存在的社保数据
 			HashMap<String, TSocialFundInfo> socialMap = new HashMap<>();
 			if (Common.isNotNull(socialInfoList)) {
-				for (TSocialFundInfo tSocialInfo : socialInfoList) {
-					socialMap.put(tSocialInfo.getEmpIdcard()
-							+ CommonConstants.DOWN_LINE_STRING + tSocialInfo.getSocialProvince()
-							+ CommonConstants.DOWN_LINE_STRING + tSocialInfo.getSocialCity()
-							+ CommonConstants.DOWN_LINE_STRING + (null == tSocialInfo.getSocialTown()
-							? "null" : tSocialInfo.getSocialTown()), tSocialInfo);
+				for (TSocialFundInfo tSocialInfo1 : socialInfoList) {
+					socialMap.put(tSocialInfo1.getEmpIdcard()
+							+ CommonConstants.DOWN_LINE_STRING + tSocialInfo1.getSocialProvince()
+							+ CommonConstants.DOWN_LINE_STRING + tSocialInfo1.getSocialCity()
+							+ CommonConstants.DOWN_LINE_STRING + (null == tSocialInfo1.getSocialTown()
+							? "null" : tSocialInfo1.getSocialTown()), tSocialInfo1);
 				}
 			}
 
@@ -1703,8 +1673,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的养老缴费数据,请勿重复导入！"));
 						continue;
-					} else {
-						payExists = null;
 					}
 				}
 
@@ -1728,8 +1696,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的失业缴费数据,请勿重复导入！"));
 						continue;
-					} else {
-						payExists = null;
 					}
 				}
 
@@ -1754,8 +1720,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医保缴费数据,请勿重复导入！"));
 						continue;
-					} else {
-						payExists = null;
 					}
 				}
 
@@ -1779,8 +1743,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的单位工伤缴费数据,请勿重复导入！"));
 						continue;
-					} else {
-						payExists = null;
 					}
 				}
 
@@ -1805,15 +1767,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医疗救助金缴费数据,请勿重复导入！"));
 						continue;
-					} else {
-						payExists = null;
 					}
 				}
 
-				TSocialInfo tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
+				tSocialInfo = socialInfoMapper.selectOne(Wrappers.<TSocialInfo>query().lambda()
 						.eq(TSocialInfo::getEmpIdcard, infoVo.getEmpIdcard()).groupBy(TSocialInfo::getCreateTime)
 						.last(CommonConstants.LAST_ONE_SQL));
-				if (null == payExists) {
+
 				payExists = new TPaymentInfo();
 				payExists.setLockStatus(CommonConstants.ZERO_STRING);
 				payExists.setEmpId(socialInfo.getEmpId());
@@ -1828,7 +1788,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 					payExists.setInauguralTeam(tSocialInfo.getInauguralTeam());
 					payExists.setEmpNo(tSocialInfo.getEmpNo());
 				}
-				}
+
 				payExists.setSocialProvince(socialInfo.getSocialProvince());
 				payExists.setSocialCity(socialInfo.getSocialCity());
 				payExists.setSocialTown(socialInfo.getSocialTown());
@@ -1899,22 +1859,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				payExists.setSumAll(payExists.getSocialSum());
 				payExists.setCreateBy(user.getId());
 				payExists.setCreateName(user.getNickname());
-				if (Common.isEmpty(payExists.getSocialId())) {
 				payExists.setSocialId(UUID.randomUUID().toString());
-				}
-				if (Common.isNotNull(payExists.getId())) {
-					res = baseMapper.updateById(payExists);
-					if (res < 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpIdcard() + "_缴费库更新失败！"));
-					}
-				} else {
+
 				res = insertAndSTimestamp(payExists);
 				if (res < 0) {
 					errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), infoVo.getEmpIdcard() + "_缴费库保存失败！"));
 				}
 			}
 		}
-		}
 		return errorMessageList;
 	}
 

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

@@ -256,6 +256,9 @@
 		<result property="fundSum" column="FUND_SUM"/>
 
 		<result property="trustRemark" column="TRUST_REMARK"/>
+		<result property="empNational" column="EMP_NATIONAL"/>
+		<result property="empRegisType" column="EMP_REGIS_TYPE"/>
+
 	</resultMap>
 	<sql id="Base_Column_List">
 				a.ID,
@@ -1035,7 +1038,9 @@
 			a.UNEMPLOY_HANDLE,
 			a.WORK_INJURY_HANDLE,
 			a.BIRTH_HANDLE,
-			a.BIGAILMENT_HANDLE
+			a.BIGAILMENT_HANDLE,
+		    d.EMP_NATIONAL,
+		    d.EMP_REGIS_TYPE
 		from t_social_fund_info a
 		left join t_dispatch_info d on a.DISPATCH_ID=d.ID
 		<where>