Browse Source

项目任务管理查询显示BUG修复

anderx 7 years ago
parent
commit
400a82a081

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

@@ -769,7 +769,7 @@ from
 			a.commodity_id as commodityId,
 			a.serial_number as taskNo,
 			a.task_status as taskStatus,
-			a.deleted_sign as deletedSign,
+			a.deleted_sign as deleteSign,
 			date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
 			a.task_comment as taskComment,
 			a.publish_status as publishStatus,
@@ -792,8 +792,8 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
-		<if test="deletedSign != null">
-			and a.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		<if test="deleteSign != null">
+			and a.deleted_sign = #{deleteSign,jdbcType=VARCHAR}
 		</if>
 		<if test="publishStatus != null">
 			and a.publish_status = #{publishStatus,jdbcType=VARCHAR}
@@ -839,8 +839,8 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
-		<if test="deletedSign != null">
-			and a.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		<if test="deleteSign != null">
+			and a.deleted_sign = #{deleteSign,jdbcType=VARCHAR}
 		</if>
 		<if test="publishStatus != null">
 			and a.publish_status = #{publishStatus,jdbcType=VARCHAR}

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

@@ -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,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize){
+			Integer taskStatus,String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate, 
-				taskStatus, categoryId,deletedSign,publishStatus, pageNo, pageSize));
+				taskStatus, categoryId,deleteSign,publishStatus, pageNo, pageSize));
 		return res;
 	}
 	

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

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

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

@@ -398,7 +398,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,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize) {
+			String startDate,String endDate, Integer taskStatus, String categoryId,String deleteSign,String publishStatus, 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);
@@ -412,7 +412,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(StringUtils.isNotBlank(deleteSign)) params.put("deleteSign", deleteSign);
 		if(StringUtils.isNotBlank(publishStatus)) params.put("publishStatus", publishStatus);
 		if(taskStatus != null) params.put("taskStatus", taskStatus);
 		return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);