Merge remote-tracking branch 'origin/master' into master

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/TextdictInfoController.java

@@ -239,11 +239,13 @@ public class TextdictInfoController extends BladeController {
 			element.children().get(0).attr("@focus","getInformation("+oncklickText+")");
 			element.children().get(0).attr("@change","datePickerChange($event,'"+keyname+"')");
 		}else if(textdictInfo.getTextId().equals("img")){
-			element.empty().append("<el-upload :disabled='formUploadLoading' v-loading='formUploadLoading' element-loading-text='上传中...' :on-progress='uploadprogress' @exceed='formUploadExceed' :on-error='formUploadError' placeholder="+placeholder+" v-model="+vmode+" keyname="+keyname+" weighing="+weighing+"  class='hc-upload-table-form' action='/api/blade-resource/oss/endpoint/put-file' trIndex="+trindex+" tdIndex="+tdindex+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"  accept='image/png,image/jpg,image/jpeg' :headers='getTokenHeader' :show-file-list='false' > <img v-if='"+vmode+"' :src="+vmode+" class='hc-table-form-img' /> <div class='hc-table-form-icon' v-else> 点此选择文件并上传 </div> <div v-if="+vmode+" class='hc-table-form-del' >" +
+			/*element.empty().append("<el-upload :disabled='formUploadLoading' v-loading='formUploadLoading' element-loading-text='上传中...' :on-progress='uploadprogress' @exceed='formUploadExceed' :on-error='formUploadError' placeholder="+placeholder+" v-model="+vmode+" keyname="+keyname+" weighing="+weighing+"  class='hc-upload-table-form' action='/api/blade-resource/oss/endpoint/put-file' trIndex="+trindex+" tdIndex="+tdindex+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"  accept='image/png,image/jpg,image/jpeg' :headers='getTokenHeader' :show-file-list='false' > <img v-if='"+vmode+"' :src="+vmode+" class='hc-table-form-img' /> <div class='hc-table-form-icon' v-else> 点此选择文件并上传 </div> <div v-if="+vmode+" class='hc-table-form-del' >" +
 					"        <el-button type='danger'"+ " plain @click.stop=delTableFormFile('"+keyname+"')>删除当前文件</el-button> " +
-					"    </div></el-upload>");
+					"    </div></el-upload>");*/
 
-			element.children().get(0).attr("@success","formUploadSuccess($event,'"+keyname+"')");
+			element.empty().append("<HcTableFormUpload :src='"+vmode+"' placeholder="+placeholder+" v-model="+vmode+"  keyName="+keyname+" weighing="+weighing+"  @success='formUploadSuccess' @del='delTableFormFile' trIndex="+trindex+" tdIndex="+tdindex+"  x1="+x1+" x2="+x2+" y1="+y1+" y2="+y2+"/>");
+
+			//element.children().get(0);
 			element.attr("@focus","getInformation("+oncklickText+")");
 			element.attr("tabindex","-1");
 		}
@@ -259,10 +261,6 @@ public class TextdictInfoController extends BladeController {
 			String clarSql = "update  "+tabName+" set "+keyname.split("__")[0]+"=null where p_key_id in(SELECT p_key_id FROM m_wbs_tree_contract WHERE id ='"+wbsTreePrivate.getId()+"' and project_id='"+wbsTreePrivate.getProjectId()+"' )";
 			jdbcTemplate.execute(clarSql);
 		}
-
-
-
-
 		return R.success("操作成功");
 	}
 
@@ -312,7 +310,7 @@ public class TextdictInfoController extends BladeController {
 			textdictInfo.setIsDeleted(0);
 			textdictInfoService.saveOrUpdate(textdictInfo);
 			element.attr("dqId",textdictInfo.getId()+"");
-			element.children().get(0).attr("readonly");
+			element.children().get(0).attr("readonly",true);
 		}
 
 		// 写入 excel

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) {
@@ -341,6 +338,16 @@ public class WbsTreeController extends BladeController {
         return R.data(rs);
     }
 
+    /**
+     * 新增或修改节点别名
+     */
+    @ApiOperationSupport(order = 19)
+    @ApiOperation(value = "新增或修改节点别名", notes = "传入节点id、fullNames")
+    @RequestMapping(value = "/submit-full-name", method = RequestMethod.POST)
+    public R submitFullName(@RequestParam String id,@RequestParam String fullNames) {
+        return R.status(wbsTreeService.submitFullName(id,fullNames));
+    }
+
 
 }
 

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

@@ -378,5 +378,15 @@ public class WbsTreePrivateController extends BladeController {
         return R.data(rs);
     }
 
+    /**
+     * 新增或修改节点别名
+     */
+    @ApiOperationSupport(order = 13)
+    @ApiOperation(value = "新增或修改节点别名", notes = "传入节点pKeyId、fullNames")
+    @RequestMapping(value = "/submit-full-name", method = RequestMethod.POST)
+    public R submitFullName(@RequestParam String pKeyId,@RequestParam String fullNames) {
+        return R.status(wbsTreePrivateService.submitFullName(pKeyId,fullNames));
+    }
+
 
 }

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

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="selectTextdictInfoPage" resultMap="textdictInfoResultMap">
-        select * from m_textdict_info where is_deleted = 0 and type =#{param2.type}
+        select * from m_textdict_info where is_deleted = 0 and type =#{param2.type} and tab_id=#{param2.tabId}
     </select>
 
 </mapper>

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/IWbsTreePrivateService.java

@@ -43,4 +43,6 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
 
     WbsNodeTabAndParamVO getNodeTabAndParam(String id, String wbsId, String projectId);
 
+    boolean submitFullName(String pKeyId, String fullNames);
+
 }

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

@@ -66,4 +66,6 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     WbsNodeTabAndParamVO getNodeTabAndParam(String id);
 
+    boolean submitFullName(String id, String fullNames);
+
 }

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/WbsTreePrivateServiceImpl.java

@@ -413,4 +413,16 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return resultList;
     }
 
+    @Override
+    public boolean submitFullName(String pKeyId, String fullNames) {
+        if (StringUtils.isNotEmpty(pKeyId)) {
+            LambdaUpdateWrapper<WbsTreePrivate> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(WbsTreePrivate::getPKeyId, pKeyId);
+            updateWrapper.set(WbsTreePrivate::getFullName, fullNames);
+            baseMapper.update(null, updateWrapper);
+            return true;
+        }
+        return false;
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -163,6 +164,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 +217,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);
 
@@ -289,6 +296,18 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return result;
     }
 
+    @Override
+    public boolean submitFullName(String id, String fullNames) {
+        if (StringUtils.isNotEmpty(id)) {
+            LambdaUpdateWrapper<WbsTree> updateWrapper = new LambdaUpdateWrapper<WbsTree>();
+            updateWrapper.set(WbsTree::getFullName, fullNames);
+            updateWrapper.eq(WbsTree::getId, id);
+            baseMapper.update(null, updateWrapper);
+            return true;
+        }
+        return false;
+    }
+
     private Boolean initTable(String tableName) {
         Integer row = baseMapper.createTable(tableName);
         if (row >= 0) {
@@ -1202,6 +1221,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 +1265,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         //引用私有wbs,同步清表id
         wbsTreePrivate.setExcelId(wbsTree.getExcelId());
 
+        wbsTreePrivate.setFillRate(wbsTree.getFillRate());
+
         return wbsTreePrivate;
     }
 
@@ -1262,7 +1284,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 +1309,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());
         }