Commit d36a8235 authored by 高建强's avatar 高建强

item:扩展根据批次号获取预案的记录接口

parent dcb843e1
...@@ -177,11 +177,15 @@ public class PlanVisual3dController extends BaseController { ...@@ -177,11 +177,15 @@ public class PlanVisual3dController extends BaseController {
@Permission @Permission
@ApiOperation(value = "根据批次号获取预案的记录", notes = "根据R批次号获取预案的记录") @ApiOperation(value = "根据批次号获取预案的记录", notes = "根据R批次号获取预案的记录")
@GetMapping(value = "/plan/getPlaneRecord") @GetMapping(value = "/plan/getPlaneRecord")
public ResponseModel getPlaneRecord(@RequestParam("batchNo") String batchNo) { public ResponseModel getPlaneRecord(@RequestParam("batchNo") String batchNo, @RequestParam(required = false) Boolean isNewest) {
if (!StringUtil.isNotEmpty(batchNo)) { if (isNewest != null && isNewest) {
batchNo = planVisual3dService.getNewestBatchNo();
} else {
if (StringUtils.isBlank(batchNo)) {
batchNo = planVisual3dService.getLastBatchNo(); batchNo = planVisual3dService.getLastBatchNo();
} }
if (!StringUtil.isNotEmpty(batchNo)) { }
if (StringUtils.isBlank(batchNo)) {
return CommonResponseUtil.successNew(null); return CommonResponseUtil.successNew(null);
} }
return CommonResponseUtil.successNew(planVisual3dService.getPlaneRecordByBatchNo(batchNo)); return CommonResponseUtil.successNew(planVisual3dService.getPlaneRecordByBatchNo(batchNo));
......
...@@ -19,13 +19,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService; ...@@ -19,13 +19,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
import com.yeejoin.amos.fas.business.service.model.ToipResponse; import com.yeejoin.amos.fas.business.service.model.ToipResponse;
import com.yeejoin.amos.fas.business.util.JSONUtil; import com.yeejoin.amos.fas.business.util.JSONUtil;
import com.yeejoin.amos.fas.business.util.StringUtil; import com.yeejoin.amos.fas.business.util.StringUtil;
import com.yeejoin.amos.fas.business.vo.ButtonJsonVO; import com.yeejoin.amos.fas.business.vo.*;
import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
import com.yeejoin.amos.fas.business.vo.MessageVO;
import com.yeejoin.amos.fas.business.vo.PlanStepJsonVO;
import com.yeejoin.amos.fas.business.vo.PlanStepVo;
import com.yeejoin.amos.fas.business.vo.Toke;
import com.yeejoin.amos.fas.business.vo.TreeSubjectVo;
import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
import com.yeejoin.amos.fas.core.util.CommonResponseUtil; import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
import com.yeejoin.amos.fas.dao.entity.*; import com.yeejoin.amos.fas.dao.entity.*;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment