|
|
@@ -30,16 +30,16 @@ import com.goafanti.demand.service.DemandService;
|
|
|
@Service
|
|
|
public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements DemandService {
|
|
|
@Autowired
|
|
|
- private DemandMapper demandMapper;
|
|
|
+ private DemandMapper demandMapper;
|
|
|
@Autowired
|
|
|
- private DemandLogMapper demandLogMapper;
|
|
|
+ private DemandLogMapper demandLogMapper;
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<DemandManageListBo> selectUserDemandManageList(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(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;
|
|
|
@@ -89,8 +89,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
-
|
|
|
- if (!StringUtils.isBlank(province)){
|
|
|
+
|
|
|
+ if (!StringUtils.isBlank(province)) {
|
|
|
params.put("province", province);
|
|
|
}
|
|
|
|
|
|
@@ -137,8 +137,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
params.put("principal", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)){
|
|
|
+
|
|
|
+ if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
params.put("mid", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@@ -151,8 +151,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@Override
|
|
|
public Pagination<DemandManageListBo> selectOrgDemandManageList(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) {
|
|
|
+ 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;
|
|
|
@@ -202,8 +202,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (null != rEnd) {
|
|
|
params.put("rEnd", rEnd);
|
|
|
}
|
|
|
-
|
|
|
- if (!StringUtils.isBlank(province)){
|
|
|
+
|
|
|
+ if (!StringUtils.isBlank(province)) {
|
|
|
params.put("province", province);
|
|
|
}
|
|
|
|
|
|
@@ -250,8 +250,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
|
|
|
params.put("principal", TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
- if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)){
|
|
|
+
|
|
|
+ if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
|
|
|
params.put("mid", TokenManager.getAdminId());
|
|
|
}
|
|
|
|
|
|
@@ -262,24 +262,23 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
@Override
|
|
|
public void saveUserDemandByManager(Demand d, String validityPeriodFormattedDate) {
|
|
|
Date validityPeriod = null;
|
|
|
- if (!StringUtils.isBlank(validityPeriodFormattedDate)){
|
|
|
+ if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
|
|
|
try {
|
|
|
validityPeriod = DateUtils.parseDate(validityPeriodFormattedDate, AFTConstants.YYYYMMDD);
|
|
|
} catch (ParseException e) {
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
d.setValidityPeriod(validityPeriod);
|
|
|
d.setId(UUID.randomUUID().toString());
|
|
|
-
|
|
|
+
|
|
|
d.setDataCategory(DemandDataCategory.USERDEMAND.getCode());
|
|
|
d.setDeletedSign(DeleteStatus.UNDELETE.getCode());
|
|
|
-
|
|
|
+
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
-
|
|
|
-
|
|
|
- if (DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())){
|
|
|
+
|
|
|
+ if (DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())) {
|
|
|
d.setReleaseDate(now.getTime());
|
|
|
d.setStatus(DemandStatus.ONGOING.getCode());
|
|
|
DemandLog log = new DemandLog();
|
|
|
@@ -290,8 +289,67 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
|
|
|
log.setOperator(TokenManager.getAdminId());
|
|
|
demandLogMapper.insert(log);
|
|
|
}
|
|
|
-
|
|
|
+ d.setStatus(DemandStatus.CREATE.getCode());
|
|
|
d.setCreateTime(now.getTime());
|
|
|
demandMapper.insert(d);
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int updateUserDemandByManager(Demand d, String validityPeriodFormattedDate) {
|
|
|
+
|
|
|
+ Date validityPeriod = null;
|
|
|
+ if (!StringUtils.isBlank(validityPeriodFormattedDate)) {
|
|
|
+ try {
|
|
|
+ validityPeriod = DateUtils.parseDate(validityPeriodFormattedDate, AFTConstants.YYYYMMDD);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ }
|
|
|
+ }
|
|
|
+ d.setValidityPeriod(validityPeriod);
|
|
|
+
|
|
|
+ Calendar now = Calendar.getInstance();
|
|
|
+ now.set(Calendar.MILLISECOND, 0);
|
|
|
+
|
|
|
+ Demand demand = demandMapper.selectByPrimaryKey(d.getId());
|
|
|
+ if (DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())
|
|
|
+ && DemandReleaseStatus.UNRELEASE.getCode().equals(demand.getReleaseStatus())) {
|
|
|
+ d.setReleaseDate(now.getTime());
|
|
|
+ d.setStatus(DemandStatus.ONGOING.getCode());
|
|
|
+ DemandLog log = new DemandLog();
|
|
|
+ log.setId(UUID.randomUUID().toString());
|
|
|
+ log.setDemandId(d.getId());
|
|
|
+ log.setStatus(d.getStatus());
|
|
|
+ log.setRecoredTime(now.getTime());
|
|
|
+ log.setOperator(TokenManager.getAdminId());
|
|
|
+ demandLogMapper.insert(log);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (DemandReleaseStatus.UNRELEASE.getCode().equals(d.getReleaseStatus())
|
|
|
+ && DemandReleaseStatus.RELEASED.getCode().equals(demand.getReleaseStatus())) {
|
|
|
+ d.setReleaseDate(now.getTime());
|
|
|
+ d.setStatus(DemandStatus.CREATE.getCode());
|
|
|
+ DemandLog log = new DemandLog();
|
|
|
+ log.setId(UUID.randomUUID().toString());
|
|
|
+ log.setDemandId(d.getId());
|
|
|
+ log.setStatus(d.getStatus());
|
|
|
+ log.setRecoredTime(now.getTime());
|
|
|
+ log.setOperator(TokenManager.getAdminId());
|
|
|
+ demandLogMapper.insert(log);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())
|
|
|
+ && (DemandStatus.SOLVED.equals(d.getStatus()) || DemandStatus.UNRESOLVED.equals(d.getStatus()))) {
|
|
|
+ DemandLog log = new DemandLog();
|
|
|
+ log.setId(UUID.randomUUID().toString());
|
|
|
+ log.setDemandId(d.getId());
|
|
|
+ log.setStatus(d.getStatus());
|
|
|
+ log.setRecoredTime(now.getTime());
|
|
|
+ log.setOperator(TokenManager.getAdminId());
|
|
|
+ demandLogMapper.insert(log);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!DemandStatus.SOLVED.equals(d.getStatus()) && !DemandStatus.UNRESOLVED.equals(d.getStatus())){
|
|
|
+ d.setStatus(null);
|
|
|
+ }
|
|
|
+ return demandMapper.updateByPrimaryKeySelective(d);
|
|
|
+ }
|
|
|
}
|