From 88ccc0d3ec6ea20775967f5c2cad048afb2cce73 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 5 Aug 2021 14:50:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ydw/bat/wkflow/business_slrs/dao/SarStandItems.java | 9 +++++++++ .../wkflow/listener/standardRead/DeptApplayAfter.java | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java index 0fcd2322..4cd4920f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarStandItems.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -117,6 +118,14 @@ public class SarStandItems { @TableField("FILE_TYPE") private String fileType; + @ApiModelProperty(value = "新车型实施日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date xccssrq; + + @ApiModelProperty(value = "在产车实施日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date zccssrq; + diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index 8fd72a4c..710f7c2c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -59,6 +59,8 @@ public class DeptApplayAfter implements TaskListener{ sarStandItems1.setDutyEngineer(object.getString("zxUserId")); sarStandItems1.setApplyArctic(object.getString("applyArctic")); sarStandItems1.setTermsConditions(object.getString("itermsConditions")); + sarStandItems1.setXccssrq(os.getDate("newData")); + sarStandItems1.setZccssrq(os.getDate("onlineData")); sarStandItems.add(sarStandItems1); //结果数据 SarInterpretationNationalStandard standard=new SarInterpretationNationalStandard(); @@ -69,6 +71,7 @@ public class DeptApplayAfter implements TaskListener{ standard.setCoreTechnicalRequirement(os.getString("technicalRequir")); standard.setComplianceState(object.getString("complianceState")); standard.setCreationTime(object.getDate("creationTime")); + standard.setLastVersionNumber(object.getString("oldNumber")); standards.add(standard); }); lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); @@ -127,6 +130,6 @@ public class DeptApplayAfter implements TaskListener{ busBean.saveOrUpdate(one2); } } - throw new ActivitiException("最后一步啦啦啦啦啦啦啦啦啦"); +// throw new ActivitiException("最后一步啦啦啦啦啦啦啦啦啦"); } }