Browse Source

我的任务列表新增筛选外包状态

anderx 5 years ago
parent
commit
3360883bda

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

@@ -936,14 +936,14 @@
   
    <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,a.project_status as projectStatus,e.contract_no contractNo,
-    a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,e.approval,
+    a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,e.approval,l.refund_status outsourceStatus,
     ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours
     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 department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
-    on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid
-    where e.delete_sign !=1  and e.order_status not in (5,7)   and a.outsource= #{outsource,jdbcType=INTEGER}
+    on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
+    on a.id=l.tid where e.delete_sign !=1  and e.order_status not in (5,7)   and a.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
@@ -958,6 +958,9 @@
   	</if>
   	<if test="approval ==2">
   	and e.approval &gt; 1
+  	</if>
+  	<if test="outsourceStatus ==2">
+  	and l.refund_status = #{outsourceStatus,jdbcType=INTEGER}
   	</if> 
   	<if test="contractNo != null">
   	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
@@ -1013,6 +1016,9 @@
   	<if test="approval ==2">
   	and e.approval &gt; 1
   	</if> 
+  	<if test="outsourceStatus ==2">
+  	and l.refund_status = #{outsourceStatus,jdbcType=INTEGER}
+  	</if> 
   	<if test="contractNo != null">
   	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
   	</if>

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

