MVP1.5.4-派单委托备注（合同起缴日期等）

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

 package com.yifu.cloud.plus.v1.yifu.archives.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,4 +27,13 @@ public class UpdateEmpVo implements Serializable {
 
 	// type 0 审核通过  2.审核不通过
 	String type;
+
+	/**
+	 * @Description: 合同审核人要传过去
+	 * @Author: hgw
+	 * @Date: 2023/5/23 9:59
+	 * @return:
+	 **/
+	private String createName;
+	private String createBy;
 }

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

@@ -2241,8 +2241,8 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						TEmployeeContractAudit contractAudit = new TEmployeeContractAudit();
 						contractAudit.setLinkId(c.getId());
 						contractAudit.setLinkType(CommonConstants.ONE_INT);
-						contractAudit.setCreateBy(c.getCreateBy());
-						contractAudit.setCreateName(c.getCreateName());
+						contractAudit.setCreateBy(vo.getCreateBy());
+						contractAudit.setCreateName(vo.getCreateName());
 						contractAudit.setCreateTime(LocalDateTime.now());
 						//审核通过
 						c.setAuditUserName(c.getCreateBy());

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

@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 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.dapr.config.DaprArchivesProperties;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -280,7 +281,7 @@ public class ArchivesDaprUtil {
 	 * @Param type 0 审核通过  1 审核不通过
 	 * @return
 	 **/
-	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type,String remarkTemp){
+	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type,String remarkTemp, YifuUser user){
 		if (Common.isEmpty(empIdCard)
 				|| Common.isEmpty(projectNo)
 				|| Common.isEmpty(type)){
@@ -292,6 +293,8 @@ public class ArchivesDaprUtil {
 		vo.setContractId(contractId);
 		vo.setRemarkTemp(remarkTemp);
 		vo.setType(type);
+		vo.setCreateBy(user.getId());
+		vo.setCreateName(user.getNickname());
 		R<Boolean> res = HttpDaprUtil.invokeMethodPost(
 				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()
 				,"/temployeeinfo/inner/updateEmpInfo" , JSON.toJSONString(vo), Boolean.class, SecurityConstants.FROM_IN);

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

@@ -3313,10 +3313,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
 						R<Boolean> res = null;
 						if (CommonConstants.ZERO_INT == flag && !isSSC){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING,remarkTemp);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING,remarkTemp, user);
 						}
 						if (CommonConstants.ONE_INT == flag){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp, user);
 						}
 						if ((Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode())  && !isSSC){
 							ServiceUtil.runTimeExceptionDiy("更新人员档案、项目档案、合同状态异常：" + (Common.isNotNull(res)?res.getMsg():CommonConstants.EMPTY_STRING));