Browse Source

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

gitadmin 7 years ago
parent
commit
5b512c0a6d

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

@@ -837,7 +837,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -865,13 +865,14 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     from t_task_log x left join  t_order_task a on x.task_id=a.id 
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
+    left join user f on e.buyer_id=f.id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
-  	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="depId != null">
   	and g.department_id= #{depId ,jdbcType=VARCHAR}

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

@@ -97,6 +97,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			return -1;
 		}
 		TOrderNew onew = new TOrderNew();
+		TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		onew.setOrderNo(orderNo);
 		onew.setDeleteSign(0);//正常
 		onew.setApproval(approval);//特批状态
@@ -113,7 +114,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNew record = new TOrderNew();
 			record.setOrderNo(orderNo);
 			record.setFinanceId(financeId);
-			TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 			if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
 				record.setProcessStatus(ProcessStatus.YPCWZY.getCode());				
 			}

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

@@ -209,7 +209,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (isSubmit==1) {
 			t.setOrderStatus(OrderNewState.QDDS.getCode());
 			t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
-			
+			if (t2.getApproval()==ApprovalNewState.BH.getCode()){
+				t.setApproval(ApprovalNewState.DSH.getCode());
+			}
 		}
 		if (t2.getApproval()==ApprovalNewState.BH.getCode()||
 				t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -68,8 +68,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setTaskAllocator(TokenManager.getAdminId());
 		t.setTaskReceiver(taskReceiverId);
 		t.setTaskDistributionTime(new Date());
-		tOrderTaskMapper.updateByPrimaryKeySelective(t);
 		insetLog(taskId, taskReceiverId);
+		tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		updateOrder(t);
+		//0-经理 (经理分派会创建子项目)1 管理员或经理转交
 		if (specially==0&&t.getCommodityQuantity()>1) {
 			for (int i = 0; i < t.getCommodityQuantity(); i++) {
 				TOrderTask tOrderTask=new TOrderTask();
@@ -85,6 +87,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}
 			}
 		}
+		return 1;
+	}
+
+	private void updateOrder(TOrderTask t) {
 		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
 		TOrderNew tNew=new TOrderNew();
 		tNew.setOrderNo(t.getOrderNo());
@@ -101,7 +107,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tNew.setProcessStatus(ProcessStatus.YBFPZXSGLY.getCode());
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
-		return 1;
 	}
 
 	private void insetLog(Integer taskId, String taskReceiverId) {

+ 8 - 6
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.99\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.99
+jedis.host=localhost
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456
@@ -54,14 +54,16 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.50
+
 portal.host=//sf.jishutao.com/portal/2.0.6
-avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload
+#连接开发
+#static.host=//sb.jishutao.com/1.0.50
+#avatar.host=//sb.jishutao.com
 
 #本地连生产
-#avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.0.92
+avatar.host=//static.kedexinxi.com
+static.host=//s.kedexinxi.com/1.0.92
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload