|
@@ -45,6 +45,8 @@ public class DictionaryDemandController {
|
|
private static final Set<Integer> STATE_SET = CollUtil.newHashSet(
|
|
private static final Set<Integer> STATE_SET = CollUtil.newHashSet(
|
|
DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
|
|
DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
|
|
DemandBillState.PROOFING.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
DemandBillState.PROOFING.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
|
|
+ /** 排序 */
|
|
|
|
+ private static final String ORDER_COLUMN = "orders";
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private IDictionaryDemandService service;
|
|
private IDictionaryDemandService service;
|
|
@@ -58,8 +60,8 @@ public class DictionaryDemandController {
|
|
public CommonResult<DictionaryDemand> save(@Valid @RequestBody DictionaryDemand vo) {
|
|
public CommonResult<DictionaryDemand> save(@Valid @RequestBody DictionaryDemand vo) {
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
|
|
// 校验
|
|
// 校验
|
|
- boolean canEdit = vo.getBillState() != null && (DemandBillState.SAVING.getIndex().equals(vo.getBillState())
|
|
|
|
- || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()));
|
|
|
|
|
|
+ boolean canEdit = vo.getBillState() == null || DemandBillState.SAVING.getIndex().equals(vo.getBillState())
|
|
|
|
+ || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState());
|
|
if(!canEdit) {
|
|
if(!canEdit) {
|
|
throw new BusinessException("只有待提交和待完善的需求可以修改");
|
|
throw new BusinessException("只有待提交和待完善的需求可以修改");
|
|
}
|
|
}
|
|
@@ -76,8 +78,8 @@ public class DictionaryDemandController {
|
|
public CommonResult<DictionaryDemand> submit(@Valid @RequestBody DictionaryDemand vo) {
|
|
public CommonResult<DictionaryDemand> submit(@Valid @RequestBody DictionaryDemand vo) {
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
|
|
ParamCheckUtil.checkParam(CommonConstant.QUERY_USERID);
|
|
// 校验
|
|
// 校验
|
|
- boolean canEdit = vo.getBillState() != null && (DemandBillState.SAVING.getIndex().equals(vo.getBillState())
|
|
|
|
- || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState()));
|
|
|
|
|
|
+ boolean canEdit = vo.getBillState() == null || DemandBillState.SAVING.getIndex().equals(vo.getBillState())
|
|
|
|
+ || DemandBillState.SEND_BACK.getIndex().equals(vo.getBillState());
|
|
if(!canEdit) {
|
|
if(!canEdit) {
|
|
throw new BusinessException("只有待提交和待完善的需求可以修改");
|
|
throw new BusinessException("只有待提交和待完善的需求可以修改");
|
|
}
|
|
}
|
|
@@ -123,6 +125,11 @@ public class DictionaryDemandController {
|
|
*/
|
|
*/
|
|
@PostMapping("/queryDraft")
|
|
@PostMapping("/queryDraft")
|
|
public CommonResult<List<DictionaryDemand>> queryDraft(@RequestBody Map<String, Object> map) {
|
|
public CommonResult<List<DictionaryDemand>> queryDraft(@RequestBody Map<String, Object> map) {
|
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
|
+ OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_CREATIONTIME);
|
|
|
|
+ map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
|
+ }
|
|
return queryDemandByState(map, DemandBillState.SAVING.getIndex());
|
|
return queryDemandByState(map, DemandBillState.SAVING.getIndex());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -133,6 +140,11 @@ public class DictionaryDemandController {
|
|
*/
|
|
*/
|
|
@PostMapping("/querySubmitted")
|
|
@PostMapping("/querySubmitted")
|
|
public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
|
|
public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
|
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
|
+ OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
|
+ map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
|
+ }
|
|
return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(),
|
|
return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(),
|
|
DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
|
|
DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(),
|
|
DemandBillState.SEND_BACK.getIndex(), DemandBillState.PROOFING.getIndex());
|
|
DemandBillState.SEND_BACK.getIndex(), DemandBillState.PROOFING.getIndex());
|
|
@@ -145,6 +157,11 @@ public class DictionaryDemandController {
|
|
*/
|
|
*/
|
|
@PostMapping("/queryTodo")
|
|
@PostMapping("/queryTodo")
|
|
public CommonResult<List<DictionaryDemand>> queryTodo(@RequestBody Map<String, Object> map) {
|
|
public CommonResult<List<DictionaryDemand>> queryTodo(@RequestBody Map<String, Object> map) {
|
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
|
+ OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
|
+ map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
|
+ }
|
|
return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(), DemandBillState.PROOFING.getIndex());
|
|
return queryDemandByState(map, DemandBillState.SUBMITTED.getIndex(), DemandBillState.PROOFING.getIndex());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -155,6 +172,11 @@ public class DictionaryDemandController {
|
|
*/
|
|
*/
|
|
@PostMapping("/queryDone")
|
|
@PostMapping("/queryDone")
|
|
public CommonResult<List<DictionaryDemand>> queryDone(@RequestBody Map<String, Object> map) {
|
|
public CommonResult<List<DictionaryDemand>> queryDone(@RequestBody Map<String, Object> map) {
|
|
|
|
+ List orderList = (List) map.get(ORDER_COLUMN);
|
|
|
|
+ if(CollUtil.isEmpty(orderList)) {
|
|
|
|
+ OrderItem order = OrderItem.desc(AuditableEntity.DO_PROP_MODIFIEDTIME);
|
|
|
|
+ map.put(ORDER_COLUMN, CollUtil.newArrayList(order));
|
|
|
|
+ }
|
|
return queryDemandByState(map, DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
return queryDemandByState(map, DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
}
|
|
}
|
|
|
|
|