Merge remote-tracking branch 'origin/master'

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/ImageClassificationFileDTO.java

@@ -16,9 +16,9 @@
  */
 package org.springblade.business.dto;
 
-import org.springblade.business.entity.ImageClassificationFile;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.business.entity.ImageClassificationFile;
 
 /**
  * 数据传输对象实体类
@@ -31,4 +31,11 @@ import lombok.EqualsAndHashCode;
 public class ImageClassificationFileDTO extends ImageClassificationFile {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 存储目录格式
+     * 1-目录存储，2-时间存储
+     * (通过classifyId 关联 m_image_classification_config 这张表主键可得到)
+     */
+    private Integer storageDirectoryFormat;
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java

@@ -283,4 +283,36 @@ public class ArchiveFile extends BaseEntity {
      */
     @ApiModelProperty("类型，1施工 2监理")
     private Integer classify;
+
+    /**
+     * m_wbs_tree_contract表中的主键,p_key_id
+     */
+    @ApiModelProperty("m_wbs_tree_contract表中的主键,p_key_id")
+    private Long mWbsTreeContractPKeyId;
+
+    /**
+     * u_image_classification_file_id表中的主键id
+     */
+    @ApiModelProperty("u_image_classification_file_id表中的主键id")
+    private Long uImageClassificationFileId;
+
+    /**
+     * 归档文件储存类型,可看代码枚举
+     * @StorageTypeEnum
+     */
+    @ApiModelProperty("归档文件储存类型")
+    private Integer archiveFileStorageType;
+
+    /**
+     * 节点树结构，1-普通树，2-时间树
+     * 正常都是1， 2是为了区分声像文件的两个树形结构下的文件
+     */
+    @ApiModelProperty("节点树结构，1-普通树，2-时间树")
+    private Integer nodeTreeStructure;
+
+    /**
+     * 文件时间名称，可用于确定时间树节点的id
+     */
+    @ApiModelProperty("文件时间名称，可用于确定时间树节点的id")
+    private String dateName;
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ImageClassificationFile.java

@@ -127,4 +127,13 @@ public class ImageClassificationFile extends BaseEntity {
     @ApiModelProperty("合并后的PDF")
     private String margePdfUrl;
 
+    @ApiModelProperty("图片或视频的水平分辨率")
+    private Integer fileWidth;
+
+    @ApiModelProperty("图片或视频的垂直分辨率")
+    private Integer fileHeight;
+
+    @ApiModelProperty("文件页数")
+    private Integer filePage;
+
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -150,4 +150,9 @@ public interface ArchiveFileClient {
     @PostMapping(API_PREFIX + "/updateById2")
     void updateById2(@RequestBody ArchiveFile archiveFile);
 
+    /**
+     * 根据合同Id和储存类型查询集合
+     */
+    @PostMapping(API_PREFIX + "/getListByContractIdAndArchiveFileStorageType")
+    List<ArchiveFile> getListByContractIdAndArchiveFileStorageType(@RequestParam Long contractId,@RequestParam Integer getListByContractIdAndArchiveFileStorageType);
 }

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ImageClassificationFileClient.java

@@ -0,0 +1,28 @@
+package org.springblade.business.feign;
+
+import org.springblade.business.dto.ImageClassificationFileDTO;
+import org.springblade.common.constant.BusinessConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author xingqianji
+ */
+@FeignClient(value = BusinessConstant.APPLICATION_WEATHER_NAME)
+public interface ImageClassificationFileClient {
+
+    /**
+     * 接口前缀
+     */
+    String API_PREFIX = "/api/business/imageClassificationFile";
+
+    /**
+     * 根据合同段id查询声像文件
+     */
+    @PostMapping(API_PREFIX + "/getImageClassificationFileListByContractId")
+    List<ImageClassificationFileDTO> getImageClassificationFileListByContractId(@RequestBody Long contractId);
+
+}

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/TreeVoTwo.java

@@ -0,0 +1,29 @@
+package org.springblade.business.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class TreeVoTwo {
+
+    private String name;
+
+    private String hierarchy;
+
+    private Long parentId;
+
+    private List<TreeVoTwo> children = new ArrayList<>();
+
+    public TreeVoTwo(String name, List<TreeVoTwo> children, String hierarchy, Long parentId) {
+        this.name = name;
+        this.children = children;
+        this.parentId = parentId;
+        this.hierarchy = hierarchy;
+    }
+
+    public TreeVoTwo() {
+    }
+
+}

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

@@ -9,6 +9,7 @@ import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.entity.Formula;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -256,19 +257,23 @@ public class FormData {
         }
     }
 
+
+    private Function<List<ElementData>,String> valueFc=l->l.stream().map(ElementData::stringValue).collect(Collectors.joining(StringPool.COMMA));
+    /*用于比较元素内容是否更新*/
     public boolean hasChange(){
         if(this.values!=null&&this.initial!=null) {
             if (this.values.size() != this.initial.size()) {
                 return true;
             } else if (this.values.size() > 0) {
-                String sa = this.values.stream().map(ElementData::stringValue).collect(Collectors.joining());
-                String sc = this.initial.stream().map(ElementData::stringValue).collect(Collectors.joining());
-                return sa.equals(sc);
+                String sa =valueFc.apply(this.values);
+                String sc =valueFc.apply(this.initial);
+                return !sa.equals(sc);
             }
         }
         return false;
     }
 
+
     /*是否是测量业务数据*/
     public boolean isContent(){
         return this.structure==1;

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

@@ -233,6 +233,13 @@ public class ArchiveTreeContract extends BaseEntity {
     @ApiModelProperty(value = "专家名称，逗号分隔")
     private String expertName;
 
+    /**
+     * 树结构
+     * 正常都是1，数据库默认保存也是1
+     * 2是因为，声像文件那里，有根据时间树形结构来展示的树
+     */
+    @ApiModelProperty(value = "树结构，1-正常树，2-时间树")
+    private Integer treeStructure;
 
     public ArchiveTreeContract() {
     }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/enums/AssociationTypeEnum.java

@@ -0,0 +1,48 @@
+package org.springblade.manager.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springblade.core.tool.utils.ObjectUtil;
+
+/**
+ * 关联类型枚举
+ * @author xingqianji
+ */
+@Getter
+@AllArgsConstructor
+public enum AssociationTypeEnum {
+
+    UNKNOWN(-1, ""),
+    QUALITY_INSPECTION_DATA(1, "质检资料"),
+    TRIAL_DATA(2, "试验资料"),
+    SOUND_IMAGE_DATA(3, "影像资料"),
+    LEDGER_DATA(4, "台账资料"),
+    FIRST_ARTICLE_DATA(5, "首件资料"),
+    LOG_FILE(6, "日志文件");
+
+    /**
+     * 编码
+     */
+    private Integer code;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 根据编码获取枚举描述
+     */
+    public static String getByCode(int code) {
+        // 判断code
+        if(ObjectUtil.isNotEmpty(code)){
+            for (AssociationTypeEnum storageTypeEnum : AssociationTypeEnum.values()) {
+                if (storageTypeEnum.getCode() == code) {
+                    return storageTypeEnum.getDesc();
+                }
+            }
+        }
+        return AssociationTypeEnum.UNKNOWN.getDesc();
+    }
+
+}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/enums/TreeStructureEnum.java

@@ -0,0 +1,27 @@
+package org.springblade.manager.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 树形结构枚举
+ * @author xingqianji
+ */
+@Getter
+@AllArgsConstructor
+public enum TreeStructureEnum {
+
+    ORDINARY_TREE(1, "普通树形"),
+    DATE_TREE(2, "时间树形");
+
+    /**
+     * 编码
+     */
+    private Integer code;
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+}

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

@@ -0,0 +1,79 @@
+package org.springblade.manager.vo;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.springblade.core.tool.utils.Func;
+
+import javax.validation.constraints.Size;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yangyj
+ * @Date 2024/1/23 14:05
+ * @description TODO
+ */
+@Data
+public class FormulaVo {
+    private Long id;
+    private String rely;
+    private String formula;
+    private String formulaParse;
+    private String number;
+    private Integer orderNum;
+    private String remark;
+    @JsonIgnore
+    private String map;
+    private Integer scale;
+    private Integer batch;
+    /**
+     * 输出模式，0自动 1填充
+     */
+    private Integer outm;
+    /**
+     * 关联的节点参数id
+     */
+    private Long paramId;
+    /**
+     * 偏差范围
+     */
+    private String dev;
+    /**
+     * 版本号
+     */
+    private Integer ver;
+
+
+    public List<String> getRelyList() {
+        if (Func.isNotBlank(rely)) {
+            return Arrays.asList(rely.split(","));
+        } else {
+            return null;
+        }
+    }
+
+
+    public JSONObject getJson() {
+        JSONObject jsonObject =JSON.parseObject(map);
+        String devStr = jsonObject.getString("deviationRangeJson");
+        if(devStr!=null&&devStr.length()>2){
+            jsonObject.fluentPut("deviationRangeJson",JSON.parseObject(devStr));
+        }
+        return jsonObject;
+    }
+
+    public void setFormulaParse(Map<String,String> dict) {
+        if(Func.isNotEmpty(rely)){
+            String f = getFormula();
+            for(String key:getRelyList()){
+                if(dict.containsKey(key)) {
+                    f = f.replace(key, dict.get(key));
+                }
+            }
+            this.formulaParse = f;
+        }
+    }
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -31,6 +31,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.oss.model.BladeFile;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.IoUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
@@ -49,6 +50,7 @@ import org.springblade.resource.vo.NewBladeFile;
 import org.springblade.system.entity.Dict;
 import org.springblade.system.feign.IDictClient;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -80,6 +82,7 @@ import static org.springblade.common.utils.CommonUtil.replaceOssUrl;
 @Api(tags = "影音资料接口（客户端）")
 public class ImageClassificationFileController extends BladeController {
 
+    @Autowired
     private final IImageClassificationFileService imageClassificationFileService;
 
     private final ImageClassificationShowService imageClassificationShowService;
@@ -160,7 +163,8 @@ public class ImageClassificationFileController extends BladeController {
         List<String> result = new ArrayList<>();
         if (excelTab != null) {
             //获取数据
-            List<ImageClassificationFile> fileResult = this.imageClassificationFileService.list(Wrappers.<ImageClassificationFile>lambdaQuery().in(ImageClassificationFile::getId, Arrays.asList(ids.split(","))));
+            List<String> strings = Arrays.asList(ids.split(","));
+            List<ImageClassificationFile> fileResult = this.imageClassificationFileService.list(Wrappers.<ImageClassificationFile>query().lambda().in(ImageClassificationFile::getId, strings));
 
             try {
                 if (fileResult != null && fileResult.size() > 0) {
@@ -609,8 +613,10 @@ public class ImageClassificationFileController extends BladeController {
     @ApiOperation(value = "修改影音资料信息", notes = "传入表单数据")
     public R<Boolean> update(@Valid @RequestBody ImageClassificationFileVO fileVO) {
         ImageClassificationFile newData = this.copyBeanData(fileVO, false);
-        newData.setMargePdfUrl("");
-        return R.data(this.imageClassificationFileService.updateById(newData));
+        boolean update = this.imageClassificationFileService.updateById(newData);
+        // 生成合并pdfUrl
+        generateMergePdfUrl(update, newData);
+        return R.data(update);
     }
 
     /**
@@ -637,8 +643,12 @@ public class ImageClassificationFileController extends BladeController {
             newFile.setClassifyId(fileVO.getClassifyId());
             newFile.setContractId(fileVO.getContractId());
             newFile.setProjectId(fileVO.getProjectId());
+            // 新增操作
+            boolean save = this.imageClassificationFileService.save(newFile);
+            // 生成合并pdfUrl
+            generateMergePdfUrl(save, newFile);
             //落库数据
-            return R.status(this.imageClassificationFileService.save(newFile));
+            return R.status(save);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -777,4 +787,30 @@ public class ImageClassificationFileController extends BladeController {
         return R.data(this.imageClassificationFileService.getFileTitleName(pKeyId));
     }
 
+    /**
+     * 生成合并PdfUrl
+     * 写这个方法是因为声像资料同步那边，一定要有可以预览的东西，
+     * 以前的逻辑是有前端点击查看按钮时，才会根据type等条件调用preview()这个方法
+     */
+    private void generateMergePdfUrl(Boolean flag, ImageClassificationFile newFile){
+        if(true){
+            // 文件类型为图片时
+            if(newFile.getType() == 2){
+                // 生成合并的pdfUrl
+                R<String> preview = preview(newFile.getId().toString());
+                if(preview.getCode() == ResultCode.SUCCESS.getCode()){
+                    // 获得合并后的pdfUrl
+                    /**后续要多注意preview()这个方法所返回回来的值，现在固定的返回集合中的第一个**/
+                    String data = preview.getData();
+                    // 获取pdf页码
+                    String pdfPage  = commonFileClient.getPdfNum(data);
+                    // 更新mergePdfUrl
+                    this.imageClassificationFileService.update(Wrappers.<ImageClassificationFile>lambdaUpdate()
+                            .set(ImageClassificationFile::getMargePdfUrl, preview.getData())
+                            .set(ImageClassificationFile::getFilePage, Integer.valueOf(pdfPage))
+                            .eq(ImageClassificationFile::getId, newFile.getId()));
+                }
+            }
+        }
+    }
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/WeatherController.java

@@ -47,7 +47,7 @@ public class WeatherController {
     //测试定时
     @GetMapping("/testTask")
     public void testTask() {
-        weatherInfoServiceImpl.syncHistoryWeatherInfo();
+        weatherInfoServiceImpl.scanMissWeather();
     }
 
     /**

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -17,6 +17,7 @@ import org.springblade.business.service.ITaskService;
 import org.springblade.business.vo.ArchiveFileVO;
 import org.springblade.common.utils.FileUtils;
 import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.enums.StorageTypeEnum;
 import org.springblade.manager.feign.ContractClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -322,4 +323,13 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
         iArchiveFileService.updateById(archiveFile);
     }
 
+    @Override
+    public List<ArchiveFile> getListByContractIdAndArchiveFileStorageType(Long contractId, Integer getListByContractIdAndArchiveFileStorageType) {
+        LambdaQueryWrapper<ArchiveFile> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(ArchiveFile::getContractId, contractId);
+        wrapper.eq(ArchiveFile::getIsDeleted, 0);
+        wrapper.eq(ArchiveFile::getArchiveFileStorageType, getListByContractIdAndArchiveFileStorageType);
+        return this.iArchiveFileService.list(wrapper);
+    }
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ImageClassificationFileClientImpl.java

@@ -0,0 +1,22 @@
+package org.springblade.business.feignClient;
+
+import lombok.AllArgsConstructor;
+import org.springblade.business.dto.ImageClassificationFileDTO;
+import org.springblade.business.feign.ImageClassificationFileClient;
+import org.springblade.business.mapper.ImageClassificationFileMapper;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+public class ImageClassificationFileClientImpl implements ImageClassificationFileClient {
+
+    private final ImageClassificationFileMapper imageClassificationFileMapper;
+
+    @Override
+    public List<ImageClassificationFileDTO> getImageClassificationFileListByContractId(Long contractId) {
+        return imageClassificationFileMapper.getImageClassificationFileListByContractId(contractId);
+    }
+
+}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -58,6 +58,8 @@
         <result column="pdf_page_url" property="pdfPageUrl"/>
         <result column="fid" property="fid"/>
         <result column="rectification" property="rectification"/>
+        <result column="m_wbs_tree_contract_p_key_id" property="mWbsTreeContractPKeyId"/>
+        <result column="u_image_classification_file_id" property="uImageClassificationFileId"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_archive_file set is_deleted = 0 where

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ImageClassificationFileMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.business.mapper;
 
+import org.springblade.business.dto.ImageClassificationFileDTO;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.ImageClassificationFile;
 import org.springblade.business.vo.ImageClassificationFileVO;
@@ -75,4 +76,9 @@ public interface ImageClassificationFileMapper extends BaseMapper<ImageClassific
      */
     public List<ImageClassificationFile> getDeleteDataByIds(@Param("ids") List<String> ids);
 
+    /**
+     * 根据合同段id查询声像文件
+     */
+    List<ImageClassificationFileDTO> getImageClassificationFileListByContractId(@Param("contractId") Long contractId);
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ImageClassificationFileMapper.xml

@@ -30,6 +30,9 @@
         <result column="text_content" property="textContent"/>
         <result column="pdf_url" property="pdfUrl"/>
         <result column="marge_pdf_url" property="margePdfUrl"/>
+        <result column="file_width" property="fileWidth"/>
+        <result column="file_height" property="fileHeight"/>
+        <result column="file_page" property="filePage"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_image_classification_file set is_deleted = 0 where
@@ -131,4 +134,46 @@
         </foreach>
     </select>
 
+    <!-- 根据合同段id查询声像文件 -->
+    <select id="getImageClassificationFileListByContractId" resultType="org.springblade.business.dto.ImageClassificationFileDTO">
+        select
+            u_image_classification_file.id,
+            u_image_classification_file.classify_id,
+            u_image_classification_file.project_id,
+            u_image_classification_file.contract_id,
+            u_image_classification_file.wbs_id,
+            u_image_classification_file.title,
+            u_image_classification_file.type,
+            u_image_classification_file.image_url,
+            u_image_classification_file.pdf_url,
+            u_image_classification_file.file_size,
+            u_image_classification_file.file_name,
+            u_image_classification_file.shooting_user,
+            u_image_classification_file.shooting_time,
+            u_image_classification_file.photo_code,
+            u_image_classification_file.film_code,
+            u_image_classification_file.see_also_code,
+            u_image_classification_file.text_content,
+            u_image_classification_file.create_user,
+            u_image_classification_file.create_dept,
+            u_image_classification_file.create_time,
+            u_image_classification_file.update_user,
+            u_image_classification_file.update_time,
+            u_image_classification_file.upload_time,
+            u_image_classification_file.marge_pdf_url,
+            u_image_classification_file.file_width,
+            u_image_classification_file.file_height,
+            u_image_classification_file.file_page,
+            m_image_classification_config.storage_directory_format
+        from
+            u_image_classification_file u_image_classification_file
+        left join
+            m_image_classification_config m_image_classification_config
+        on
+            u_image_classification_file.classify_id = m_image_classification_config.id
+        where
+            u_image_classification_file.contract_id = #{contractId}
+        and u_image_classification_file.is_deleted = 0
+    </select>
+
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/WeatherInfoMapper.java

@@ -1,9 +1,25 @@
 package org.springblade.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.business.entity.WeatherInfo;
+import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.entity.ProjectContractArea;
+import org.springblade.manager.vo.ContractInfoVO;
+
+import java.time.LocalDate;
+import java.util.List;
 
 public interface WeatherInfoMapper extends BaseMapper<WeatherInfo> {
 
 
+    ProjectContractArea selectAreaIdByContractId(@Param("contractId") Long contractId);
+
+    Integer deWeightWeather(@Param("ids") List<Long> ids);
+
+    List<Long> getRepetitionId(@Param("areaId") Long areaId);
+
+    List<LocalDate> getAllWeatherByAreaId(@Param("areaId") Long areaId);
+
+    List<ContractInfoVO> getAllContract();
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/WeatherInfoMapper.xml

@@ -20,5 +20,33 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
+    <delete id="deWeightWeather">
+        DELETE FROM u_weather_info
+        WHERE id in
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getRepetitionId" resultType="java.lang.Long">
+        select id
+        from u_weather_info WHERE contract_area_id = #{areaId}
+        group by DATE_FORMAT(record_time, '%Y-%m-%d')
+        HAVING COUNT(DATE_FORMAT(record_time, '%Y-%m-%d')) > 1
+    </select>
+    <select id="selectAreaIdByContractId" resultType="org.springblade.manager.entity.ProjectContractArea">
+        select * from m_project_contract_area where contract_id = #{contractId} and is_deleted = 0
+    </select>
+    <select id="getAllWeatherByAreaId" resultType="java.time.LocalDate">
+        select DATE_FORMAT(record_time, '%Y-%m-%d')
+        from u_weather_info WHERE contract_area_id = #{areaId}
+        order by DATE_FORMAT(record_time, '%Y-%m-%d')
+    </select>
+    <select id="getAllContract" resultType="org.springblade.manager.vo.ContractInfoVO">
+        select mpi.project_name as projectName,mci.*
+        from m_project_info mpi left join m_contract_info mci on mpi.id = mci.p_id
+        WHERE mpi.is_deleted = 0 and mci.is_deleted =0
+    </select>
+
 
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -2,12 +2,12 @@ package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hankcs.hanlp.dictionary.py.Pinyin;
 import com.hankcs.hanlp.dictionary.py.PinyinDictionary;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -20,22 +20,23 @@ import org.springblade.business.mapper.WeatherInfoMapper;
 import org.springblade.business.service.WeatherInfoService;
 //import org.springframework.scheduling.annotation.Scheduled;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ProjectContractArea;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.feign.ProjectClient;
 import org.springblade.manager.feign.ProjectContractAreaClient;
+import org.springblade.manager.vo.ContractInfoVO;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springblade.core.mp.support.Condition;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -232,6 +233,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
                             weatherMap = this.getWeather(county.toString(), plainTime.format(DateTimeFormatter.ofPattern("yyyyMM")));
                             if (weatherMap == null || weatherMap.get(plainTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"))) == null) {
                                 weatherMap = this.getWeather(city.toString(), plainTime.format(DateTimeFormatter.ofPattern("yyyyMM")));
+                                county = city;
                                 if (weatherMap == null || weatherMap.get(plainTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日"))) == null) {
                                     log.info("获取历史天气失败！contractAreaId：" + projectContractArea.getId() + "，syncTime：" + plainTime);
                                     break;
@@ -254,6 +256,133 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
 
     }
 
+    //去除重复天气，并填充每个合同段缺失的天气
+    @Scheduled(cron = "0 0 9 * * ?")
+    public void scanMissWeather(){
+        //获取所有项目的合同段
+        List<ContractInfoVO> contractInfos = baseMapper.getAllContract();
+        for (ContractInfoVO contract : contractInfos) {
+            //获取合同段的区域信息
+            ProjectContractArea area = baseMapper.selectAreaIdByContractId(contract.getId());
+            if (area == null || StringUtils.isBlank(area.getCounty()) || StringUtils.isBlank(area.getCity())){
+                continue;
+            }
+            List<Pinyin> py = PinyinDictionary.convertToPinyin(area.getCounty().substring(0, area.getCounty().length() - 1));
+            StringBuilder county = new StringBuilder();
+            for (int i = 0; i < py.size(); i++) {
+                county.append(py.get(i).getPinyinWithoutTone());
+            }
+            List<Pinyin> py2 = PinyinDictionary.convertToPinyin(area.getCity().substring(0, area.getCity().length() - 1));
+            StringBuilder city = new StringBuilder();
+            for (int i = 0; i < py2.size(); i++) {
+                city.append(py2.get(i).getPinyinWithoutTone());
+            }
+            //获取当前合同下所有重复的天气id,根据区域id
+            List<Long> ids = new ArrayList<>();
+            ids = baseMapper.getRepetitionId(area.getId());
+            while (ids.size() > 0){
+                //为单个合同段去除重复天气,根据天气id集合
+                System.out.println(contract.getProjectName()+":"+contract.getContractName()+"重复日期："+ids.size()+"条");
+                Integer total = baseMapper.deWeightWeather(ids);
+                System.out.println(contract.getProjectName()+":"+contract.getContractName()+"删除重复日期："+total+"条");
+                ids = baseMapper.getRepetitionId(area.getId());
+            }
+
+            //补全缺失的天气
+            List<LocalDate> missDate = new ArrayList<>();
+            //获取当前合同段所有天气,并且按照日期排序
+            List<LocalDate> allDate = baseMapper.getAllWeatherByAreaId(area.getId());
+            //如果没有获取到天气则直接跳过
+            if (allDate.size() == 0){
+                continue;
+            }
+            //判断最小日期是否小于当前日期
+            if (LocalDate.now().compareTo(allDate.get(0)) < 1){
+                continue;
+            }
+            //循环结合，遗漏日期添加进集合
+            for (int i = 0; i < allDate.size()-1; i++) {
+                LocalDate today = allDate.get(i);
+                LocalDate tomorrow = allDate.get(i+1);
+                while (!today.plusDays(1).equals(tomorrow)){
+                    missDate.add(today.plusDays(1));
+                    today = today.plusDays(1);
+                }
+            }
+            //判断是否有遗漏
+            if (missDate.size() == 0){
+                continue;
+            }
+            Map<String, Map<String, String>> weatherMap = null;
+            List<WeatherInfo> list = new ArrayList<>();
+            ZoneId zone = ZoneId.systemDefault();
+            //遗漏日期根据年月分组
+            Map<String, List<LocalDate>> map = missDate.stream().collect(Collectors.groupingBy(l -> l.format(DateTimeFormatter.ofPattern("yyyyMM"))));
+            for (String s : map.keySet()) {
+                //获取整月天气
+                weatherMap = this.getWeather(county.toString(), s);
+                if (weatherMap == null || weatherMap.size() == 0) {
+                    weatherMap = this.getWeather(city.toString(), s);
+                    county = city;
+                    if (weatherMap == null || weatherMap.size() == 0) {
+                        log.info("获取历史天气失败：" + area.getCity()+"-"+area.getCounty() + "，syncTime：" + s);
+                        break;
+                    }
+                }
+                //为遗漏日期设置天气
+                List<LocalDate> dates = map.get(s);
+                for (LocalDate date : dates) {
+                    Map<String, String> day = weatherMap.get(date.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")));
+                    if (day == null || day.size() == 0){
+                        log.info("从整月天气中获取当天失败：" + area.getCity()+"-"+area.getCounty() + "，syncTime：" + date);
+                    }
+                    //计算平均气温
+                    BigDecimal aver = (new BigDecimal(day.get("high")).add(new BigDecimal(day.get("low")))).divide(new BigDecimal("2"), 1, BigDecimal.ROUND_HALF_UP);
+                    WeatherInfo newWeather = new WeatherInfo(String.valueOf(area.getId()), day.get("weather"), aver.toString(), day.get("high"), day.get("low"), day.get("windLevel"));
+                    newWeather.setRecordTime(Date.from(date.atStartOfDay().atZone(zone).toInstant()));
+                    list.add(newWeather);
+                }
+
+            }
+            //保存进天气表
+            this.saveBatch(list);
+        }
+
+        System.out.println("同步天气完成");
+
+    }
+    //测试循环
+    public void test7(){
+        List<LocalDate> missDate = new ArrayList<>();
+        //获取当前合同段所有天气,并且按照日期排序
+        List<LocalDate> allDate = baseMapper.getAllWeatherByAreaId(1697501022614122498L);
+        //如果没有获取到天气则直接跳过
+        if (allDate.size() == 0){
+            System.out.println("111");
+        }
+        //判断最小日期是否小于当前日期
+        if (LocalDate.now().compareTo(allDate.get(0)) < 1){
+            System.out.println(222);
+        }
+        //循环结合，遗漏日期添加进集合
+        for (int i = 0; i < allDate.size()-1; i++) {
+            LocalDate today = allDate.get(i).plusDays(1);
+            LocalDate tomorrow = allDate.get(i+1);
+            while (!today.equals(tomorrow)){
+                if (today.compareTo(tomorrow) == 1){
+                    System.out.println(today);
+                }
+                missDate.add(today);
+                today = today.plusDays(1);
+            }
+        }
+        //判断是否有遗漏
+        if (missDate.size() == 0){
+            System.out.println(88888);
+        }
+        System.out.println("9999");
+    }
+
     public Map<String, Map<String, String>> getWeather(String city, String month) {
         String html = "http://www.tianqihoubao.com/lishi/" + city + "/month/" + month + ".html";
         Map<String, Map<String, String>> map = new HashMap<>();
@@ -261,7 +390,8 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
         try {
             System.out.println(html);
             Connection connect = Jsoup.connect(html);
-            connect.timeout(20000);
+            connect.timeout(10000);
+            connect.userAgent("Chrome");
             document = connect.get();
             Element body = document.body();
             Elements table = body.getElementsByTag("table");
@@ -285,6 +415,8 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+
         }
         return map;
     }

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

@@ -506,6 +506,20 @@ public class ArchiveTreeContractController extends BladeController {
         return R.data(archiveTreeContractService.startInspect(projectId,type));
     }
 
-
-
+    @PostMapping("syncSoundImageData")
+    @ApiOperation(value = "同步合同段声像文件", notes = "传入当前节点id")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "projectId", value = "项目id", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "contractId", value = "合同段id", required = true, dataType = "Long"),
+            @ApiImplicitParam(name = "nodeId", value = "当前节点id", required = true, dataType = "Long"),
+    })
+    public R syncSoundImageData(Long projectId, Long contractId, Long nodeId) {
+        R returnObject = R.success("同步合同段声像文件完成" );
+        try {
+            archiveTreeContractSync.syncSoundImageData(projectId,contractId, nodeId);
+        }catch (Exception e) {
+            returnObject = R.fail(e.getMessage());
+        }
+        return returnObject;
+    }
 }

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

@@ -1901,6 +1901,7 @@ public class ExcelTabController extends BladeController {
         List<TableInfo> tableInfoList = this.excelTabService.getTableInfoList(dataArray);
         long start = System.currentTimeMillis();
         if (tableInfoList != null) {
+            tableInfoList.forEach(e->{e.setToBeUpdated(true);});
             tableAll = wbsTreeContractService.searchNodeAllTable(nodeId, "1", contractId, projectId, null);
             doForTableIst(tableAll,tableInfoList);
           /*  List<Long> tableAllIds = tableAll.stream().map(AppWbsTreeContractVO::getPKeyId).collect(Collectors.toList());
@@ -1935,6 +1936,10 @@ public class ExcelTabController extends BladeController {
         System.out.println("加载所有表单数据耗时："+(System.currentTimeMillis()-start));
         //公式填充
         this.excelTabService.formulaFillData(tableInfoList, Long.parseLong(nodeId), ExecuteType.INSPECTION);
+        assert tableInfoList != null;
+        if(tableInfoList.size()==0){
+            R.success("数据未发生变化");
+        }
         //保存数据到数据库
         R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
         if (!result.isSuccess()) {

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

@@ -38,10 +38,12 @@ import org.springblade.manager.vo.CurrentNode;
 import org.springblade.manager.wrapper.FormulaWrapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.http.HttpRequest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotNull;
 import java.io.FileNotFoundException;
 import java.net.UnknownHostException;
@@ -570,83 +572,7 @@ public class FormulaController {
         return R.data(map);
     }
 
-  /*  public R<Object> chartInit(@RequestBody ChartOption option){
-        *//*1.获取公式配置，如果存在子公式，则一直查找到最终公式*//*
-        *//*2.查找所有依赖元素的所有数据，按表单排序*//*
-        *//*3.计算结果*//*
-        *//*4.查找当前表对应返回配置模版结合计算结果生成option*//*
-        Long pkeyId=option.getPkeyId();
-        String id=option.getId();
-        WbsTreePrivate wtp = this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getPKeyId,pkeyId));
-        if(wtp!=null&&Func.isNotEmpty(id)){
-            *//*获取配置*//*
-            List<Map<String,Object>> listMap= this.jdbcTemplate.queryForList("select content from m_formula_panel  a  join m_wbs_tree_private b on a.id=b.init_table_id where b.p_key_id="+pkeyId);
-            if(Func.isNotEmpty(listMap)){
-                JSONObject job = JSON.parseObject(listMap.get(0).get("content").toString());
-                *//*获取关联数据*//*
-                List<Map<String,Object>>  configList= this.jdbcTemplate.queryForList("select d.rely ,b.e_key ekey from m_wbs_tree_private a join  m_wbs_form_element b on a.init_table_id=b.f_id join m_element_formula_mapping c on b.id=c.element_id join m_formula d on c.formula_id=d.id  where p_key_id="+wtp.getPKeyId()+" and b.is_deleted=0 and  d.formula like 'FC.chart%' limit 1");
-                if(Func.isNotEmpty(configList)){
-                    Map<String,Object> config =configList.get(0);
-                    String[] rely = Func.toStr(config.get("rely")).split(",");
-                    String ky=rely[0].split(":")[1];
-                    String kx=rely[1].split(":")[1];
-                    Map<String,Map<String,Object>> formMap = option.getData();
-                    List<Map<String,Object>> dataMap;
-                    if(formMap!=null&&formMap.size()>0){
-                        dataMap=new ArrayList<>();
-                        Map<String,Object> md= new HashMap<>();
-                        dataMap.add(md);
-                        StringBuilder sy= new StringBuilder();
-                        StringBuilder sx = new StringBuilder();
-                        formMap.forEach((o,t)->{
-                            t.forEach((k,v)->{
-                                String[] ka=k.split("__");
-                                if(ky.equals(ka[0])){
-                                    sy.append(v).append("_^_").append(ka[1]).append("☆");
-                                }else if(kx.equals(ka[0])){
-                                    sx.append(v).append("_^_").append(ka[1]).append("☆");
-                                }
-                            });
-                        });
-                        if(sy.length()>1){
-                            sy.deleteCharAt(sy.length()-1);
-                        }
-                        if(sx.length()>1){
-                            sx.deleteCharAt(sx.length()-1);
-                        }
-                        md.put(ky,sy.toString());
-                        md.put(kx,sx.toString());
-                    }else{
-                        dataMap= this.jdbcTemplate.queryForList("select "+ky+","+kx+" from "+wtp.getInitTableName() +" where group_id="+id+" and p_key_id ="+pkeyId);
-                    }
-                    if(Func.isNotEmpty(dataMap)){
-                        Map<String,Object> data = dataMap.get(0);
-                        String dy= Func.toStr(data.get(ky));
-                        String dx=Func.toStr(data.get(kx));
-                        if(dy.length()>0&&dx.length()>0){
-                            Map<String,String> coordsMap = FormulaUtils.getElementCell(wtp.getHtmlUrl());
-                            List<ElementData> ly = FormulaUtils.getElementDataList(coordsMap.get(ky),dy);
-                            List<ElementData> lx = FormulaUtils.getElementDataList(coordsMap.get(kx),dx);
-                            JSONArray jsonArray =new JSONArray();
-                            for(int i=0;i< Math.min(ly.size(),lx.size());i++){
-                                ElementData edy= ly.get(i);
-                                ElementData edx = lx.get(i);
-                                if(StringUtils.isNotEmpty(edy.stringValue(),edx.stringValue())){
-                                    jsonArray.add(new JSONArray().fluentAdd(edx.numberValue()).fluentAdd(edy.numberValue()));;
-                                }
-                            }
-                            if(!jsonArray.isEmpty()){
-                                JSONObject chartData= job.getJSONArray("series").getJSONObject(0);
-                                chartData.put("data",jsonArray);
-                            }
-                        }
-                    }
-                    return R.data(job);
-                }
-            }
-        }
-        return R.data("{}");
-    }*/
+
     @PostMapping("/chart-init")
     @ApiOperationSupport(order = 11)
     public R<Object> chartInit(@RequestBody ChartOption option){
@@ -862,6 +788,7 @@ public class FormulaController {
         return R.fail("失败");
     }
 
+    /*按项目向m_wbs_tree_contract刷入is_type_private_pid字段*/
     @GetMapping("/ref")
     public R<Object> ref(Long projectId) {
         if(!StringUtils.isNumber(projectId)){
@@ -938,6 +865,12 @@ public class FormulaController {
          return this.service.evaluate(tablePkeyId);
     }
 
+    /*根据p_key_id 获取各个元素的执行公式*/
+    @GetMapping("/formulaForNode")
+    public R<Object> formulaForNode(@NotNull Long pkeyId,String tableName,String elementName){
+        return R.data(this.service.formulasForNode(pkeyId,tableName, elementName));
+    }
+
     @GetMapping("/test")
     public R<Object> meter(Long contractId,Long periodId ,Integer type){
         /* public  List<ReportResult> execute3(Long contractId,Long periodId ,Integer type)*/
@@ -946,4 +879,5 @@ public class FormulaController {
 
 
 
+
 }

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

@@ -489,7 +489,7 @@ public class WbsParamController {
     @GetMapping("/file-title")
     public R<Object> ref(Long projectId) {
         if (StringUtils.isNumber(projectId)) {
-            String sql ="select a.id, a.wbs_id pkeyId  from u_information_query a  join m_wbs_tree_contract b on a.wbs_id=b.p_Key_id where a.name='还未配置提名规则' and a.project_id=?";
+            String sql ="select a.id, b.p_key_id pkeyId  from u_information_query a  join m_wbs_tree_contract b on a.wbs_id=b.p_Key_id where a.name='还未配置提名规则' and a.project_id=?";
             List<Map<String,Object>> listMaps=this.jdbcTemplate.queryForList(sql,projectId);
             if(listMaps.size()>0){
                 List<Long> pkeyIds= listMaps.stream().map(m->Long.parseLong(m.get("pkeyId").toString())).distinct().collect(Collectors.toList());

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

@@ -226,7 +226,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
 
     public void c8103(List<TurnPoint> data,List<NodeTable> nodeTableList,TableElementConverter tec){
         nodeTableList.stream().filter(e-> "m_20220928163111_1575040410223378432".equals(e.getInitTableName())).findFirst().ifPresent(t->{
-            List<FormData> fds= tec.formDataMap.values().stream().filter(k-> "m_20220928163111_1575040410223378432".equals(k.getTableName())&&k.getCoordsList().size()>1).collect(Collectors.toList());
+            List<FormData> fds= tec.formDataMap.values().stream().filter(k-> ("m_20220928163111_1575040410223378432".equals(k.getTableName()))&&k.getCoordsList().size()>1).collect(Collectors.toList());
             /*[{"key":"#2","m":"垫石编号"},{"key":"#3","m":"顶面高程设计"},{"key":"#4","m":"顶面高程实测"},{"key":"#5","m":"顶面高程偏差"},{"key":"#6","m":"顶面四角高差实测"}]*/
             FormData dsbh=null,dmgcsj=null, dmgcsc=null,dmgcpc=null,sjgcsc=null;
             for(FormData u:fds){
@@ -263,6 +263,7 @@ public class FormulaTurnPoint implements FormulaStrategy {
                 Map<Integer,List<Object>> group=tmpList.stream().collect(Collectors.groupingBy(e->ai.getAndIncrement()%fda.length));
                 for(int i=0;i<fda.length;i++){
                     FormData fd= fda[i];
+                    if(fd==null)continue;
                     FormulaUtils.write(fd,group.get(i),true);
                     fd.setUpdate(1);
                 }

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

@@ -375,6 +375,8 @@ public class TableElementConverter implements ITableElementConverter {
             /*这个方法的核心就是把fds的数据按照既定格式(key_xxx_val_y_x)回写到tableInfo,对fds进行tableName分组,非空循环写人*/
             LinkedHashMap<String, List<KeyMapper>> tabs = keyMappers.stream().collect(Collectors.groupingBy(KeyMapper::getCode, LinkedHashMap::new, Collectors.toList()));
             List<FormData> updateList = formDataMap.values().stream().filter(e -> e.getUpdate() == 1 && e.isCurrentNodeElement).collect(Collectors.toList());
+            /*再次核对是否已经被修改*/
+            updateList=updateList.stream().filter(FormData::hasChange).collect(Collectors.toList());
             if (Func.isNotEmpty(updateList)) {
                 for (FormData fd : updateList) {
                     if (fd.getUpdate().equals(1)) {
@@ -405,6 +407,8 @@ public class TableElementConverter implements ITableElementConverter {
             } else {
                 log.put(FormulaLog.OTHER,"公式未插入或者修改任何数据");
             }
+            /*删除无需更新的表*/
+            tableInfoList.removeIf(e->!e.isToBeUpdated());
         }
     }
     public class AfterB implements Converter{

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

@@ -131,4 +131,19 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
     List<MyInspectTreeVO> MyLazyTree(@Param("parentId") Long parentId,@Param("projectId") Long projectId,@Param("userId") Long userId);
 
     ArchiveExpertConclusion getNewTable(@Param("projectId") Long projectId);
+
+    /**
+     * 批量添加归档合同树
+     */
+    int batchInsertArchiveTreeContract(@Param("list") List<ArchiveTreeContract> list);
+
+    /**
+     * 批量删除归档合同树
+     */
+    int batchDeleteArchiveTreeContractByIdList(@Param("ids") List<Long> ids, @Param("isDeleted") Integer isDeleted);
+
+    /**
+     * 批量修改归档树
+     */
+    int batchUpdateArchiveTreeContract(@Param("list") List<Map> list);
 }

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

@@ -189,7 +189,7 @@
         SELECT
         d.id,
         d.parent_id,
-        d.node_name AS title,
+        IFNULL(if(length(trim(d.full_name))>0,d.full_name,d.node_name),d.node_name)AS title,
         d.id AS "value",
         d.id AS "key",
         d.major_data_type AS "majorDataType",
@@ -699,4 +699,50 @@
 <!--          and contract_id = #{contractId} and is_deleted = 0;-->
 <!--    </select>-->
 
+    <!-- 批量添加归档合同树 -->
+    <insert id="batchInsertArchiveTreeContract" parameterType="java.util.List">
+        INSERT INTO m_archive_tree_contract (id, tenant_id, project_id, contract_id, parent_id, ancestors, node_name,
+        full_name, tree_code, ext_type, ext_id, ext_key_id, ext_attach_id, sort, status, is_deleted, from_id, node_type,
+        is_storage_node, post_type, major_data_type, project_type, storage_type, create_user, create_dept, create_time, tree_structure)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.id}, #{item.tenantId}, #{item.projectId}, #{item.contractId}, #{item.parentId},#{item.ancestors},
+            #{item.nodeName},#{item.fullName},#{item.treeCode},#{item.extType},#{item.extId},#{item.extKeyId},#{item.extAttachId},
+            #{item.sort},#{item.status},#{item.isDeleted},#{item.fromId},#{item.nodeType},#{item.isStorageNode},#{item.postType},#{item.majorDataType}
+            ,#{item.projectType},#{item.storageType},#{item.createUser},#{item.createDept},#{item.createTime}, #{item.treeStructure})
+        </foreach>
+    </insert>
+
+    <!-- 批量删除归档合同树 -->
+    <update id="batchDeleteArchiveTreeContractByIdList">
+        update
+            m_archive_tree_contract
+        set
+            is_deleted = #{isDeleted},
+            update_time = NOW()
+        where
+            id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <!-- 批量修改归档树 -->
+    <update id="batchUpdateArchiveTreeContract">
+        <foreach collection="list" item="item" index="index" separator=";">
+            update
+                m_archive_tree_contract
+            <set>
+                parent_id = #{item.parentId},
+                ancestors = #{item.ancestors},
+                node_name = #{item.nodeName},
+                node_type = #{item.nodeType},
+                full_name = #{item.fullName},
+                tree_structure = #{item.treeStructure},
+                update_time = NOW()
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
+
 </mapper>

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

@@ -460,6 +460,7 @@
         d.parent_id AS "parentId",
         IFNULL(if(length(trim(full_name)) > 0, full_name, node_name),node_name) AS title,
         d.node_name AS "nodeName",
+        d.full_name AS "fullName",
         d.node_type ,
         d.id AS "value",
         d.id AS "key",

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

@@ -89,7 +89,8 @@ public interface IFormulaService extends BaseService<Formula> {
     R<Object> evaluate(Long pkeyId);
     /**获取当前节点的参数wbsNodeId:WBS级id ,wtpPkeyId:项目级PkeyId*/
     List<WbsParam> getNodeWps(Long wbsNodeId,Long wtpPkeyId);
-    /*计量公式执行 0中间，1材料，2开工*/
+    /**计量公式执行 0中间，1材料，2开工*/
     List<ReportResult> execute3(Long contractId, Long periodId, Integer type);
 
+    R<Object>formulasForNode(Long pkeyId,String tableName,String elementName);
 }

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

@@ -1,35 +1,48 @@
 package org.springblade.manager.service.impl;
 
+import com.alibaba.nacos.common.utils.DateFormatUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.protobuf.ServiceException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.feign.ArchiveAutoClient;
+import org.springblade.business.dto.ImageClassificationFileDTO;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.InformationQuery;
 import org.springblade.business.feign.ArchiveFileClient;
+import org.springblade.business.feign.ImageClassificationFileClient;
 import org.springblade.business.feign.InformationQueryClient;
+import org.springblade.business.vo.TreeVoTwo;
+import org.springblade.common.utils.ForestNodeMergerEx;
+import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ContractRelationJlyz;
 import org.springblade.manager.entity.ProjectInfo;
-import org.springblade.manager.feign.ContractClient;
+import org.springblade.manager.enums.StorageTypeEnum;
+import org.springblade.manager.enums.TreeStructureEnum;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IContractInfoService;
 import org.springblade.manager.service.IProjectInfoService;
-import org.springblade.common.utils.ForestNodeMergerEx;
-import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.utils.ForestNodeMerger;
+import org.springblade.manager.utils.YearTreeUtils;
+import org.springblade.manager.vo.ArchiveTreeContractVO;
 import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.manager.vo.ArchiveTreeVO2;
 import org.springblade.manager.vo.WbsTreeContractVO6;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -55,6 +68,7 @@ public class ArchiveTreeContractSyncImpl {
 
     private final ArchiveAutoClient archiveAutoClient;
 
+    private final ImageClassificationFileClient imageClassificationFileClient;
 
     /**
      * 普通同步
@@ -620,10 +634,10 @@ public class ArchiveTreeContractSyncImpl {
 
     public List<ArchiveTreeContract>  getArchiveTreeContractsWbs(Long contractId,Long attachId,Integer classify) {
 
-        List<ArchiveTreeContract> archiveTreeContracts = 	archiveTreeContractMapper.selectList(Wrappers.<ArchiveTreeContract>query().lambda()
+        List<ArchiveTreeContract> archiveTreeContracts = archiveTreeContractMapper.selectList(Wrappers.<ArchiveTreeContract>query().lambda()
                 .eq(ArchiveTreeContract::getContractId, contractId)
                 .eq(ArchiveTreeContract::getExtAttachId, attachId)
-                .eq(ArchiveTreeContract::getClassify, classify)
+                .eq(ObjectUtil.isNotEmpty(classify), ArchiveTreeContract::getClassify, classify)
                 .eq(ArchiveTreeContract::getExtType, 1));
         return archiveTreeContracts;
 
@@ -738,5 +752,697 @@ public class ArchiveTreeContractSyncImpl {
         return groupedFiles;
     }
 
+    /**
+     * 同步合同段声像文件
+     */
+    public void syncSoundImageData(Long projectId, Long contractId, Long nodeId) throws ServiceException {
+        // 合同信息
+        ContractInfo contractInfo = contractInfoService.getById(contractId);
+        // 判断是否正在同步
+        Integer isArchivesAuto = contractInfo.getIsArchivesAuto();
+        if(ObjectUtil.isNotEmpty(isArchivesAuto) && isArchivesAuto != 0) {
+            throw new ServiceException("当前合同段已经在同步中,请耐心等待");
+        }
+        // 判断节点存储类型是否为声像
+        ArchiveTreeContract archiveTreeContract = archiveTreeContractMapper.selectById(nodeId);
+        if(archiveTreeContract != null) {
+            if(!archiveTreeContract.getStorageType().equals(StorageTypeEnum.SOUND_IMAGE.getCode())){
+                throw new ServiceException("当前节点存储类型不是声像,无法同步声像文件");
+            }
+        }else{
+            throw new ServiceException("当前节点不存在,同步失败");
+        }
+        log.info("开始自动组卷...." + contractId);
+        //设置自动组卷中
+        contractInfoService.updateIsArchivesAutoById(contractId,1);
+        try {
+            // 同步文件
+            syncSoundImageData(projectId,contractInfo,archiveTreeContract);
+            //完成自动组卷
+            contractInfoService.updateIsArchivesAutoById(contractId, 0);
+        }catch (Exception e){
+            e.printStackTrace();
+            //设置自动组卷结束
+            contractInfoService.updateIsArchivesAutoById(contractId, 0);
+            log.error("同步声像文件报错,projectId："+projectId+"、contractId："+contractId+"nodeId："+nodeId+",原因："+e.getMessage());
+            throw new ServiceException("同步声像文件报错");
+        }
+    }
+
+    /**
+     * 同步某个合同段的声像资料到归档
+     */
+    public void syncSoundImageData(Long projectId, ContractInfo contractInfo, ArchiveTreeContract archiveTreeContract) {
+        Long contractId = contractInfo.getId();
+
+        log.info("同步声像文件，projectId："+projectId+"，contractId:"+contractId+"，nodeId："+archiveTreeContract.getId());
+
+        //项目信息
+        ProjectInfo projectInfo = projectInfoService.getOne(projectId);
+
+        //项目使用的wbs模板
+        Long lWbsId = projectInfo.getReferenceWbsTemplateId();
+
+        //获取合同段wbs划分树，用来组织树
+        List<WbsTreeContractVO6> wbsTrees = contractInfoService.tree8(lWbsId.toString(), projectId.toString(), contractId.toString());
+        if (CollectionUtil.isEmpty(wbsTrees)) {
+            return;
+        }
+
+        // wbs转换archive树形集合
+        List<ArchiveTreeContract> wbsCovertArchiveTreeContractList = new ArrayList<>();
+
+        // wbs转换archive,并初始化值
+        getTreeList(AuthUtil.getTenantId(), wbsTrees.get(0), wbsCovertArchiveTreeContractList, archiveTreeContract, archiveTreeContract.getId());
+
+        log.info("同步声像文件树  imageClassificationFileList :"+wbsCovertArchiveTreeContractList.size());
+
+        //同步质检关联节点
+        syncNodes(wbsCovertArchiveTreeContractList, contractInfo, archiveTreeContract);
+    }
+
+    /**
+     * 将树形节点对象转换为普通的list集合
+     */
+    public void getTreeList(String tenantId, WbsTreeContractVO6 tree, List<ArchiveTreeContract> wbsCovertArchiveTreeContractList, ArchiveTreeContract archiveTreeContract, Long archiveTreeContractId) {
+        if (ObjectUtil.isEmpty(tree)) {
+            return;
+        }
+        // wbs树转archive树
+        ArchiveTreeContract archiveTreeContractTemp = wbsTreeContractCovertArchiveTreeContract(tenantId, tree, archiveTreeContract, archiveTreeContractId);
+        wbsCovertArchiveTreeContractList.add(archiveTreeContractTemp);
+
+        // 循环遍历，转换树对象
+        List<WbsTreeContractVO6> childrenList = tree.getChildren();
+        if (childrenList != null) {
+            for (WbsTreeContractVO6 child : childrenList) {
+                getTreeList(tenantId, child, wbsCovertArchiveTreeContractList, archiveTreeContractTemp, archiveTreeContractId);
+            }
+        }
+    }
+
+    /**
+     * 将wbs树初始化为归档树
+     */
+    public ArchiveTreeContract wbsTreeContractCovertArchiveTreeContract(String tenantId, WbsTreeContractVO6 tree, ArchiveTreeContract archiveTreeContract, Long archiveTreeContractId) {
+        ArchiveTreeContract archiveTreeContractTemp = new ArchiveTreeContract();
+        //设置基本信息
+        archiveTreeContractTemp.setId(SnowFlakeUtil.getId());
+        archiveTreeContractTemp.setTenantId(tenantId);
+        archiveTreeContractTemp.setProjectId(archiveTreeContract.getProjectId());
+        archiveTreeContractTemp.setContractId(archiveTreeContract.getContractId());
+        archiveTreeContractTemp.setParentId(archiveTreeContract.getId());
+        archiveTreeContractTemp.setAncestors(archiveTreeContract.getAncestors()+","+archiveTreeContract.getId());
+        archiveTreeContractTemp.setNodeName(tree.getNodeName());
+        archiveTreeContractTemp.setNodeType(1);
+        archiveTreeContractTemp.setFullName(tree.getFullName());
+        archiveTreeContractTemp.setTreeCode(archiveTreeContract.getContractId().toString());
+        //设置关联
+        archiveTreeContractTemp.setExtType(1);
+        archiveTreeContractTemp.setExtId(tree.getId());
+        archiveTreeContractTemp.setExtKeyId(tree.getPKeyId());
+        archiveTreeContractTemp.setExtAttachId(archiveTreeContractId);
+        archiveTreeContractTemp.setSort(tree.getSort());
+        archiveTreeContractTemp.setStatus(1);
+        archiveTreeContractTemp.setIsDeleted(0);
+        archiveTreeContractTemp.setFromId(tree.getId());
+        if (StringUtils.isNotEmpty(tree.getOldId())) {
+            archiveTreeContractTemp.setFromId(Long.parseLong(tree.getOldId()));
+        }
+        archiveTreeContractTemp.setIsStorageNode(1);
+        //wbs_tree_contract与archive_tree_contract字段等存在差异，不清楚的字段值，我沿用同步节点的字段值进行初始化
+        archiveTreeContractTemp.setPostType(archiveTreeContract.getPostType());
+        archiveTreeContractTemp.setMajorDataType(archiveTreeContract.getMajorDataType());
+        archiveTreeContractTemp.setProjectType(archiveTreeContract.getProjectType());
+        archiveTreeContractTemp.setStorageType(archiveTreeContract.getStorageType());
+        archiveTreeContractTemp.setCreateUser(tree.getCreateUser());
+        archiveTreeContractTemp.setCreateDept(tree.getCreateDept());
+        archiveTreeContractTemp.setCreateTime(tree.getCreateTime());
+        archiveTreeContractTemp.setTreeStructure(TreeStructureEnum.ORDINARY_TREE.getCode());
+        return archiveTreeContractTemp;
+    }
+
+    private void syncNodes(List<ArchiveTreeContract> wbsCovertArchiveTreeContractList,
+                           ContractInfo contractInfo, ArchiveTreeContract archiveTreeContract) {
+        Long contractId = contractInfo.getId();
+
+        // 获取关联节点
+        List<ArchiveTreeContract> associatedNodes = Arrays.asList(archiveTreeContract);
+
+        log.info("同步声像文件树节点  syncNodes："+associatedNodes.size());
+
+        // 新增的归档树聚合
+        List<ArchiveTreeContract> saveArchiveTreeContractList = new ArrayList<>();
+        // 新增的归档文件集合
+        List<ArchiveFile> saveArchiveFileList = new ArrayList<>();
+        // 修改的归档树聚合
+        List<Map> updateArchiveTreeContractList = new ArrayList<>();
+        // 修改的归档文件集合
+        List<ArchiveFile> updateArchiveFileList = new ArrayList<>();
+        // 删除的归档树聚合
+        List<ArchiveTreeContract> deleteArchiveTreeContractList = new ArrayList<>();
+        // 删除的归档文件集合
+        List<ArchiveFile> deleteArchiveFileList = new ArrayList<>();
+
+        for (ArchiveTreeContract node : associatedNodes) {
+            log.info("同步声像文件树节点  syncNode：" + node.getId() + "-" +  node.getNodeName());
+
+            /***同步树-开始*/
+            // 获取该合同段下的wbs节点
+            List<ArchiveTreeContract> originalArchiveTreeContractList = getArchiveTreeContractsWbs(contractId, node.getId(),null);
+
+            // 树形map
+            Map<Long, ArchiveTreeContract> originalArchiveTreeContractMap = buildNodeMap(originalArchiveTreeContractList);
+
+            // 转换类型
+            List<ArchiveTreeContractVO> archiveTreeContractVOList = wbsCovertArchiveTreeContractList.stream().map(tree -> {
+                ArchiveTreeContractVO vo = new ArchiveTreeContractVO();
+                BeanUtils.copyProperties(tree, vo);
+                return vo;
+            }).collect(Collectors.toList());
+
+            // list转换为树形
+            List<ArchiveTreeContractVO> mergeList = org.springblade.core.tool.node.ForestNodeMerger.merge(archiveTreeContractVOList);
+
+            // 与已有数据做合并(目的是将已有的树信息复制到对应的树)
+            archiveAndOldTreeMergeData(mergeList, originalArchiveTreeContractMap, TreeStructureEnum.ORDINARY_TREE);
+
+            // 重新刷新整个树结构(刷新整个树的父子节点id)
+            for (ArchiveTreeContractVO archiveTreeContractVO : mergeList) {
+                refreshTreeStructure(archiveTreeContractVO, node.getId(), node.getAncestors());
+            }
+
+            // 将树转换为list
+            List<ArchiveTreeContractVO> archiveTreeContractVOTempList = new ArrayList<>();
+            ForestNodeMerger.getTreeList(mergeList.get(0), archiveTreeContractVOTempList);
+
+            List<ArchiveTreeContract> newArchiveTreeContractList = archiveTreeContractVOTempList.stream().map(vo -> {
+                ArchiveTreeContract archiveTreeContractTemp = new ArchiveTreeContract();
+                BeanUtils.copyProperties(vo, archiveTreeContractTemp);
+                return vo;
+            }).collect(Collectors.toList());
+
+            // 树形map
+            Map<Long, ArchiveTreeContract> newArchiveTreeContractMap = buildNodeMap(newArchiveTreeContractList);
+
+            // 取两个树形集合中的差异，并输出新增、修改、删除三个集合
+            diffTrees(originalArchiveTreeContractList, newArchiveTreeContractList, originalArchiveTreeContractMap,
+                    newArchiveTreeContractMap, saveArchiveTreeContractList, deleteArchiveTreeContractList, updateArchiveTreeContractList);
+            /***同步树-结束*/
+
+            /***同步树型文件数据准备-开始*/
+            // 根据合同段id查询声像文件
+            List<ImageClassificationFileDTO> imageClassificationFileList = getImageClassificationFileListByContractId(contractId);
+
+            // 声像文件转换
+            List<ArchiveFile> newArchiveFileList = imageClassificationFileList.stream().map(file -> {
+                ArchiveFile archiveFile = imageClassificationFileCovertArchiveFile(file, node, newArchiveTreeContractMap);
+                return archiveFile;
+            }).collect(Collectors.toList());
+
+            // 查询合同段下的声像文件
+            List<ArchiveFile> originalArchiveFileList = archiveFileClient.getListByContractIdAndArchiveFileStorageType(contractId, StorageTypeEnum.SOUND_IMAGE.getCode());
+
+            // 构件原始文件TreeMap
+            Map<Long, ArchiveFile> originalArchiveFileMap = buildArchiveFileMap(originalArchiveFileList);
+
+            // 与已有数据做合并(目的是将已有的树信息复制到对应的树)
+            originalAndNewArchiveFileMergeData(newArchiveFileList, originalArchiveFileMap);
+
+            // 构件新文件TreeMap
+            Map<Long, ArchiveFile> newArchiveFileMap = buildArchiveFileMap(newArchiveFileList);
+
+            // 将声像文件集合遍历，分为时间储存和树形储存两个集合
+            List<ArchiveFile> newArchiveFileTreeList = new ArrayList<>();
+            List<ArchiveFile> newArchiveFileDateList = new ArrayList<>();
+            for (ArchiveFile archiveFile : newArchiveFileList) {
+                if(archiveFile.getNodeTreeStructure() == 1) {
+                    newArchiveFileTreeList.add(archiveFile);
+                }else if(archiveFile.getNodeTreeStructure() == 2) {
+                    newArchiveFileDateList.add(archiveFile);
+                }
+            }
+
+            // 将声像文件集合遍历，分为时间储存和树形储存两个集合
+            List<ArchiveFile> originalArchiveFileTreeList = new ArrayList<>();
+            List<ArchiveFile> originalArchiveFileDateList = new ArrayList<>();
+            for (ArchiveFile archiveFile : originalArchiveFileList) {
+                if(archiveFile.getNodeTreeStructure() == 1) {
+                    originalArchiveFileTreeList.add(archiveFile);
+                }else if(archiveFile.getNodeTreeStructure() == 2) {
+                    originalArchiveFileDateList.add(archiveFile);
+                }
+            }
+            /***同步树型文件数据准备-结束*/
+
+            /**同步树形文件-开始**/
+            // 取两个树形集合中的差异，并输出新增、修改、删除三个集合
+            diffFiles(originalArchiveFileTreeList, newArchiveFileTreeList, originalArchiveFileMap, newArchiveFileMap,
+                    saveArchiveFileList, deleteArchiveFileList, updateArchiveFileList, newArchiveTreeContractMap, TreeStructureEnum.ORDINARY_TREE);
+            /**同步树形文件-结束**/
+
+            /**同步时间树-开始**/
+            // 获取该合同段下的时间型节点
+            List<ArchiveTreeContract> originalDateArchiveTreeContractList = getArchiveTreeContractsByTreeStructure(contractId, node.getId(), TreeStructureEnum.DATE_TREE);
+
+            // 树形map
+            Map<Long, ArchiveTreeContract> originalDateArchiveTreeContractMap = buildDateMap(originalDateArchiveTreeContractList);
+
+            // 将最新文件的时间取出，创建时间树
+            List<String> dateList = newArchiveFileDateList.stream().map(archiveFile -> {
+                String format = DateFormatUtils.format(archiveFile.getCreateTime(), "yyyy-MM-dd");
+                return format;
+            }).collect(Collectors.toList());
+
+            // 转时间树
+            List<TreeVoTwo> dateTreeList = YearTreeUtils.yearMonthDayTree(dateList, "DESC");
+
+            // date转换archive树形集合
+            List<ArchiveTreeContractVO> dateCovertArchiveTreeContractVoList = new ArrayList<>();
+
+            // date转换archive,并初始化值
+            getTreeList(AuthUtil.getTenantId(), dateTreeList, dateCovertArchiveTreeContractVoList, archiveTreeContract, archiveTreeContract.getId());
+
+            // list转换为树形
+            List<ArchiveTreeContractVO> mergeDateList = org.springblade.core.tool.node.ForestNodeMerger.merge(dateCovertArchiveTreeContractVoList);
+
+            // 与已有数据做合并(目的是将已有的树信息复制到对应的树)
+            archiveAndOldTreeMergeData(mergeDateList, originalDateArchiveTreeContractMap, TreeStructureEnum.DATE_TREE);
+
+            // 重新刷新整个树结构(刷新整个树的父子节点id)
+            for (ArchiveTreeContractVO dateArchiveTreeContractVO : mergeDateList) {
+                refreshTreeStructure(dateArchiveTreeContractVO, node.getId(), node.getAncestors());
+            }
+
+            // 将树转换为list
+            List<ArchiveTreeContractVO> dateArchiveTreeContractVOTempList = new ArrayList<>();
+            for (ArchiveTreeContractVO archiveTreeContractVO : mergeDateList) {
+                ForestNodeMerger.getTreeList(archiveTreeContractVO, dateArchiveTreeContractVOTempList);
+            }
+            // 转实体类
+            List<ArchiveTreeContract> newDateArchiveTreeContractList = dateArchiveTreeContractVOTempList.stream().map(vo -> {
+                ArchiveTreeContract archiveTreeContractTemp = new ArchiveTreeContract();
+                BeanUtils.copyProperties(vo, archiveTreeContractTemp);
+                return vo;
+            }).collect(Collectors.toList());
+
+            // 树形map
+            Map<Long, ArchiveTreeContract> newDateArchiveTreeContractMap = buildDateMap(newDateArchiveTreeContractList);
+
+            // 取两个树形集合中的差异，并输出新增、修改、删除三个集合
+            diffDateTrees(originalDateArchiveTreeContractList, newDateArchiveTreeContractList, originalDateArchiveTreeContractMap,
+                    newDateArchiveTreeContractMap, saveArchiveTreeContractList, deleteArchiveTreeContractList, updateArchiveTreeContractList);
+            /**同步时间树-结束**/
+
+            /**同步时间树形文件-开始**/
+            // 取两个树形集合中的差异，并输出新增、修改、删除三个集合
+            diffFiles(originalArchiveFileDateList, newArchiveFileDateList, originalArchiveFileMap, newArchiveFileMap,
+                    saveArchiveFileList, deleteArchiveFileList, updateArchiveFileList, newDateArchiveTreeContractMap, TreeStructureEnum.DATE_TREE);
+            /**同步时间树形文件-结束**/
+
+            /**统一刷新树与文件**/
+            // 刷新树
+            refreshArchiveTreeContract(saveArchiveTreeContractList, updateArchiveTreeContractList, deleteArchiveTreeContractList);
+
+            // 刷新文件
+            refreshArchiveFile(saveArchiveFileList, updateArchiveFileList, deleteArchiveFileList);
+        }
+    }
+    /**
+     * 时间树中的差异
+     * 遍历循环，获取差异，并输出三个集合(归档树的fullName = 老树中的fullName)
+     */
+    private static void diffDateTrees(List<ArchiveTreeContract> originalDateArchiveTreeContractList, List<ArchiveTreeContract> newDateArchiveTreeContractList, Map<Long, ArchiveTreeContract> originalDateArchiveTreeContractMap,
+                                  Map<Long, ArchiveTreeContract> newDateArchiveTreeContractMap, List<ArchiveTreeContract> insertions,
+                                  List<ArchiveTreeContract> deletions, List<Map> modifications) {
+        for (ArchiveTreeContract originalDateArchiveTreeContract : originalDateArchiveTreeContractList) {
+            if (!newDateArchiveTreeContractMap.containsKey(Long.valueOf(originalDateArchiveTreeContract.getFullName()))) {
+                deletions.add(originalDateArchiveTreeContract);
+            } else {
+                ArchiveTreeContract node2 = newDateArchiveTreeContractMap.get(Long.valueOf(originalDateArchiveTreeContract.getFullName()));
+                if (originalDateArchiveTreeContract.getFullName().equals(node2.getFullName())) {
+                    Map map = new HashMap();
+                    map.put("id", originalDateArchiveTreeContract.getId());
+                    map.put("parentId", node2.getParentId());
+                    map.put("ancestors", node2.getAncestors());
+                    map.put("nodeName", node2.getNodeName());
+                    map.put("nodeType", node2.getNodeType());
+                    map.put("fullName", node2.getFullName());
+                    map.put("treeStructure", node2.getTreeStructure());
+                    modifications.add(map);
+                }
+            }
+        }
+        for (ArchiveTreeContract newArchiveTreeContract : newDateArchiveTreeContractList) {
+            if (!originalDateArchiveTreeContractMap.containsKey(Long.valueOf(newArchiveTreeContract.getFullName()))) {
+                insertions.add(newArchiveTreeContract);
+            }
+        }
+    }
+
+    /**
+     * 根据tree结构获取归档树
+     */
+    public List<ArchiveTreeContract>  getArchiveTreeContractsByTreeStructure(Long contractId,Long attachId, TreeStructureEnum treeStructure) {
+        List<ArchiveTreeContract> archiveTreeContracts = archiveTreeContractMapper.selectList(Wrappers.<ArchiveTreeContract>query().lambda()
+                .eq(ArchiveTreeContract::getContractId, contractId)
+                .eq(ArchiveTreeContract::getExtAttachId, attachId)
+                .eq(ArchiveTreeContract::getTreeStructure, treeStructure.getCode()));
+        return archiveTreeContracts;
+    }
+
+    /**
+     * 将时间树形节点对象转换为普通的list集合
+     */
+    public void getTreeList(String tenantId, List<TreeVoTwo> dateTreeList, List<ArchiveTreeContractVO> dateCovertArchiveTreeContractList, ArchiveTreeContract archiveTreeContract, Long archiveTreeContractId) {
+        if (CollectionUtil.isEmpty(dateTreeList)) {
+            return;
+        }
+        for (TreeVoTwo tree : dateTreeList) {
+            // wbs树转archive树
+            ArchiveTreeContractVO archiveTreeContractVoTemp = dateTreeCovertArchiveTreeContract(tenantId, tree, archiveTreeContract, archiveTreeContractId);
+            dateCovertArchiveTreeContractList.add(archiveTreeContractVoTemp);
+
+            // 循环遍历，转换树对象
+            List<TreeVoTwo> childrenList = tree.getChildren();
+            if (childrenList != null) {
+                getTreeList(tenantId, childrenList, dateCovertArchiveTreeContractList, archiveTreeContractVoTemp, archiveTreeContractId);
+            }
+        }
+    }
+
+    /**
+     * 将时间树初始化为归档树
+     */
+    public ArchiveTreeContractVO dateTreeCovertArchiveTreeContract(String tenantId, TreeVoTwo tree, ArchiveTreeContract archiveTreeContract, Long archiveTreeContractId) {
+        ArchiveTreeContractVO archiveTreeContractVoTemp = new ArchiveTreeContractVO();
+        //设置基本信息
+        archiveTreeContractVoTemp.setId(SnowFlakeUtil.getId());
+        archiveTreeContractVoTemp.setTenantId(tenantId);
+        archiveTreeContractVoTemp.setProjectId(archiveTreeContract.getProjectId());
+        archiveTreeContractVoTemp.setContractId(archiveTreeContract.getContractId());
+        archiveTreeContractVoTemp.setParentId(archiveTreeContract.getId());
+        archiveTreeContractVoTemp.setAncestors(archiveTreeContract.getAncestors()+","+archiveTreeContract.getId());
+        archiveTreeContractVoTemp.setNodeName(tree.getName());
+        archiveTreeContractVoTemp.setNodeType(1);
+        archiveTreeContractVoTemp.setFullName(tree.getHierarchy());
+        archiveTreeContractVoTemp.setTreeCode(archiveTreeContract.getContractId().toString());
+        //设置关联
+        archiveTreeContractVoTemp.setExtAttachId(archiveTreeContractId);
+        archiveTreeContractVoTemp.setSort(archiveTreeContract.getSort());
+        archiveTreeContractVoTemp.setStatus(1);
+        archiveTreeContractVoTemp.setIsDeleted(0);
+        archiveTreeContractVoTemp.setIsStorageNode(1);
+        //时间树不同于wbs树，不清楚的字段值，我沿用同步节点的字段值进行初始化
+        archiveTreeContractVoTemp.setPostType(archiveTreeContract.getPostType());
+        archiveTreeContractVoTemp.setMajorDataType(archiveTreeContract.getMajorDataType());
+        archiveTreeContractVoTemp.setProjectType(archiveTreeContract.getProjectType());
+        archiveTreeContractVoTemp.setStorageType(archiveTreeContract.getStorageType());
+        archiveTreeContractVoTemp.setCreateUser(archiveTreeContract.getCreateUser());
+        archiveTreeContractVoTemp.setCreateDept(archiveTreeContract.getCreateDept());
+        archiveTreeContractVoTemp.setCreateTime(archiveTreeContract.getCreateTime());
+        archiveTreeContractVoTemp.setTreeStructure(TreeStructureEnum.DATE_TREE.getCode());
+        return archiveTreeContractVoTemp;
+    }
+
+    /**
+     * 刷新归档文件
+     */
+    void refreshArchiveFile(List<ArchiveFile> saveArchiveFileList, List<ArchiveFile> updateArchiveFileList,
+                            List<ArchiveFile> deleteArchiveFileList) {
+        if (CollectionUtil.isNotEmpty(saveArchiveFileList)) {
+            archiveFileClient.addArchiveFile(saveArchiveFileList);
+        }
+        if (CollectionUtil.isNotEmpty(updateArchiveFileList)) {
+            archiveFileClient.updateArchiveFile(updateArchiveFileList);
+        }
+        if (CollectionUtil.isNotEmpty(deleteArchiveFileList)) {
+            List<Long> idList = deleteArchiveFileList.stream().map(ArchiveFile::getId).collect(Collectors.toList());
+            archiveFileClient.removeFile(idList);
+        }
+    }
+
+    /**
+     * 现有的树与wbs的树做合并
+     */
+    public void originalAndNewArchiveFileMergeData(List<ArchiveFile> mergeList, Map<Long, ArchiveFile> archiveFileMap) {
+        if (CollectionUtil.isEmpty(mergeList)) {
+            return;
+        }
+        // 循环遍历，将已有的赋值
+        for (ArchiveFile archiveFile : mergeList) {
+            ArchiveFile archiveFileTemp = archiveFileMap.get(archiveFile.getUImageClassificationFileId());
+            if(ObjectUtil.isNotEmpty(archiveFileTemp)){
+                archiveFile.setId(archiveFileTemp.getId());
+                archiveFile.setNodeId(archiveFileTemp.getNodeId());
+            }
+        }
+    }
+
+    /**
+     * 遍历循环，获取差异，并输出三个集合(archiveFile表的uImageClassificationFileId = ImageClassificationFile 的 id)
+     */
+    private static void diffFiles(List<ArchiveFile> originalArchiveFileList, List<ArchiveFile> newArchiveFileList, Map<Long, ArchiveFile> originalArchiveFileTreeMap,
+                                  Map<Long, ArchiveFile> newArchiveFileTreeMap, List<ArchiveFile> insertions, List<ArchiveFile> deletions, List<ArchiveFile> modifications,
+                                  Map<Long, ArchiveTreeContract> newArchiveTreeContractMap, TreeStructureEnum treeStructureEnum) {
+        for (ArchiveFile originalArchiveFile : originalArchiveFileList) {
+            if (!newArchiveFileTreeMap.containsKey(originalArchiveFile.getUImageClassificationFileId())) {
+                deletions.add(originalArchiveFile);
+            } else {
+                ArchiveFile node2 = newArchiveFileTreeMap.get(originalArchiveFile.getUImageClassificationFileId());
+                if (originalArchiveFile.getUImageClassificationFileId().equals(node2.getUImageClassificationFileId())) {
+                    modifications.add(node2);
+                }
+            }
+        }
+        for (ArchiveFile newArchiveFile : newArchiveFileList) {
+            if (!originalArchiveFileTreeMap.containsKey(newArchiveFile.getUImageClassificationFileId())) {
+                ArchiveTreeContract archiveTreeContract = null;
+                if(treeStructureEnum.getCode() == TreeStructureEnum.ORDINARY_TREE.getCode()){
+                    archiveTreeContract = newArchiveTreeContractMap.get(newArchiveFile.getMWbsTreeContractPKeyId());
+                } else if(treeStructureEnum.getCode() == TreeStructureEnum.DATE_TREE.getCode()) {
+                    archiveTreeContract = newArchiveTreeContractMap.get(Long.valueOf(newArchiveFile.getDateName()));
+                }
+                if(ObjectUtil.isNotEmpty(archiveTreeContract)){
+                    newArchiveFile.setNodeId(String.valueOf(archiveTreeContract.getId()));
+                }
+                insertions.add(newArchiveFile);
+            }
+        }
+    }
+
+    /**
+     * 构建节点map
+     */
+    private static Map<Long, ArchiveFile> buildArchiveFileMap(List<ArchiveFile> archiveFileList) {
+        Map<Long, ArchiveFile> map = new HashMap<>();
+        for (ArchiveFile archiveFile : archiveFileList) {
+            map.put(archiveFile.getUImageClassificationFileId(), archiveFile);
+        }
+        return map;
+    }
+
+    /**
+     * imageClassificationFile 转换为 archiveFile
+     */
+    private ArchiveFile imageClassificationFileCovertArchiveFile(ImageClassificationFileDTO file,
+                                                                 ArchiveTreeContract node,
+                                                                 Map<Long, ArchiveTreeContract> wbsCovertArchiveTreeContractMap)
+    {
+        ArchiveFile archiveFile = new ArchiveFile();
+        archiveFile.setId(SnowFlakeUtil.getId());
+        archiveFile.setProjectId(String.valueOf(node.getProjectId()));
+        archiveFile.setContractId(String.valueOf(node.getContractId()));
+        ArchiveTreeContract archiveTreeContractTemp = wbsCovertArchiveTreeContractMap.get(Long.valueOf(file.getWbsId()));
+        if(archiveTreeContractTemp != null){
+            archiveFile.setNodeId(String.valueOf(archiveTreeContractTemp.getId()));
+        }
+        archiveFile.setFileNumber(String.valueOf(file.getId()));
+        archiveFile.setFileName(file.getTitle());
+        archiveFile.setFileTime(file.getUploadTime());
+        archiveFile.setFileUrl(file.getImageUrl());
+        // 根据type判断，设置pdfUrl, 1=视频格式，取原本的视频地址就好，2=图片格式，就取合并后的pdfUrl
+        if(file.getType() == 1){
+            archiveFile.setPdfFileUrl(file.getImageUrl());
+        }else{
+            archiveFile.setPdfFileUrl(StringUtils.isNotEmpty(file.getMargePdfUrl()) ? file.getMargePdfUrl() : file.getPdfUrl());
+        }
+        archiveFile.setFilePage(file.getFilePage());
+        archiveFile.setIsApproval(0);
+        archiveFile.setIsCertification(1);
+        archiveFile.setIsNeedCertification(0);
+        archiveFile.setDutyUser(file.getShootingUser());
+        archiveFile.setCreateUser(file.getCreateUser());
+        archiveFile.setCreateDept(file.getCreateDept());
+        archiveFile.setCreateTime(file.getCreateTime());
+        archiveFile.setUpdateUser(file.getUpdateUser());
+        archiveFile.setUpdateTime(file.getUpdateTime());
+        archiveFile.setStatus(0);
+        archiveFile.setIsDeleted(0);
+        archiveFile.setFileType(Long.valueOf(file.getType()));
+        archiveFile.setFilmingTime(file.getShootingTime());
+        archiveFile.setFilmingorTime(file.getShootingTime());
+        archiveFile.setPicCode(file.getPhotoCode());
+        archiveFile.setFilmCode(file.getFilmCode());
+        archiveFile.setReferCode(file.getSeeAlsoCode());
+        archiveFile.setWidth(file.getFileWidth());
+        archiveFile.setHeight(file.getFileHeight());
+        // 创建 LocalDateTime 时间爱你
+        LocalDateTime localDateTime = new Date().toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime();
+        archiveFile.setFtime(localDateTime);
+        archiveFile.setUtime(localDateTime);
+        archiveFile.setSort(0);
+        archiveFile.setPageNum(String.valueOf(file.getFilePage()));
+        archiveFile.setFileSize(convertSizeToBytes(file.getFileSize()));
+        archiveFile.setSourceType(1);
+        archiveFile.setIsElement(0);
+        archiveFile.setRectification(0);
+        archiveFile.setMWbsTreeContractPKeyId(file.getWbsId());
+        archiveFile.setUImageClassificationFileId(file.getId());
+        archiveFile.setArchiveFileStorageType(StorageTypeEnum.SOUND_IMAGE.getCode());
+        archiveFile.setNodeTreeStructure(file.getStorageDirectoryFormat());
+        archiveFile.setDateName(DateFormatUtils.format(file.getCreateTime(), "yyyyMMdd"));
+        return archiveFile;
+    }
+
+    /**
+     * imageClassificationFile里面的fileSize，是已经转换过的(230.6MB)，是字符串
+     * 而archiveFile里面的fileSize是纯数字大小，现在要转换回来
+     */
+    private static Long convertSizeToBytes(String size) {
+        Long value = Double.valueOf(size.replaceAll("[^\\d.]", "")).longValue();
+        String unit = size.replaceAll("[\\d.]", "").trim();
+        switch (unit) {
+            case "B":
+                return value;
+            case "KB":
+                return value * 1024;
+            case "MB":
+                return value * 1024 * 1024;
+            case "GB":
+                return value * 1024 * 1024 * 1024;
+            default:
+                throw new IllegalArgumentException("Invalid size unit: " + unit);
+        }
+    }
+
+    /**
+     * 重新刷新整个树结构
+     */
+    public void refreshTreeStructure(ArchiveTreeContractVO archiveTreeContractVO, Long id, String ancestors) {
+        archiveTreeContractVO.setParentId(id);
+        archiveTreeContractVO.setAncestors(ancestors+","+id);
+        List<ArchiveTreeContractVO> children = archiveTreeContractVO.getChildren();
+        if (CollectionUtil.isNotEmpty(children)) {
+            for (ArchiveTreeContractVO child : children) {
+                refreshTreeStructure(child, archiveTreeContractVO.getId(), archiveTreeContractVO.getAncestors());
+            }
+        }
+    }
+
+    /**
+     * 现有的树与老的树做合并
+     */
+    public void archiveAndOldTreeMergeData(List<ArchiveTreeContractVO> mergeList, Map<Long, ArchiveTreeContract> archiveTreeContractMap, TreeStructureEnum treeStructureEnum) {
+        if (CollectionUtil.isEmpty(mergeList)) {
+            return;
+        }
+        // 循环遍历，将已有的赋值，随后再次将整个树的上下节点，重新刷新
+        for (ArchiveTreeContractVO archiveTreeContractVO : mergeList) {
+            ArchiveTreeContract archiveTreeContract = null;
+            if(treeStructureEnum.getCode() == TreeStructureEnum.ORDINARY_TREE.getCode()){
+                archiveTreeContract = archiveTreeContractMap.get(archiveTreeContractVO.getExtKeyId());
+            } else if(treeStructureEnum.getCode() == TreeStructureEnum.DATE_TREE.getCode()) {
+                archiveTreeContract = archiveTreeContractMap.get(Long.valueOf(archiveTreeContractVO.getFullName()));
+            }
+            if(ObjectUtil.isNotEmpty(archiveTreeContract)){
+                archiveTreeContractVO.setId(archiveTreeContract.getId());
+                archiveTreeContractVO.setParentId(archiveTreeContract.getParentId());
+                archiveTreeContractVO.setAncestors(archiveTreeContract.getAncestors());
+            }
+            archiveAndOldTreeMergeData(archiveTreeContractVO.getChildren(), archiveTreeContractMap, treeStructureEnum);
+        }
+    }
+
+    /**
+     * 刷新归档树
+     */
+    void refreshArchiveTreeContract(List<ArchiveTreeContract> saveArchiveTreeContractList, List<Map> updateArchiveTreeContractList,
+                                    List<ArchiveTreeContract> deleteArchiveTreeContractList) {
+        if (CollectionUtil.isNotEmpty(saveArchiveTreeContractList)) {
+            archiveTreeContractMapper.batchInsertArchiveTreeContract(saveArchiveTreeContractList);
+        }
+        if (CollectionUtil.isNotEmpty(updateArchiveTreeContractList)) {
+            archiveTreeContractMapper.batchUpdateArchiveTreeContract(updateArchiveTreeContractList);
+        }
+        if (CollectionUtil.isNotEmpty(deleteArchiveTreeContractList)) {
+            List<Long> idList = deleteArchiveTreeContractList.stream().map(ArchiveTreeContract::getId).collect(Collectors.toList());
+            archiveTreeContractMapper.batchDeleteArchiveTreeContractByIdList(idList, 1);
+        }
+    }
+
+    /**
+     * 根据合同段id查询声像文件
+     */
+    public List<ImageClassificationFileDTO> getImageClassificationFileListByContractId(Long contractId) {
+        return imageClassificationFileClient.getImageClassificationFileListByContractId(contractId);
+    }
+
+    /**
+     * 遍历循环，获取差异，并输出三个集合(归档树的ExtKeyId = Wbs树的pKeyId)
+     */
+    private static void diffTrees(List<ArchiveTreeContract> originalArchiveTreeContractList, List<ArchiveTreeContract> newArchiveTreeContractList, Map<Long, ArchiveTreeContract> originalArchiveTreeContractMap,
+                                  Map<Long, ArchiveTreeContract> newArchiveTreeContractMap, List<ArchiveTreeContract> insertions,
+                                  List<ArchiveTreeContract> deletions, List<Map> modifications) {
+        for (ArchiveTreeContract originalArchiveTreeContract : originalArchiveTreeContractList) {
+            if (!newArchiveTreeContractMap.containsKey(originalArchiveTreeContract.getExtKeyId())) {
+                deletions.add(originalArchiveTreeContract);
+            } else {
+                ArchiveTreeContract node2 = newArchiveTreeContractMap.get(originalArchiveTreeContract.getExtKeyId());
+                if (originalArchiveTreeContract.getExtKeyId().equals(node2.getExtKeyId())) {
+                    // 更新修改数据
+                    Map map = new HashMap();
+                    map.put("id", originalArchiveTreeContract.getId());
+                    map.put("parentId", node2.getParentId());
+                    map.put("ancestors", node2.getAncestors());
+                    map.put("nodeName", node2.getNodeName());
+                    map.put("nodeType", node2.getNodeType());
+                    map.put("fullName", node2.getFullName());
+                    map.put("treeStructure", node2.getTreeStructure());
+                    modifications.add(map);
+                }
+            }
+        }
+        for (ArchiveTreeContract newArchiveTreeContract : newArchiveTreeContractList) {
+            if (!originalArchiveTreeContractMap.containsKey(newArchiveTreeContract.getExtKeyId())) {
+                insertions.add(newArchiveTreeContract);
+            }
+        }
+    }
+
+    /**
+     * 构建节点map
+     */
+    private static Map<Long, ArchiveTreeContract> buildNodeMap(List<ArchiveTreeContract> tree) {
+        Map<Long, ArchiveTreeContract> map = new HashMap<>();
+        for (ArchiveTreeContract node : tree) {
+            map.put(node.getExtKeyId(), node);
+        }
+        return map;
+    }
+
+    /**
+     * 构建时间map
+     */
+    private static Map<Long, ArchiveTreeContract> buildDateMap(List<ArchiveTreeContract> tree) {
+        Map<Long, ArchiveTreeContract> map = new HashMap<>();
+        for (ArchiveTreeContract node : tree) {
+            // 时间树中，fullName表示该节点的详细时间，如20240109，唯一性
+            map.put(Long.valueOf(node.getFullName()), node);
+        }
+        return map;
+    }
 
 }

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

@@ -398,6 +398,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
     }
 
 
+
     @Override
     public void formulaFillData2(JSONArray dataArray, ExecuteType type) {
         try {

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

@@ -37,6 +37,7 @@ import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.*;
 import org.springblade.manager.utils.FileUtils;
 import org.springblade.manager.vo.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -1709,6 +1710,58 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         return Collections.emptyList();
     }
 
+    @Override
+    public R<Object> formulasForNode(Long pkeyId ,String tableName,String elementName) {
+            long start = System.currentTimeMillis();
+            WbsTreeContract wtc = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract> lambdaQuery().eq(WbsTreeContract::getPKeyId,pkeyId));
+            if(wtc!=null) {
+                System.out.println("A0耗时"+(System.currentTimeMillis()-start));
+                List<Map<String, Object>> listMap = this.jdbcTemplate.queryForList("select init_table_name number ,node_name nodeName ,b.tab_ch_name tableName from m_wbs_tree_contract a  join m_table_info b on a.init_table_name = b.tab_en_name where parent_id =?  and a.is_deleted=0 and contract_id = ?", wtc.getId(), wtc.getContractId());
+                Predicate<Map<String, Object>> tableNameFilter = map ->true;
+                if(Func.isNotEmpty(tableName)){
+                    tableNameFilter=map->map.get("nodeName").toString().contains(tableName);
+                }
+                Map<String, Map<String, Object>> tablesMap = listMap.stream().filter(tableNameFilter).collect(Collectors.toMap(m -> m.get("number").toString(), m -> m, (m1, m2) -> m1));
+                System.out.println("A1耗时"+(System.currentTimeMillis()-start));
+                if(tablesMap.size()>0) {
+                    String tableNames = String.join("','", tablesMap.keySet());
+                    List<FormData> processFds = this.createFormDataByTableName(tableNames);
+                    System.out.println("B耗时"+(System.currentTimeMillis()-start));
+                    if(processFds.size()>0) {
+                        Predicate<FormData> elementFilter = ele ->true;
+                        if(Func.isNotEmpty(elementName)){
+                            elementFilter=ele->ele.getEName().contains(elementName);
+                        }
+                        Map<String,String> dictMap = processFds.stream().collect(Collectors.toMap(FormData::getCode,fd->fd.getTableChName()+":"+fd.getEName(),(p,n)->p));
+                        processFds=processFds.stream().filter(elementFilter).collect(Collectors.toList());
+                        this.formulaInto(processFds, wtc.getProjectId(), String.valueOf(pkeyId), ExecuteType.INSPECTION);
+                        System.out.println("C耗时"+(System.currentTimeMillis()-start));
+                        Map<String, List<Map<String, Object>>> fdGroup = processFds.stream()
+                                .filter(FormData::executable)
+                                .collect(Collectors.groupingBy(
+                                        FormData::getTableChName,
+                                        Collectors.mapping(formData -> {
+                                                    Map<String, Object> show = new HashMap<>();
+                                                    FormulaVo vo= new FormulaVo();
+                                                    BeanUtils.copyProperties(formData.getFormula(),vo);
+                                                    vo.setFormulaParse(dictMap);
+                                                    show.put("formula", vo);
+                                                    show.put("name", formData.getEName());
+                                                    show.put("code",formData.getCode());
+                                                    return show;
+                                                },
+                                                Collectors.toList()
+                                        )));
+                        System.out.println("D耗时"+(System.currentTimeMillis()-start));
+                        return R.data(fdGroup);
+                    }
+                    return R.data("元素不存在");
+                }
+                return R.data("表不存在");
+            }
+            return R.data("节点不存在");
+    }
+
     @Override
     public void formulaInto(List<FormData> curFormDatas, String projectId, String nodeId, ExecuteType executeType) {
         if(executeType.equals(ExecuteType.INSPECTION)){
@@ -1806,7 +1859,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
        }
        return this.wbsTreePrivateMapper.selectOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getId,wtc.getId()).eq(WbsTreePrivate::getProjectId,wtc.getProjectId()));
     }
-    private List<KeyMapper> listForContract(List<Long> ids,String projectId,String nodeId){
+    /*表id,项目id,节点Id*/
+    public List<KeyMapper> listForContract(List<Long> ids,String projectId,String nodeId){
         List<Map<String,Object>> listMap = listMap(ids,ExecuteType.INSPECTION);
         WbsTreePrivate wtp =wtpId(Long.parseLong(nodeId));
         if(Func.isNotEmpty(listMap)){

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

@@ -64,10 +64,18 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
                     }
                     if (Func.isNotEmpty(wp)) {
                         return CustomFunction.tree(nodes.stream().map(w->StringUtils.isNotEmpty(w.getFullName())?w.getFullName():w.getNodeName()).collect(Collectors.toList()), wp.getV()).toString();
+                    }else{
+                        System.out.println(wtp.getNodeName()+"找不到文件题名配置");
                     }
+                }else{
+                    return "找不到项目配置信息";
                 }
 
+            }else{
+                return "层级断链";
             }
+        }else {
+            return "找不到节点";
         }
         return NOT_SET;
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/YearTreeUtils.java

@@ -0,0 +1,83 @@
+package org.springblade.manager.utils;
+
+import org.springblade.business.vo.TreeVo;
+import org.springblade.business.vo.TreeVoTwo;
+import org.springblade.common.utils.SnowFlakeUtil;
+
+import java.util.*;
+
+public class YearTreeUtils {
+
+    public static List<TreeVoTwo> yearMonthDayTree(List<String> yearMonthDayList, String sort) {
+
+        //最终集合
+        List<TreeVoTwo> result = new ArrayList<>();
+        if (yearMonthDayList == null || yearMonthDayList.size() <= 0) {
+            return result;
+        }
+
+        //年
+        Map<String, List<String>> yearMap = new HashMap<>();
+        for (String dateStr : yearMonthDayList) {
+            //拆分获取年月日
+            String[] dateArray = dateStr.split("-");
+
+            List<String> monthList;
+            if (yearMap.containsKey(dateArray[0] + "年")) {
+                //存在，获取集合
+                monthList = yearMap.get(dateArray[0] + "年");
+            } else {
+                //不存在，创建
+                monthList = new ArrayList<>();
+            }
+            monthList.add(dateArray[1] + "-" + dateArray[2]);
+            yearMap.put(dateArray[0] + "年", monthList);
+        }
+
+        //循环年
+        for (Map.Entry<String, List<String>> yearMaps : yearMap.entrySet()) {
+            String year = yearMaps.getKey().replace("年", "");
+            List<String> monthList = yearMaps.getValue();
+
+            //月集合
+            List<TreeVoTwo> monthResult = new ArrayList<>();
+
+            //月
+            TreeVoTwo monthMap = new TreeVoTwo();
+
+            //循环月份
+            String month = monthList.get(0).split("-")[0];
+            int index = 0;
+            for (String monthDay : monthList) {
+                //拆分
+                String[] monthDays = monthDay.split("-");
+
+                if (!month.equals(monthDays[0])) {
+                    month = monthDays[0];
+                    monthResult.add(monthMap);
+                    monthMap = new TreeVoTwo();
+                }
+                monthMap.setName(month + "月");
+                monthMap.setHierarchy(year + month);
+                monthMap.setParentId(Long.valueOf(year));
+                monthMap.getChildren().add(new TreeVoTwo(monthDays[1] + "日", new ArrayList<>(), year + month + monthDays[1], Long.valueOf(year + month)));
+                index++;
+                if (index == monthList.size()) {
+                    monthResult.add(monthMap);
+                }
+            }
+            //年
+            TreeVoTwo yearResult = new TreeVoTwo(year, monthResult, year, 0L);
+            result.add(yearResult);
+        }
+
+        if ("DESC".equals(sort)) {
+            result.sort(Comparator.comparing(TreeVoTwo::getName).reversed());
+        } else {
+            result.sort(Comparator.comparing(TreeVoTwo::getName));
+        }
+
+        return result;
+    }
+
+}

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -2037,12 +2037,30 @@ public class TaskController extends BladeController {
                 aopParamsSet.add(param);
             }
 
+            // 判断是否为审批 最后一人 如果是 即生成 pdf 并开始电签
+            /*当前审批轮次*/
+            String sql_3 = "SELECT * FROM u_task_parallel WHERE status=1 and process_instance_id = ? ORDER BY sort";
+            List<TaskParallel> lastTaskParallels = jdbcTemplate.query(sql_3, new Object[]{task.getProcessInstanceId()}, new BeanPropertyRowMapper<>(TaskParallel.class));
+            if(lastTaskParallels == null || lastTaskParallels.size() == 0 ){
+                meterPdfInfo(task);
+            }
             return R.data(200, aopParamsSet, "操作成功");
         }
 
         return R.fail("操作失败");
     }
 
+
+    // pdf 生成
+
+    private boolean meterPdfInfo(Task task) {
+
+
+
+
+        return true;
+    }
+
     private void check(Task task) {
         String sql_2 = "SELECT * FROM u_task_parallel WHERE process_instance_id = ? ORDER BY sort";
         List<TaskParallel> taskParallels = jdbcTemplate.query(sql_2, new Object[]{task.getProcessInstanceId()}, new BeanPropertyRowMapper<>(TaskParallel.class));