Browse Source

Merge remote-tracking branch 'origin/patch' into test

anderx 8 years ago
parent
commit
74c029f23f

+ 2 - 2
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -104,7 +104,7 @@ public class AchievementApiController extends CertifyApiController {
 	 */
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	private Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category,
 	private Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category,
-			Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+			Integer ownerType, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
 			Integer releaseStatus, String pageNo, String pageSize) {
 			Integer releaseStatus, String pageNo, String pageSize) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
@@ -117,7 +117,7 @@ public class AchievementApiController extends CertifyApiController {
 			pNo = Integer.parseInt(pageNo);
 			pNo = Integer.parseInt(pageNo);
 		}
 		}
 		res.setData(achievementService.listUserAchievement(auditStatus, serialNumber, name, keyword, category,
 		res.setData(achievementService.listUserAchievement(auditStatus, serialNumber, name, keyword, category,
-				ownerType, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+				ownerType, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 		return res;
 	}
 	}
 
 

+ 3 - 3
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -21,7 +21,7 @@ public interface AchievementService {
 
 
 	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,Integer boutique,Integer effective);
 
 
 	void saveAchievement(Achievement a, String[] keywords);
 	void saveAchievement(Achievement a, String[] keywords);
 
 
@@ -33,7 +33,7 @@ public interface AchievementService {
 
 
 	Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 	Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 
 
 	int updateAuditAchievement(Achievement a, String techBroderId, Integer auditStatus);
 	int updateAuditAchievement(Achievement a, String techBroderId, Integer auditStatus);
 
 
@@ -41,7 +41,7 @@ public interface AchievementService {
 
 
 	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id);
 
 

+ 30 - 7
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -92,10 +92,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	@Override
 	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
 	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 		Map<String, Object> params = disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,null, hot);
 				boutique,null, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
@@ -117,10 +117,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	@Override
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
 			Integer boutique, Integer hot) {
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 		Map<String, Object> params = disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
-				releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
 				boutique,internationalFlag, hot);
 				boutique,internationalFlag, hot);
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
@@ -202,7 +202,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	@Override
 	@Override
 	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 	public Pagination<AchievementListBo> listUserAchievement(Integer auditStatus, Integer serialNumber, String name,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
 			String keyword, Integer category, Integer ownerType, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
 		}
 		}
@@ -212,18 +212,20 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
 				disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
-						status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null, null,null, null),
+						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
 				pNo, pSize);
 				pNo, pSize);
 	}
 	}
 
 
 	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
 	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
-			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type,
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
 			Integer boutique,String internationalFlag, Integer hot) {
 			Integer boutique,String internationalFlag, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 
 
 		Date rStart = null;
 		Date rStart = null;
 		Date rEnd = null;
 		Date rEnd = null;
+		Date cStart = null;
+		Date cEnd = null;
 
 
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
 			try {
@@ -238,6 +240,19 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			} catch (ParseException e) {
 			} catch (ParseException e) {
 			}
 			}
 		}
 		}
+		if (!StringUtils.isBlank(createDateStartDate)) {
+			try {
+				cStart = DateUtils.parseDate(createDateStartDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (!StringUtils.isBlank(createDateEndDate)) {
+			try {
+				cEnd = DateUtils.addDays(DateUtils.parseDate(createDateEndDate, AFTConstants.YYYYMMDD), 1);
+			} catch (ParseException e) {
+			}
+		}
 
 
 		if (StringUtils.isNotBlank(ownerName)) {
 		if (StringUtils.isNotBlank(ownerName)) {
 			params.put("ownerName", ownerName);
 			params.put("ownerName", ownerName);
@@ -258,6 +273,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != rEnd) {
 		if (null != rEnd) {
 			params.put("rEnd", rEnd);
 			params.put("rEnd", rEnd);
 		}
 		}
+		if (null != cStart) {
+			params.put("cStart", cStart);
+		}
+
+		if (null != cEnd) {
+			params.put("cEnd", cEnd);
+		}
+		
 
 
 		if (null != auditStatus) {
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);
 			params.put("auditStatus", auditStatus);

+ 5 - 4
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -63,7 +63,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
     @RequestMapping(value = "/userList", method = RequestMethod.GET)
     private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
     private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
             Integer serialNumber, String name, String keyword, Integer category, Integer status,
-            String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String pageNo,
+            String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String pageNo,
             String pageSize,Integer boutique,Integer hot) {
             String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Result res = new Result();
         Integer pNo = 1;
         Integer pNo = 1;
@@ -74,8 +74,9 @@ public class AdminAchievementApiController extends CertifyApiController {
         if (StringUtils.isNumeric(pageNo)) {
         if (StringUtils.isNumeric(pageNo)) {
             pNo = Integer.parseInt(pageNo);
             pNo = Integer.parseInt(pageNo);
         }
         }
+       
         res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
         res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, pNo, pSize,boutique,hot));
         return res;
         return res;
     }
     }
     /**
     /**
@@ -83,7 +84,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      */
      */
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
     private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
-            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+            String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
             Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
         Result res = new Result();
         Result res = new Result();
         Integer pNo = 1;
         Integer pNo = 1;
@@ -96,7 +97,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         }
         
         
         Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
         Object o = achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
         
         
         res.setData(o);
         res.setData(o);
         
         

