|
|
@@ -35,85 +35,34 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
private UserService userService;
|
|
|
|
|
|
/**
|
|
|
- * 下载需求文件--文本文件
|
|
|
+ * 个人用户--需求列表
|
|
|
*/
|
|
|
- @RequestMapping(value = "/download", method = RequestMethod.GET)
|
|
|
- public Result download(HttpServletResponse response, String id) {
|
|
|
+ @RequestMapping(value = "/userList", method = RequestMethod.GET)
|
|
|
+ public Result userList(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,
|
|
|
+ String pageNo, String pageSize) {
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
- if (StringUtils.isEmpty(id)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
|
|
|
- return res;
|
|
|
+ Integer pNo = 1;
|
|
|
+ Integer pSize = 10;
|
|
|
+ if (StringUtils.isNumeric(pageSize)) {
|
|
|
+ pSize = Integer.parseInt(pageSize);
|
|
|
}
|
|
|
|
|
|
- Demand d = demandService.selectByPrimaryKey(id);
|
|
|
- if (null == d) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
|
|
|
- return res;
|
|
|
+ if (StringUtils.isNumeric(pageNo)) {
|
|
|
+ pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
-
|
|
|
- downloadUnPrivateFile(response, d.getTextFileDownloadFileName(), d.getTextFileUrl());
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 需求管理--获取组织用户下拉
|
|
|
- */
|
|
|
- @RequestMapping(value = "/unitNames", method = RequestMethod.GET)
|
|
|
- public Result getUnitNames() {
|
|
|
- Result res = new Result();
|
|
|
- res.setData(userService.selectDemandUnitNames());
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 需求管理--获取个人用户下拉
|
|
|
- */
|
|
|
- @RequestMapping(value = "/userNames", method = RequestMethod.GET)
|
|
|
- public Result getUserNames() {
|
|
|
- Result res = new Result();
|
|
|
- res.setData(userService.selectDemandUserNames());
|
|
|
+ res.setData(demandService.selectUserDemandManageList(province, serialNumber, name, keyword, infoSources,
|
|
|
+ demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
+ releaseDateStartDate, releaseDateEndDate, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- /**
|
|
|
- * 组织用户详情
|
|
|
- */
|
|
|
- @RequestMapping(value = "/orgDemandDetail", method = RequestMethod.GET)
|
|
|
- public Result orgDemandDetail(String id) {
|
|
|
- Result res = new Result();
|
|
|
-
|
|
|
- if (StringUtils.isBlank(id)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- res.setData(demandService.selectOrgDemandDetail(id));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * 个人需求详情
|
|
|
- */
|
|
|
- @RequestMapping(value = "/userDemandDetail", method = RequestMethod.GET)
|
|
|
- public Result userDemandDetail(String id) {
|
|
|
- Result res = new Result();
|
|
|
-
|
|
|
- if (StringUtils.isBlank(id)) {
|
|
|
- res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
- res.setData(demandService.selectUserDemandDetail(id));
|
|
|
- return res;
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
- * 个人用户--需求列表
|
|
|
+ * 组织用户--需求列表
|
|
|
*/
|
|
|
- @RequestMapping(value = "/userList", method = RequestMethod.GET)
|
|
|
- public Result userList(String province, Integer serialNumber, String name, String keyword, Integer infoSources,
|
|
|
+ @RequestMapping(value = "/orgList", method = RequestMethod.GET)
|
|
|
+ public Result orgList(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,
|
|
|
String pageNo, String pageSize) {
|
|
|
@@ -127,12 +76,12 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
if (StringUtils.isNumeric(pageNo)) {
|
|
|
pNo = Integer.parseInt(pageNo);
|
|
|
}
|
|
|
- res.setData(demandService.selectUserDemandManageList(province, serialNumber, name, keyword, infoSources,
|
|
|
+ res.setData(demandService.selectOrgDemandManageList(province, serialNumber, name, keyword, infoSources,
|
|
|
demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
releaseDateStartDate, releaseDateEndDate, pNo, pSize));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 新增需求
|
|
|
*/
|
|
|
@@ -155,60 +104,59 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
demandService.saveUserDemand(d, validityPeriodFormattedDate);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 修改需求
|
|
|
+ * 个人需求详情
|
|
|
*/
|
|
|
- @RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
- public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult,
|
|
|
- String validityPeriodFormattedDate) {
|
|
|
+ @RequestMapping(value = "/userDemandDetail", method = RequestMethod.GET)
|
|
|
+ public Result userDemandDetail(String id) {
|
|
|
Result res = new Result();
|
|
|
- if (bindingResult.hasErrors()) {
|
|
|
- res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
- DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
- return res;
|
|
|
- }
|
|
|
|
|
|
- if (StringUtils.isBlank(demand.getId())) {
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- res = disposeDemand(res, demand);
|
|
|
- if (!res.getError().isEmpty()) {
|
|
|
+ res.setData(demandService.selectUserDemandDetail(id));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 组织用户详情
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/orgDemandDetail", method = RequestMethod.GET)
|
|
|
+ public Result orgDemandDetail(String id) {
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(id)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- Demand d = new Demand();
|
|
|
- BeanUtils.copyProperties(demand, d);
|
|
|
- res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate));
|
|
|
+ res.setData(demandService.selectOrgDemandDetail(id));
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
- * 组织用户--需求列表
|
|
|
+ * 需求管理--获取个人用户下拉
|
|
|
*/
|
|
|
- @RequestMapping(value = "/orgList", method = RequestMethod.GET)
|
|
|
- public Result orgList(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,
|
|
|
- String pageNo, String pageSize) {
|
|
|
+ @RequestMapping(value = "/userNames", method = RequestMethod.GET)
|
|
|
+ public Result getUserNames() {
|
|
|
Result res = new Result();
|
|
|
- Integer pNo = 1;
|
|
|
- Integer pSize = 10;
|
|
|
- if (StringUtils.isNumeric(pageSize)) {
|
|
|
- pSize = Integer.parseInt(pageSize);
|
|
|
- }
|
|
|
-
|
|
|
- if (StringUtils.isNumeric(pageNo)) {
|
|
|
- pNo = Integer.parseInt(pageNo);
|
|
|
- }
|
|
|
- res.setData(demandService.selectOrgDemandManageList(province, serialNumber, name, keyword, infoSources,
|
|
|
- demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
|
|
|
- releaseDateStartDate, releaseDateEndDate, pNo, pSize));
|
|
|
+ res.setData(userService.selectDemandUserNames());
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 需求管理--获取组织用户下拉
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/unitNames", method = RequestMethod.GET)
|
|
|
+ public Result getUnitNames() {
|
|
|
+ Result res = new Result();
|
|
|
+ res.setData(userService.selectDemandUnitNames());
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 需求资料--图片上传
|
|
|
*/
|
|
|
@@ -253,6 +201,60 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 修改需求
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
+ public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult,
|
|
|
+ String validityPeriodFormattedDate) {
|
|
|
+ Result res = new Result();
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
|
+ DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (StringUtils.isBlank(demand.getId())) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ res = disposeDemand(res, demand);
|
|
|
+ if (!res.getError().isEmpty()) {
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Demand d = new Demand();
|
|
|
+ BeanUtils.copyProperties(demand, d);
|
|
|
+ res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 下载需求文件--文本文件
|
|
|
+ */
|
|
|
+ @RequestMapping(value = "/download", method = RequestMethod.GET)
|
|
|
+ public Result download(HttpServletResponse response, String id) {
|
|
|
+ Result res = new Result();
|
|
|
+
|
|
|
+ if (StringUtils.isEmpty(id)) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ Demand d = demandService.selectByPrimaryKey(id);
|
|
|
+ if (null == d) {
|
|
|
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
+ downloadUnPrivateFile(response, d.getTextFileDownloadFileName(), d.getTextFileUrl());
|
|
|
+ return res;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 删除需求(个人&团体)
|
|
|
*/
|