|
@@ -121,7 +121,7 @@ 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) {
|
|
- return queryDemandByState(map, DemandBillState.SAVING.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
|
|
|
|
+ return queryDemandByState(map, DemandBillState.SAVING.getIndex());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -133,7 +133,7 @@ public class DictionaryDemandController {
|
|
public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
|
|
public CommonResult<List<DictionaryDemand>> querySubmitted(@RequestBody Map<String, Object> map) {
|
|
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.PROOFING.getIndex());
|
|
|
|
|
|
+ DemandBillState.SEND_BACK.getIndex(), DemandBillState.PROOFING.getIndex());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -153,7 +153,7 @@ 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) {
|
|
- return queryDemandByState(map, DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex());
|
|
|
|
|
|
+ return queryDemandByState(map, DemandBillState.APPROVED_ACCEPT.getIndex(), DemandBillState.APPROVED_REJECT.getIndex(), DemandBillState.SEND_BACK.getIndex());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|