Merge branch 'develop' into feature-licancan

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/ArchivesConstants.java

@@ -29,4 +29,8 @@ public class ArchivesConstants {
 	 * 减档减项
 	 */
 	public static final String REDUCE_EMP_PROJECT_CONTENT = "减档减项";
+	/**
+	 * 员工合同签订类型
+	 */
+	public static final String[] contractSituation = {"作废","离职再入职","合同未到期重新签订","正常签订","商务合同更改","正常续签","终止"};
 }

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

@@ -478,8 +478,17 @@ public class TEmployeeContractInfo extends BaseEntity {
 	@Schema(description = "归档列表查询标志，1：是归档，去除作废、终止两种")
 	private Integer isFilePage;
 
-	@ExcelAttribute(name = "派单类型",readConverterExp = "0=派增,1=派减")
-	@Schema(description = "派单类型")
+	/**
+	 * @Author fxj
+	 * @Description
+	 * 1、增加“审核类型”，内容为：派增-社保派单、派增-无社保新签、派增-续签、派减-作废、派减-终止
+	 * 2、社保派单过来的合同，审核类型统一为：派增-社保派单；
+	 * 3、合同申请处申请类型为：新签（正常签订）——审核类型为：派增-无社保新签、；续签（合同未到期重新签订、离职再入职、商务合同更改）——审核类型统一为：派增-续签；
+	 * 3、合同申请处申请类型为：作废——审核类型统一为：派减-作废；终止——审核类型统一为：派减-终止；
+	 * @Date 14:50 2022/11/7
+	 **/
+	@ExcelAttribute(name = "审核类型",readConverterExp = "0=派增,1=派减")
+	@Schema(description = "审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止")
 	private String type;
 
 	/**

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

@@ -45,9 +45,17 @@ import java.util.Set;
 public class EmployeeContractExportAuditVO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
-
-	@ExcelAttribute(name = "派单类型",readConverterExp = "0=派增,1=派减")
-	@Schema(description = "派单类型")
+	/**
+	 * @Author fxj
+	 * @Description 0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
+	 * 1、增加“审核类型”，内容为：派增-社保派单、派增-无社保新签、派增-续签、派减-作废、派减-终止
+	 * 2、社保派单过来的合同，审核类型统一为：派增-社保派单；
+	 * 3、合同申请处申请类型为：新签（正常签订）——审核类型为：派增-无社保新签、；续签（合同未到期重新签订、离职再入职、商务合同更改）——审核类型统一为：派增-续签；
+	 * 3、合同申请处申请类型为：作废——审核类型统一为：派减-作废；终止——审核类型统一为：派减-终止；
+	 * @Date 14:50 2022/11/7
+	**/
+	@ExcelAttribute(name = "审核类型",readConverterExp = "0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止")
+	@Schema(description = "审核类型")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("审核类型")
 	private String type;

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

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.constants.ArchivesConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.constants.EmployeeContractConstants;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
@@ -311,6 +312,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 				}
 			}
 		}
+		//初始化审核类型  审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
+		initType(tEmployeeContractInfo);
+
 		if (Common.isEmpty(tEmployeeContractInfo.getId())) {
 			// 针对编码再做一次重复性校验
 			String isCur = baseMapper.getContractByApplyNo(tEmployeeContractInfo.getApplyNo());
@@ -333,6 +337,34 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 		return R.ok(null, CommonConstants.SAVE_SUCCESS);
 	}
 
+	/**
+	 * @Author fxj
+	 * @Description  初始化审核类型  审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
+	 * @Date 15:28 2022/11/7
+	**/
+	private void initType(TEmployeeContractInfo tEmployeeContractInfo) {
+		// 初始化审核类型  审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
+		if (ArchivesConstants.contractSituation[0].equals(tEmployeeContractInfo.getSituation())){
+			// 作废
+			tEmployeeContractInfo.setType(CommonConstants.THREE_STRING);
+		}
+		if (ArchivesConstants.contractSituation[6].equals(tEmployeeContractInfo.getSituation())){
+			// 终止
+			tEmployeeContractInfo.setType(CommonConstants.FOUR_STRING);
+		}
+		if (ArchivesConstants.contractSituation[1].equals(tEmployeeContractInfo.getSituation())
+				|| ArchivesConstants.contractSituation[2].equals(tEmployeeContractInfo.getSituation())
+				|| ArchivesConstants.contractSituation[4].equals(tEmployeeContractInfo.getSituation())
+				|| ArchivesConstants.contractSituation[5].equals(tEmployeeContractInfo.getSituation())){
+			// 离职再入职 合同未到期重新签订 商务合同更改 正常续签
+			tEmployeeContractInfo.setType(CommonConstants.TWO_STRING);
+		}
+		if (ArchivesConstants.contractSituation[3].equals(tEmployeeContractInfo.getSituation())){
+			//正常签订
+			tEmployeeContractInfo.setType(CommonConstants.ONE_STRING);
+		}
+	}
+
 	/**
 	 * @param tEmployeeContractInfo
 	 * @Description: 更新附件的合同id

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

@@ -2272,6 +2272,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						contract.setInUse(CommonConstants.ONE_STRING);
 						contract.setIsObsolete(CommonConstants.ZERO_ONE);
 						contract.setDispatchFlag(CommonConstants.ONE_STRING);
+						contract.setType(CommonConstants.ZERO_STRING);
 						contractServicer.save(contract);
 						contractAdd.setId(contract.getId());
 						contractAdd.setEmpNo(contract.getEmpNo());

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

@@ -240,6 +240,9 @@
 			<if test="tEmployeeContractInfo.id != null and tEmployeeContractInfo.id.trim() != ''">
 				AND a.ID = #{tEmployeeContractInfo.id}
 			</if>
+			<if test="tEmployeeContractInfo.type != null and tEmployeeContractInfo.type.trim() != ''">
+				AND a.type = #{tEmployeeContractInfo.type}
+			</if>
 			<if test="tEmployeeContractInfo.empNo != null and tEmployeeContractInfo.empNo.trim() != ''">
 				AND a.EMP_NO = #{tEmployeeContractInfo.empNo}
 			</if>