1：更新项目、合同段接口

2：调整了项目包位置

blade-ops/blade-swagger/src/main/resources/application-dev.yml

@@ -10,3 +10,6 @@ knife4j:
       - name: 系统模块
         uri: 127.0.0.1
         location: /blade-system/v2/api-docs
+      - name: 后台接口
+        uri: 127.0.0.1
+        location: /blade-manager/v2/api-docs

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

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.ContractInfo;
+
+/**
+ * 合同段信息表数据传输对象实体类
+ *
+ * @author liuyc
+ * @since 2022-04-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractInfoDTO extends ContractInfo {
+	private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.ProjectInfo;
+
+/**
+ * 客户级项目表数据传输对象实体类
+ *
+ * @author liuyc
+ * @since 2022-04-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectInfoDTO extends ProjectInfo {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/dto/WbsFormElementDTO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsFormElementDTO.java

@@ -14,18 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.dto;
+package org.springblade.manager.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.wbs.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsFormElement;
 
 
 /**
  * wbs表单元素数据传输对象实体类
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 @Data

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/dto/WbsInfoDTO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsInfoDTO.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.dto;
+package org.springblade.manager.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.wbs.entity.WbsInfo;
+import org.springblade.manager.entity.WbsInfo;
 
 
 /**

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/dto/WbsTreeDTO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO.java

@@ -14,17 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.dto;
+package org.springblade.manager.dto;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.wbs.entity.WbsTree;
-
-import java.util.Date;
+import org.springblade.manager.entity.WbsTree;
 
 
 /**

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

@@ -0,0 +1,125 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 合同段信息表实体类
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+@Data
+@TableName("t_pf_contract_info")
+@EqualsAndHashCode(callSuper = true)
+public class ContractInfo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目id
+     */
+    @ApiModelProperty(value = "项目id")
+    private String pId;
+
+    /**
+     * 项目名称
+     */
+	@ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    /**
+     * 合同段名称
+     */
+	@ApiModelProperty(value = "合同段名称")
+    private String contractName;
+    /**
+     * 合同段编号
+     */
+	@ApiModelProperty(value = "合同段编号")
+    private String contractNumber;
+    /**
+     * 承包商单位名称
+     */
+	@ApiModelProperty(value = "承包商单位名称")
+    private String contractorUnitName;
+    /**
+     * 监理单位名称
+     */
+	@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

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 客户级项目表实体类
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+@Data
+@TableName("t_pf_project_info")
+@EqualsAndHashCode(callSuper = true)
+public class ProjectInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 项目名称
+	 */
+	@ApiModelProperty(value = "项目名称")
+	private String projectName;
+	/**
+	 * 项目别名
+	 */
+	@ApiModelProperty(value = "项目别名")
+	private String projectAlias;
+	/**
+	 * 项目编号
+	 */
+	@ApiModelProperty(value = "项目编号")
+	private String projectNumber;
+	/**
+	 * 项目大概
+	 */
+	@ApiModelProperty(value = "项目大概")
+	private String projectGist;
+	/**
+	 * 工程等级
+	 */
+	@ApiModelProperty(value = "工程等级")
+	private String projectGrade;
+	/**
+	 * 计划开始时间
+	 */
+	@ApiModelProperty(value = "计划开始时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime planStartTime;
+	/**
+	 * 计划完成时间
+	 */
+	@ApiModelProperty(value = "计划完成时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime planEndTime;
+	/**
+	 * 实际开始时间
+	 */
+	@ApiModelProperty(value = "实际开始时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime actualStartTime;
+	/**
+	 * 实际完工时间
+	 */
+	@ApiModelProperty(value = "实际完工时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime actualEndTime;
+	/**
+	 * 施工期
+	 */
+	@ApiModelProperty(value = "施工期")
+	private Integer construcetionDate;
+	/**
+	 * 建设合同金额
+	 */
+	@ApiModelProperty(value = "建设合同金额")
+	private BigDecimal estimatedAmount;
+	/**
+	 * 项目里程
+	 */
+	@ApiModelProperty(value = "项目里程")
+	private BigDecimal projectMileage;
+	/**
+	 * 项目备注
+	 */
+	@ApiModelProperty(value = "项目备注")
+	private String projectRemark;
+	/**
+	 * 节点状态
+	 */
+	@ApiModelProperty(value = "节点状态")
+	private Integer state;
+	/**
+	 * 是否开启电签
+	 */
+	@ApiModelProperty(value = "是否开启电签")
+	private Integer isOpenSign;
+
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/entity/WbsFormElement.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsFormElement.java

@@ -1,4 +1,4 @@
-package org.springblade.manager.wbs.entity;
+package org.springblade.manager.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/entity/WbsInfo.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsInfo.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.entity;
+package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/entity/WbsTree.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTree.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.entity;
+package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractInfoVO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.ContractInfo;
+
+/**
+ * 合同段信息表视图实体类
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ContractInfoVO extends ContractInfo {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractlnfoCountVO.java

@@ -0,0 +1,21 @@
+package org.springblade.manager.vo;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 合同段信息表统计视图实体类
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+@Data
+public class ContractlnfoCountVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	//合同名字
+	private String contractName;
+	//每个项目的合同数量
+	private String contractCounts;
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ProjectInfoVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.vo;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.manager.entity.ProjectInfo;
+
+/**
+ * 客户级项目表视图实体类
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectInfoVO extends ProjectInfo {
+	private static final long serialVersionUID = 1L;
+	/*private String createUserName;
+	private User createUserInfo;*/
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/vo/WbsFormElementVO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsFormElementVO.java

@@ -14,17 +14,17 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.vo;
+package org.springblade.manager.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.wbs.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsFormElement;
 
 
 /**
  * wbs表单元素视图实体类
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 @Data

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/vo/WbsInfoVO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsInfoVO.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.vo;
+package org.springblade.manager.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.wbs.entity.WbsInfo;
+import org.springblade.manager.entity.WbsInfo;
 
 
 /**

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/vo/WbsNodeTableVO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsNodeTableVO.java

@@ -1,10 +1,8 @@
-package org.springblade.manager.wbs.vo;
+package org.springblade.manager.vo;
 
 import lombok.Data;
-import org.springblade.manager.wbs.entity.WbsFormElement;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * wbs动态库节点表单视图实体类

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/wbs/vo/WbsTreeVO.java → blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package org.springblade.manager.wbs.vo;
+package org.springblade.manager.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.node.INode;
-import org.springblade.manager.wbs.entity.WbsTree;
+import org.springblade.manager.entity.WbsTree;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -0,0 +1,171 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.jsonwebtoken.Claims;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.jwt.JwtUtil;
+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.service.IContractInfoService;
+import org.springblade.manager.wrapper.ContractInfoWrapper;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.vo.ContractInfoVO;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 合同段信息表 控制器
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/contractInfo")
+@Api(value = "合同段信息表", tags = "合同段信息表接口")
+public class ContractInfoController extends BladeController {
+
+	@Resource
+	private final IContractInfoService contractInfoService;
+
+
+	//测试条件查询
+	@GetMapping("/selectAllList")
+	public R<List<ContractInfo>> selectAllList(ContractInfo contractInfo){
+		List<ContractInfo> list = contractInfoService.list(Wrappers.query(contractInfo));
+		return R.data(list);
+	}
+
+	//测试分页查询
+	@GetMapping("/page2")
+	public R<IPage<ContractInfo>> page(@ApiIgnore @RequestParam Map<String, Object> obj, Query query) {
+		IPage<ContractInfo> pages = contractInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(obj, ContractInfo.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入contractInfo")
+	public R<ContractInfoVO> detail(ContractInfo contractInfo) {
+		ContractInfo detail = contractInfoService.getOne(Condition.getQueryWrapper(contractInfo));
+		return R.data(ContractInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 根据项目名称查询当前所有合同
+	 */
+	@GetMapping("/findContractInfoByPid")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "合同ID", notes = "传入pid")
+	public R<List<ContractInfo>> findContractInfoByPid(String pid){
+		List<ContractInfo> contractInfoVOS = contractInfoService.selectContractInfoPageByPid(pid);
+		return R.data(contractInfoVOS);
+	}
+
+	/**
+	 * 分页 合同段信息表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入contractInfo")
+	public R<IPage<ContractInfoVO>> list(ContractInfo contractInfo, Query query) {
+		IPage<ContractInfo> pages = contractInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(contractInfo));
+		return R.data(ContractInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 自定义分页 合同段信息表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入contractInfo")
+	public R<IPage<ContractInfoVO>> page(ContractInfoVO contractInfo, Query query){
+		IPage<ContractInfoVO> pages = contractInfoService.selectContractInfoPage(Condition.getPage(query), contractInfo);
+		//获取token信息
+		String[] tokens = AuthUtil.getHeader().split(" ");
+		if (tokens.length>=1){
+			System.out.println(tokens[1]);
+			//解析
+			Claims claims = JwtUtil.parseJWT(tokens[1]);
+			System.out.println(claims);
+		}
+		return R.data(pages);
+	}
+
+
+	/**
+	 * 新增 合同段信息表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入contractInfo")
+	public R save(@Valid @RequestBody ContractInfo contractInfo) {
+		return R.status(contractInfoService.save(contractInfo));
+	}
+
+	/**
+	 * 修改 合同段信息表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入contractInfo")
+	public R update(@Valid @RequestBody ContractInfo contractInfo) {
+		return R.status(contractInfoService.updateById(contractInfo));
+	}
+
+	/**
+	 * 新增或修改 合同段信息表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入contractInfo")
+	public R submit(@Valid @RequestBody ContractInfo contractInfo) {
+		return R.status(contractInfoService.saveOrUpdate(contractInfo));
+	}
+
+
+	/**
+	 * 删除 合同段信息表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(contractInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

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

@@ -0,0 +1,146 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.service.IProjectInfoService;
+import org.springblade.manager.wrapper.ProjectInfoWrapper;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.vo.ContractlnfoCountVO;
+import org.springblade.manager.vo.ProjectInfoVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 客户级项目表 控制器
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/projectInfo")
+@Api(value = "客户级项目表", tags = "客户级项目表接口")
+public class ProjectInfoController extends BladeController {
+
+	private final IProjectInfoService projectInfoService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入projectInfo")
+	public R<ProjectInfoVO> detail(ProjectInfo projectInfo) {
+		ProjectInfo detail = projectInfoService.getOne(Condition.getQueryWrapper(projectInfo));
+		return R.data(ProjectInfoWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 客户级项目表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入projectInfo")
+	public R<IPage<ProjectInfoVO>> list(  ProjectInfo projectInfo, Query query) {
+
+		IPage<ProjectInfo> pages = projectInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(projectInfo));
+		pages.getRecords().forEach(System.out::print);
+
+		return R.data(ProjectInfoWrapper.build().pageVO(pages));
+	}
+
+	/**
+	 * 查询业务条数
+	 * @return
+	 */
+	@GetMapping("/listContractInfoCount")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "无参", notes = "null")
+	public List<ContractlnfoCountVO> selectContractInfoCount(){
+		List<ContractlnfoCountVO> contractlnfoCountsVO = projectInfoService.selectContractInfoCount();
+		return contractlnfoCountsVO;
+	}
+
+
+	/**
+	 * 自定义分页 客户级项目表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入projectInfo")
+	public R<IPage<ProjectInfoVO>> page(ProjectInfoVO projectInfo, Query query) {
+		IPage<ProjectInfoVO> pages = projectInfoService.selectProjectInfoPage(Condition.getPage(query), projectInfo);
+		return R.data(pages);
+	}
+
+
+	/**
+	 * 新增 客户级项目表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入projectInfo")
+	public R save(@Valid @RequestBody ProjectInfo projectInfo) {
+		return R.status(projectInfoService.save(projectInfo));
+	}
+
+	/**
+	 * 修改 客户级项目表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入projectInfo")
+	public R update(@Valid @RequestBody ProjectInfo projectInfo) {
+		return R.status(projectInfoService.updateById(projectInfo));
+	}
+
+	/**
+	 * 新增或修改 客户级项目表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入projectInfo")
+	public R submit(@Valid @RequestBody ProjectInfo projectInfo) {
+		return R.status(projectInfoService.saveOrUpdate(projectInfo));
+	}
+
+
+	/**
+	 * 删除 客户级项目表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(projectInfoService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+}

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

@@ -23,8 +23,8 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.manager.wbs.dto.WbsFormElementDTO;
-import org.springblade.manager.wbs.entity.WbsFormElement;
+import org.springblade.manager.dto.WbsFormElementDTO;
+import org.springblade.manager.entity.WbsFormElement;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.manager.service.IWbsFormElementService;
@@ -33,7 +33,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 /**
  * wbs表单元素 控制器
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 @RestController

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

@@ -26,8 +26,8 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.manager.wbs.entity.WbsInfo;
-import org.springblade.manager.wbs.vo.WbsInfoVO;
+import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.vo.WbsInfoVO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

@@ -26,11 +26,11 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.manager.wbs.dto.WbsTreeDTO;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.entity.WbsTree;
-import org.springblade.manager.wbs.vo.WbsNodeTableVO;
-import org.springblade.manager.wbs.vo.WbsTreeVO;
+import org.springblade.manager.dto.WbsTreeDTO;
+import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.vo.WbsNodeTableVO;
+import org.springblade.manager.vo.WbsTreeVO;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.enums.DictEnum;
 import org.springframework.web.bind.annotation.*;

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

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.vo.ContractInfoVO;
+import org.springblade.manager.vo.ContractlnfoCountVO;
+
+
+import java.util.List;
+
+/**
+ * 合同段信息表 Mapper 接口
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param contractInfo
+	 * @return
+	 */
+	List<ContractInfoVO> selectContractInfoPage(IPage page, ContractInfoVO contractInfo);
+
+	List<ContractlnfoCountVO> selectContractInfoCount();
+
+	List<ContractInfo> selectContractInfoPageByPid(@Param("pid") String pid);
+
+}

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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.manager.mapper.ContractInfoMapper">
+
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="contractInfoResultMap" type="org.springblade.manager.entity.ContractInfo">
+        <result column="id" property="id"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="contract_name" property="contractName"/>
+        <result column="project_name" property="projectName" />
+        <result column="contract_number" property="contractNumber"/>
+        <result column="contractor_unit_name" property="contractorUnitName"/>
+        <result column="supervision_unit_name" property="supervisionUnitName"/>
+        <result column="contractor_join_time" property="contractorJoinTime"/>
+        <result column="plan_start_time" property="planStartTime"/>
+        <result column="plan_end_time" property="planEndTime"/>
+        <result column="actual_start_time" property="actualStartTime"/>
+        <result column="actual_end_time" property="actualEndTime"/>
+        <result column="start_file_url" property="startFileUrl"/>
+        <result column="contract_amount" property="contractAmount"/>
+        <result column="contract_amount" property="contractAmount"/>
+        <result column="project_place" property="projectPlace"/>
+        <result column="start_station" property="startStation"/>
+        <result column="end_station" property="endStation"/>
+    </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="contractInfoResultMap1" type="org.springblade.manager.vo.ContractlnfoCountVO">
+        <result column="contract_name" property="contractName"/>
+        <result column="contract_counts" property="contractCounts"/>
+    </resultMap>
+
+
+    <select id="selectContractInfoPage" resultMap="contractInfoResultMap">
+        select c.* ,p.project_name as project_name from t_pf_contract_info c INNER JOIN t_pf_project_info p on c.p_id=p.id where c.is_deleted = 0
+    </select>
+
+    <select id="selectContractInfoCount" resultMap="contractInfoResultMap1">
+        select c.contract_name,count(*) as contract_counts from t_pf_contract_info c where c.is_deleted = 0  GROUP BY c.p_id
+    </select>
+
+    <select id="selectContractInfoPageByPid" resultMap="contractInfoResultMap" >
+        select c.*,p.project_name as project_name  from t_pf_contract_info c INNER JOIN t_pf_project_info p on c.p_id=p.id where p.id = #{pid} and c.is_deleted = 0
+    </select>
+
+</mapper>

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

@@ -0,0 +1,45 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.vo.ProjectInfoVO;
+
+import java.util.List;
+
+/**
+ * 客户级项目表 Mapper 接口
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param projectInfo
+	 * @return
+	 */
+	List<ProjectInfoVO> selectProjectInfoPage(IPage page, ProjectInfoVO projectInfo);
+
+
+
+}

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.manager.mapper.ProjectInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="projectInfoResultMap" type="org.springblade.manager.entity.ProjectInfo">
+        <result column="id" property="id"/>
+        <result column="create_time" property="createTime"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="project_name" property="projectName"/>
+        <result column="project_alias" property="projectAlias"/>
+        <result column="project_number" property="projectNumber"/>
+        <result column="project_gist" property="projectGist"/>
+        <result column="project_grade" property="projectGrade"/>
+        <result column="plan_start_time" property="planStartTime"/>
+        <result column="plan_end_time" property="planEndTime"/>
+        <result column="actual_start_time" property="actualStartTime"/>
+        <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_remark" property="projectRemark"/>
+        <result column="state" property="state"/>
+        <result column="is_open_sign" property="isOpenSign"/>
+    </resultMap>
+
+
+    <select id="selectProjectInfoPage" resultMap="projectInfoResultMap">
+        select * from t_pf_project_info where is_deleted = 0
+    </select>
+
+</mapper>

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

