台账管理-业内台账

1、后管WBS树添加附件类型字段
2、质检-表单绑定试验报告添加附件类型字段

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

@@ -24,4 +24,7 @@ public class TrialFileSubmitDTO implements Serializable {
     @ApiModelProperty(value = "合同段id")
     private String contractId;
 
+    @ApiModelProperty(value = "附件类型（table_file_type 字典数据）")
+    private String tableFileType;
+
 }

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

@@ -267,5 +267,7 @@ public class WbsTreePrivate extends BaseEntity {
     @ApiModelProperty(value = "是否包含单元评定")
     private Integer isClassifition;
 
+    @ApiModelProperty(value = "附件类型（复选）")
+    private String tableFileType;
 
 }

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

@@ -6,9 +6,12 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tool.node.INode;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.WbsTreePrivate;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 @Data
@@ -68,5 +71,10 @@ public class WbsTreePrivateVO extends WbsTreePrivate implements INode<WbsTreePri
      */
     private Integer checkStatus = 0;
 
+    /**
+     * 附件类型
+     */
+    private List<String> tableFileTypes;
+
 
 }

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

@@ -35,7 +35,7 @@ public interface TrialSelfInspectionRecordMapper extends BaseMapper<TrialSelfIns
 
     void deleteSeletedStatusByNodeId(String nodeId, Integer type, String recordId);
 
-    void insertSeletedStatus(Long id, String nodeId, Integer type, String recordId);
+    void insertSeletedStatus(Long id, String nodeId, Integer type, String recordId, String tableFileType);
 
     List<String> selectCountSeletedStatus(String nodeId, Integer type);
 

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

@@ -42,7 +42,7 @@
     </insert>
 
     <insert id="insertSeletedStatus">
-        insert into u_trial_file_pdf_record(id,node_id,type,record_id) values ( #{id} , #{nodeId} , #{type} , #{recordId} )
+        insert into u_trial_file_pdf_record(id,node_id,type,record_id,table_file_type) values ( #{id} , #{nodeId} , #{type} , #{recordId} , #{tableFileType})
     </insert>
 
     <update id="updateInformationQuery">

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

@@ -2063,7 +2063,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                                     .eq(InformationQuery::getId, informationQuery.getId()))) {
                                 for (String recordId : Func.toStrList(dto.getIds())) {
                                     baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
-                                    baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
+                                    baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId, dto.getTableFileType()); //新增该类型选中的记录信息
                                 }
                                 return true;
                             }
@@ -2123,7 +2123,7 @@ public class TrialSelfInspectionRecordServiceImpl extends BaseServiceImpl<TrialS
                                     .eq(InformationQuery::getId, informationQuery.getId()))) {
                                 for (String recordId : recordIds) {
                                     baseMapper.deleteSeletedStatusByNodeId(dto.getNodeId(), dto.getType(), recordId); //先删除对应记录
-                                    baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId); //新增该类型选中的记录信息
+                                    baseMapper.insertSeletedStatus(SnowFlakeUtil.getId(), dto.getNodeId(), dto.getType(), recordId, dto.getTableFileType()); //新增该类型选中的记录信息
                                 }
                                 return true;
                             }

blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreePrivateWrapper.java

@@ -2,9 +2,11 @@ package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.WbsTreePrivateVO;
 
+import java.util.Arrays;
 import java.util.Objects;
 
 public class WbsTreePrivateWrapper extends BaseEntityWrapper<WbsTreePrivate, WbsTreePrivateVO> {
@@ -15,6 +17,9 @@ public class WbsTreePrivateWrapper extends BaseEntityWrapper<WbsTreePrivate, Wbs
     @Override
     public WbsTreePrivateVO entityVO(WbsTreePrivate wbsTree) {
         WbsTreePrivateVO wbsTreePrivateVO = Objects.requireNonNull(BeanUtil.copy(wbsTree, WbsTreePrivateVO.class));
+        if(StringUtil.isNotBlank(wbsTreePrivateVO.getTableFileType())){
+            wbsTreePrivateVO.setTableFileTypes(Arrays.asList(wbsTreePrivateVO.getTableFileType().split(",")));
+        }
 
         //User createUser = UserCache.getUser(wbsTree.getCreateUser());
         //User updateUser = UserCache.getUser(wbsTree.getUpdateUser());