@@ -27,6 +27,7 @@ public class TOrderTaskListBo {
 	private Integer outsource;
 	/** 外包部门 */
 	private String outsourceName;
+	private Integer outsourceStatus;
 	public String getContractNo() {
 		return contractNo;
 	}
@@ -165,5 +166,11 @@ public class TOrderTaskListBo {
 	public void setOutsource(Integer outsource) {
 		this.outsource = outsource;
 	}
+	public Integer getOutsourceStatus() {
+		return outsourceStatus;
+	}
+	public void setOutsourceStatus(Integer outsourceStatus) {
+		this.outsourceStatus = outsourceStatus;
+	}
 	
 }

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

@@ -1,218 +1,218 @@
-package com.goafanti.order.controller;
-
-
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.order.bo.TOrderTaskDetailBo;
-import com.goafanti.order.bo.TaskProgressBo;
-import com.goafanti.order.bo.inuptTaskHoursListBo;
-import com.goafanti.order.service.OrderProjectService;
-
-@RestController
-@RequestMapping(value = "/api/admin/orderProject")
-public class OrderProjectApiController extends CertifyApiController {
-	
-	@Autowired
-	
-	private OrderProjectService	orderProjectService;
-	
-	/**
-	 * 项目分配
-	 * taskId 项目ID
-	 * taskReceiverId 受理人ID
-	 * specially 0 任务派单(咨询师经理派单) 1项目派单(咨询师管理员派单)2咨询师退回给经理
-	 */
-	@RequestMapping(value = "/projectDistribution", method = RequestMethod.POST)
-	public Result projectDistribution(Integer taskId,String taskReceiverId,Integer specially ,String remarks){
-		Result res = new Result();
-		if(null==taskId || StringUtils.isBlank(taskReceiverId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和受理人"));
-			return res;
-		}
-		res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId,specially,remarks));
-		return res;
-	}
-	
-	/**
-	 * 任务派单列表
-	 */
-	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
-	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer pageNo,Integer pageSize,Integer outsource){
-		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, 
-				projectStatus,approval,pageNo, pageSize, outsource));
-		return res;
-	}
-	
-	
-	/**
-	 * 任务派单查询
-	 */
-	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
-	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 ,  depId  ,pageNo, pageSize));
-		return res;
-	}
-	/**
-	 * 任务详情
-	 */
-	@RequestMapping(value="/orderTaskDetail" ,method = RequestMethod.GET)
-	public Result orderTaskDetail(String id){
-		Result res=new Result();
-		res.setData(orderProjectService.orderTaskDetail(id));
-		return res;
-	}
-	/**
-	 * 任务修改
-	 */
-	@RequestMapping(value="/updateOrderTask" ,method = RequestMethod.POST)
-	public Result updateOrderTask(TOrderTaskDetailBo t){
-		Result res=new Result();
-		res.setData(orderProjectService.updateOrderTask(t));
-		return res;
-	}
-	/**
-	 * 添加工时
-	 */
-	@RequestMapping(value="/addTaskHours" ,method = RequestMethod.POST)
-	public Result addTaskHours(TTaskHours t,String taskDate){
-		Result res=new Result();
-		if (t.getHours()==null) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务时间"));
-			return res;
-		}
-		if (StringUtils.isBlank(taskDate)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "工作日期"));
-			return res;
-		}
-		if (StringUtils.isBlank(t.getRemarks())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "工作内容"));
-			return res;
-		}
-		if (StringUtils.isNotBlank(taskDate)) {
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			try {
-				t.setTaskDay(sdf.parse(taskDate));
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-		}
-		res.setData(orderProjectService.addTaskHours(t));
-		return res;
-	}
-	/**
-	 * 任务工时列表
-	 */
-	@RequestMapping(value="/taskHoursList" ,method = RequestMethod.GET)
-	public Result taskHoursList(inuptTaskHoursListBo ib,
-			Integer pageNo, Integer pageSize){
-		Result res=new Result();
-		res.setData(orderProjectService.taskHoursList(ib,pageNo, pageSize));
-		return res;
-	}
-	/**
-	 * 任务工时详情列表
-	 */
-	@RequestMapping(value="/taskHoursDetailsList" ,method = RequestMethod.GET)
-	public Result taskHoursDetailsList( String taskId ){
-		Result res=new Result();
-		if (StringUtils.isBlank(taskId)) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目编号"));
-			return res;
-		}
-		res.setData(orderProjectService.taskHoursDetailsList(taskId));
-		return res;
-	}
-	
-	
-	/**
-	 * 任务操作日志
-	 */
-	@RequestMapping(value="/TaskLogList" ,method = RequestMethod.GET)
-	public Result TaskLogList(Integer id){
-		Result res=new Result();
-		res.setData(orderProjectService.TaskLogList(id));
-		return res;
-	}
-	/** 任务文件上传 **/
-	@RequestMapping(value = "/uploadOrderTaskFile", method = RequestMethod.POST)
-	public Result uploadOrderTaskFile(HttpServletRequest req,String sign){
-		Result res = new Result();
-		res.setData(handleFile(res, "/order_task_file/", false, req, sign));
-		return res;
-	}
-	/**
-	 * 	新增项目申报进度
-	 */
-	@RequestMapping(value="/createTaskProgress" ,method = RequestMethod.POST)
-	public Result createTaskProgress(TaskProgressBo t){
-		Result res=new Result();
-		if (StringUtils.isBlank(t.getLicenceTimes())|| null==t.getTaskId()|| null==t.getAlreadyNumber()) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
-		}
-		res.setData(orderProjectService.createTaskProgress(t));
-		return res;
-	}
-	
-	/**
-	 * 	删除项目申报进度
-	 */
-	@RequestMapping(value="/delectTaskProgress" ,method = RequestMethod.POST)
-	public Result delectTaskProgress(Integer id){
-		Result res=new Result();
-		if (null==id) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
-		}
-		res.setData(orderProjectService.delectTaskProgress(id));
-		return res;
-	}
-	/**
-	 * 	查看项目申报进度
-	 */
-	@RequestMapping(value="/selectTaskProgress" ,method = RequestMethod.GET)
-	public Result selectTaskProgress(Integer tid){
-		Result res=new Result();
-		if (null==tid) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
-		}
-		res.setData(orderProjectService.selectTaskProgress(tid));
-		return res;
-	}
-	
-	
-	/**
-	 * 我的任务列表导出xls
-	 * @throws IOException 
-	 */
-	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
-	public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) throws IOException{
-		Result res=new Result();
-		try {
-			orderProjectService.exportMyTaskList( response, ib,  pageNo, pageSize);
-		} catch (Exception e) {
-			res.getError().add(buildError("格式不正确"));
-			e.printStackTrace();
-			return res;
-		}
-     res.data(1); 
-	return res;
-		
-	}
-}
+package com.goafanti.order.controller;
+
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.TTaskHours;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.order.bo.TOrderTaskDetailBo;
+import com.goafanti.order.bo.TaskProgressBo;
+import com.goafanti.order.bo.inuptTaskHoursListBo;
+import com.goafanti.order.service.OrderProjectService;
+
+@RestController
+@RequestMapping(value = "/api/admin/orderProject")
+public class OrderProjectApiController extends CertifyApiController {
+	
+	@Autowired
+	
+	private OrderProjectService	orderProjectService;
+	
+	/**
+	 * 项目分配
+	 * taskId 项目ID
+	 * taskReceiverId 受理人ID
+	 * specially 0 任务派单(咨询师经理派单) 1项目派单(咨询师管理员派单)2咨询师退回给经理
+	 */
+	@RequestMapping(value = "/projectDistribution", method = RequestMethod.POST)
+	public Result projectDistribution(Integer taskId,String taskReceiverId,Integer specially ,String remarks){
+		Result res = new Result();
+		if(null==taskId || StringUtils.isBlank(taskReceiverId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和受理人"));
+			return res;
+		}
+		res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId,specially,remarks));
+		return res;
+	}
+	
+	/**
+	 * 任务派单列表
+	 */
+	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
+	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,Integer pageNo,Integer pageSize){
+		Result res=new Result();
+		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, 
+				projectStatus,approval, outsource, outsourceStatus,pageNo, pageSize));
+		return res;
+	}
+	
+	
+	/**
+	 * 任务派单查询
+	 */
+	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
+	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 ,  depId  ,pageNo, pageSize));
+		return res;
+	}
+	/**
+	 * 任务详情
+	 */
+	@RequestMapping(value="/orderTaskDetail" ,method = RequestMethod.GET)
+	public Result orderTaskDetail(String id){
+		Result res=new Result();
+		res.setData(orderProjectService.orderTaskDetail(id));
+		return res;
+	}
+	/**
+	 * 任务修改
+	 */
+	@RequestMapping(value="/updateOrderTask" ,method = RequestMethod.POST)
+	public Result updateOrderTask(TOrderTaskDetailBo t){
+		Result res=new Result();
+		res.setData(orderProjectService.updateOrderTask(t));
+		return res;
+	}
+	/**
+	 * 添加工时
+	 */
+	@RequestMapping(value="/addTaskHours" ,method = RequestMethod.POST)
+	public Result addTaskHours(TTaskHours t,String taskDate){
+		Result res=new Result();
+		if (t.getHours()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务时间"));
+			return res;
+		}
+		if (StringUtils.isBlank(taskDate)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "工作日期"));
+			return res;
+		}
+		if (StringUtils.isBlank(t.getRemarks())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "工作内容"));
+			return res;
+		}
+		if (StringUtils.isNotBlank(taskDate)) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			try {
+				t.setTaskDay(sdf.parse(taskDate));
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
+		}
+		res.setData(orderProjectService.addTaskHours(t));
+		return res;
+	}
+	/**
+	 * 任务工时列表
+	 */
+	@RequestMapping(value="/taskHoursList" ,method = RequestMethod.GET)
+	public Result taskHoursList(inuptTaskHoursListBo ib,
+			Integer pageNo, Integer pageSize){
+		Result res=new Result();
+		res.setData(orderProjectService.taskHoursList(ib,pageNo, pageSize));
+		return res;
+	}
+	/**
+	 * 任务工时详情列表
+	 */
+	@RequestMapping(value="/taskHoursDetailsList" ,method = RequestMethod.GET)
+	public Result taskHoursDetailsList( String taskId ){
+		Result res=new Result();
+		if (StringUtils.isBlank(taskId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目编号"));
+			return res;
+		}
+		res.setData(orderProjectService.taskHoursDetailsList(taskId));
+		return res;
+	}
+	
+	
+	/**
+	 * 任务操作日志
+	 */
+	@RequestMapping(value="/TaskLogList" ,method = RequestMethod.GET)
+	public Result TaskLogList(Integer id){
+		Result res=new Result();
+		res.setData(orderProjectService.TaskLogList(id));
+		return res;
+	}
+	/** 任务文件上传 **/
+	@RequestMapping(value = "/uploadOrderTaskFile", method = RequestMethod.POST)
+	public Result uploadOrderTaskFile(HttpServletRequest req,String sign){
+		Result res = new Result();
+		res.setData(handleFile(res, "/order_task_file/", false, req, sign));
+		return res;
+	}
+	/**
+	 * 	新增项目申报进度
+	 */
+	@RequestMapping(value="/createTaskProgress" ,method = RequestMethod.POST)
+	public Result createTaskProgress(TaskProgressBo t){
+		Result res=new Result();
+		if (StringUtils.isBlank(t.getLicenceTimes())|| null==t.getTaskId()|| null==t.getAlreadyNumber()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.createTaskProgress(t));
+		return res;
+	}
+	
+	/**
+	 * 	删除项目申报进度
+	 */
+	@RequestMapping(value="/delectTaskProgress" ,method = RequestMethod.POST)
+	public Result delectTaskProgress(Integer id){
+		Result res=new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.delectTaskProgress(id));
+		return res;
+	}
+	/**
+	 * 	查看项目申报进度
+	 */
+	@RequestMapping(value="/selectTaskProgress" ,method = RequestMethod.GET)
+	public Result selectTaskProgress(Integer tid){
+		Result res=new Result();
+		if (null==tid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.selectTaskProgress(tid));
+		return res;
+	}
+	
+	
+	/**
+	 * 我的任务列表导出xls
+	 * @throws IOException 
+	 */
+	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
+	public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) throws IOException{
+		Result res=new Result();
+		try {
+			orderProjectService.exportMyTaskList( response, ib,  pageNo, pageSize);
+		} catch (Exception e) {
+			res.getError().add(buildError("格式不正确"));
+			e.printStackTrace();
+			return res;
+		}
+     res.data(1); 
+	return res;
+		
+	}
+}

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

