From bed1d43552b7692aa81b2d50923dac3f6aed961c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 20 十一月 2023 19:23:49 +0800
Subject: [PATCH] 安全管理同步修改
---
src/main/java/com/fzzy/api/utils/ShRSAUtils.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java | 9 +++++++--
src/main/java/com/fzzy/api/entity/Api1301.java | 2 +-
src/main/java/com/fzzy/api/view/Api1401.view.xml | 2 ++
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1301.java b/src/main/java/com/fzzy/api/entity/Api1301.java
index c0d6b79..5b5ea63 100644
--- a/src/main/java/com/fzzy/api/entity/Api1301.java
+++ b/src/main/java/com/fzzy/api/entity/Api1301.java
@@ -97,7 +97,7 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鏁存敼鏃堕檺" )
- @Column(name = "zgsx", length = 10)
+ @Column(name = "zgsx")
private Date zgsx;
@PropertyDef(label = "璐ｄ换鍗曚綅" )
diff --git a/src/main/java/com/fzzy/api/utils/ShRSAUtils.java b/src/main/java/com/fzzy/api/utils/ShRSAUtils.java
index b9f6503..a84cc0f 100644
--- a/src/main/java/com/fzzy/api/utils/ShRSAUtils.java
+++ b/src/main/java/com/fzzy/api/utils/ShRSAUtils.java
@@ -1,6 +1,6 @@
package com.fzzy.api.utils;
-;
+
import org.apache.commons.codec.binary.Base64;
diff --git a/src/main/java/com/fzzy/api/view/Api1401.view.xml b/src/main/java/com/fzzy/api/view/Api1401.view.xml
index 08f526f..8728634 100644
--- a/src/main/java/com/fzzy/api/view/Api1401.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1401.view.xml
@@ -38,6 +38,8 @@
</PropertyDef>
<PropertyDef name="ylcbgmjhsl">
<Property name="label">鍌ㄥ瑙勬ā璁″垝鏁伴噺</Property>
+ <Property name="dataType">double</Property>
+ <Property name="displayFormat">#0.000鍚�</Property>
</PropertyDef>
<PropertyDef name="cbgmjhwh">
<Property name="label">鍌ㄥ瑙勬ā璁″垝鏂囧彿</Property>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index 0a00a8e..7d3b87e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -105,7 +105,12 @@
api1310.setJydw(fz40Quality.getUser());
api1310.setJyr(fz40Quality.getUser());
api1310.setJyyj(fz40Quality.getStandard());
- api1310.setZblb(fz40Quality.getZblb());
+ if (StringUtils.isEmpty(fz40Quality.getZblb())) {
+ api1310.setZblb("2");
+ } else {
+ api1310.setZblb(fz40Quality.getZblb());
+ }
+
//妫�娴嬮」锛屾娴嬪��
jyxm = "";
jyz = "";
@@ -131,7 +136,7 @@
api1310.setQfrq(fz40Quality.getTime());
api1310.setBgcjsj(fz40Quality.getTime());
api1310.setShrxm(fz40Quality.getCheckUser());
- if(null == fz40Quality.getCheckTime()){
+ if (null == fz40Quality.getCheckTime()) {
fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
}
if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java
index c87ecb1..ee84196 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java
@@ -18,6 +18,6 @@
*
* @return
*/
- @Query("from Fz40DepotStore where deptId=:deptId and createDate >=:start and createDate <:end order by createDate ")
+ @Query("from Fz40DepotStore where deptId=:deptId and updateDate >=:start and updateDate <:end order by updateDate ")
List<Fz40DepotStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}
--
Gitblit v1.9.3