更新代码

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

@@ -16,9 +16,9 @@
  */
 package org.springblade.manager.dto;
 
+import org.springblade.manager.entity.ContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.ContractInfo;
 
 /**
  * 合同段信息表数据传输对象实体类

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

@@ -16,9 +16,9 @@
  */
 package org.springblade.manager.dto;
 
+import org.springblade.manager.entity.ProjectInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.ProjectInfo;
 
 /**
  * 客户级项目表数据传输对象实体类

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

@@ -17,14 +17,14 @@
 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;
 
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * 合同段信息表实体类
  *
@@ -36,90 +36,74 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class ContractInfo extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
 
-    /**
-     * 项目id
-     */
-    @ApiModelProperty(value = "项目id")
-    private String pId;
+	/**
+	 * 项目id
+	 */
+	private String pId;
 
-    /**
-     * 项目名称
-     */
-	@ApiModelProperty(value = "项目名称")
-    private String projectName;
+	/**
+	 * 项目名称
+	 */
+	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;
+	/**
+	 * 合同段名称
+	 */
+	private String contractName;
+	/**
+	 * 合同段编号
+	 */
+	private String contractNumber;
+	/**
+	 * 承包商单位名称
+	 */
+	private String contractorUnitName;
+	/**
+	 * 监理单位名称
+	 */
+	private String supervisionUnitName;
+	/**
+	 * 参与方进场时间
+	 */
+	private String contractorJoinTime;
+	/**
+	 * 计划开工时间
+	 */
+	private LocalDateTime planStartTime;
+	/**
+	 * 计划完工时间
+	 */
+	private LocalDateTime planEndTime;
+	/**
+	 * 实际开工时间
+	 */
+	private LocalDateTime actualStartTime;
+	/**
+	 * 实际完工时间
+	 */
+	private LocalDateTime actualEndTime;
+	/**
+	 * 开工令文件
+	 */
+	private String startFileUrl;
+	/**
+	 * 合同段总金额
+	 */
+	private BigDecimal contractAmount;
+	/**
+	 * 合同段工程位置
+	 */
+	private String projectPlace;
+	/**
+	 * 起始桩号
+	 */
+	private String startStation;
+	/**
+	 * 结束桩号
+	 */
+	private String endStation;
 
 
 }

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

@@ -17,15 +17,15 @@
 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;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * 客户级项目表实体类
  *