@@ -1,52 +1,52 @@
-package com.goafanti.order.service;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-import com.goafanti.common.model.TTaskHours;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.order.bo.TOrderTaskDetailBo;
-import com.goafanti.order.bo.TOrderTaskListBo;
-import com.goafanti.order.bo.TaskLogBo;
-import com.goafanti.order.bo.TaskProgressBo;
-import com.goafanti.order.bo.inuptTaskHoursListBo;
-
-public interface OrderProjectService {
-
-	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially, String remarks);
-
-	Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,Integer specially, String depId,
-			String contractNo, Integer approval, Integer pageNo, Integer pageSize,Integer outsource, Integer outsource2);
-
-	TOrderTaskDetailBo orderTaskDetail(String id);
-
-	int updateOrderTask(TOrderTaskDetailBo t);
-
-	int addTaskHours(TTaskHours t);
-	
-	Pagination<TOrderTaskListBo> taskHoursList(inuptTaskHoursListBo ib,
-			Integer pageNo, Integer pageSize);
-
-
-	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
-			Integer specially,String depId  , Integer pageNo, Integer pageSize);
-
-	List<TaskLogBo> TaskLogList(Integer id);
-
-	int createTaskProgress(TaskProgressBo t);
-
-	int delectTaskProgress(Integer id);
-
-	List<TaskProgressBo> selectTaskProgress(Integer tid);
-
-
-	List<TTaskHours> taskHoursDetailsList(String taskId);
-
-	void exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize)throws IOException ;
-
-	
-}
+package com.goafanti.order.service;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import com.goafanti.common.model.TTaskHours;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.TOrderTaskDetailBo;
+import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.order.bo.TaskLogBo;
+import com.goafanti.order.bo.TaskProgressBo;
+import com.goafanti.order.bo.inuptTaskHoursListBo;
+
+public interface OrderProjectService {
+
+	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially, String remarks);
+
+	Pagination<TOrderTaskListBo> orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,Integer pageNo,Integer pageSize);
+
+	TOrderTaskDetailBo orderTaskDetail(String id);
+
+	int updateOrderTask(TOrderTaskDetailBo t);
+
+	int addTaskHours(TTaskHours t);
+	
+	Pagination<TOrderTaskListBo> taskHoursList(inuptTaskHoursListBo ib,
+			Integer pageNo, Integer pageSize);
+
+
+	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
+			Integer specially,String depId  , Integer pageNo, Integer pageSize);
+
+	List<TaskLogBo> TaskLogList(Integer id);
+
+	int createTaskProgress(TaskProgressBo t);
+
+	int delectTaskProgress(Integer id);
+
+	List<TaskProgressBo> selectTaskProgress(Integer tid);
+
+
+	List<TTaskHours> taskHoursDetailsList(String taskId);
+
+	void exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize)throws IOException ;
+
+	
+}

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

