更改需求

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

@@ -37,130 +37,136 @@ import org.springblade.core.mp.base.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 public class WbsTree extends BaseEntity {
 
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键id
-	 */
-	@TableId(value = "id")
-	private Long id;
-
-	/**
-	 * wbs库id
-	 */
-	@ApiModelProperty(value = "wbs库id")
-	private String wbsId;
-	/**
-	 * 租户id
-	 */
-	@ApiModelProperty(value = "租户id")
-	private String tenantId;
-
-	/**
-	 * 父主键
-	 */
-	@ApiModelProperty(value = "父主键id")
-	private Long parentId;
-
-	/**
-	 * 部门类型
-	 */
-	@ApiModelProperty(value = "节点类型")
-	private Integer deptCategory;
-
-	/**
-	 * '1'节点 '2'表单
-	 */
-	@ApiModelProperty(value = "'1'节点 '2'表单")
-	private Integer type;
-
-	/**
-	 * 部门名
-	 */
-	@ApiModelProperty(value = "节点名称")
-	private String deptName;
-	/**
-	 * 部门全称
-	 */
-	@ApiModelProperty(value = "节点全称")
-	private String fullName;
-
-	/**
-	 * 表单类型
-	 */
-	@ApiModelProperty(value = "表单类型")
-	private Integer tableType;
-
-	/**
-	 * 排序
-	 */
-	@ApiModelProperty(value = "排序")
-	private Integer sort;
-
-	/**
-	 * 祖级列表
-	 */
-	@ApiModelProperty(value = "祖级id列表")
-	private String ancestors;
-
-	/**
-	 * 备注
-	 */
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
-	/**
-	 * 唯一编号
-	 */
-	@ApiModelProperty(value = "唯一编号")
-	private String uniqueCode;
-
-	/**
-	 * 划分编号
-	 */
-	@ApiModelProperty(value = "划分编号")
-	private String partitionCode;
-
-	/**
-	 * 是否是实验节点 '0'否 '1'是
-	 */
-	@ApiModelProperty(value = "实验节点")
-	private Integer isExpernode;
-
-	/**
-	 * 是否有混泥土 '0'否 '1'是
-	 */
-	@ApiModelProperty(value = "混泥土")
-	private Integer isConcrete;
-
-	/**
-	 * 表单所属方
-	 */
-	@ApiModelProperty(value = "表单所属方")
-	private String tableOwner;
-
-	/**
-	 *内业资料类型
-	 */
-	@ApiModelProperty(value = "内业资料类型")
-	private Integer majorDataType;
-
-	/**
-	 * 初始化实体表名
-	 */
-	@ApiModelProperty(value = "初始化实体表名")
-	private String initTableName;
-
-	/**
-	 * 工程根节点id
-	 */
-	@ApiModelProperty(value = "工程根节点id")
-	private Long projectNodeId;
-
-
-	/**
-	 *是否关联清表 '0'否 '1'是
-	 */
-	@ApiModelProperty(value = "是否关联清表 '1'否 '2'是")
-	private Integer isLinkTable;
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * wbs库id
+     */
+    @ApiModelProperty(value = "wbs库id")
+    private String wbsId;
+    /**
+     * 租户id
+     */
+    @ApiModelProperty(value = "租户id")
+    private String tenantId;
+
+    /**
+     * 父主键
+     */
+    @ApiModelProperty(value = "父主键id")
+    private Long parentId;
+
+    /**
+     * 部门类型
+     */
+    @ApiModelProperty(value = "节点类型")
+    private Integer deptCategory;
+
+    /**
+     * '1'节点 '2'表单
+     */
+    @ApiModelProperty(value = "'1'节点 '2'表单")
+    private Integer type;
+
+    /**
+     * 部门名
+     */
+    @ApiModelProperty(value = "节点名称")
+    private String deptName;
+    /**
+     * 部门全称
+     */
+    @ApiModelProperty(value = "节点全称")
+    private String fullName;
+
+    /**
+     * 表单类型
+     */
+    @ApiModelProperty(value = "表单类型")
+    private Integer tableType;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 祖级列表
+     */
+    @ApiModelProperty(value = "祖级id列表")
+    private String ancestors;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 唯一编号
+     */
+    @ApiModelProperty(value = "唯一编号")
+    private String uniqueCode;
+
+    /**
+     * 划分编号
+     */
+    @ApiModelProperty(value = "划分编号")
+    private String partitionCode;
+
+    /**
+     * 是否是实验节点 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "实验节点")
+    private Integer isExpernode;
+
+    /**
+     * 是否有混泥土 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "混泥土")
+    private Integer isConcrete;
+
+    /**
+     * 表单所属方
+     */
+    @ApiModelProperty(value = "表单所属方")
+    private String tableOwner;
+
+    /**
+     * 内业资料类型
+     */
+    @ApiModelProperty(value = "内业资料类型")
+    private Integer majorDataType;
+
+    /**
+     * 初始化实体表名
+     */
+    @ApiModelProperty(value = "初始化实体表名")
+    private String initTableName;
+
+    /**
+     * 工程根节点id
+     */
+    @ApiModelProperty(value = "工程根节点id")
+    private Long projectNodeId;
+
+
+    /**
+     * 是否关联清表 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "是否关联清表 '1'否 '2'是")
+    private Integer isLinkTable;
+
+    /**
+     * 是否存在表单 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "是否存在表单 '0'否 '1'是")
+    private Integer isExistForm;
 }

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

@@ -158,4 +158,9 @@ public class WbsTreePrivate extends BaseEntity {
     @ApiModelProperty(value = "清表Id")
     private Long excelId;
 
+    /**
+     * 是否存在表单 '0'否 '1'是
+     */
+    @ApiModelProperty(value = "是否存在表单 '0'否 '1'是")
+    private Integer isExistForm;
 }

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

