Browse Source

项目列表修改

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

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

@@ -1487,6 +1487,9 @@ a.commodity_price commodityPrice
   	<if test="adminName != null">
   	and a.receiver_name like CONCAT('%', #{adminName,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="startSignTime != null and endSignTime != null">
+  	and e.sign_time between #{startSignTime} and #{endSignTime}
+  	</if>
   	order by a.task_distribution_time desc
   	<if test="page_sql!=null">
 			${page_sql}
@@ -1551,6 +1554,9 @@ a.commodity_price commodityPrice
   	<if test="adminName != null">
   	and a.receiver_name  like CONCAT('%', #{adminName,jdbcType=VARCHAR},'%')
   	</if>
+  	<if test="startSignTime != null and endSignTime != null">
+  	and e.sign_time between #{startSignTime} and #{endSignTime}
+  	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
 select  

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

@@ -54,10 +54,11 @@ 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  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,Integer pageNo,Integer pageSize){
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,
+			String startSignTime,String endSignTime,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));
+				projectStatus,approval, outsource, outsourceStatus,startSignTime,endSignTime,pageNo, pageSize));
 		return res;
 	}
 	

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

@@ -20,7 +20,7 @@ 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);
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startSignTime,String endSignTime,Integer pageNo,Integer pageSize);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
 

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

@@ -225,7 +225,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  ,
-			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,Integer pageNo,Integer pageSize) {
+			String contractNo,Integer projectStatus ,Integer approval,Integer outsource,Integer outsourceStatus,String startSignTime,String endSignTime,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;
@@ -239,6 +239,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (approval !=null) params.put("approval", approval);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
+		if (StringUtils.isNotBlank(startSignTime)) params.put("startSignTime", startSignTime);
+		if (StringUtils.isNotBlank(endSignTime)) params.put("endSignTime", endSignTime);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		params.put("outsource", outsource==null?0:outsource);
 		if (outsourceStatus !=null) params.put("outsourceStatus", outsourceStatus);