@@ -187,8 +187,8 @@ 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, String depId, String contractNo,Integer projectStatus , Integer approval,Integer pageNo, Integer pageSize,Integer outsource) {
+	public Pagination<TOrderTaskListBo> orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,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;
@@ -204,6 +204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		params.put("outsource", outsource==null?0:outsource);
+		if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, pageNo, pageSize);
 		return p;
 	}

+ 6 - 5
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -118,13 +118,13 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 			if (o.getRefundStatus()==1) {
 				t.setOrderStatus(2);//订单审核标记通过
 				t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
-				addOrderLog(o.getOrderNo(),OrderLogProcess.WBTG.getCode());
+				addOrderLog(o.getOrderNo(),OrderLogProcess.WBTG.getCode(),o.getRemarks());
 				aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
 				type=NoticeStatus.ORDER_OUTSOURCE_YES.getCode();
 			}else {
 				t.setOrderStatus(1);
 				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
-				addOrderLog(o.getOrderNo(),OrderLogProcess.WBBH.getCode());
+				addOrderLog(o.getOrderNo(),OrderLogProcess.WBBH.getCode(),o.getRemarks());
 				aids.addAll(adminMapper.listNameByDepAndName(adminMapper.getDeptNameByAid(t2.getSalesmanId()).getDepartmentId(), "营销管理员"));
 				type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 			}
