From f14e4c2b788ed8a06f25388ce3b0236d248af3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Fri, 17 Mar 2023 17:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=BB=B4=E6=8A=A4=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/UdiRelevanceController.java  |  8 ++++++++
 .../glxp/api/entity/basic/UdiRelevanceEntity.java |  6 +++++-
 .../api/req/basic/UdiRelevanceSaveRequest.java    |  7 +++++++
 .../glxp/api/res/basic/UdiRelevanceResponse.java  |  5 +++++
 .../mybatis/mapper/basic/UdiRelevanceDao.xml      | 15 +++++++++++++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
index 7c873aae..5f595547 100644
--- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
+++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java
@@ -288,6 +288,14 @@ public class UdiRelevanceController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        //更新关联表
+        if(udiRelevanceSaveRequest.getIsDateBy()!=null && udiRelevanceSaveRequest.getIsDateBy()==1){
+            if(udiRelevanceSaveRequest.getRecentDateTime()!=null){
+                int time=udiRelevanceSaveRequest.getRecentDateTime()*24;
+                udiRelevanceSaveRequest.setRecentDateTime(time);
+            }
+        }
+
         //更新关联表
         UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
         BeanUtils.copyProperties(udiRelevanceSaveRequest, udiRelevanceEntity);
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index bdb0291f..4a6462c1 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -162,5 +162,9 @@ public class UdiRelevanceEntity {
     @TableField(value = "dispatch")
     private boolean dispatch;
     @TableField(value = "groupBuy")        //是否可配送
-    private boolean groupBuy;           //是否集采产品
+    private boolean groupBuy;
+    //是否集采产品
+    @TableField(value = "isDateBy")
+    private Integer isDateBy;
+
 }
diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
index ba64bc0b..1b8dc694 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
@@ -85,10 +85,17 @@ public class UdiRelevanceSaveRequest {
     private String price;
     private Integer useExpireTime;
 
+    private Integer lowStockNum;
+    private Integer overStockNum;
+    private Integer recentDateTime;
+    private Integer isDateBy;
+    private String relCode;
+
     //关联修改提交:true;单独提交:false
     private Boolean relSubmit;
 
 
+
     private boolean dispatch;           //是否可配送
     private boolean groupBuy;           //是否集采产品
 
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
index 05863e49..d5c6ed61 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
@@ -90,6 +90,11 @@ public class UdiRelevanceResponse {
 
     private Integer useExpireTime;
 
+    private Integer lowStockNum;
+    private Integer overStockNum;
+    private Integer recentDateTime;
+    private Integer isDateBy;
+    private String relCode;
 
     //关联查询字典
     private String unitFk;          //供应商ID
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 080f26e5..7dab6bea 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -746,6 +746,21 @@
             <if test="groupBuy != null">
                 groupBuy=#{groupBuy},
             </if>
+            <if test="lowStockNum != null">
+                lowStockNum=#{lowStockNum},
+            </if>
+            <if test="overStockNum != null">
+                overStockNum=#{overStockNum},
+            </if>
+            <if test="recentDateTime != null">
+                recentDateTime=#{recentDateTime},
+            </if>
+            <if test="isDateBy != null">
+                isDateBy=#{isDateBy},
+            </if>
+            <if test="relCode != '' and relCode != null">
+                relCode=#{relCode},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>