浏览代码

通过和驳回

ys321973351 1 年之前
父节点
当前提交
f851cf2f67

+ 7 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/entity/ItdmRunFlowPathStep.java

@@ -75,6 +75,13 @@ public class ItdmRunFlowPathStep implements Serializable {
 	@Excel(name = "表单数据", width = 15)
     @ApiModelProperty(value = "表单数据")
     private String saveData;
+
+
+    @Excel(name = "审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "审核时间")
+    private java.util.Date shenheTime;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;

+ 4 - 0
itdmServer/module-iTDM/src/main/java/org/jeecg/modules/flowpath/service/impl/ItdmRunFlowPathStepServiceImpl.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -108,6 +109,7 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
         select.setSaveData(saveRunFlowPath.getSaveData());
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         select.setFqUser(user.getUsername());
+        select.setShenheTime(new Date());
         this.baseMapper.updateById(select);
         ItdmRunFlowPathStep nextstep = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
                 .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())
@@ -142,6 +144,8 @@ public class ItdmRunFlowPathStepServiceImpl extends ServiceImpl<ItdmRunFlowPathS
         );
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         select.setFqUser(user.getUsername());
+        select.setShenheTime(new Date());
+
         this.baseMapper.updateById(select);
         ItdmRunFlowPathStep nextstep = this.baseMapper.selectOne(Wrappers.lambdaQuery(ItdmRunFlowPathStep.class)
                 .eq(ItdmRunFlowPathStep::getRunFlowPath, select.getRunFlowPath())