Forráskód Böngészése

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

anderx 2 éve%!(EXTRA string=óta)
szülő
commit
2d76a2123c

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

@@ -1527,9 +1527,7 @@
     <if test="screen ==0">
       and a.project_status in(0,1,2,3)
     </if>
-    <if test="screen ==1">
-      and ttm.complete_count > 0
-    </if>
+
     <if test="screen ==2">
       and a.project_status &gt; 3
     </if>
@@ -1632,7 +1630,6 @@
   <select id="selectProjectStatisticsCount" resultType="java.lang.Integer">
     select  count(*)
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
-    left join t_task_mid ttm on a.id=ttm.tid
     <if test="province !=null">
       left join department c on b.order_dep =c.id
     </if>
@@ -1673,9 +1670,7 @@
     <if test="screen ==0">
       and a.project_status in(0,1,2,3)
     </if>
-    <if test="screen ==1">
-      and ttm.complete_count > 0
-    </if>
+
     <if test="screen ==2">
       and a.project_status &gt; 3
     </if>

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

@@ -145,7 +145,7 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 修改项目状态(咨询师)
+	 * 修改项目状态(咨询师)、项目状态修改
 	 */
 	@RequestMapping(value="/updateProjectStatus" ,method = RequestMethod.POST)
 	public Result updateProjectStatus(@Valid UpdateProjectStatusBo a,BindingResult bindingResult){

+ 11 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -174,6 +174,17 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		aids.add(taskReceiverId);
 		TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),order, TokenManager.getAdminId(),0,taskId);
+		//处理项目统计表
+		TTaskMid dtails = tTaskMidMapper.getDtails(taskId);
+		if (type==0){
+			dtails.setDispatchCount(t.getCommodityQuantity());
+			dtails.setStockCount(t.getCommodityQuantity());
+		}
+		//如果不相等就切换
+		if (!dtails.getDutyDep().equals(a.getDepartmentId())){
+			dtails.setDutyDep(a.getDepartmentId());
+		}
+		tTaskMidMapper.updateByTid(dtails);
 		//处理订单信息
 		checkProjiectAllocation(t.getOrderNo());
 		pushTaskChange(TokenManager.getAdminId(),taskReceiverId,type,t.getOrderNo());

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.76
+static.host=//static.jishutao.com/1.2.77
 rd.static.host=//static.jishutao.com/RD/1.0.01
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.76
+static.host=//static.jishutao.com/1.2.77
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload