|
|
@@ -89,12 +89,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus,
|
|
|
Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
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) {
|
|
|
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
- releaseDateStartDate, releaseDateEndDate, boutique, hot);
|
|
|
+ releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, boutique, hot);
|
|
|
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
@@ -138,11 +138,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus,
|
|
|
Integer province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
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) {
|
|
|
Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
- releaseDateStartDate, releaseDateEndDate, boutique, hot);
|
|
|
+ releaseDateStartDate, releaseDateEndDate, createDateStartDate, createDateEndDate, boutique, hot);
|
|
|
|
|
|
if (pNo == null || pNo < 0) {
|
|
|
pNo = 1;
|
|
|
@@ -277,12 +277,12 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@Override
|
|
|
public Pagination<DemandListBo> listDemand(Integer auditStatus, Integer serialNumber, String name, String keyword,
|
|
|
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,
|
|
|
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) {
|
|
|
pNo = 1;
|
|
|
@@ -497,15 +497,18 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
return demandMapper.selectDemandSearchDetail(uid, id);
|
|
|
}
|
|
|
|
|
|
+ @SuppressWarnings("unused")
|
|
|
private Map<String, Object> disposeParams(Integer auditStatus, Integer province, Integer serialNumber, String name,
|
|
|
String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
|
|
|
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<>();
|
|
|
Date vStart = null;
|
|
|
Date vEnd = null;
|
|
|
Date rStart = null;
|
|
|
Date rEnd = null;
|
|
|
+ Date cStart = null;
|
|
|
+ Date cEnd = null;
|
|
|
|
|
|
if (!StringUtils.isBlank(validityPeriodStartDate)) {
|
|
|
try {
|
|
|
@@ -534,6 +537,19 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
} 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) {
|
|
|
params.put("vStart", vStart);
|
|
|
@@ -550,6 +566,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
+ if (null != cStart) {
|
|
|
+ params.put("cStart", cStart);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (null != cEnd) {
|
|
|
+ params.put("cEnd", cEnd);
|
|
|
+ }
|
|
|
|
|
|
if (null != auditStatus) {
|
|
|
params.put("auditStatus", auditStatus);
|