元素表填报率

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

@@ -27,4 +27,9 @@ public class WbsTreePrivateDTO3 implements Serializable {
      * 表单所属方
      */
     private String tableOwner;
+
+    /**
+     * 填报率
+     */
+    private String fillRate;
 }

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

@@ -152,4 +152,11 @@ public class WbsTree extends BaseEntity {
      */
     @ApiModelProperty(value = "状态")
     private Integer status;
+
+    /**
+     * 填报率百分比
+     */
+    @ApiModelProperty(value = "填报率百分比")
+    private String fillRate;
+
 }

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

@@ -220,4 +220,10 @@ public class WbsTreeContract extends BaseEntity {
     @ApiModelProperty(value = "type=2，映射私有pKeyId")
     private Long isTypePrivatePid;
 
+    /**
+     * 填报率百分比
+     */
+    @ApiModelProperty(value = "填报率百分比")
+    private String fillRate;
+
 }

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

@@ -164,4 +164,10 @@ public class WbsTreePrivate extends BaseEntity {
     @ApiModelProperty(value = "htmlURL")
     private String htmlUrl;
 
+    /**
+     * 填报率百分比
+     */
+    @ApiModelProperty(value = "填报率百分比")
+    private String fillRate;
+
 }

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

@@ -79,4 +79,9 @@ public class WbsNodeTableVO implements Serializable {
      */
     private String parentId;
 
+    /**
+     * 填报率
+     */
+    private String fillRate;
+
 }

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

@@ -324,16 +324,13 @@ public class WbsTreeController extends BladeController {
     @ApiOperation(value = "批量修改节点下元素表基本信息", notes = "传入List<WbsTree>")
     @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTree> WbsTrees) {
-        WbsTrees.forEach(wbsTree -> {
-            wbsTree.setFullName(wbsTree.getNodeName());
-        });
         return R.status(wbsTreeService.updateBatchById(WbsTrees));
     }
 
     /**
      * 查询公有wbs节点元素表与节点参数
      */
-    @ApiOperationSupport(order = 12)
+    @ApiOperationSupport(order = 18)
     @ApiOperation(value = "查询公有wbs节点元素表与节点参数", notes = "传入父节点id")
     @RequestMapping(value = "/getNodeTabAndParam", method = RequestMethod.GET)
     public R<WbsNodeTabAndParamVO> getNodeTabAndParam(@ApiParam(value = "父节点id", required = true) @RequestParam String id) {

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

@@ -73,6 +73,7 @@
         <result column="initTableName" property="initTableName"/>
         <result column="sort" property="sort"/>
         <result column="pKeyId" property="pKeyId"/>
+        <result column="fillRate" property="fillRate"/>
     </resultMap>
 
     <resultMap id="wbsFormElementMap" type="org.springblade.manager.vo.WbsFormElementVO">
@@ -320,6 +321,7 @@
             wt.init_table_name as "initTableName",
             wt.parent_id AS "parentId",
             wt.wbs_id AS "wbsId",
+            wt.fill_rate AS "fillRate",
             (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id and is_deleted = 0 and status = 1) AS "elementTotal"
         FROM
             m_wbs_tree AS wt

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

@@ -194,7 +194,8 @@
         SET node_name   = #{wbsTreePrivates.nodeName},
             full_name   =#{wbsTreePrivates.nodeName},
             table_type  = #{wbsTreePrivates.tableType},
-            table_owner = #{wbsTreePrivates.tableOwner}
+            table_owner = #{wbsTreePrivates.tableOwner},
+            fill_rate = #{wbsTreePrivates.fillRate}
         WHERE p_key_id = #{wbsTreePrivates.pKeyId}
     </update>
 
@@ -208,6 +209,7 @@
         partition_code = #{wbsTree.partitionCode},
         table_type = #{wbsTree.tableType},
         table_owner = #{wbsTree.tableOwner}
+        fill_rate = #{wbsTree.fillRate}
         <if test="wbsTree.sort != null and wbsTree.sort != ''">
             , sort = #{wbsTree.sort}
         </if>
@@ -227,6 +229,7 @@
         partition_code = #{wbsTreePrivate.partitionCode},
         table_type = #{wbsTreePrivate.tableType},
         table_owner = #{wbsTreePrivate.tableOwner}
+        fill_rate = #{wbsTreePrivate.fillRate}
         <if test="wbsTreePrivate.sort != null and wbsTreePrivate.sort != ''">
             , sort = #{wbsTreePrivate.sort}
         </if>
@@ -249,6 +252,7 @@
                 partition_code = #{item.partitionCode},
                 table_type = #{item.tableType},
                 table_owner = #{item.tableOwner}
+                fill_rate = #{item.fillRate}
             </set>
             WHERE id = #{item.id}
             AND project_id = #{item.projectId}
@@ -374,17 +378,18 @@
           AND project_id = #{projectId}
     </select>
     <select id="selectByNodeTable" resultType="org.springblade.manager.vo.WbsNodeTableVO">
-        SELECT wt.p_key_id                                                  AS "pKeyId",
-               wt.id                                                        AS id,
-               wt.node_name                                                 AS tableName,
-               wt.table_type                                                AS tableType,
-               wt.`status`                                                  AS isCreateTable,
-               wt.table_owner                                               as tableOwner,
+        SELECT wt.p_key_id AS "pKeyId",
+               wt.id AS id,
+               wt.node_name AS tableName,
+               wt.table_type AS tableType,
+               wt.`status` AS isCreateTable,
+               wt.table_owner AS tableOwner,
                wt.is_link_table,
                wt.init_table_name,
-               wt.excel_id                                                  as excelId,
+               wt.excel_id AS excelId,
                wt.sort,
                wt.status,
+               wt.fill_rate AS "fillRate",
                (SELECT count(1) FROM m_wbs_form_element WHERE f_id = wt.id) AS "elementTotal"
         FROM m_wbs_tree_private AS wt
         WHERE wt.type = 2

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

@@ -650,7 +650,9 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             //初始化否存在表单
             wbsTreeMapper.updateIsExistFormById(parent.getId());
         }
