|
|
|
@ -66,23 +66,25 @@ public class PlanController {
|
|
|
|
|
public CommonResult<Boolean> updatePlanStatus(@Valid @RequestBody PlanSaveReqVO updateReqVO) {
|
|
|
|
|
PlanDO plan = planService.getPlan(updateReqVO.getId());
|
|
|
|
|
|
|
|
|
|
PlanPageReqVO pageReqVO = new PlanPageReqVO();
|
|
|
|
|
pageReqVO.setPlanNo(plan.getPlanNo()).setPageSize(99);
|
|
|
|
|
PageResult<PlanDO> pageResult = planService.getPlanOfSchedulePage(pageReqVO);
|
|
|
|
|
|
|
|
|
|
if(pageResult.getTotal()>0){
|
|
|
|
|
Integer orderTotal = pageResult.getList().get(0).getAmount();
|
|
|
|
|
final Integer[] finishedTotal = {0};
|
|
|
|
|
pageResult.getList().forEach(item ->{
|
|
|
|
|
finishedTotal[0] += item.getFinishedAmount();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
if(orderTotal == finishedTotal[0]){
|
|
|
|
|
plan.setStatus(updateReqVO.getStatus());
|
|
|
|
|
planMapper.updateById(plan);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
plan.setStatus(updateReqVO.getStatus());
|
|
|
|
|
planMapper.updateById(plan);
|
|
|
|
|
|
|
|
|
|
// PlanPageReqVO pageReqVO = new PlanPageReqVO();
|
|
|
|
|
// pageReqVO.setPlanNo(plan.getPlanNo()).setPageSize(99);
|
|
|
|
|
// PageResult<PlanDO> pageResult = planService.getPlanOfSchedulePage(pageReqVO);
|
|
|
|
|
// if(pageResult.getTotal()>0){
|
|
|
|
|
// Integer orderTotal = pageResult.getList().get(0).getAmount();
|
|
|
|
|
// final Integer[] finishedTotal = {0};
|
|
|
|
|
// pageResult.getList().forEach(item ->{
|
|
|
|
|
// finishedTotal[0] += item.getFinishedAmount();
|
|
|
|
|
// });
|
|
|
|
|
//
|
|
|
|
|
// if(orderTotal == finishedTotal[0]){
|
|
|
|
|
// plan.setStatus(updateReqVO.getStatus());
|
|
|
|
|
// planMapper.updateById(plan);
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|