修复bug

java110-bean/src/main/java/com/java110/vo/api/purchaseApply/ApiPurchaseApplyDataVo.java

@@ -6,6 +6,7 @@ import java.util.List;
 public class ApiPurchaseApplyDataVo implements Serializable {
 
     private String applyOrderId;
+    private String resOrderType;
     private String state;
     private String userName;
     private String stateName;
@@ -90,4 +91,12 @@ public class ApiPurchaseApplyDataVo implements Serializable {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public String getResOrderType() {
+        return resOrderType;
+    }
+
+    public void setResOrderType(String resOrderType) {
+        this.resOrderType = resOrderType;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java

@@ -16,6 +16,7 @@ public class PurchaseApplyDetailVo {
     private String bId;
     private String operate;
     private String statusCd;
+    private String description;
 
 
     public String getApplyOrderId() {
@@ -113,6 +114,14 @@ public class PurchaseApplyDetailVo {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
 }
 
 

java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -28,6 +28,7 @@
             <result property="resCode" column="resCode"/>
             <result property="price" column="price"/>
             <result property="stock" column="stock"/>
+            <result property="description" column="description"/>
         </collection>
     </resultMap>
 
@@ -218,7 +219,7 @@
         t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
         t.store_id storeId,t.user_name userName,
         t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
-        de.apply_order_id applyOrderId,de.res_id resId,de.quantity,de.remark,rs.res_name resName,rs.price,rs.stock,rs.res_code resCode
+        de.apply_order_id applyOrderId,de.res_id resId,de.quantity,de.remark,rs.res_name resName,rs.price,rs.stock,rs.res_code resCode,rs.description
         from purchase_apply t
         inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
         inner join purchase_apply_detail de on de.apply_order_id = t.apply_order_id
@@ -267,6 +268,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="resOrderType !=null and resOrderType != ''">
+            and t.res_order_type= #{resOrderType}
+        </if>
         <if test="bId !=null and bId != ''">
             and p.b_id= #{bId}
         </if>