@@ -30,9 +30,19 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
 
     private Integer deptCategory;
 
+    private Integer isExistForm;
+
     public TreeNodeVO() {
     }
 
+    public Integer getIsExistForm() {
+        return isExistForm;
+    }
+
+    public void setIsExistForm(Integer isExistForm) {
+        this.isExistForm = isExistForm;
+    }
+
     public Integer getDeptCategory() {
         return deptCategory;
     }
@@ -90,7 +100,7 @@ public class TreeNodeVO extends BaseNode<TreeNode> {
     }
 
     public String toString() {
-        return "TreeNode(deptCategory=" + this.getDeptCategory() + ",wbsType=" + this.getWbsType() + ", primaryKeyId=" + this.getPrimaryKeyId() + ", type=" + this.getType() + ", title=" + this.getTitle() + ", key=" + this.getKey() + ", value=" + this.getValue() + ")";
+        return "TreeNode(deptCategory=" + this.getDeptCategory() + ",isExistForm" + this.getIsExistForm() + ",wbsType=" + this.getWbsType() + ", primaryKeyId=" + this.getPrimaryKeyId() + ", type=" + this.getType() + ", title=" + this.getTitle() + ", key=" + this.getKey() + ", value=" + this.getValue() + ")";
     }
 
     public boolean equals(final Object o) {

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

@@ -277,13 +277,9 @@ public class ContractInfoController extends BladeController {
     @PostMapping("/findAllUserByCondition")
     @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前项目合同岗位下的用户", notes = "传入项目id、合同id、岗位id")
-    public R<List<UserVO2>> findAllUserByCondition(@RequestBody FindAllUserByConditionDTO values) {
-        //TODO 修改成分页显示 参考上面运维人员分页
-        List<UserVO2> users = contractInfoService.findAllUserByCondition(values);
-        if (users.size() > 0) {
-            return R.data(users);
-        }
-        return R.data(users, "未查询到数据");
+    public R<IPage<UserVO2>> findAllUserByCondition(@RequestBody FindAllUserByConditionDTO values, Query query) {
+        IPage<UserVO2> users = contractInfoService.findAllUserByCondition(Condition.getPage(query), values);
+        return R.data(users);
     }
 
 

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

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
@@ -31,10 +32,14 @@ import org.springblade.manager.dto.WbsFormElementDTO;
 import org.springblade.manager.dto.WbsFormElementDTO2;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.entity.WbsTree;
 import org.springblade.manager.excel.WbsExcelUtil;
 import org.springblade.manager.excel.WbsFormElementExcel;
 import org.springblade.manager.excel.WbsFormElementImporter;
 import org.springblade.manager.excel.WbsTreeExcel;
+import org.springblade.manager.vo.WbsTreeVO;
+import org.springblade.manager.wrapper.WbsFormElementWrapper;
+import org.springblade.manager.wrapper.WbsTreeWrapper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springblade.manager.service.IWbsFormElementService;
@@ -61,6 +66,22 @@ public class WbsFormElementController extends BladeController {
 
     private final IWbsFormElementService wbsFormElementService;
 
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "传入元素id")
+    @ApiImplicitParam(name = "id", value = "id", required = true)
+    public R<WbsFormElement> detail(WbsFormElement wbsFormElement) {
+        WbsFormElement detail = wbsFormElementService.getOne(Condition.getQueryWrapper(wbsFormElement));
+        if (detail != null) {
+            return R.data(WbsFormElementWrapper.build().entityVO(detail));
+        }
+        return R.fail(200, "未查询到信息");
+    }
+
+
     /**
      * 新增或同步 wbs表单元素
      */
@@ -170,4 +191,17 @@ public class WbsFormElementController extends BladeController {
         return R.status(b);
     }
 
+
+    /**
+     * Wbs公有树节点批量导入元素表、元素
+     */
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "Wbs公有树节点批量导入元素表与元素", notes = "传入excel文件")
+    @RequestMapping(value = "/import-wbsTreeTableAndForm", method = RequestMethod.POST)
+    public R importWbsTreeTableAndForm(@RequestPart("excelFile") MultipartFile excelFile,
+                                       @RequestPart("nodeId") String nodeId) {
+        boolean b = wbsFormElementService.importWbsTreeTableAndForm(excelFile, nodeId);
+        return R.status(b);
+    }
+
 }

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

@@ -115,16 +115,14 @@ public class WbsTreeController extends BladeController {
 
     /**
      * 获取项目节点树形结构 (新增、修改加载、分配合同wbs树加载type=1)
-     *
-     * @return
      */
     @GetMapping("/tree")
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "节点树形结构", notes = "传入租户Id、wbsId、type、请求头token")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "tenantId", value = "租户id", required = false),
+            @ApiImplicitParam(name = "tenantId", value = "租户id"),
             @ApiImplicitParam(name = "wbsId", value = "wbsId", required = true),
