计量相关

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

@@ -2,6 +2,8 @@ package org.springblade.manager.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.math.BigDecimal;
 
 /**
@@ -10,8 +12,8 @@ import java.math.BigDecimal;
  * @description 基础信息
  */
 @Data
-public class BaseInfo {
-    public static final String ID="89963247815";
+public class BaseInfo  {
+    public static final String ID="20100000000";
     public static final String TBN="BSI";
     public static final String TBN_CH="合同信息";
     /**项目名称*/

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

@@ -12,7 +12,7 @@ import java.time.LocalDate;
  */
 @Data
 public class MeterPeriodInfo {
-    public static final String ID="87963214698";
+    public static final String ID="20200000000";
     /**计量期信息表名*/
     public static final String TBN="MPI";
     public static final String TBN_CH="开工材料计量期";

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

@@ -0,0 +1,18 @@
+package org.springblade.manager.vo;
+
+/**
+ * @author yangyj
+ * @Date 2023/12/29 16:30
+ * @description 选项模型-计量
+ */
+public class SelectorModel {
+    public static final String NODE_NAME="模型数据";
+    public  static final Long ID=20000000000L;
+    public  static final Long P_ID=12345678910L;
+    public Long getParentId(){
+        return ID;
+    }
+    public String getNodeName(){
+        return NODE_NAME;
+    }
+}

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

@@ -34,4 +34,6 @@ public class WbsFormElementVO extends WbsFormElement {
      * 是否保存业务时间 '0'否 '1'是
      */
     private Integer isBussTime;
+    /*是否包含节点公式*/
+    private Boolean hasPartFormula;
 }

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

@@ -614,8 +614,8 @@ public class WbsTreePrivateController extends BladeController {
             @ApiImplicitParam(name = "parentId", value = "父级id", required = true),
             @ApiImplicitParam(name = "titleName", value = "搜索关键字", required = true)
     })
-    public R<IPage<TreeNodeVOByTabType>> tabTypeLazyTreeAll(Long parentId, BladeUser bladeUser, String titleName, Query query) {
-        IPage<TreeNodeVOByTabType> page = wbsTreePrivateService.tabTypeLazyTreeAll(Condition.getPage(query), parentId, titleName);
+    public R<IPage<TreeNodeVOByTabType>> tabTypeLazyTreeAll(Long parentId, BladeUser bladeUser, String titleName, Query query,Boolean hasPartFormula) {
+        IPage<TreeNodeVOByTabType> page = wbsTreePrivateService.tabTypeLazyTreeAll(Condition.getPage(query), parentId, titleName,hasPartFormula);
         return R.data(page);
     }
 

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

@@ -32,7 +32,7 @@ public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
     IPage<TreeNodeVOByTabType> tabTypeLazyTree(IPage<TreeNodeVOByTabType> page, Long parentId, String projectId, String titleName);
 
     // 元素
-    IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName);
+    IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName,Boolean hasPartFormula);
 
     List<WbsTreePrivateDTO2> findWbsTreePrivateSameLevel(String projectId, String parentId, String wbsId);
 

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

@@ -1871,6 +1871,11 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         return Collections.emptyList();
     }
 
+    /*获取*/
+    private void listForMeter(Long projectId,Long pkeyId){
+
+    }
+
 
     private List<Map<String,Object>>   listMap(List<Long> ids,ExecuteType type){
         String pkIds=ids.stream().map(String::valueOf).collect(Collectors.joining(","));

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

@@ -45,6 +45,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -219,19 +220,25 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     }
 
     @Override
-    public IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName) {
+    public IPage<TreeNodeVOByTabType> tabTypeLazyTreeAll(IPage<TreeNodeVOByTabType> page, Long parentId, String titleName, Boolean hasPartFormula) {
         boolean base=false;
+        if(hasPartFormula==null){
+            hasPartFormula=true;
+        }
         if ((parentId + "").equals("12345678910")) {
             page.setSize(100);
             base=true;
         }
         List<TreeNodeVOByTabType>data ;
-        if("2222236".equals(parentId+"")){
+        if(SelectorModel.ID.equals(parentId)){
              data =this.baseList();
         }else{
              data= baseMapper.tabTypeLazyTreeAll(page, parentId, titleName);
         }
         addBase(data,base);
+        if(base&&!hasPartFormula){
+            data.removeIf(e->e.getId()!=20&&!e.getId().equals(SelectorModel.ID));
+        }
         return page.setRecords(data);
     }
 
@@ -239,10 +246,10 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
     public void addBase(List<TreeNodeVOByTabType> data,Boolean base){
         if(base){
             TreeNodeVOByTabType baseInfo = new TreeNodeVOByTabType();
-            baseInfo.setTitle("基础信息");
-            baseInfo.setPrimaryKeyId("BASIN");
-            baseInfo.setParentId(12345678910L);
-            baseInfo.setId(2222236L);
+            baseInfo.setTitle(SelectorModel.NODE_NAME);
+            /*baseInfo.setPrimaryKeyId("BASIN");*/
+            baseInfo.setParentId(SelectorModel.P_ID);
+            baseInfo.setId(SelectorModel.ID);
             baseInfo.setHasChildren(true);
             data.add(baseInfo);
         }
@@ -254,8 +261,8 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return titleMap.entrySet().stream().map(kv->{
             TreeNodeVOByTabType tn = new TreeNodeVOByTabType();
             tn.setTitle(kv.getKey());
-            tn.setTabType("基础信息");
-            tn.setParentId(2222236L);
+            tn.setTabType(SelectorModel.NODE_NAME);
+            tn.setParentId(SelectorModel.ID);
             tn.setId(Long.parseLong(kv.getValue()[1]));
             tn.setPrimaryKeyId(kv.getValue()[1]);
             tn.setInitTableId(kv.getValue()[1]);
@@ -2415,6 +2422,14 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
         return true;
     }
 
+    public Boolean hasPart(String id){
+        if(Func.isNotBlank(id)) {
+            List<Map<String,Object>> mapList =this.jdbcTemplate.queryForList("select a.id from m_wbs_tree a join m_wbs_info b on a.wbs_id=b.id where a.id="+id+"  and b.wbs_type=3  union  select p_key_id from m_wbs_tree_private where p_key_id ="+id+" and wbs_type =3");
+            return mapList.size()==0;
+        }
+        return true;
+    }
+
     /**
      * 修改initTableId
      */

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

@@ -704,10 +704,12 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         if (Func.isEmpty(wbsFormElements)) {
             wbsFormElements = wbsTreeMapper.selectFormElements4TableId(id);
         }
+        Boolean hp=this.wbsTreePrivateService.hasPart(id);
         wbsFormElements.forEach(elements -> {
             String eAllowDeviation = elements.getEAllowDeviation();
             //转义
             String escapeChar = getEscapeChar(eAllowDeviation);
+            elements.setHasPartFormula(hp);
             if (escapeChar != null) {
                 elements.setEAllowDeviation(escapeChar);
             }