-
+        if (StringUtils.isEmpty(dept.getFillRate())){
+            dept.setFillRate("80%");
+        }
         dept.setType(2);
         dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
         dept.setNodeType(1);

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

@@ -163,6 +163,10 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             fd.setAncestors(ancestors);
             baseMapper.updateIsExistFormById(parent.getId());
         }
+        if (StringUtils.isEmpty(fd.getFillRate())) {
+            fd.setFillRate("80%");
+        }
+
         fd.setType(2);
         fd.setIsDeleted(BladeConstant.DB_NOT_DELETED);
 
@@ -212,7 +216,9 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                 String initTableName = "m_" + DateUtil.time() + "_" + id;
                 wbsTree.setInitTableName(initTableName);
                 wbsTree.setId(id);
-
+                if (StringUtils.isEmpty(wbsTree.getFillRate())) {
+                    wbsTree.setFillRate("80%");
+                }
                 //新增表单
                 boolean b = submit3(wbsTree);
 
@@ -1202,6 +1208,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreePrivate.setUpdateUser(wbsTree.getUpdateUser());
         wbsTreePrivate.setCreateUser(wbsTree.getCreateUser());
         wbsTreePrivate.setCreateDept(wbsTree.getCreateDept());
+        wbsTreePrivate.setFillRate(wbsTree.getFillRate());
 
         return wbsTreePrivate;
     }
@@ -1245,6 +1252,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         //引用私有wbs,同步清表id
         wbsTreePrivate.setExcelId(wbsTree.getExcelId());
 
+        wbsTreePrivate.setFillRate(wbsTree.getFillRate());
+
         return wbsTreePrivate;
     }
 
@@ -1262,7 +1271,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreeContract.setAncestors(wbsTree.getAncestors());
         wbsTreeContract.setNodeName(wbsTree.getNodeName());
         wbsTreeContract.setNodeType(wbsTree.getNodeType());
-        wbsTreeContract.setFullName(wbsTree.getNodeName());
+        wbsTreeContract.setFullName(wbsTree.getFullName());
         wbsTreeContract.setSort(wbsTree.getSort());
         wbsTreeContract.setRemark(wbsTree.getRemark());
         wbsTreeContract.setType(wbsTree.getType());
@@ -1287,6 +1296,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         wbsTreeContract.setCreateUser(wbsTree.getCreateUser());
         wbsTreeContract.setCreateDept(wbsTree.getCreateDept());
 
+        wbsTreeContract.setFillRate(wbsTree.getFillRate());
+
         if (wbsTree.getType() == 2) {
             wbsTreeContract.setIsTypePrivatePid(wbsTree.getPKeyId());
         }