From da6b53ae3010e45ee72cf358c821777f0e3a799f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 21 Jun 2022 11:21:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=202.=E5=88=A0=E9=99=A4=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84redis=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api-admin/pom.xml                             |   4 -
 .../dao/business/StockOrderUploadLogDao.java  |  34 ++++
 .../business/StockOrderUploadLogDao.xml       | 151 ++++++++++++++++++
 3 files changed, 185 insertions(+), 4 deletions(-)
 create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java
 create mode 100644 api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml

diff --git a/api-admin/pom.xml b/api-admin/pom.xml
index 6a4093da..c47f293e 100644
--- a/api-admin/pom.xml
+++ b/api-admin/pom.xml
@@ -166,10 +166,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
 
         <!--解析excel-->
         <!--xls-->
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java
new file mode 100644
index 00000000..bbffd862
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderUploadLogDao.java
@@ -0,0 +1,34 @@
+package com.glxp.api.admin.dao.business;
+
+import com.glxp.api.admin.entity.business.StockOrderUploadLogEntity;
+import com.glxp.api.admin.req.business.StockOrderUploadLogRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface StockOrderUploadLogDao {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(StockOrderUploadLogEntity record);
+
+    int insertSelective(StockOrderUploadLogEntity record);
+
+    StockOrderUploadLogEntity selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(StockOrderUploadLogEntity record);
+
+    int updateByPrimaryKey(StockOrderUploadLogEntity record);
+
+    List<StockOrderUploadLogEntity> selectList(StockOrderUploadLogRequest request);
+
+    /**
+     * 根据
+     *
+     * @param billNo
+     * @param status
+     * @return
+     */
+    List<String> selectBillNoList(@Param("billNo") String billNo, @Param("status") String status);
+}
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
new file mode 100644
index 00000000..506ee39e
--- /dev/null
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderUploadLogDao.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.admin.dao.business.StockOrderUploadLogDao">
+  <resultMap id="BaseResultMap" type="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
+    <!--@mbg.generated-->
+    <!--@Table stock_order_upload_log-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="billNo" jdbcType="VARCHAR" property="billNo" />
+    <result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
+    <result column="billType" jdbcType="VARCHAR" property="billType" />
+    <result column="thrBillNo" jdbcType="VARCHAR" property="thrBillNo" />
+    <result column="submitTime" jdbcType="TIMESTAMP" property="submitTime" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="result" jdbcType="VARCHAR" property="result" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result`
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from stock_order_upload_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--@mbg.generated-->
+    delete from stock_order_upload_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into stock_order_upload_log (billNo, billDate, billType, 
+      thrBillNo, submitTime, `status`, 
+      `result`)
+    values (#{billNo,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billType,jdbcType=VARCHAR},
+      #{thrBillNo,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
+      #{result,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into stock_order_upload_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="billNo != null">
+        billNo,
+      </if>
+      <if test="billDate != null">
+        billDate,
+      </if>
+      <if test="billType != null">
+        billType,
+      </if>
+      <if test="thrBillNo != null">
+        thrBillNo,
+      </if>
+      <if test="submitTime != null">
+        submitTime,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="result != null">
+        `result`,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="billNo != null">
+        #{billNo,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null">
+        #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billType != null">
+        #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="thrBillNo != null">
+        #{thrBillNo,jdbcType=VARCHAR},
+      </if>
+      <if test="submitTime != null">
+        #{submitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="result != null">
+        #{result,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
+    <!--@mbg.generated-->
+    update stock_order_upload_log
+    <set>
+      <if test="billNo != null">
+        billNo = #{billNo,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null">
+        billDate = #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billType != null">
+        billType = #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="thrBillNo != null">
+        thrBillNo = #{thrBillNo,jdbcType=VARCHAR},
+      </if>
+      <if test="submitTime != null">
+        submitTime = #{submitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="result != null">
+        `result` = #{result,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.glxp.api.admin.entity.business.StockOrderUploadLogEntity">
+    <!--@mbg.generated-->
+    update stock_order_upload_log
+    set billNo = #{billNo,jdbcType=VARCHAR},
+      billDate = #{billDate,jdbcType=TIMESTAMP},
+      billType = #{billType,jdbcType=VARCHAR},
+      thrBillNo = #{thrBillNo,jdbcType=VARCHAR},
+      submitTime = #{submitTime,jdbcType=TIMESTAMP},
+      `status` = #{status,jdbcType=INTEGER},
+      `result` = #{result,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="selectList" resultMap="BaseResultMap">
+    select * from stock_order_upload_log
+    <where>
+      <if test="billNo != null and billNo != ''">
+        AND billNo = #{billNo}
+      </if>
+      <if test="thirdBillNo != null and thirdBillNo != ''">
+        AND thrBillNo = #{thirdBillNo}
+      </if>
+      <if test="status != null">
+        AND status = #{status}
+      </if>
+      <if test="submitTime != null">
+        AND submitTime = date_format(#{submitTime},'%Y-%m-%d')
+      </if>
+    </where>
+    order by submitTime desc
+  </select>
+
+</mapper>
\ No newline at end of file