@@ -19,15 +19,15 @@ package org.springblade.manager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.vo.WbsFormElementVO;
+import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.vo.WbsFormElementVO;
 
 import java.util.List;
 
 /**
  * wbs表单元素 Mapper 接口
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 public interface WbsFormElementMapper extends BaseMapper<WbsFormElement> {

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

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.manager.mapper.WbsFormElementMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="wbsFormElementResultMap" type="org.springblade.manager.wbs.entity.WbsFormElement">
+    <resultMap id="wbsFormElementResultMap" type="org.springblade.manager.entity.WbsFormElement">
         <result column="id" property="id"/>
         <result column="create_time" property="createTime"/>
         <result column="create_user" property="createUser"/>

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

@@ -18,8 +18,8 @@ package org.springblade.manager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.manager.wbs.entity.WbsInfo;
-import org.springblade.manager.wbs.vo.WbsInfoVO;
+import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.vo.WbsInfoVO;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.manager.mapper.WbsInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="wbsInfoResultMap" type="org.springblade.manager.wbs.entity.WbsInfo">
+    <resultMap id="wbsInfoResultMap" type="org.springblade.manager.entity.WbsInfo">
         <result column="id" property="id"/>
         <result column="create_time" property="createTime"/>
         <result column="create_user" property="createUser"/>

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

@@ -19,10 +19,10 @@ package org.springblade.manager.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.entity.WbsTree;
-import org.springblade.manager.wbs.vo.WbsNodeTableVO;
-import org.springblade.manager.wbs.vo.WbsTreeVO;
+import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.vo.WbsNodeTableVO;
+import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@
 <mapper namespace="org.springblade.manager.mapper.WbsTreeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="wbsTreeResultMap" type="org.springblade.manager.wbs.entity.WbsTree">
+    <resultMap id="wbsTreeResultMap" type="org.springblade.manager.entity.WbsTree">
         <result column="id" property="id"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="status" property="status"/>
@@ -33,7 +33,7 @@
         <result column="has_children" property="hasChildren"/>
     </resultMap>
 
-    <resultMap id="selectByNodeTableMap" type="org.springblade.manager.wbs.vo.WbsNodeTableVO">
+    <resultMap id="selectByNodeTableMap" type="org.springblade.manager.vo.WbsNodeTableVO">
         <id column="id" property="id"/>
         <result column="tableName" property="tableName"/>
         <result column="tableType" property="tableType"/>
@@ -41,7 +41,7 @@
         <result column="elementTotal" property="elementTotal"/>
     </resultMap>
 
-    <resultMap id="wbsFormElementMap" type="org.springblade.manager.wbs.entity.WbsFormElement">
+    <resultMap id="wbsFormElementMap" type="org.springblade.manager.entity.WbsFormElement">
         <id column="id" property="id"/>
         <result column="fId" property="fId"/>
         <result column="e_name" property="eName"/>
@@ -51,7 +51,7 @@
         <result column="e_inspection_method" property="eInspectionMethod"/>
     </resultMap>
 
-    <insert id="addFormElement" parameterType="org.springblade.manager.wbs.dto.WbsFormElementDTO">
+    <insert id="addFormElement" parameterType="org.springblade.manager.dto.WbsFormElementDTO">
         insert into m_wbs_form_element(f_id,e_name,e_type,e_length)
         values (#{f_id},#{e_name},#{e_type},#{e_length})
     </insert>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IContractInfoService.java

@@ -0,0 +1,45 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.vo.ContractInfoVO;
+
+import java.util.List;
+
+/**
+ * 合同段信息表 服务类
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+public interface IContractInfoService extends BaseService<ContractInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param contractInfo
+	 * @return
+	 */
+	IPage<ContractInfoVO> selectContractInfoPage(IPage<ContractInfoVO> page, ContractInfoVO contractInfo);
+
+	List<ContractInfo> selectContractInfoPageByPid(String pid);
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IProjectInfoService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.vo.ContractlnfoCountVO;
+import org.springblade.manager.vo.ProjectInfoVO;
+
+import java.util.List;
+
+
+/**
+ * 客户级项目表 服务类
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+public interface IProjectInfoService extends BaseService<ProjectInfo> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param projectInfo
+	 * @return
+	 */
+	IPage<ProjectInfoVO> selectProjectInfoPage(IPage<ProjectInfoVO> page, ProjectInfoVO projectInfo);
+
+	/**
+	 * 查询业务条数
+	 * @return
+	 */
+	public List<ContractlnfoCountVO> selectContractInfoCount();
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsFormElementService.java

