更改需求

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

@@ -1,12 +1,15 @@
 knife4j:
   cloud:
     routes:
+      - name: 用户管理
+        uri: 127.0.0.1
+        location: /blade-user/v2/api-docs
       - name: 授权模块
         uri: 127.0.0.1
         location: /blade-auth/v2/api-docs
-#      - name: 工作台模块
-#        uri: 127.0.0.1
-#        location: /blade-desk/v2/api-docs
+      #      - name: 工作台模块
+      #        uri: 127.0.0.1
+      #        location: /blade-desk/v2/api-docs
       - name: 系统模块
         uri: 127.0.0.1
         location: /blade-system/v2/api-docs

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

@@ -1,7 +1,6 @@
 package org.springblade.manager.entity;
 
 
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -56,14 +55,28 @@ public class WbsFormElement extends BaseEntity {
     /**
      * 允许偏差值
      */
-    @ApiModelProperty(value = "允许偏差值", required = true)
+    @ApiModelProperty(value = "允许偏差值")
     @JsonProperty(value = "eAllowDeviation")
     private String eAllowDeviation;
 
     /**
      * 检查方法
      */
-    @ApiModelProperty(value = "检查方法", required = true)
+    @ApiModelProperty(value = "检查方法")
     @JsonProperty(value = "eInspectionMethod")
     private String eInspectionMethod;
+
+    /**
+     * 计算公式
+     */
+    @ApiModelProperty(value = "计算公式")
+    @JsonProperty(value = "calculationFormula")
+    private String calculationFormula;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    @JsonProperty(value = "remark")
+    private String remark;
 }

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

@@ -0,0 +1,42 @@
+package org.springblade.manager.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SaveUserInfoByProjectVO2 implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @JsonProperty(value = "id")
+    private Long id;
+
+    /**
+     * 项目id
+     */
+    @JsonProperty(value = "projectName")
+    private String projectName;
+
+    /**
+     * 合同id
+     */
+    @JsonProperty(value = "contractName")
+    private String contractName;
+
+    /**
+     * 角色名
+     */
+    @JsonProperty(value = "roleName")
+    private String roleName;
+
+    /**
+     * 角色类型
+     */
+    @JsonProperty(value = "roleType")
+    private String roleType;
+
+}

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -17,6 +17,7 @@
 package org.springblade.system.user.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
@@ -103,11 +104,13 @@ public class User extends TenantEntity {
     /**
      * 单位名称
      */
+    @ApiModelProperty(value = "单位名称")
     private String companyName;
 
     /**
      * 职位
      */
+    @ApiModelProperty(value = "职位")
     private String position;
 
 }

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

@@ -250,8 +250,8 @@ public class ProjectInfoController extends BladeController {
     @GetMapping("/findProjectAndContractList")
     @ApiOperationSupport(order = 12)
     @ApiOperation(value = "根据用户id查询项目合同岗位列表信息", notes = "传入用户id")
-    public R<List<SaveUserInfoByProjectVO>> findProjectAndContractList(Long userId) {
-        List<SaveUserInfoByProjectVO> result = wbsTreeService.findProjectAndContractList(userId);
+    public R<List<SaveUserInfoByProjectVO2>> findProjectAndContractList(Long userId) {
+        List<SaveUserInfoByProjectVO2> result = wbsTreeService.findProjectAndContractList(userId);
         return R.data(result);
     }
 }

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

@@ -37,6 +37,7 @@ 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.WbsFormElementVO;
 import org.springblade.manager.vo.WbsTreeVO;
 import org.springblade.manager.wrapper.WbsFormElementWrapper;
 import org.springblade.manager.wrapper.WbsTreeWrapper;
@@ -73,15 +74,14 @@ public class WbsFormElementController extends BladeController {
     @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));
+    public R<WbsFormElementVO> detail(WbsFormElement wbsFormElement) {
+        WbsFormElement detail = wbsFormElementService.getDetailById(wbsFormElement);
         if (detail != null) {
             return R.data(WbsFormElementWrapper.build().entityVO(detail));
         }
         return R.fail(200, "未查询到信息");
     }
 
-
     /**
      * 新增或同步 wbs表单元素
      */

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

@@ -58,4 +58,6 @@ public interface WbsFormElementMapper extends BaseMapper<WbsFormElement> {
     List<WbsFormElementDTO2> selectWbsTreeTableListByParentId(String parentId);
 
     void updateSortById(String id, Integer sort);
+
+    WbsFormElementVO selectDetailById(Long id);
 }

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

@@ -19,6 +19,8 @@
         <result column="e_length" property="eLength"/>
         <result column="e_allow_deviation" property="eAllowDeviation"/>
         <result column="e_inspection_method" property="eInspectionMethod"/>
+        <result column="calculation_formula" property="calculationFormula"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
 
@@ -67,5 +69,11 @@
         AND type = 2
         ORDER BY sort
     </select>
