Browse Source

新增我的项目合同编号、项目状态筛选

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
e363f7205d

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -930,6 +930,12 @@
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="contractNo != null">
+  	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="projectStatus != null">
+  	and e.project_status = #{projectStatus,jdbcType=INTEGER}
+  	</if>
   	<if test="depId != null">
   	and e.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>
@@ -969,6 +975,12 @@
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="contractNo != null">
+  	and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="projectStatus != null">
+  	and e.project_status = #{projectStatus,jdbcType=INTEGER}
+  	</if>
   	<if test="depId != null">
   	and e.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>

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

@@ -55,9 +55,10 @@ 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,String depId  ,Integer pageNo,Integer pageSize,Integer outsource){
+	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,
+			String contractNo,Integer projectStatus ,Integer pageNo,Integer pageSize,Integer outsource){
 		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,pageNo, pageSize, outsource));
+		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,contractNo, projectStatus,pageNo, pageSize, outsource));
 		return res;
 	}
 	

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

@@ -16,7 +16,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, String depId,
-			Integer pageNo, Integer pageSize,Integer outsource);
+			String contractNo, Integer pageNo, Integer pageSize,Integer outsource, Integer outsource2);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
 

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

@@ -169,7 +169,7 @@ 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, Integer pageNo, Integer pageSize,Integer outsource) {
+			String adminName,Integer specially, String depId, String contractNo,Integer projectStatus ,Integer pageNo, Integer pageSize,Integer outsource) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -178,6 +178,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		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(contractNo)) params.put("contractNo", contractNo);
+		if (projectStatus !=null ) params.put("projectStatus", projectStatus);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);