From b98c8291bdf1a9edcc6f109904bd56ebdcdb5a0e Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 28 Jul 2021 09:07:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/att/controller/AttFileEOController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index f49b116c..4e7d55e0 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -280,9 +280,9 @@ public class AttFileEOController { userMsg += tsUser.getWorkNum() + ","; } } -// SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 -// String date = df.format(new Date()); - String waterContent = userMsg ; + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 + String date = df.format(new Date()); + String waterContent = userMsg+date ; //2020年9月5日 去掉水印处理 //2021年7月25日要求下载生成水印 WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); From 3adc08d17897062aeb247aa93e2c8265b328df82 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 28 Jul 2021 15:30:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/att/controller/AttFileEOController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 4e7d55e0..ef5fb044 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -276,9 +276,10 @@ public class AttFileEOController { TsUser tsUser = userDao.selectById(userId); if (tsUser != null) { userMsg = tsUser.getUname() + ","; - if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { - userMsg += tsUser.getWorkNum() + ","; - } + //2021/7/28水印内容取消工号 +// if (StringUtils.isNotEmpty(tsUser.getWorkNum())) { +// userMsg += tsUser.getWorkNum() + ","; +// } } SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式 String date = df.format(new Date()); From 0b069efd95e2dbe6b08203c2daf10094fe262e3b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 28 Jul 2021 16:14:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E6=A0=87=E5=87=86=20=E5=A4=9A=E6=96=87=E6=A1=A3=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=20=E5=8F=8A=20=E5=88=A0=E9=99=A4=20=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandAttrInfo/entity/SarStandAttrInfo.java | 12 ------------ .../service/impl/SarStandardsInfoServiceImpl.java | 9 +++++++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java index 55893831..ab0dacf0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java @@ -158,18 +158,6 @@ public class SarStandAttrInfo extends BaseEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private String ssrq; - @ApiModelProperty(value = "实施日期(国际）") - @TableField("SSRQGJ") - private String ssrqgj; - - @ApiModelProperty(value = "新车型实施日期(国家）") - @TableField("XCXSSRQGJ") - private String xcxssrqgj; - - @ApiModelProperty(value = "在产车实施日期(国家）") - @TableField("ZCCSSRQGJ") - private String zccssrqgj; - @ApiModelProperty(value = "修改单") @TableField("XGD") private String xgd; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 29b00573..247f3cc1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -608,8 +608,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (multiTimeMap != null && multiTimeMap.size() > 0) {