采购订单按供应商创建

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;
+
     /**
      * 是否已生成采购计划
      */

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;
 }

src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml

@@ -35,34 +35,41 @@
 
     <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
             resultType="com.glxp.api.res.purchase.PurOrderResponse">
-
+        SELECT pur_order.*,
-    SELECT
-    pur_order.*,
                cb.employeeName     createUserName,
                ab.employeeName     auditUserName,
                auth_warehouse.NAME invName,
-    auth_dept.`name` deptName
+               auth_dept.`name`    deptName,
-    FROM
+               basic_corp.name     supName
-    pur_order
+        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}]]>
+                <![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}]]>
+                <![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}]]>
+                <![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}]]>
+                <![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}
@@ -90,8 +97,5 @@
                 AND emergency = #{emergency}
             </if>
         </where>
-
     </select>
-
-
 </mapper>