Browse Source

任务BUG修复

anderx 7 years ago
parent
commit
72518d07dc

+ 2 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1168,7 +1168,9 @@
   	<if test="specially == 4">
   	a.process_status,
   	</if>
+  	<if test="specially != 4">
   	a.order_status,
+  	</if>
   	a.create_time 
   	<if test="specially != 4">
   	desc

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

@@ -662,14 +662,16 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	 select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+  	     select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName
+    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
   	from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.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
+    left join admin g on e.salesman_id=g.id
+    left join department h on g.department_id=h.id
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
@@ -685,6 +687,9 @@
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and g.department_id= #{depId,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -711,6 +716,8 @@
   	from t_order_task a 
     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 admin g on e.salesman_id=g.id
+    left join department h on g.department_id=h.id
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
@@ -726,6 +733,9 @@
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and g.department_id= #{depId,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -812,13 +822,15 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
    <select id="selectTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName
+    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
     from t_task_log x left join  t_order_task a on x.task_id=a.id 
   	left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.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
+    left join admin g on e.salesman_id=g.id
+    left join department h on g.department_id=h.id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     <if test="orderNo != null">
@@ -830,6 +842,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and g.department_id= #{depId ,jdbcType=VARCHAR}
+  	</if>
   	<if test="taskId != null">
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
@@ -858,6 +873,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     <if test="name != null">
   	and a.commodity_name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="depId != null">
+  	and g.department_id= #{depId ,jdbcType=VARCHAR}
+  	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>

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

@@ -50,9 +50,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务派单列表
 	 */
 	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
-	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,Integer pageNo,Integer pageSize){
+	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially , pageNo, pageSize));
+		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,pageNo, pageSize));
 		return res;
 	}
 	
@@ -61,9 +61,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务派单查询
 	 */
 	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
-	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,Integer pageNo,Integer pageSize){
+	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId  ,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially , pageNo, pageSize));
+		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId  ,pageNo, pageSize));
 		return res;
 	}
 	/**

+ 2 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -11,7 +11,7 @@ public interface OrderProjectService {
 
 	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially);
 
-	Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,Integer specially,
+	Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,Integer specially, String depId,
 			Integer pageNo, Integer pageSize);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
@@ -26,6 +26,6 @@ public interface OrderProjectService {
 	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String starTime, String endTime);
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
-			Integer specially, Integer pageNo, Integer pageSize);
+			Integer specially,String depId  , Integer pageNo, Integer pageSize);
 	
 }

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

@@ -116,13 +116,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName,Integer specially, Integer pageNo, Integer pageSize) {
+			String adminName,Integer specially, String depId, 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;
 		params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		if (null!=specially) params.put("specially", specially);
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
@@ -265,12 +266,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> selectTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName, Integer specially, Integer pageNo, Integer pageSize) {
+			String adminName, Integer specially,String depId  , 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;
 		params.put("aid", TokenManager.getAdminId()==null?"e82a4405-2104-481d-ba5f-72a639589efd":TokenManager.getAdminId());
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);

+ 2 - 2
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.2\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://192.168.0.13\: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.2
+jedis.host=192.168.0.13
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456