Эх сурвалжийг харах

安全检查提交签名代码

jingyuanchao 1 жил өмнө
parent
commit
55c6f00205

+ 1 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -602,6 +602,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 .set(CoreSafetyTask::getSubmitorId, SecurityUtils.getUserId())
                 .set(CoreSafetyTask::getSubmitBy, SecurityUtils.getLoginUser().getName())
                 .set(CoreSafetyTask::getExceptionCount, exceptionCount)
+                .set(CoreSafetyTask::getSignImg, data.getSignImg())
                 .set(CoreSafetyTask::getCheckTeam, data.getCheckTeam());
         if (ObjectUtil.equal(isSubmit, 1) && ObjectUtil.notEqual(SecurityUtils.getUserId(), data.getGrantUserId())) {
             //不是被授权人完成的该任务,则清空被授权人信息

+ 6 - 6
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -1,21 +1,18 @@
 package com.xunmei.core.safetyCheck.vo.regsiter;
 
-import java.util.Date;
-import java.util.List;
-
-import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
 import com.xunmei.system.api.domain.SysOrg;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * 任务登记信息
  */
@@ -93,6 +90,9 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "检查列表")
     private List<T> checkList;
 
+    @ApiModelProperty(value = "签名图片")
+    private String signImg;
+
     public static TaskRegisterVo of(CoreSafetyTask task, SysOrg beCheckedOrg, List<IdNameVo> checkRoles, int inRegisterTime) {
         TaskRegisterVo vo = new TaskRegisterVo();
         vo.setId(task.getId());