+ 4 - 4
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -196,7 +196,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 	public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
@@ -209,7 +209,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		}
 		res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 		res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot));
 		return res;
 		return res;
 	}
 	}
 
 
@@ -220,7 +220,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
@@ -233,7 +233,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		}
 		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
 		return res;
 		return res;
 	}
 	}
 
 

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminVarietiesApiController.java

@@ -14,7 +14,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.controller.BaseController;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.common.utils.StringUtils;
 @RestController
 @RestController
-@RequestMapping("open/api/admin/Varieties")
+@RequestMapping("api/admin/Varieties")
 public class AdminVarietiesApiController extends BaseController{
 public class AdminVarietiesApiController extends BaseController{
 	@Resource
 	@Resource
 	private AdminVarietiesService adminVarietiesService;
 	private AdminVarietiesService adminVarietiesService;

+ 26 - 2
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -700,7 +700,7 @@
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.id, a.serial_number as serialNumber, a.data_category as dataCategory, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
   		a.name, a.keyword, a.category, a.owner_name as ownerName, a.owner_type as ownerType, 
   		ui.username as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
   		ui.username as username, a.owner_id as ownerId, a.org_id as orgId, a.contacts,
-  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique
+  		a.release_date as releaseDate, a.audit_status as auditStatus, ad.name as techBrokerId,a.boutique,a.create_time as createTime
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
   	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		,1 as hot
 		,1 as hot
 	</if>
 	</if>
@@ -711,7 +711,7 @@
 		,ifnull(mm.effective,0) as hot
 		,ifnull(mm.effective,0) as hot
 	</if>
 	</if>
   	from achievement a
   	from achievement a
-  	LEFT JOIN admin ad on a.id = a.tech_broker_id
+  	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN user_identity ui on a.owner_id = ui.uid
   	LEFT JOIN user_identity ui on a.owner_id = ui.uid
 	<if test="hot != null and hot == 1"><!-- 在首页 -->
 	<if test="hot != null and hot == 1"><!-- 在首页 -->
 		inner join marketing_management mm on a.id = mm.product_id
 		inner join marketing_management mm on a.id = mm.product_id
@@ -754,6 +754,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -820,6 +826,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -903,6 +915,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -974,6 +992,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and a.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	a.create_time <![CDATA[ >= ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and a.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="releaseStatus != null">
 	<if test="releaseStatus != null">
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	   and  a.release_status = #{releaseStatus,jdbcType=INTEGER}
 	</if>
 	</if>

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

@@ -573,6 +573,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -656,6 +662,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -754,6 +766,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
 	</if>
@@ -841,6 +859,12 @@
 	<if test="rEnd != null">
 	<if test="rEnd != null">
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	   and d.release_date <![CDATA[ < ]]> #{rEnd,jdbcType=TIMESTAMP}
 	</if>
 	</if>
+	<if test="cStart != null">
+       and	d.create_time <![CDATA[ > ]]> #{cStart,jdbcType=TIMESTAMP}
+	</if>
+	<if test="cEnd != null">
+	   and d.create_time <![CDATA[ < ]]> #{cEnd,jdbcType=TIMESTAMP}
+	</if>
 	<if test="boutique != null">
 	<if test="boutique != null">
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 		and d.boutique = #{boutique,jdbcType=INTEGER}
 	</if>
 	</if>

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

@@ -84,7 +84,7 @@ public class DemandApiController extends CertifyApiController {
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	public Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,
 	public Result list(Integer auditStatus, Integer serialNumber, String name, String keyword, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
 			String validityPeriodStartDate, String validityPeriodEndDate, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, String pageNo, String pageSize) {
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize) {
 		Result res = new Result();
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pNo = 1;
 		Integer pSize = 10;
 		Integer pSize = 10;
@@ -97,7 +97,7 @@ public class DemandApiController extends CertifyApiController {
 		}
 		}
 		res.setData(demandService.listDemand(auditStatus, serialNumber, name, keyword, demandType,
 		res.setData(demandService.listDemand(auditStatus, serialNumber, name, keyword, demandType,
 				validityPeriodStartDate, validityPeriodEndDate, status, releaseStatus, releaseDateStartDate,
 				validityPeriodStartDate, validityPeriodEndDate, status, releaseStatus, releaseDateStartDate,
-				releaseDateEndDate, pNo, pSize));
+				releaseDateEndDate,createDateStartDate,  createDateEndDate, pNo, pSize));
 		return res;
 		return res;
 	}
 	}
 
 

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

@@ -23,12 +23,12 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 	Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot);
 
 
 	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
 
 
 	void saveUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 	void saveUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
 
@@ -44,7 +44,7 @@ public interface DemandService {
 
 
 	Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 	Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize);
 
 
 	int updateReleaseStatus(Demand d);
 	int updateReleaseStatus(Demand d);
 
 

+ 31 - 8
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -89,12 +89,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus,
 	public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
-			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
 			Integer pSize, Integer boutique, Integer hot) {
 			Integer pSize, Integer boutique, Integer hot) {
 
 
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate, boutique, hot);
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
 
 
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
@@ -138,11 +138,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
 	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, String username,
-			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo,
+			Integer status, Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo,
 			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
 			Integer pSize, Integer boutique, Integer hot, String techBrokerId) {
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
-				releaseDateStartDate, releaseDateEndDate, boutique, hot);
+				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
 
 
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
@@ -277,12 +277,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	@Override
 	public Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 	public Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
 			Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate, Integer status,