@@ -139,21 +139,22 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 				tt2.setOutsource(1);
 				tOrderTaskMapper.updateByPrimaryKeySelective(tt2);
 				type=NoticeStatus.PROJECT_OUTSOURCE_YES.getCode();
-				addOrderLog(o.getOrderNo(),OrderLogProcess.XMWBTG.getCode());
+				addOrderLog(o.getOrderNo(),OrderLogProcess.XMWBTG.getCode(),o.getRemarks());
 			}else {
 				type=NoticeStatus.PROJECT_OUTSOURCE_NO.getCode();
-				addOrderLog(o.getOrderNo(),OrderLogProcess.XMWBBH.getCode());
+				addOrderLog(o.getOrderNo(),OrderLogProcess.XMWBBH.getCode(),o.getRemarks());
 			}
 		}
 		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,o.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
 		return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 	}
 	
-	public void addOrderLog(String orderNo, Integer code) {
+	public void addOrderLog(String orderNo, Integer code,String remarks) {
 		TOrderLog tl=new TOrderLog();
 		tl.setOrderNo(orderNo);
 		tl.setProcess(code);
 		tl.setAid(TokenManager.getAdminId());
+		tl.setRemarks(remarks);
 		tOrderLogMapper.insertSelective(tl);
 		
 	}