Просмотр исходного кода

订单列表新增特批类型与说明

anderx 1 год назад
Родитель
Сommit
d6aa575de7

+ 2 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -986,11 +986,9 @@
             and a.tag= #{tag}
         </if>
         <if test="approvalType != null">
-            and a.approval_type = #{approvalType,jdbcType=INTEGER}
-        </if>
-        <if test="approvalTypeExplain != null">
-            and a.approval_type_explain = #{approvalTypeExplain,jdbcType=VARCHAR}
+            and fina.approval_type = #{approvalType,jdbcType=INTEGER}
         </if>
+
         <if test="amountStatus == 0">
             and a.total_amount &lt; 10
         </if>

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -21,12 +21,21 @@ public class InputOrderNewListBo {
     private String contractStart;
     private String contractEnd;
     private String uid;
+    private String approvalType;
     private Integer projectType;
     private Integer processStatus;
     private Integer tag;
     private  Integer pageNo;
     private Integer pageSize;
 
+    public String getApprovalType() {
+        return approvalType;
+    }
+
+    public void setApprovalType(String approvalType) {
+        this.approvalType = approvalType;
+    }
+
     public Integer getTag() {
         return tag;
     }

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1168,6 +1168,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(null != in.getTag()){
 			params.put("tag",in.getTag());
 		}
+		if(in.getApprovalType()!=null){
+			params.put("approvalType",in.getApprovalType());
+		}
 		params.put("outsource", in.getOutsource());
 		return null;
 	}