From 0a1bc5609a3859ff22102b36b8fb65ba2addc884 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 九月 2023 10:20:22 +0800
Subject: [PATCH] 更改熏蒸备案

---
 src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java      |    4 +---
 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java |    7 +++----
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java          |    5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
similarity index 98%
rename from src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java
rename to src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
index 35d20fd..047d1eb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz4DrugLogApply.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DrugLogApply.java
@@ -17,14 +17,13 @@
 @Entity
 @Data
 @Table(name = "D_DRUG_LOG_APPLY")
-public class Fz4DrugLogApply implements Serializable {
+public class Fz40DrugLogApply implements Serializable {
 
     @Id
     @Column(name = "xzbm", length = 4)
     @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
     private String xzbm;
 
-    @Id
     @Column(name = "DEPT_ID_", length = 21)
     @PropertyDef(label = "搴撳尯浠g爜")
     private String deptId;
@@ -33,7 +32,6 @@
     @PropertyDef(label = "缁勭粐缂栫爜")
     private String companyId;
 
-    @Id
     @Column(name = "tbrq")
     @PropertyDef(label = "濉姤鏃ユ湡")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
index aaedf5b..75b478e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1023.java
@@ -22,7 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.text.DateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -68,7 +67,7 @@
         apiLog.setStatus(99);
         apiLog.setId(ContextUtil.getUUID());
         try {
-            List<Fz4DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
+            List<Fz40DrugLogApply> list = fzzy40Sync1023Rep.listDrugLogApply(deptId);
 
             if (null == list || list.isEmpty()) {
                 log.info("-------------娌℃湁鑾峰彇鍒扮啅钂稿妗堜俊鎭�------------------");
@@ -77,7 +76,7 @@
             List<GdApi1023Dtl> dtlList = new ArrayList<>();
             List<GdApi1023Way> wayList = new ArrayList<>();
             List<GdApi1023People> peopleList = new ArrayList<>();
-            for (Fz4DrugLogApply data : list) {
+            for (Fz40DrugLogApply data : list) {
                 List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, kqdm + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
                 if (apiInfoList.size() != 0) {
                     continue;
diff --git a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
index 207f07c..f15f98c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
+++ b/src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1023Rep.java
@@ -5,7 +5,6 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -13,10 +12,10 @@
  *
  * @Author:YAN
  */
-public interface Fzzy40Sync1023Rep extends JpaRepository<Fz40DeptDevice, String> {
+public interface Fzzy40Sync1023Rep extends JpaRepository<Fz40DrugLogApply, String> {
 
     //鏌ヨ鐔忚捀澶囨涓昏〃
-    @Query("from Fz4DrugLogApply where deptId =:deptId")
-    List<Fz4DrugLogApply> listDrugLogApply(@Param("deptId") String deptId);
+    @Query("from Fz40DrugLogApply where deptId =:deptId")
+    List<Fz40DrugLogApply> listDrugLogApply(@Param("deptId") String deptId);
 
    }

--
Gitblit v1.9.3