Browse Source

项目任务管理,增加锁定、未锁定的筛选项。

anderx 7 years ago
parent
commit
ce6a5f82b6

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -1383,7 +1383,7 @@
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
 			c.department_id = f.id
-		where a.order_type = 0 and order_status = 3
+		where a.order_type = 0 and order_status = 3	and delete_sign = 0	
 		<if test="orderNo != null">
 			and a.order_no = #{orderNo,jdbcType=VARCHAR}
 		</if>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -785,6 +785,9 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
+		<if test="deletedSign != null">
+			and d.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		</if>
 		<if test="taskStatus != null">
 			and a.task_status = #{taskStatus,jdbcType=VARCHAR}
 		</if>
@@ -826,6 +829,9 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
+		<if test="deletedSign != null">
+			and d.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		</if>
 		<if test="taskStatus != null">
 			and a.task_status = #{taskStatus,jdbcType=VARCHAR}
 		</if>

+ 3 - 3
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -780,7 +780,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 			Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "", 
-				startDate, endDate, taskStatus, categoryId, pageNo, pageSize));
+				startDate, endDate, taskStatus, categoryId,null, pageNo, pageSize));
 		return res;
 	}
 	
@@ -799,10 +799,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/listTask",method = RequestMethod.POST)
 	public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate, 
-			Integer taskStatus,String categoryId,Integer pageNo, Integer pageSize){
+			Integer taskStatus,String categoryId,String deletedSign,Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate, 
-				taskStatus, categoryId, pageNo, pageSize));
+				taskStatus, categoryId,deletedSign, pageNo, pageSize));
 		return res;
 	}
 	

+ 2 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -115,12 +115,13 @@ public interface TechProjectService {
 	 * @param endDate
 	 * @param taskStatus
 	 * @param categoryId
+	 * @param deletedSign 
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
 	Pagination<TaskListBo> selectProjectTask(String projectNo,String buyerName,String taskReceiverId, String taskReceiverName,
-			String startDate,String endDate, Integer taskStatus,String categoryId,Integer pageNo, Integer pageSize);
+			String startDate,String endDate, Integer taskStatus,String categoryId,String deletedSign, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 根据任务id查询任务

+ 2 - 1
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -396,7 +396,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TaskListBo> selectProjectTask(String projectNo, String buyerName, String taskReceiverId, String taskReceiverName,
-			String startDate,String endDate, Integer taskStatus, String categoryId, Integer pageNo, Integer pageSize) {
+			String startDate,String endDate, Integer taskStatus, String categoryId,String deletedSign, Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(StringUtils.isNotBlank(projectNo)) params.put("projectNo", projectNo);
 		if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
@@ -410,6 +410,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			} catch (ParseException e) {
 		}
 		if(StringUtils.isNotBlank(categoryId)) params.put("categoryId", categoryId);
+		if(StringUtils.isNotBlank(deletedSign)) params.put("deletedSign", deletedSign);
 		if(taskStatus != null) params.put("taskStatus", taskStatus);
 		return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);
 	}