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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeXProjectVO.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.write.style.ColumnWidth;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 项目档案表excel对应的实体
+ *
+ * @author huyc
+ * @date 2022-06-20 17:54:40
+ */
+@Data
+@ColumnWidth(30)
+public class EmployeeXProjectVO extends RowIndex implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 员工姓名
+     */
+	@NotNull(message = "员工姓名不能为空")
+	@ExcelAttribute(name = "员工姓名",isNotEmpty = true, errorInfo = "员工姓名不能为空",maxLength = 20)
+	@ExcelProperty(value ="员工姓名")
+    private String empName;
+
+    /**
+     * 身份证号码
+     */
+	@NotNull(message = "身份证号不能为空")
+	@ExcelAttribute(name = "身份证号",isNotEmpty = true, errorInfo = "身份证号不能为空",maxLength = 20)
+	@ExcelProperty(value ="身份证号")
+    private String empIdcard;
+
+    /**
+     * 项目编码
+     */
+	@NotNull(message = "项目编码不能为空")
+	@ExcelProperty(value ="项目编码")
+	@ExcelAttribute(name = "项目编码",isNotEmpty = true, errorInfo = "项目编码不能为空",maxLength = 20)
+    private String deptNo;
+
+    /**
+     * 减项原因
+     */
+	@ExcelProperty(value ="减项原因")
+	@NotNull(message = "减项原因不能为空")
+	@ExcelAttribute(name = "减项原因",isNotEmpty = true, errorInfo = "减项原因不能为空",maxLength = 100)
+    private String leaveReason;
+
+	/**
+	 * 减项备注
+	 */
+	@ExcelProperty(value ="减项备注")
+	private String leaveRemark;
+
+	/**
+	 * 是否同步减档（0否；1是）
+	 */
+	@ExcelProperty(value ="是否同步减档")
+	@NotNull(message = "是否同步减档不能为空")
+	@ExcelAttribute(name = "是否同步减档",isNotEmpty = true, errorInfo = "是否同步减档不能为空",maxLength = 1)
+	private Integer isLeaveEmployee;
+}

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

@@ -24,7 +24,7 @@ import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 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.EmployeeProjectVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
@@ -190,7 +190,7 @@ public class TEmployeeProjectController {
 	@SysLog("批量减项" )
 	@PostMapping("/batchDeleteEmpPro")
 	@PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdelempproinfo')" )
-	public R<List<ErrorMessage>> batchDeleteEmpPro(@RequestExcel List<EmployeeProjectVO> excelVOList, BindingResult bindingResult) {
+	public R<List<ErrorMessage>> batchDeleteEmpPro(@RequestExcel List<EmployeeXProjectVO> excelVOList, BindingResult bindingResult) {
 		return tEmployeeProjectService.batchDeleteEmpPro(excelVOList,bindingResult);
 	}
 

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

@@ -24,7 +24,7 @@ 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.EmployeeProjectVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import org.springframework.validation.BindingResult;
@@ -66,7 +66,7 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	 * @Date: 2022/6/21 10:30
 	 * @return: R
 	 **/
-	R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeProjectVO> list, BindingResult bindingResult);
+	R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeXProjectVO> list, BindingResult bindingResult);
 
 	/**
 	 * @param inputStream

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

@@ -40,6 +40,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectService;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectExportVO;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeProjectVO;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeXProjectVO;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
@@ -238,13 +239,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	}
 
 	@Override
-	public R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeProjectVO> excelVOList, BindingResult bindingResult) {
+	public R<List<ErrorMessage>> batchDeleteEmpPro(List<EmployeeXProjectVO> excelVOList, BindingResult bindingResult) {
 		// 通用校验获取失败的数据
 		List<ErrorMessage> errorMessageList = (List<ErrorMessage>) bindingResult.getTarget();
 
 		// 执行数据插入操作 组装 PostDto
 		for (int i = 0; i < excelVOList.size(); i++) {
-			EmployeeProjectVO excel = excelVOList.get(i);
+			EmployeeXProjectVO excel = excelVOList.get(i);
 			//根据身份证和项目编码获取项目档案
 			TEmployeeProject tEmployeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
 					.eq(TEmployeeProject::getEmpIdcard, excel.getEmpIdcard())
@@ -255,7 +256,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			TEmployeeProject tEmployeeProjectOld = this.getById(tEmployeeProject.getId());
 			if (Common.isNotNull(tEmployeeProject)) {
 				TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectById(tEmployeeProject.getEmpId());
-				if (tEmployeeProject.getIsLeaveEmployee() == CommonConstants.dingleDigitIntArray[1]) {
+				if (excel.getIsLeaveEmployee() == CommonConstants.dingleDigitIntArray[1]) {
 					Long count = this.count(Wrappers.<TEmployeeProject>query().lambda()
 							.eq(TEmployeeProject::getEmpId, tEmployeeProject.getEmpId())
 							.eq(TEmployeeProject::getProjectStatus, CommonConstants.dingleDigitIntArray[0]));
@@ -263,11 +264,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.ARCHIVES_PROJECT_CHANGE_NOT_EXIST)));
 					}
 					tEmployeeInfo.setFileStatus(CommonConstants.dingleDigitIntArray[1]);
+					tEmployeeInfo.setLeaveReason(excel.getLeaveReason());
+					tEmployeeInfo.setLeaveRemark(excel.getLeaveRemark());
 					tEmployeeInfoMapper.updateById(tEmployeeInfo);
+					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeProjectOld, tEmployeeInfo);
 				}
 				tEmployeeProject.setProjectStatus(CommonConstants.dingleDigitIntArray[1]);
+				tEmployeeProject.setLeaveReason(excel.getLeaveReason());
+				tEmployeeProject.setLeaveRemark(excel.getLeaveRemark());
 				this.updateById(tEmployeeProject);
-				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[0], tEmployeeInfo.getId(), "", tEmployeeProjectOld, tEmployeeInfo);
 				tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeInfoOld, tEmployeeProject);
 			}
 		}

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

@@ -49,8 +49,10 @@ public class HrEquator extends GetterBaseEquator {
         List<FieldInfo> diff = equator.getDiffFields(oldInfo, newInfo);
         if(!Common.isEmpty(diff)){
             for(FieldInfo field:diff){
+				if (!"updateTime".equals(field.getFieldName()) && !"updateBy".equals(field.getFieldName())) {
 					sb.append(field.getFieldName()).append(",");
 				}
+            }
             sb.deleteCharAt(sb.length()-1);
         }
         return sb.toString();