@@ -19,13 +19,13 @@ package org.springblade.manager.service;
 
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.vo.WbsFormElementVO;
+import org.springblade.manager.vo.WbsFormElementVO;
+import org.springblade.manager.entity.WbsFormElement;
 
 /**
  * wbs表单元素 服务类
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 public interface IWbsFormElementService extends BaseService<WbsFormElement> {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsInfoService.java

@@ -19,8 +19,8 @@ package org.springblade.manager.service;
 
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.manager.wbs.entity.WbsInfo;
-import org.springblade.manager.wbs.vo.WbsInfoVO;
+import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.vo.WbsInfoVO;
 
 /**
  * wbs动态库信息 服务类

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -16,19 +16,12 @@
  */
 package org.springblade.manager.service;
 
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.apache.ibatis.annotations.Param;
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.tool.api.R;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.entity.WbsTree;
-import org.springblade.manager.wbs.vo.WbsNodeTableVO;
-import org.springblade.manager.wbs.vo.WbsTreeVO;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.vo.WbsNodeTableVO;
+import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.List;
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.mapper.ContractInfoMapper;
+import org.springblade.manager.service.IContractInfoService;
+import org.springblade.manager.vo.ContractInfoVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 合同段信息表 服务实现类
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+@Service
+public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper, ContractInfo> implements IContractInfoService {
+
+
+	@Override
+	public IPage<ContractInfoVO> selectContractInfoPage(IPage<ContractInfoVO> page, ContractInfoVO contractInfo) {
+		List<ContractInfoVO> dat = baseMapper.selectContractInfoPage(page, contractInfo);
+		return page.setRecords(dat);
+	}
+
+	@Override
+	public List<ContractInfo> selectContractInfoPageByPid(String pid) {
+		return baseMapper.selectContractInfoPageByPid(pid);
+	}
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProjectInfoServiceImpl.java

@@ -0,0 +1,56 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.mapper.ContractInfoMapper;
+import org.springblade.manager.mapper.ProjectInfoMapper;
+import org.springblade.manager.service.IProjectInfoService;
+import org.springblade.manager.vo.ContractlnfoCountVO;
+import org.springblade.manager.vo.ProjectInfoVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 客户级项目表 服务实现类
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+@Service
+public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, ProjectInfo> implements IProjectInfoService {
+
+	@Resource
+	private ContractInfoMapper contractInfoMapper;
+
+	@Override
+	public IPage<ProjectInfoVO> selectProjectInfoPage(IPage<ProjectInfoVO> page, ProjectInfoVO projectInfo) {
+		return page.setRecords(baseMapper.selectProjectInfoPage(page, projectInfo));
+	}
+
+	@Override
+	public List<ContractlnfoCountVO> selectContractInfoCount() {
+		List<ContractlnfoCountVO> contractlnfoCountVO = contractInfoMapper.selectContractInfoCount();
+		return contractlnfoCountVO;
+	}
+
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -18,16 +18,16 @@ package org.springblade.manager.service.impl;
 
 import org.springblade.manager.mapper.WbsFormElementMapper;
 import org.springblade.manager.service.IWbsFormElementService;
+import org.springblade.manager.vo.WbsFormElementVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.vo.WbsFormElementVO;
+import org.springblade.manager.entity.WbsFormElement;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 /**
  * wbs表单元素 服务实现类
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 @Service

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java

@@ -18,9 +18,9 @@ package org.springblade.manager.service.impl;
 
 import org.springblade.manager.mapper.WbsInfoMapper;
 import org.springblade.manager.service.IWbsInfoService;
+import org.springblade.manager.vo.WbsInfoVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.manager.wbs.entity.WbsInfo;
-import org.springblade.manager.wbs.vo.WbsInfoVO;
+import org.springblade.manager.entity.WbsInfo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.manager.service.impl;
 
-import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -25,17 +24,15 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.mapper.WbsTreeMapper;
 import org.springblade.manager.service.IWbsTreeService;
+import org.springblade.manager.vo.WbsNodeTableVO;
+import org.springblade.manager.vo.WbsTreeVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.entity.WbsTree;
-import org.springblade.manager.wbs.vo.WbsNodeTableVO;
-import org.springblade.manager.wbs.vo.WbsTreeVO;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.util.*;
 
 /**

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ContractInfoWrapper.java

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.vo.ContractInfoVO;
+
+
+import java.util.Objects;
+
+/**
+ * 合同段信息表包装类,返回视图层所需的字段
+ *
+ * @author liuyc
+ * @since 2022-04-14
+ */
+public class ContractInfoWrapper extends BaseEntityWrapper<ContractInfo, ContractInfoVO>  {
+
+	public static ContractInfoWrapper build() {
+		return new ContractInfoWrapper();
+ 	}
+
+	@Override
+	public ContractInfoVO entityVO(ContractInfo contractInfo) {
+		ContractInfoVO contractInfoVO = Objects.requireNonNull(BeanUtil.copy(contractInfo, ContractInfoVO.class));
+
+		return contractInfoVO;
+	}
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ProjectInfoWrapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.vo.ProjectInfoVO;
+
+
+import java.util.Objects;
+
+/**
+ * 客户级项目表包装类,返回视图层所需的字段
+ *
+ * @author liuyc
+ * @since 2022-04-13
+ */
+public class ProjectInfoWrapper extends BaseEntityWrapper<ProjectInfo, ProjectInfoVO>  {
+
+	public static ProjectInfoWrapper build() {
+		return new ProjectInfoWrapper();
+ 	}
+
+	@Override
+	public ProjectInfoVO entityVO(ProjectInfo projectInfo) {
+		ProjectInfoVO projectInfoVO = Objects.requireNonNull(BeanUtil.copy(projectInfo, ProjectInfoVO.class));
+
+		//User createUser = UserCache.getUser(projectInfo.getCreateUser());
+		//User updateUser = UserCache.getUser(projectInfo.getUpdateUser());
+		//projectInfoVO.setCreateUserName(createUser.getName());
+		//projectInfoVO.setCreateUserInfo(createUser);
+		//projectInfoVO.setUpdateUserName(updateUser.getName());
+		//System.out.println(createUser);
+
+
+		return projectInfoVO;
+	}
+
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsFormElementWrapper.java

@@ -18,15 +18,15 @@ package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.manager.wbs.entity.WbsFormElement;
-import org.springblade.manager.wbs.vo.WbsFormElementVO;
+import org.springblade.manager.vo.WbsFormElementVO;
+import org.springblade.manager.entity.WbsFormElement;
 
 import java.util.Objects;
 
 /**
  * wbs表单元素包装类,返回视图层所需的字段
  *
- * @author BladeX
+ * @author liuyc
  * @since 2022-04-27
  */
 public class WbsFormElementWrapper extends BaseEntityWrapper<WbsFormElement, WbsFormElementVO>  {

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsInfoWrapper.java

@@ -18,8 +18,8 @@ package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.manager.wbs.entity.WbsInfo;
-import org.springblade.manager.wbs.vo.WbsInfoVO;
+import org.springblade.manager.entity.WbsInfo;
+import org.springblade.manager.vo.WbsInfoVO;
 
 import java.util.Objects;
 

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreeWrapper.java

@@ -18,8 +18,8 @@ package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.manager.wbs.entity.WbsTree;
-import org.springblade.manager.wbs.vo.WbsTreeVO;
+import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.Objects;
 

blade-service/blade-manager/src/main/java/sql/contractinfo.menu.sql

@@ -0,0 +1,10 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515953420169297922', 1123598815738675201, 'contractinfo', '合同段列表', 'menu', '/project/contractinfo', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515953420169297923', '1515953420169297922', 'contractinfo_add', '新增', 'add', '/project/contractinfo/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515953420169297924', '1515953420169297922', 'contractinfo_edit', '修改', 'edit', '/project/contractinfo/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515953420169297925', '1515953420169297922', 'contractinfo_delete', '删除', 'delete', '/api/blade-project-info/contractinfo/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515953420169297926', '1515953420169297922', 'contractinfo_view', '查看', 'view', '/project/contractinfo/view', 'file-text', 4, 2, 2, 1, NULL, 0);

blade-service/blade-manager/src/main/java/sql/projectinfo.menu.sql

@@ -0,0 +1,11 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515954856571617282', 1123598815738675201, 'projectinfo', '项目列表', 'menu', '/project/projectinfo', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515954856571617283', '1515954856571617282', 'projectinfo_add', '新增', 'add', '/project/projectinfo/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515954856571617284', '1515954856571617282', 'projectinfo_edit', '修改', 'edit', '/project/projectinfo/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515954856571617285', '1515954856571617282', 'projectinfo_delete', '删除', 'delete', '/api/blade-project-info/projectinfo/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1515954856571617286', '1515954856571617282', 'projectinfo_view', '查看', 'view', '/project/projectinfo/view', 'file-text', 4, 2, 2, 1, NULL, 0);
+