Przeglądaj źródła

Merge branch 'test' of jishutao/kede-server into prod

anderx 5 lat temu
rodzic
commit
0a95640d04

+ 2 - 1
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1512,7 +1512,8 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
   
    <select id="selectOrderTaskListCount" resultType="java.lang.Integer">
   	select  count(*) from t_order_task a  left join t_order_new e on a.order_no=e.order_no
-    left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign in (0,2,3)  and e.order_status in (2,4) 
+  	left join user f on e.buyer_id=f.id left join admin g on e.salesman_id=g.id 
+  	left join department h on g.department_id=h.id where e.delete_sign in (0,2,3)  and e.order_status in (2,4) 
     and a.outsource= #{outsource,jdbcType=INTEGER}
    <if test="role == 0 ">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}

+ 3 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1131,13 +1131,13 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 	/**
 	 * 
-	 * @param type  0录入  1领取 2转交客户 3转交业务
+	 * @param type  0录入 1 领取 2 转交私有客户 3转交业务 4 未跟进丢失(30) 5未签单丢失(270天)6释放  7转交签单客户
 	 */
 	private void addUserTransferLog(String uid,String aid,Integer type,String pid,Date lockTime, List<String> uList) {
 		if(uList.isEmpty()) {
 			UserTransferLog utl=new UserTransferLog();
 			if(type==0||type==1) utl.setAid(aid);
-			else if(type==2||type==3) {
+			else if(type==2||type==3||type==7) {
 				utl.setAid(TokenManager.getAdminId());
 				utl.setTakeAid(aid);
 			}
@@ -1152,7 +1152,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			for (String string : ulist) {
 				UserTransferLog utl=new UserTransferLog();
 				if(type==0||type==1) utl.setAid(string);
-				else if(type==2||type==3) {
+				else if(type==2||type==3||type==7) {
 					utl.setAid(TokenManager.getAdminId());
 					utl.setTakeAid(string);
 				}

+ 2 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -907,9 +907,9 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
     				case "分类名称": o = ob.getCname(); break;
     				case "合同编号": o = ob.getContractNo(); break;
     				case "订单编号": o = ob.getOrderNo(); break;
-    				case "客户名称": o = ob.getCname(); break;
+    				case "客户名称": o = ob.getUserName(); break;
     				case "部门名称": o = ob.getDepName(); break;
-    				case "第三方机构名称": o = ob.getCname(); break;
+    				case "第三方机构名称": o = ob.getCompanyName(); break;
     				case "付款类型": o = ob.getChooseType()==0?"第三方成本":
     						ob.getChooseType()==1?"催款节点":ob.getChooseType()==2?"官费":""; 
     					break;