对接

src/main/java/com/zhgd/xmgl/modules/cost/controller/CostContractPlanController.java

@@ -9,6 +9,7 @@ import com.zhgd.xmgl.modules.cost.dto.CostBudgetDto;
 import com.zhgd.xmgl.modules.cost.dto.CostContractPlanDto;
 import com.zhgd.xmgl.modules.cost.entity.CostSubject;
 import com.zhgd.xmgl.modules.cost.vo.CostContractPlanVo;
+import com.zhgd.xmgl.modules.project.entity.Project;
 import com.zhgd.xmgl.modules.project.entity.vo.ProjectInfoExtVo;
 import com.zhgd.xmgl.modules.project.service.IProjectService;
 import com.zhgd.xmgl.security.util.SecurityUtils;
@@ -120,7 +121,12 @@ public class CostContractPlanController {
     @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", dataType = "String")
     @PostMapping(value = "/tree")
     public Result<List<CostContractPlanDto>> tree(@ApiIgnore @RequestBody Map<String, Object> map) {
+        Integer projectId = MapUtils.getInteger(map, "projectId");
         String projectSn = MapUtils.getString(map, "projectSn");
+        if (projectId != null) {
+            Project id = projectService.getById(projectId);
+            projectSn = id.getProjectSn();
+        }
         ProjectInfoExtVo projectInfoBySn = projectService.getProjectInfoBySn(projectSn);
         Company company = companyService.getOne(Wrappers.<Company>lambdaQuery().eq(Company::getCompanySn, projectInfoBySn.getCompanySn()));
         map.put("companySn", company.getHeadquartersSn());

src/main/java/com/zhgd/xmgl/modules/cost/controller/CostPayPlanController.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.xmgl.modules.cost.entity.CostQuantity;
 import com.zhgd.xmgl.modules.cost.service.ICostQuantityService;
+import com.zhgd.xmgl.modules.project.entity.Project;
+import com.zhgd.xmgl.modules.project.service.IProjectService;
 import com.zhgd.xmgl.util.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -68,6 +70,9 @@ public class CostPayPlanController {
     @Autowired
     private ICostQuantityService costQuantityService;
 
+    @Autowired
+    private IProjectService projectService;
+
     /**
      * 分页列表查询
      *
@@ -97,6 +102,10 @@ public class CostPayPlanController {
     @ApiOperation(value = " 列表查询资金计划信息", notes = "列表查询资金计划信息", httpMethod = "POST")
     @PostMapping(value = "/list")
     public Result<List<CostPayPlan>> queryList(@RequestBody CostPayPlan costPayPlan) {
+        if (costPayPlan.getProjectId() != null) {
+            Project project = projectService.getById(costPayPlan.getProjectId());
+            costPayPlan.setProjectSn(project.getProjectSn());
+        }
         QueryWrapper<CostPayPlan> queryWrapper = QueryGenerator.initQueryWrapper(costPayPlan);
         List<CostPayPlan> list = costPayPlanService.list(queryWrapper);
         return Result.success(list);

src/main/java/com/zhgd/xmgl/modules/cost/entity/CostPayPlan.java

@@ -93,4 +93,8 @@ public class CostPayPlan implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "产值列表")
     private List<CostQuantity> costQuantityList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "项目ID")
+    private String projectId;
 }

src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java

@@ -192,6 +192,27 @@ public class ProgressPanoramaNodePlanController {
 		return result;
 	}
 
+	/**
+	 *  编辑
+	 * @param progressPanoramaNodePlan
+	 * @return
+	 */
+	@ApiOperation(value = "编辑进度-全景节点计划信息", notes = "编辑进度-全景节点计划信息" , httpMethod="POST")
+	@PostMapping(value = "/editInfo")
+	public Result<ProgressPanoramaNodePlan> editInfo(@RequestBody ProgressPanoramaNodePlan progressPanoramaNodePlan) {
+		Result<ProgressPanoramaNodePlan> result = new Result<ProgressPanoramaNodePlan>();
+		ProgressPanoramaNodePlan progressPanoramaNodePlanEntity = progressPanoramaNodePlanService.getById(progressPanoramaNodePlan.getId());
+		if(progressPanoramaNodePlanEntity==null) {
+			result.error500(MessageUtil.get("notFindErr"));
+		}else {
+			boolean ok = progressPanoramaNodePlanService.updateById(progressPanoramaNodePlan);
+			if(ok) {
+				result.successMsg(MessageUtil.get("editSucess"));
+			}
+		}
+		return result;
+	}
+
 //	/**
 //	 *  编辑
 //	 * @param object