-			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
+			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize) {
 		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
 		Map<String, Object> params = disposeParams(auditStatus, null, serialNumber, name, keyword, null, demandType,
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
 				validityPeriodStartDate, validityPeriodEndDate, null, status, releaseStatus, releaseDateStartDate,
-				releaseDateEndDate, null, null);
+				releaseDateEndDate, createDateStartDate, createDateEndDate, null, null);
 
 
-		params.put("employerId", "cb6336c1-5e41-431c-a531-617124f316a9");//TokenManager.getUserId()
+		params.put("employerId", TokenManager.getUserId());
 		
 		
 		if (pNo == null || pNo < 0) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 			pNo = 1;
@@ -497,15 +497,18 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return demandMapper.selectDemandSearchDetail(uid, id);
 		return demandMapper.selectDemandSearchDetail(uid, id);
 	}
 	}
 
 
+	@SuppressWarnings("unused")
 	private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
 	private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
 			String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate, Integer boutique, Integer hot) {
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer boutique, Integer hot) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 		Date vStart = null;
 		Date vStart = null;
 		Date vEnd = null;
 		Date vEnd = null;
 		Date rStart = null;
 		Date rStart = null;
 		Date rEnd = null;
 		Date rEnd = null;
+		Date cStart = null;
+		Date cEnd = null;
 
 
 		if (!StringUtils.isBlank(validityPeriodStartDate)) {
 		if (!StringUtils.isBlank(validityPeriodStartDate)) {
 			try {
 			try {
@@ -534,6 +537,19 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			} catch (ParseException e) {
 			} catch (ParseException e) {
 			}
 			}
 		}
 		}
+		if (!StringUtils.isBlank(createDateStartDate)) {
+			try {
+				cStart = DateUtils.parseDate(createDateStartDate, AFTConstants.YYYYMMDD);
+			} catch (ParseException e) {
+			}
+		}
+
+		if (!StringUtils.isBlank(createDateEndDate)) {
+			try {
+				cEnd = DateUtils.addDays(DateUtils.parseDate(createDateEndDate, AFTConstants.YYYYMMDD), 1);
+			} catch (ParseException e) {
+			}
+		}
 
 
 		if (null != vStart) {
 		if (null != vStart) {
 			params.put("vStart", vStart);
 			params.put("vStart", vStart);
@@ -550,6 +566,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null != rEnd) {
 		if (null != rEnd) {
 			params.put("rEnd", rEnd);
 			params.put("rEnd", rEnd);
 		}
 		}
+		if (null != cStart) {
+			params.put("cStart", cStart);
+		}
+
+		if (null != cEnd) {
+			params.put("cEnd", cEnd);
+		}
 
 
 		if (null != auditStatus) {
 		if (null != auditStatus) {
 			params.put("auditStatus", auditStatus);
 			params.put("auditStatus", auditStatus);