-            @ApiImplicitParam(name = "type", value = "节点类型type '1'节点or'2'表单", defaultValue = "", required = false),
+            @ApiImplicitParam(name = "type", value = "节点类型type '1'节点or'2'表单"),
     })
     public R<List<WbsTreeVO>> tree(String wbsId, String type, String tenantId, BladeUser bladeUser) {
         List<WbsTreeVO> tree = wbsTreeService.tree(wbsId, Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), type);
@@ -345,6 +343,7 @@ public class WbsTreeController extends BladeController {
     }
 
 
+
 }
 
 

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

@@ -53,7 +53,7 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     List<CRolePostVO> findJobByRoleId(@Param("id") String id);
 
-    List<UserVO2> findAllUserByCondition(@Param("Values") FindAllUserByConditionDTO values);
+    List<UserVO2> findAllUserByCondition(IPage page, @Param("Values") FindAllUserByConditionDTO values);
 
     List<User> findUserListByCondition(IPage page, @Param("Values") FindAllUserByConditionDTO values);
 

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

@@ -128,4 +128,6 @@ public interface WbsTreeMapper extends BaseMapper<WbsTree> {
     void updateSortById(String id, Integer sort);
 
     int deleteLogicByWbsId(String ids);
+
+    int updateIsExistFormById(Long id);
 }

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

@@ -31,6 +31,7 @@
         <result column="major_data_type" property="majorDataType"/>
         <result column="init_table_name" property="initTableName"/>
         <result column="is_link_table" property="isLinkTable"/>
+        <result column="is_exist_form" property="isExistForm"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap" type="org.springblade.manager.vo.TreeNodeVO">
@@ -43,6 +44,7 @@
         <result column="type" property="type"/>
         <result column="deptCategory" property="deptCategory"/>
         <result column="wbsType" property="wbsType"/>
+        <result column="isExistForm" property="isExistForm"/>
     </resultMap>
 
     <resultMap id="selectByNodeTableMap" type="org.springblade.manager.vo.WbsNodeTableVO">
@@ -147,13 +149,17 @@
     <update id="deleteLogicByWbsId">
         update m_wbs_tree set is_deleted = 1 where wbs_id = #{ids} and status = 1
     </update>
