Kaynağa Gözat

奖金报错处理

anderx 3 yıl önce
ebeveyn
işleme
190a5ee4a7

+ 11 - 5
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -546,8 +546,11 @@
   	<if test="b.orderNo != null and b.orderNo != &quot;&quot;">
   	and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test="b.departmentId != null and b.departmentId != &quot;&quot;">
-	and  o.order_dep = #{b.departmentId,jdbcType=VARCHAR}
+  	<if test="deps !=null">
+	and  o.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
 	</if>
   	<if test="b.creater != null and b.creater != &quot;&quot;">
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
@@ -591,9 +594,12 @@
   	<if test="b.creater != null and b.creater != &quot;&quot;">
   	and b.creater = #{b.creater,jdbcType=VARCHAR}
   	</if>
-  	<if test="b.departmentId != null and b.departmentId != &quot;&quot;">
-	and  o.order_dep = #{b.departmentId,jdbcType=VARCHAR}
-	</if>
+    <if test="deps !=null">
+      and  o.order_dep in
+      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+        #{depId}
+      </foreach>
+    </if>
   	<if test="b.payerName != null and b.payerName != &quot;&quot;">
   	<bind name="nn" value="'%' + b.payerName + '%'" />
   	and tm.buyer_name like #{nn,jdbcType=VARCHAR}

+ 22 - 22
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -9,7 +9,7 @@ import com.goafanti.common.utils.excel.Excel;
 
 
 public class TOrderBillNew {
-    
+
 	@Excel(name = "订单编号")
 	private String orderNo;
 	@Excel(name = "合同编号")
@@ -63,16 +63,16 @@ public class TOrderBillNew {
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private String payerId;
-	
-	
-	
-	
+
+
+
+
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.transaction_channel
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Integer transactionChannel;
-	
+
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.confirm_sign
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
@@ -83,15 +83,15 @@ public class TOrderBillNew {
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Byte deleteSign;
-	
-	
+
+
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.financial_pay_time
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
 	 */
 	private Date financialPayTime;
-	
-	
+
+
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_bill_new.delete_time
 	 * @mbg.generated  Wed Feb 19 08:54:03 CST 2020
@@ -427,20 +427,20 @@ public class TOrderBillNew {
 		this.refundTime = refundTime;
 	}
 
-	
-    
+
+
     private String createrName;
     private String startTime;
     private String endTime;
-    private String departmentId;
+    private String deps;
     private String saleId;
     private String saleName;
     private String departmentName;
-	
+
 	private String deleteTimes;
 	private String refundTimes;
-	
-    
+
+
     public String getFinancialPayTimes() {
 		return this.financialPayTimes;
 	}
@@ -489,12 +489,12 @@ public class TOrderBillNew {
 		this.endTime = endTime;
 	}
 
-	public String getDepartmentId() {
-		return departmentId;
+	public String getDeps() {
+		return deps;
 	}
 
-	public void setDepartmentId(String departmentId) {
-		this.departmentId = departmentId;
+	public void setDeps(String deps) {
+		this.deps = deps;
 	}
 
 	public String getSaleId() {
@@ -522,7 +522,7 @@ public class TOrderBillNew {
 	}
 
 	public String getCreateTimes() {
-		return this.createTimes; 
+		return this.createTimes;
 	}
 
 	public void setCreateTimes(String createTimes) {
@@ -552,4 +552,4 @@ public class TOrderBillNew {
 	public void setRefundTimes(String refundTimes) {
 		this.refundTimes = refundTimes;
 	}
-}
+}

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -207,7 +207,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
      *
      * @return
      */
-    @RequestMapping(value = "/exportReceivables" , method = RequestMethod.POST)
+    @RequestMapping(value = "/exportReceivables" , method = RequestMethod.GET)
     public Result exportReceivables(OrderListBo o,Integer pageSize ,Integer pageNo)  {
     	if (pageSize==null)pageSize=99999;
     	o.setOrderStatus(2);//营销管理员审核通过

+ 9 - 3
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.goafanti.admin.service.DepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -24,7 +25,7 @@ import com.goafanti.order.service.OrderBillService;
 
 @Service
 public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> implements OrderBillService {
-	
+
 	@Autowired
 	private TOrderBillNewMapper billNewMapper;
 	@Autowired
@@ -33,6 +34,8 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 	private AdminMapper	adminMapper;
 	@Value(value = "${upload.path}")
 	private String	uploadPath = null;
+	@Autowired
+	private DepartmentService	 departmentService;
 
 
 	@SuppressWarnings("unchecked")
@@ -48,11 +51,14 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		}
 		params.put("fids", fids);
 		params.put("b", billNew);
+		if (billNew.getDeps()!=null){
+			params.put("deps", departmentService.parseArray(billNew.getDeps()));
+		}
 		return (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
 	}
 
 
-	
+
 
 
 	@Override
@@ -78,5 +84,5 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		billNewMapper.updateByPrimaryKeySelective(ntbn);
 		return 1;
 	}
-	
+
 }