|
@@ -1,15 +1,19 @@
|
|
|
package com.siwei.apply.controller;
|
|
|
|
|
|
import com.siwei.apply.domain.LandOneCode;
|
|
|
+import com.siwei.apply.domain.ProjectWorkflow;
|
|
|
import com.siwei.apply.domain.vo.LandOneCodeVo;
|
|
|
+import com.siwei.apply.mapper.ProjectWorkflowMapper;
|
|
|
import com.siwei.apply.service.LandOneCodeService;
|
|
|
import com.siwei.common.core.domain.R;
|
|
|
import com.siwei.common.core.web.controller.BaseController;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
/**
|
|
|
* 土地统一编码 控制器
|
|
@@ -22,6 +26,7 @@ public class LandOneCodeController extends BaseController {
|
|
|
|
|
|
private final LandOneCodeService service;
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 新增
|
|
|
*/
|
|
@@ -85,12 +90,16 @@ public class LandOneCodeController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@GetMapping("/getResourceCode")
|
|
|
public R<LandOneCodeVo> getResourceCode(@RequestParam String projectId,@RequestParam String projectWorkflowId) {
|
|
|
try {
|
|
|
- LandOneCodeVo landOneCodeVo = service.getLandOneCodeByWorkflowId(projectWorkflowId);
|
|
|
+ LandOneCodeVo landOneCodeVo = null;
|
|
|
+ // projectWorkflowId 这里为节点id,前端兼容
|
|
|
+ ProjectWorkflow projectWorkflow= service.getProjectWorkflowByNodeId(projectWorkflowId);
|
|
|
+ if(Objects.nonNull(projectWorkflow)){
|
|
|
+ projectWorkflowId=projectWorkflow.getId();
|
|
|
+ landOneCodeVo = service.getLandOneCodeByWorkflowId(projectWorkflowId);
|
|
|
+ }
|
|
|
return R.ok(landOneCodeVo);
|
|
|
} catch (Exception e) {
|
|
|
return R.fail(e.getMessage());
|