+    <update id="updateIsExistFormById">
+        UPDATE m_wbs_tree SET is_exist_form = 1 WHERE id = #{id} AND status = 1 AND is_deleted = 0
+    </update>
 
     <select id="selectWbsTreePage" resultMap="wbsTreeResultMap">
         select * from m_wbs_tree where is_deleted = 0
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
-        select id, parent_id, dept_name as title,type as "type", id as "value", id as "key",
+        select id, parent_id, dept_name as title,type as "type", id as "value", id as "key", dept_category as
+        "deptCategory",is_exist_form AS "isExistForm",
         (select wbs_type from m_wbs_info where id = #{wbsId}) as "wbsType"
         from m_wbs_tree where
         is_deleted = 0
@@ -175,6 +181,7 @@
         SELECT
         dept.type AS "type",
         dept.dept_category AS "deptCategory",
+        dept.is_exist_form AS "isExistForm",
         dept.table_type,
         dept.id,
         dept.parent_id,

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

@@ -54,6 +54,7 @@
         <result column="wbsType" property="wbsType"/>
         <result column="primaryKeyId" property="primaryKeyId"/>
         <result column="deptCategory" property="deptCategory"/>
+        <result column="isExistForm" property="isExistForm"/>
     </resultMap>
     <insert id="insertCombination1">
         INSERT INTO m_wbs_tree_private(
@@ -224,6 +225,7 @@
     <select id="tree" resultMap="treeNodeResultMap">
         select p_key_id as "primaryKeyId",
         id, parent_id, dept_name as title,type as "type", id as "value", id as "key" ,
+        dept_category AS "deptCategory", is_exist_form AS "isExistForm",
         (select wbs_type from m_wbs_info where id = #{wbsId}) as "wbsType"
         from m_wbs_tree_private
         where

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

@@ -46,7 +46,7 @@ public interface IContractInfoService extends BaseService<ContractInfo> {
 
     List<CRolePostVO> findJobByRoleId(String id);
 
-    List<UserVO2> findAllUserByCondition(FindAllUserByConditionDTO values);
+    IPage<UserVO2> findAllUserByCondition(IPage<UserVO2> page, FindAllUserByConditionDTO values);
 
     IPage<User> findUserListByCondition(IPage<User> page, FindAllUserByConditionDTO values);
 

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

@@ -25,6 +25,7 @@ import org.springblade.manager.dto.WbsFormElementDTO2;
 import org.springblade.manager.entity.WbsFormElement;
 import org.springblade.manager.excel.WbsFormElementExcel;
 import org.springblade.manager.vo.WbsFormElementVO;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -58,4 +59,5 @@ public interface IWbsFormElementService extends BaseService<WbsFormElement> {
 
     boolean wbsTreeTableSort(List<WbsFormElementDTO2> wbsTreeDTO);
 
+    boolean importWbsTreeTableAndForm(MultipartFile excelFile, String nodeId);
 }

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

@@ -81,8 +81,9 @@ public class ContractInfoServiceImpl
     }
 
     @Override
-    public List<UserVO2> findAllUserByCondition(FindAllUserByConditionDTO values) {
-        return contractInfoMapper.findAllUserByCondition(values);
+    public IPage<UserVO2> findAllUserByCondition(IPage<UserVO2> page, FindAllUserByConditionDTO values) {
+        List<UserVO2> list = contractInfoMapper.findAllUserByCondition(page, values);
+        return page.setRecords(list);
     }
 
     @Override

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

@@ -25,14 +25,18 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.manager.dto.WbsFormElementDTO2;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.WbsFormElement;
+import org.springblade.manager.excel.WbsExcelUtil;
 import org.springblade.manager.excel.WbsFormElementExcel;
 import org.springblade.manager.mapper.WbsFormElementMapper;
 import org.springblade.manager.service.IWbsFormElementService;
 import org.springblade.manager.vo.WbsFormElementVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -287,4 +291,16 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
         }
         return true;
     }
+
+    @Override
+    public boolean importWbsTreeTableAndForm(MultipartFile excelFile, String nodeId) {
+        //解析excel TODO
+        try {
+            File convert = WbsExcelUtil.convert(excelFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return false;
+    }
 }

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

@@ -133,12 +133,12 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             dept.setTenantId(parent.getTenantId());
             String ancestors = parent.getAncestors() + StringPool.COMMA + dept.getParentId();
             dept.setAncestors(ancestors);
+            //设置表示该父节点下存在表单
+            baseMapper.updateIsExistFormById(parent.getId());
         }
         //设置类型默认值为 '2' 表单
         dept.setType(2);
-
         dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-
         return saveOrUpdate(dept);
     }
 
@@ -534,6 +534,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
         //创建元素表
         boolean b1 = submit2(formElementDTO);
+
         List<WbsFormElement> elementList = formElementDTO.getElementList();
         int i = 1;
         for (WbsFormElement wbsFormElement : elementList) {