anderx преди 5 години
родител
ревизия
52771fc96e

+ 0 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -237,7 +237,6 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	public Pagination<AchievementObject> listMyAchievement(Integer auditStatus, String name,Integer dataCategory, 
 			String startDate,String endDate, Integer pNo, Integer pSize) {
-		System.out.println("as:"+auditStatus+" dc:"+ dataCategory);
 		Map<String,Object> params = new HashMap<>();
 		params.put("ownerId", TokenManager.getUserId());
 		if (null != startDate) params.put("startDate", startDate);

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

@@ -779,6 +779,12 @@
 		<if test="endDate != null">
 			and a.release_date <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
 		</if>
+		<if test="createStartDate != null">
+			and a.create_time <![CDATA[ >= ]]> #{createStartDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="createEndDate != null">
+			and a.create_time <![CDATA[ <= ]]> #{createEndDate,jdbcType=TIMESTAMP}
+		</if>
 		<if test="name != null">
 			and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
@@ -814,6 +820,12 @@
 		<if test="endDate != null">
 			and a.release_date <![CDATA[ <= ]]> #{endDate,jdbcType=TIMESTAMP}
 		</if>
+		<if test="createStartDate != null">
+			and a.create_time <![CDATA[ >= ]]> #{createStartDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="createEndDate != null">
+			and a.create_time <![CDATA[ <= ]]> #{createEndDate,jdbcType=TIMESTAMP}
+		</if>
 		<if test="name != null">
 			and a.name like concat('%',#{name,jdbcType=VARCHAR},'%')
 		</if>

+ 3 - 2
src/main/java/com/goafanti/demand/controller/UserDemandApiController.java

@@ -42,9 +42,10 @@ public class UserDemandApiController extends CertifyApiController {
 	 * 用户需求列表
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Result list(String name,String startDate,String endDate,Integer pageNo, Integer pageSize) {
+	public Result list(String name,String startDate,String endDate,String createStartDate,String createEndDate,Integer auditStatus,
+			Integer pageNo, Integer pageSize) {
 		Result res = new Result();
-		res.setData(demandService.listMyDemand(name, startDate, endDate, pageNo, pageSize));
+		res.setData(demandService.listMyDemand(name, startDate, endDate,createStartDate, createEndDate, auditStatus, pageNo, pageSize));
 		return res;
 	}
 

+ 3 - 2
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -16,7 +16,8 @@ import com.goafanti.portal.bo.DemandSearchDetailBo;
 import com.goafanti.portal.bo.DemandSearchListBo;
 
 public interface DemandService {
-	Pagination<DemandListBo> listMyDemand(String name,String startDate,String endDate,Integer pageNo, Integer pageSize);
+	Pagination<DemandListBo> listMyDemand(String name,String startDate,String endDate,
+			String createStartDate,String createEndDate,Integer auditStatus,Integer pageNo, Integer pageSize);
 	
 	Pagination<DemandListBo> listDemand(String name,String employerName,Integer demandType, 
 			Integer auditStatus,Integer status,String startDate, String endDate,Integer pageNo, Integer pageSize);
@@ -53,8 +54,8 @@ public interface DemandService {
 
 	Pagination<ObjectInterestListBo> selectinterest(Integer type,Integer pageNo, Integer pageSize);
 
-	Pagination<AppDemandBo> listMyDemand(Integer pNo, Integer pSize);
 
+	Pagination<AppDemandBo> listMyDemand(Integer pNo, Integer pSize);
 	int saveAppUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
 	Demand DemandFollowDetails(String id);

+ 6 - 3
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -856,12 +856,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,
-			Integer pageNo, Integer pageSize) {
+	public Pagination<DemandListBo> listMyDemand(String name, String startDate, String endDate,String createStartDate,String createEndDate,
+		Integer auditStatus,Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(StringUtils.isNotBlank(name)) params.put("name", name);
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
-		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
+		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate+" 23:59:59");
+		if(StringUtils.isNotBlank(createStartDate)) params.put("createStartDate", createStartDate);
+		if(StringUtils.isNotBlank(createEndDate)) params.put("createEndDate", createEndDate+" 23:59:59");
+		if(auditStatus!=null)params.put("auditStatus", auditStatus);
 		params.put("employerId", TokenManager.getUserId());
 		return (Pagination<DemandListBo>) findPage("selectDemandListByPage", "selectDemandListCount", params, pageNo, pageSize);
 	}