From d166dd09d79ec809d931802bb17acf8390f02149 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 15 May 2023 16:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=8C=89?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/purchase/PurOrderEntity.java   |   3 +
 .../api/res/purchase/PurOrderResponse.java    |   2 +
 .../mybatis/mapper/purchase/PurOrderDao.xml   | 184 +++++++++---------
 3 files changed, 99 insertions(+), 90 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
index 1c725d34c..573a981c9 100644
--- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
+++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
@@ -132,6 +132,9 @@ public class PurOrderEntity {
     @TableField(value = "emergency")
     private Integer emergency;
 
+    @TableField(value = "supId")
+    private String supId;
+
     /**
      * 是否已生成采购计划
      */
diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
index 1e3ce05c6..01be33715 100644
--- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
@@ -73,4 +73,6 @@ public class PurOrderResponse {
     private String auditUserName;
     private Integer emergency;
     private Date arrivalTime;
+    private String supId;
+    private String supName;
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
index 7501b5a37..2679e956b 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
@@ -1,97 +1,101 @@
 <?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.dao.purchase.PurOrderDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
-    <!--@mbg.generated-->
-    <!--@Table pur_order-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="billNo" jdbcType="VARCHAR" property="billNo" />
-    <result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
-    <result column="status" jdbcType="TINYINT" property="status" />
-    <result column="billType" jdbcType="VARCHAR" property="billType" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="invCode" jdbcType="VARCHAR" property="invCode" />
-    <result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
-    <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime" />
-    <result column="auditRemark" jdbcType="VARCHAR" property="auditRemark" />
-    <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
-    <result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser" />
-    <result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser" />
-    <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark" />
-    <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo" />
-    <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
-    createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
-    applyAuditUser, applyRemark, applyBillNo, stockOrderNo
-  </sql>
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
+        <!--@mbg.generated-->
+        <!--@Table pur_order-->
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="billNo" jdbcType="VARCHAR" property="billNo"/>
+        <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
+        <result column="status" jdbcType="TINYINT" property="status"/>
+        <result column="billType" jdbcType="VARCHAR" property="billType"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="invCode" jdbcType="VARCHAR" property="invCode"/>
+        <result column="deptCode" jdbcType="VARCHAR" property="deptCode"/>
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
+        <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
+        <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime"/>
+        <result column="auditRemark" jdbcType="VARCHAR" property="auditRemark"/>
+        <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
+        <result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser"/>
+        <result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser"/>
+        <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark"/>
+        <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo"/>
+        <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
+        createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
+        applyAuditUser, applyRemark, applyBillNo, stockOrderNo
+    </sql>
 
 
-  <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
-          resultType="com.glxp.api.res.purchase.PurOrderResponse">
-
-    SELECT
-    pur_order.*,
-    cb.employeeName createUserName,
-    ab.employeeName auditUserName,
-    auth_warehouse.NAME invName,
-    auth_dept.`name` deptName
-    FROM
-    pur_order
-    LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
-    LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
-    LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
-    LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
-    <where>
-      <if test="billNo != '' and billNo != null">
-        AND billNo = #{billNo}
-      </if>
-      <if test="startDate != null and startDate !=''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
-      </if>
-      <if test="endDate != null and endDate !=''">
-        <![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
-      </if>
-      <if test="startAuditDate != null and startAuditDate !=''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
-      </if>
-      <if test="endAuditDate != null and endAuditDate !=''">
-        <![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
-      </if>
-      <if test="status!=null and status!=10 and status!=11">
-        and pur_order.status = #{status}
-      </if>
-      <if test="status ==10">
-        and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4)
-      </if>
-      <if test="status ==11">
-        and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4)
-      </if>
-
-      <if test="deptCode != '' and deptCode != null">
-        AND deptCode = #{deptCode}
-      </if>
-      <if test="invCode != '' and invCode != null">
-        AND invCode = #{invCode}
-      </if>
-      <if test="auditUser != '' and auditUser != null">
-        AND auditUser = #{auditUser}
-      </if>
-      <if test="createUser != '' and createUser != null">
-        AND createUser = #{createUser}
-      </if>
-      <if test="emergency != null">
-        AND emergency = #{emergency}
-      </if>
-    </where>
-
-  </select>
-
+    <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
+            resultType="com.glxp.api.res.purchase.PurOrderResponse">
+        SELECT pur_order.*,
+               cb.employeeName     createUserName,
+               ab.employeeName     auditUserName,
+               auth_warehouse.NAME invName,
+               auth_dept.`name`    deptName,
+               basic_corp.name     supName
+        FROM pur_order
+                     LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
+                     LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
+                     LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
+                     LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
+                     left join basic_corp on pur_order.supId = basic_corp.erpId
+        <where>
+            <if test="billNo != '' and billNo != null">
+                AND billNo = #{billNo}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
+                ]]>
+            </if>
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
+                ]]>
+            </if>
+            <if test="startAuditDate != null and startAuditDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
+                ]]>
+            </if>
+            <if test="endAuditDate != null and endAuditDate != ''">
+                <![CDATA[
+                and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
+                ]]>
+            </if>
+            <if test="status != null and status != 10 and status != 11">
+                and pur_order.status = #{status}
+            </if>
+            <if test="status == 10">
+                and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
+            </if>
+            <if test="status == 11">
+                and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
+            </if>
 
+            <if test="deptCode != '' and deptCode != null">
+                AND deptCode = #{deptCode}
+            </if>
+            <if test="invCode != '' and invCode != null">
+                AND invCode = #{invCode}
+            </if>
+            <if test="auditUser != '' and auditUser != null">
+                AND auditUser = #{auditUser}
+            </if>
+            <if test="createUser != '' and createUser != null">
+                AND createUser = #{createUser}
+            </if>
+            <if test="emergency != null">
+                AND emergency = #{emergency}
+            </if>
+        </where>
+    </select>
 </mapper>