Quellcode durchsuchen

开单与签单列表修改

Signed-off-by: anderx <312518615@qq.com>
anderx vor 6 Jahren
Ursprung
Commit
931c2e454f

+ 19 - 12
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1195,21 +1195,18 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   		where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
-  	select 
-  		a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.contract_no as contractNo,
+  	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.contract_no as contractNo,
   		b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.order_status as orderStatus,
-  		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,g.name as financeName
+  		a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,dep.name as depName,c.finance_name as financeName,
+  		c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount
   	<if test="specially == 2">
   	,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
   	</if>
   	<if test="specially == 4">
   	,f.name as consultantName,a.settlement_amount as settlementAmount
   	</if>
-  	from t_order_new a  left join `user` b on a.buyer_id=b.id 
-  	left join admin c on a.salesman_id=c.id
+  	from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
   	left join department dep on a.order_dep=dep.id
-  	left join admin g on dep.finance_id=g.id
-  	left join admin d on a.finance_id=d.id
   	<if test="specially == 2">
 	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id
@@ -1230,7 +1227,7 @@ where super_id is null )  e on e.order_no=a.order_no
   	<if test="specially == 1">
   	and a.process_status = 1  and a.order_status = 1
   	<!-- and c.department_id in (#{deps,jdbcType=VARCHAR}) -->
-  	and c.department_id in
+  	and a.order_dep in
   	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>
@@ -1265,9 +1262,15 @@ where super_id is null )  e on e.order_no=a.order_no
   	<if test="name != null">
   	and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
-  	<if test="orderNo != null">
+  	<if test="orderNo != null"> 
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="contractNo != null">
+  	and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="liquidationStatus != null">
+  	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
+  	</if>
   	<if test="depId != null">
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
@@ -1293,10 +1296,8 @@ where super_id is null )  e on e.order_no=a.order_no
    <select id="selectOrderNewListCount" resultType="java.lang.Integer">
   	select 
   		count(*)
-  	from t_order_new a  left join `user` b on a.buyer_id=b.id
-  	left join admin c on a.salesman_id=c.id
+  	from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
   	left join department dep on a.order_dep=dep.id
-  	left join admin d on a.finance_id=d.id
   	<if test="specially == 2">
 	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id
@@ -1354,6 +1355,12 @@ where super_id is null ) e on e.order_no=a.order_no
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="contractNo != null">
+  	and a.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="liquidationStatus != null">
+  	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
+  	</if>
   	<if test="depId != null">
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -35,6 +35,7 @@ public class TOrderNewBo extends TOrderNew{
 	private Integer locationCity;
 	private Integer locationArea;
 	private String postalAddress;
+	private BigDecimal invoiceAmount;
 	private String NowFinance;
 	private String  NowFinanceMobile;
 	private String oldSalesmanName;
@@ -307,5 +308,11 @@ public class TOrderNewBo extends TOrderNew{
 	public void setDunStatus(Integer dunStatus) {
 		this.dunStatus = dunStatus;
 	}
+	public BigDecimal getInvoiceAmount() {
+		return invoiceAmount;
+	}
+	public void setInvoiceAmount(BigDecimal invoiceAmount) {
+		this.invoiceAmount = invoiceAmount;
+	}
 	
 }

+ 6 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -239,11 +239,15 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	}
 	/**
 	 * 订单列表
+	 * 
+	 *specially  0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
+	 *distribution	(咨询师管理列表 0 未分配 1部分 2全部
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,String depId,Integer pageNo,Integer pageSize,Integer outsource){
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,
+			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, pageNo, pageSize,outsource));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, contractNo,outsource, liquidationStatus,pageNo, pageSize));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -91,7 +91,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,Integer pageNo, Integer pageSize,Integer outsource);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus,Integer pageNo, Integer pageSize);
 	/**
 	 * 订单审核
 	 * @param orderNo

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -471,8 +471,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer distribution,String depId, Integer pageNo,
-			Integer pageSize,Integer outsource) {
+	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,
+			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -489,6 +489,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			params.put("specially",specially);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
+		if (null!=liquidationStatus) params.put("liquidationStatus", liquidationStatus);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");