接口修改

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

@@ -18,6 +18,8 @@ public class UpdateEmpVo implements Serializable {
 	String projectNo;
 	// 合同ID
 	String contractId;
+	// 备注
+	String remarkTemp;
 
 	// type 0 审核通过  2.审核不通过
 	String type;

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

@@ -2206,7 +2206,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							c.setInUse(CommonConstants.ZERO_STRING);
 							c.setAuditTimeLast(LocalDateTime.now());
 							contractAudit.setAuditStatus("审核通过");
-							contractAudit.setRemark("派单审核通过,同步审核通过合同");
+							contractAudit.setRemark(vo.getRemarkTemp());
 							contractAudit.setRootName("合同审核");
 							contractServicer.updateInUseStatusById(c.getEmpId(),c.getDeptNo(),c.getId());
 							//审核不同
@@ -2214,7 +2214,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 							c.setAuditStatus(CommonConstants.THREE_INT);
 							c.setInUse(CommonConstants.ONE_STRING);
 							contractAudit.setAuditStatus("审核不通过");
-							contractAudit.setRemark("派单审核不通过,同步审核不通过合同");
+							contractAudit.setRemark(vo.getRemarkTemp());
 							contractAudit.setRootName("合同审核");
 						}
 						contractAuditMapper.insert(contractAudit);

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

@@ -205,7 +205,7 @@ public class ArchivesDaprUtil {
 	 * @Param type 0 审核通过  1 审核不通过
 	 * @return
 	 **/
-	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type){
+	public R<Boolean> updateEmpInfo(String empIdCard, String projectNo, String contractId,String type,String remarkTemp){
 		if (Common.isEmpty(empIdCard)
 				|| Common.isEmpty(projectNo)
 				|| Common.isEmpty(type)){
@@ -215,6 +215,7 @@ public class ArchivesDaprUtil {
 		vo.setEmpIdCard(empIdCard);
 		vo.setProjectNo(projectNo);
 		vo.setContractId(contractId);
+		vo.setRemarkTemp(remarkTemp);
 		vo.setType(type);
 		R<Boolean> res = HttpDaprUtil.invokeMethodPost(
 				daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId()

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

@@ -3026,10 +3026,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
 						R<Boolean> res = null;
 						if (CommonConstants.ZERO_INT == flag){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ZERO_STRING,remarkTemp);
 						}
 						if (CommonConstants.ONE_INT == flag){
-							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING);
+							res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
 
 							// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
 							flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())