|
|
@@ -49,10 +49,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, String 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 pSize) {
|
|
|
+ public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, String 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 pSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
Date vStart = null;
|
|
|
Date vEnd = null;
|
|
|
@@ -102,8 +102,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
-
|
|
|
- if (null != auditStatus){
|
|
|
+
|
|
|
+ if (null != auditStatus) {
|
|
|
params.put("auditStatus", auditStatus);
|
|
|
}
|
|
|
|
|
|
@@ -158,8 +158,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
params.put("mid", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECHBROKER)){
|
|
|
+
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
params.put("techBroker", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@@ -170,10 +170,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, String 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 pSize) {
|
|
|
+ public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, String 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 pSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
Date vStart = null;
|
|
|
Date vEnd = null;
|
|
|
@@ -223,8 +223,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
-
|
|
|
- if (null != auditStatus){
|
|
|
+
|
|
|
+ if (null != auditStatus) {
|
|
|
params.put("auditStatus", auditStatus);
|
|
|
}
|
|
|
|
|
|
@@ -279,8 +279,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
params.put("mid", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.TECHBROKER)){
|
|
|
+
|
|
|
+ if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
|
|
|
params.put("techBroker", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@@ -331,7 +331,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
}
|
|
|
d.setValidityPeriod(validityPeriod);
|
|
|
|
|
|
-
|
|
|
if (DemandAuditStatus.SUBMIT.getCode().equals(d.getAuditStatus())) {
|
|
|
d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
|
|
|
d.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
|
|
|
@@ -452,6 +451,60 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
return (Pagination<DemandListBo>) findPage("findDemandListByPage", "findDemandCount", params, pNo, pSize);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public int updateReleaseStatus(Demand d) {
|
|
|
+ d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
|
|
|
+ d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
|
|
|
+ d.setStatus(DemandStatus.UNRESOLVED.getCode());
|
|
|
+ demandMapper.updateReleaseDate(d.getId());
|
|
|
+ return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int updateAuditDemand(Demand d, String techBroderId, Integer auditStatus) {
|
|
|
+ d.setAuditStatus(auditStatus);
|
|
|
+ if (DemandAuditStatus.AUDITED.getCode().equals(auditStatus)) {
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+ d.setReleaseDate(now.getTime());
|
|
|
+ } else {
|
|
|
+ d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
|
|
|
+ }
|
|
|
+ return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void saveDemand(Demand d, String validityPeriodFormattedDate) {
|
|
|
+ Date validityPeriod = null;
|
|
|
+ if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
|
|
|
+ try {
|
|
|
+ validityPeriod = DateUtils.parseDate(validityPeriodFormattedDate, AFTConstants.YYYYMMDD);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ d.setValidityPeriod(validityPeriod);
|
|
|
+ d.setId(UUID.randomUUID().toString());
|
|
|
+
|
|
|
+ d.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
+
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+ d.setStatus(DemandStatus.UNRESOLVED.getCode());
|
|
|
+ d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
|
|
|
+ d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
|
|
|
+
|
|
|
+ if (DemandAuditStatus.SUBMIT.getCode().equals(d.getAuditStatus())) {
|
|
|
+ d.setAuditStatus(DemandAuditStatus.INAUDIT.getCode());
|
|
|
+ d.setReleaseStatus(DemandReleaseStatus.RELEASED.getCode());
|
|
|
+ createAuditorNotice(d);
|
|
|
+ }
|
|
|
+
|
|
|
+ d.setCreateTime(now.getTime());
|
|
|
+ demandMapper.insert(d);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
// 给所有审核员发送审核通知
|
|
|
private void createAuditorNotice(Demand d) {
|
|
|
List<String> ids = userRoleMapper.listAuditor();
|
|
|
@@ -481,26 +534,4 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- @Override
|
|
|
- public int updateReleaseStatus(Demand d) {
|
|
|
- d.setAuditStatus(DemandAuditStatus.CREATE.getCode());
|
|
|
- d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
|
|
|
- d.setStatus(DemandStatus.UNRESOLVED.getCode());
|
|
|
- demandMapper.updateReleaseDate(d.getId());
|
|
|
- return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public int updateAuditDemand(Demand d, String techBroderId, Integer auditStatus) {
|
|
|
- d.setAuditStatus(auditStatus);
|
|
|
- if (DemandAuditStatus.AUDITED.getCode().equals(auditStatus)){
|
|
|
- Calendar now = Calendar.getInstance();
|
|
|
- now.set(Calendar.MILLISECOND, 0);
|
|
|
- d.setReleaseDate(now.getTime());
|
|
|
- } else {
|
|
|
- d.setReleaseStatus(DemandReleaseStatus.UNRELEASE.getCode());
|
|
|
- }
|
|
|
- return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
- }
|
|
|
}
|