浏览代码

qhse体系文件文件代码上传

Zimo 1 周之前
父节点
当前提交
6664a4444d

+ 5 - 1
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/file/QhseFileTreeController.java

@@ -153,5 +153,9 @@ public class QhseFileTreeController {
         qhseFileTreeService.initTree();
         qhseFileTreeService.initTree();
     }
     }
 
 
-
+    @GetMapping("/init/number")
+    @PermitAll
+    public void initNumber() {
+        qhseFileTreeService.initTree();
+    }
 }
 }

+ 6 - 4
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/file/vo/QhseFileTreeRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.file.vo;
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.file.vo;
 
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 
 @Schema(description = "管理后台 - QHSE文件树 Response VO")
 @Schema(description = "管理后台 - QHSE文件树 Response VO")
 @Data
 @Data
@@ -60,4 +60,6 @@ public class QhseFileTreeRespVO {
     @ExcelProperty("部门名称")
     @ExcelProperty("部门名称")
     private String deptName;
     private String deptName;
 
 
+    @Schema(description = "子文件数量")
+    private Integer childNumber;
 }
 }

+ 2 - 6
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/report/QhseMonthReportController.java

@@ -18,7 +18,6 @@ import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
-import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,10 +30,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -194,7 +190,7 @@ public class QhseMonthReportController {
         return success("审批完成");
         return success("审批完成");
     }
     }
     @PostMapping("/reject")
     @PostMapping("/reject")
-    public CommonResult<String> rejectMonthReport(@RequestBody ImmutableMap<String, String> map) {
+    public CommonResult<String> rejectMonthReport(@RequestBody Map<String, String> map) {
         assert Objects.nonNull(map);
         assert Objects.nonNull(map);
         Long id = Long.parseLong(map.get("id").toString());
         Long id = Long.parseLong(map.get("id").toString());
         String rejectDesc = map.get("rejectDesc").toString();
         String rejectDesc = map.get("rejectDesc").toString();

+ 4 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/file/QhseFileTreeDO.java

@@ -67,4 +67,8 @@ public class QhseFileTreeDO extends BaseDO {
      */
      */
     private String deptName;
     private String deptName;
 
 
+    /**
+     * 文件数量
+     */
+    private Integer childNumber;
 }
 }

+ 1 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/file/QhseFileTreeService.java

@@ -67,4 +67,5 @@ public interface QhseFileTreeService {
     List<QhseFileTreeDO> getChildTreeList(Collection<Long> ids);
     List<QhseFileTreeDO> getChildTreeList(Collection<Long> ids);
     List<QhseFileTreeDO> getAllParentIds(Long classId);
     List<QhseFileTreeDO> getAllParentIds(Long classId);
     void initTree();
     void initTree();
+    void initNumber();
 }
 }

+ 12 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/file/QhseFileTreeServiceImpl.java

@@ -199,4 +199,16 @@ public class QhseFileTreeServiceImpl implements QhseFileTreeService {
         });
         });
         qhseFileTreeMapper.updateBatch(treeDOS);
         qhseFileTreeMapper.updateBatch(treeDOS);
     }
     }
+
+    @Override
+    public void initNumber() {
+        List<QhseFileTreeDO> qhseFileTreeDOS = qhseFileTreeMapper.selectList();
+        qhseFileTreeDOS.forEach(qhseFileTreeDO -> {
+            List<QhseFileTreeDO> qhseFileTreeDOS1 = qhseFileTreeMapper.selectListByParentId(ImmutableList.of(qhseFileTreeDO.getId()));
+            if (CollUtil.isNotEmpty(qhseFileTreeDOS1)) {
+                qhseFileTreeDO.setChildNumber(qhseFileTreeDOS1.size());
+                qhseFileTreeMapper.updateById(qhseFileTreeDO);
+            }
+        });
+    }
 }
 }

+ 9 - 0
yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/file/QhseInfoServiceImpl.java

@@ -129,6 +129,7 @@ public class QhseInfoServiceImpl implements QhseInfoService {
      * 处理文件
      * 处理文件
      */
      */
     private void processFiles(JsonNode filesNode, Long rootParentId,Long fileClassId, Long deptId, String deptName) {
     private void processFiles(JsonNode filesNode, Long rootParentId,Long fileClassId, Long deptId, String deptName) {
+        int fileNumber = 0;
         for (JsonNode fileNode : filesNode) {
         for (JsonNode fileNode : filesNode) {
             String path = fileNode.get("path").asText();
             String path = fileNode.get("path").asText();
             String filePath = fileNode.get("filePath").asText();
             String filePath = fileNode.get("filePath").asText();
@@ -166,6 +167,14 @@ public class QhseInfoServiceImpl implements QhseInfoService {
                 }
                 }
                 qhseInfoMapper.insert(info);
                 qhseInfoMapper.insert(info);
             }
             }
+            fileNumber++;
+        }
+        if (fileNumber>0) {
+            QhseFileTreeDO qhseFileTreeDO = qhseFileTreeMapper.selectById(fileClassId);
+            if (Objects.nonNull(qhseFileTreeDO)) {
+                qhseFileTreeDO.setChildNumber(qhseFileTreeDO.getChildNumber()+fileNumber);
+                qhseFileTreeMapper.updateById(qhseFileTreeDO);
+            }
         }
         }
     }
     }
     /**
     /**