修改BUG

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ContractInfoDTO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.manager.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.manager.entity.ContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,6 +35,7 @@ public class ContractInfoDTO extends ContractInfo {
 	/**
 	 * 项目名称
 	 */
+	@ApiModelProperty(value = "项目名称")
 	private String projectName;
 
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProjectInfoDTO.java

@@ -96,10 +96,21 @@ public class ProjectInfoDTO extends ProjectInfo {
 	@ApiModelProperty(value = "建设合同金额",required = true)
 	private BigDecimal estimatedAmount;
 	/**
-	 * 项目里程
+	 * 项目总里程
 	 */
-	@ApiModelProperty(value = "项目里程",required = true)
-	private BigDecimal projectMileage;
+	@ApiModelProperty(value = "项目总里程")
+	private BigDecimal projectAllMileage;
+	/**
+	 * 项目路面
+	 */
+	@ApiModelProperty(value = "项目路面")
+	private BigDecimal projectPavement;
+	/**
+	 * 项目路基
+	 */
+	@ApiModelProperty(value = "项目路基")
+	private BigDecimal projectSubgrade;
+	/**
 	/**
 	 * 项目备注
 	 */

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ContractInfo.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -41,67 +42,88 @@ public class ContractInfo extends BaseEntity {
 	/**
 	 * 项目id
 	 */
+	@ApiModelProperty(value = "项目id")
 	private String pId;
 
 	/**
 	 * 合同段名称
 	 */
+	@ApiModelProperty(value = "合同段名称")
 	private String contractName;
+	/**
+	 * 合同段类型
+	 */
+	@ApiModelProperty(value = "合同段类型")
+	private Integer contractType;
 	/**
 	 * 合同段编号
 	 */
+	@ApiModelProperty(value = "合同段编号")
 	private String contractNumber;
 	/**
 	 * 业主单位名称
 	 */
+	@ApiModelProperty(value = "业主单位名称")
 	private String contractorUnitName;
 	/**
 	 * 施工单位名称
 	 */
+	@ApiModelProperty(value = "施工单位名称")
 	private String constructionUnitName;
 	/**
 	 * 监理单位名称
 	 */
+	@ApiModelProperty(value = "监理单位名称")
 	private String supervisionUnitName;
 	/**
 	 * 参与方进场时间
 	 */
+	@ApiModelProperty(value = "参与方进场时间")
 	private String contractorJoinTime;
 	/**
 	 * 计划开工时间
 	 */
+	@ApiModelProperty(value = "计划开工时间")
 	private LocalDateTime planStartTime;
 	/**
 	 * 计划完工时间
 	 */
+	@ApiModelProperty(value = "计划完工时间")
 	private LocalDateTime planEndTime;
 	/**
 	 * 实际开工时间
 	 */
+	@ApiModelProperty(value = "实际开工时间")
 	private LocalDateTime actualStartTime;
 	/**
 	 * 实际完工时间
 	 */
+	@ApiModelProperty(value = "实际完工时间")
 	private LocalDateTime actualEndTime;
 	/**
 	 * 开工令文件
 	 */
+	@ApiModelProperty(value = "开工令文件")
 	private String startFileUrl;
 	/**
 	 * 合同段总金额
 	 */
+	@ApiModelProperty(value = "合同段总金额")
 	private BigDecimal contractAmount;
 	/**
 	 * 合同段工程位置
 	 */
+	@ApiModelProperty(value = "合同段工程位置")
 	private String projectPlace;
 	/**
 	 * 起始桩号
 	 */
+	@ApiModelProperty(value = "起始桩号")
 	private String startStation;
 	/**
 	 * 结束桩号
 	 */
+	@ApiModelProperty(value = "结束桩号")
 	private String endStation;
 
 

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProjectInfo.java

@@ -100,10 +100,20 @@ public class ProjectInfo extends BaseEntity {
 	@ApiModelProperty(value = "建设合同金额")
 	private BigDecimal estimatedAmount;
 	/**
-	 * 项目里程
+	 * 项目总里程
 	 */
-	@ApiModelProperty(value = "项目里程")
-	private BigDecimal projectMileage;
+	@ApiModelProperty(value = "项目总里程")
+	private BigDecimal projectAllMileage;
+	/**
+	 * 项目路面
+	 */
+	@ApiModelProperty(value = "项目路面")
+	private BigDecimal projectPavement;
+	/**
+	 * 项目路基
+	 */
+	@ApiModelProperty(value = "项目路基")
+	private BigDecimal projectSubgrade;
 	/**
 	 * 项目备注
 	 */

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -79,7 +79,7 @@ public class ContractInfoController extends BladeController {
      */
     @GetMapping("/findContractInfoByPid")
     @ApiOperationSupport(order = 8)
-    @ApiOperation(value = "合同ID", notes = "传入pid")
+    @ApiOperation(value = "根据项目id查询当前所有合同", notes = "传入pid")
     public R<List<ContractInfo>> findContractInfoByPid(String pid) {
         List<ContractInfo> contractInfoVOS = contractInfoService.selectContractInfoPageByPid(pid);
         return R.data(contractInfoVOS);

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -127,7 +127,11 @@ public class ProjectInfoController extends BladeController {
     @ApiOperation(value = "新增或修改", notes = "传入projectInfo")
     @ApiImplicitParam(value = "id", name = "id", required = true)
     public R submit(@Valid @RequestBody ProjectInfo projectInfo) {
-        return R.status(projectInfoService.saveOrUpdate(projectInfo));
+        boolean b = projectInfoService.saveOrUpdate(projectInfo);
+        if (b){
+            return R.data(projectInfo,"操作成功");
+        }
+        return R.fail("操作失败");
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -24,11 +24,15 @@ import javax.validation.Valid;
 
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.WbsInfoDTO;
 import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.manager.vo.WbsInfoVO;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +53,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class WbsInfoController extends BladeController {
 
 	private final IWbsInfoService wbsInfoService;
+	private final IWbsTreeService wbsTreeService;
 
 	/**
 	 * 详情
@@ -117,8 +122,30 @@ public class WbsInfoController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入wbsInfo")
 	@ApiImplicitParam(value = "id",name = "id",required = true)
+	@Transactional(rollbackFor = Exception.class)
 	public R submit(@Valid @RequestBody WbsInfoDTO wbsInfo) {
-		return R.status(wbsInfoService.saveOrUpdate(wbsInfo));
+		boolean result1 = wbsInfoService.saveOrUpdate(wbsInfo);
+		if (result1){
+			Long wbsId = wbsInfo.getId();
+			String nodeName = wbsInfo.getWbsName();
+			//初始化wbs动态库树的根节点
+			WbsTree wbsTree = new WbsTree();
+			wbsTree.setWbsId(String.valueOf(wbsId));
+			wbsTree.setTenantId(AuthUtil.getTenantId());
+			wbsTree.setParentId(0L);
+			wbsTree.setAncestors("0");
+			wbsTree.setDeptCategory(1);
+			wbsTree.setDeptName(nodeName);
+			wbsTree.setFullName(nodeName);
+//			wbsTree.setSort(1);
+			wbsTree.setType(1);
+//			wbsTree.setTableType(-1);
+			boolean result2 = wbsTreeService.save(wbsTree);
+			if (result2){
+				return R.data(wbsInfo,"操作成功");
+			}
+		}
+		return R.fail("操作失败");
 	}
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.xml

@@ -14,6 +14,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="contract_name" property="contractName"/>
+        <result column="contract_type" property="contractType"/>
         <result column="p_id" property="pId"/>
         <result column="project_name" property="projectName"/>
         <result column="contract_number" property="contractNumber"/>

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.xml

@@ -23,7 +23,9 @@
         <result column="actual_end_time" property="actualEndTime"/>
         <result column="construcetion_date" property="construcetionDate"/>
         <result column="estimated_amount" property="estimatedAmount"/>
-        <result column="project_mileage" property="projectMileage"/>
+        <result column="project_mileage" property="projectAllMileage"/>
+        <result column="project_pavement" property="projectPavement"/>
+        <result column="project_subgrade" property="projectSubgrade"/>
         <result column="project_remark" property="projectRemark"/>
         <result column="state" property="state"/>
         <result column="is_open_sign" property="isOpenSign"/>