+    <select id="selectDetailById" resultType="org.springblade.manager.vo.WbsFormElementVO">
+        SELECT
+        *,
+        (SELECT concat(dept_name,"_",t.e_name) FROM m_wbs_tree WHERE id = t.f_id) AS "tableElementKey"
+        FROM m_wbs_form_element t WHERE t.id = #{id} AND status = 1 AND is_deleted = 0
+    </select>
 
 </mapper>

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

@@ -23,10 +23,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.WbsFormElement;
 import org.springblade.manager.entity.WbsTree;
-import org.springblade.manager.vo.SaveUserInfoByProjectVO;
-import org.springblade.manager.vo.WbsFormElementVO;
-import org.springblade.manager.vo.WbsNodeTableVO;
-import org.springblade.manager.vo.WbsTreeVO;
+import org.springblade.manager.vo.*;
 
 import java.util.List;
 
@@ -121,7 +118,7 @@ public interface WbsTreeMapper extends BaseMapper<WbsTree> {
 
     int updateByCondition(@Param("id") Long id, @Param("wbsName") String wbsName, @Param("status") Integer status);
 
-    List<SaveUserInfoByProjectVO> selectListByUserId(Long userId);
+    List<SaveUserInfoByProjectVO2> selectListByUserId(Long userId);
 
     List<WbsTreeDTO2> selectWbsTreeListByParentId(String parentId);
 

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

@@ -279,15 +279,16 @@
         AND type = 1
     </select>
 
-    <select id="selectListByUserId" resultType="org.springblade.manager.vo.SaveUserInfoByProjectVO">
+    <select id="selectListByUserId" resultType="org.springblade.manager.vo.SaveUserInfoByProjectVO2">
         SELECT
-            pi.project_name as "projectName"
+            mpau.id AS "id"
+            ,pi.project_name as "projectName"
             ,ci.contract_name as "contractName"
-            ,p.category as "postType"
-            ,p.post_name as "postName"
+            ,(SELECT role_name  FROM blade_role WHERE id = r.parent_id  ) as "roleType"
+            ,r.role_name as "roleName"
         FROM
             m_project_assignment_user mpau
-        INNER JOIN blade_post p ON p.id = mpau.post_id
+        INNER JOIN blade_role r ON r.id = mpau.role_id
         INNER JOIN m_contract_info ci ON ci.id = mpau.contract_id
         INNER JOIN m_project_info pi ON pi.id = mpau.project_id
         WHERE mpau.is_deleted = 0 AND mpau.`status` = 1

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

@@ -60,4 +60,7 @@ public interface IWbsFormElementService extends BaseService<WbsFormElement> {
     boolean wbsTreeTableSort(List<WbsFormElementDTO2> wbsTreeDTO);
 
     boolean importWbsTreeTableAndForm(MultipartFile excelFile, String nodeId);
+
+    WbsFormElementVO getDetailById(WbsFormElement wbsFormElement);
+
 }

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

@@ -101,7 +101,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     List<WbsTree> findByWbsTreeNode(String ids);
 
-    List<SaveUserInfoByProjectVO> findProjectAndContractList(Long userId);
+    List<SaveUserInfoByProjectVO2> findProjectAndContractList(Long userId);
 
     List<WbsTreeDTO2> findWbsTreeSameLevel(String parentId);
 

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

@@ -39,6 +39,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * wbs表单元素 服务实现类
@@ -294,13 +295,30 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
 
     @Override
     public boolean importWbsTreeTableAndForm(MultipartFile excelFile, String nodeId) {
-        //解析excel TODO
         try {
-            File convert = WbsExcelUtil.convert(excelFile);
+            //解析excel
+            File file = WbsExcelUtil.convert(excelFile);
+            String canonicalPath = file.getCanonicalPath();
+            WbsExcelUtil excelUtil = new WbsExcelUtil();
+            ArrayList<Map<String, String>> result = excelUtil.readExcelToObj(canonicalPath);
+            for (Map<String, String> map : result) {
+                map.forEach((nodeType, nodeName) -> {
+                    //TODO
+
+
+                });
+            }
+
         } catch (IOException e) {
             e.printStackTrace();
         }
 
         return false;
     }
+
+    @Override
+    public WbsFormElementVO getDetailById(WbsFormElement wbsFormElement) {
+        WbsFormElementVO detail = baseMapper.selectDetailById(wbsFormElement.getId());
+        return detail;
+    }
 }

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

@@ -282,8 +282,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<SaveUserInfoByProjectVO> findProjectAndContractList(Long userId) {
-        List<SaveUserInfoByProjectVO> list = baseMapper.selectListByUserId(userId);
+    public List<SaveUserInfoByProjectVO2> findProjectAndContractList(Long userId) {
+        List<SaveUserInfoByProjectVO2> list = baseMapper.selectListByUserId(userId);
         return list;
     }
 

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -21,10 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.CacheNames;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -71,6 +68,7 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 @RestController
 @RequestMapping
 @AllArgsConstructor
+@Api(value = "用户管理", tags = "用户管理接口")
 public class UserController {
 
     private final IUserService userService;