@@ -42,81 +42,66 @@ public class ProjectInfo extends BaseEntity {
 	/**
 	 * 项目名称
 	 */
-	@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/vo/ContractInfoVO.java

@@ -16,9 +16,9 @@
  */
 package org.springblade.manager.vo;
 
+import org.springblade.manager.entity.ContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.ContractInfo;
 
 /**
  * 合同段信息表视图实体类

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

@@ -6,10 +6,10 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 合同段信息表统计视图实体类
+ * 合同段信息统计表视图实体类
  *
  * @author liuyc
- * @since 2022-04-13
+ * @since 2022-04-14
  */
 @Data
 public class ContractlnfoCountVO implements Serializable {

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

@@ -16,9 +16,9 @@
  */
 package org.springblade.manager.vo;
 
+import org.springblade.manager.entity.ProjectInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.manager.entity.ProjectInfo;
 
 /**
  * 客户级项目表视图实体类
@@ -30,7 +30,6 @@ import org.springblade.manager.entity.ProjectInfo;
 @EqualsAndHashCode(callSuper = true)
 public class ProjectInfoVO extends ProjectInfo {
 	private static final long serialVersionUID = 1L;
-	/*private String createUserName;
-	private User createUserInfo;*/
+
 
 }

blade-service/blade-manager/pom.xml

@@ -32,6 +32,12 @@
             <artifactId>blade-manager-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

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

@@ -18,30 +18,40 @@ 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.jsonwebtoken.JwtParser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 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.constant.AuthConstant;
 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.core.tool.utils.ThreadLocalUtil;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.vo.ContractInfoVO;
-import org.springframework.web.bind.annotation.*;
+import org.springblade.manager.wrapper.ContractInfoWrapper;
+import org.springblade.manager.service.IContractInfoService;
+import org.springblade.core.boot.ctrl.BladeController;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
+import java.sql.Wrapper;
+import java.util.*;
 
 /**
  * 合同段信息表 控制器
@@ -115,14 +125,13 @@ public class ContractInfoController extends BladeController {
 	public R<IPage<ContractInfoVO>> page(ContractInfoVO contractInfo, Query query){
 		IPage<ContractInfoVO> pages = contractInfoService.selectContractInfoPage(Condition.getPage(query), contractInfo);
 		//获取token信息
-		/*String[] tokens = AuthUtil.getHeader().split(" ");
+		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);
 	}
 

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

@@ -16,25 +16,30 @@
  */
 package org.springblade.manager.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import org.springblade.core.boot.ctrl.BladeController;
+import javax.validation.Valid;
+
 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.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springblade.manager.entity.ProjectInfo;
+import org.springblade.manager.vo.ProjectInfoVO;
+import org.springblade.manager.wrapper.ProjectInfoWrapper;
+import org.springblade.manager.service.IProjectInfoService;
+import org.springblade.core.boot.ctrl.BladeController;
 
-import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 
 /**

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

@@ -16,11 +16,11 @@
  */
 package org.springblade.manager.controller;
 
-
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 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.dto.WbsFormElementDTO;
@@ -50,6 +50,14 @@ public class WbsFormElementController extends BladeController {
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "新增", notes = "传入wbsFormElement")
+	/*@ApiImplicitParams(value = {
+		@ApiImplicitParam(name = "fId",value = "父id",required = true),
+		@ApiImplicitParam(name = "eName",value = "元素名称",required = true),
+		@ApiImplicitParam(name = "eType",value = "元素类型",required = true),
+		@ApiImplicitParam(name = "eLength",value = "元素长度",required = true),
+		@ApiImplicitParam(name = "eAllowDeviation",value = "允许偏差值",required = true),
+		@ApiImplicitParam(name = "eInspectionMethod",value = "检查方法",required = true)
+	})*/
 	public R save(@Valid @RequestBody WbsFormElementDTO wbsFormElement) {
 		return R.status(wbsFormElementService.save(wbsFormElement));
 	}

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

@@ -16,13 +16,13 @@
  */
 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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.vo.ContractlnfoCountVO;
-
+import org.springblade.manager.vo.ProjectInfoVO;
 
 import java.util.List;
 

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

@@ -16,11 +16,10 @@
  */
 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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
 
 /**

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

@@ -17,9 +17,10 @@
 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 org.springblade.core.mp.base.BaseService;
+
 
 import java.util.List;
 

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

@@ -16,15 +16,15 @@
  */
 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.ContractInfoVO;
 import org.springblade.manager.vo.ContractlnfoCountVO;
 import org.springblade.manager.vo.ProjectInfoVO;
+import org.springblade.core.mp.base.BaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-
 /**
  * 客户级项目表 服务类
  *

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsFormElementService.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.vo.WbsFormElementVO;
 import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.vo.WbsFormElementVO;
 
 /**
  * wbs表单元素 服务类

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

@@ -16,13 +16,13 @@
  */
 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.vo.ContractInfoVO;
 import org.springblade.manager.mapper.ContractInfoMapper;
 import org.springblade.manager.service.IContractInfoService;
-import org.springblade.manager.vo.ContractInfoVO;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 

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

@@ -16,15 +16,15 @@
  */
 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.springblade.manager.mapper.ProjectInfoMapper;
+import org.springblade.manager.service.IProjectInfoService;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import javax.annotation.Resource;
 import java.util.List;

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

@@ -18,9 +18,9 @@ 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.entity.WbsFormElement;
+import org.springblade.manager.vo.WbsFormElementVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

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.entity.WbsInfo;
+import org.springblade.manager.vo.WbsInfoVO;
 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

@@ -24,11 +24,11 @@ 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.entity.WbsFormElement;
 import org.springblade.manager.entity.WbsTree;
+import org.springblade.manager.vo.WbsNodeTableVO;
+import org.springblade.manager.vo.WbsTreeVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

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

@@ -20,8 +20,6 @@ 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;
 
 /**

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

@@ -20,7 +20,8 @@ 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 org.springblade.system.user.cache.UserCache;
+import org.springblade.system.user.entity.User;
 
 import java.util.Objects;
 

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsFormElementWrapper.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.vo.WbsFormElementVO;
 import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.vo.WbsFormElementVO;
 
 import java.util.Objects;