Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

liuyc 2 лет назад
Родитель
Сommit
76f466ed1d
16 измененных файлов с 132 добавлено и 4 удалено
  1. 41 0
      blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveInspection.java
  2. 3 0
      blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java
  3. 1 0
      blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java
  4. 4 0
      blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/ArchiveFile.java
  5. 1 1
      blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java
  6. 19 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveInspectionController.java
  7. 11 1
      blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java
  8. 8 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchiveInspectionMapper.java
  9. 11 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchiveInspectionMapper.xml
  10. 1 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml
  11. 8 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchiveInspectionService.java
  12. 2 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java
  13. 13 0
      blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveInspectionServiceImpl.java
  14. 6 2
      blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java
  15. 2 0
      blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java
  16. 1 0
      blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

+ 41 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveInspection.java

@@ -0,0 +1,41 @@
+package org.springblade.archive.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("u_archive_inspection")
+public class ArchiveInspection extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId = "000000";
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 抽检意见
+     */
+    private String opinion;
+
+    /**
+     * 抽检用户ID
+     */
+    private Long userId;
+
+    /**
+     * 抽检文件ID
+     */
+    private Long fileId;
+
+}

+ 3 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchivesAuto.java

@@ -168,6 +168,9 @@ public class ArchivesAuto extends BaseEntity {
 
     private Integer isLock;  //案卷锁定  0未锁  1已锁定    (已锁定的案卷,自动归档执行不再拆卷重新组卷)
 
+    //是否查阅,0,未查阅,1已查阅
+    private Integer isReviewed;
+
     //是否是影音
     public boolean isMedia() {
         return (this.getCarrierType() != null &&

+ 1 - 0
blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/vo/ArchivesAutoVO.java

@@ -195,5 +195,6 @@ public class ArchivesAutoVO extends ArchivesAuto {
 		private  String archiveId;
 
 		private Long id;
+		private Long fileSize;
 	}
 }

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

@@ -273,4 +273,8 @@ public class ArchiveFile extends BaseEntity {
 
     @ApiModelProperty("卷内索引")
     private Integer fid;
+
+    //整改情况,0,无整改,1 待整改,2 已整改
+    @ApiModelProperty("整改情况")
+    private Integer rectification;
 }

+ 1 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -99,7 +99,7 @@ public class ArchiveFileAutoController extends BladeController {
                     this.archiveFileClient.saveArchiveFile(saveVos);
                     archive.setFileN(saveVos.getSize());
                     archive.setPageN(pageN);
-                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(saveVos.getNodeId(), saveVos.getContractId() == null ? null : Long.parseLong(saveVos.getContractId()));
+                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(archive.getNodeId()+"", archive.getContractId() == null ? null : archive.getContractId());
                     if (archiveTreeContracts != null && archiveTreeContracts.size() > 0) {
                         archive.setTreeSort(archiveTreeContracts.get(0).getTreeSort());
                         if (archiveTreeContracts.get(0).getStorageType() != null) {

+ 19 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveInspectionController.java

@@ -0,0 +1,19 @@
+package org.springblade.inspection.controller;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/archiveInspection")
+@Api(value = "档案检查信息", tags = "档案检查信息")
+public class ArchiveInspectionController extends BladeController {
+
+
+
+}

+ 11 - 1
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
+
 import javax.validation.Valid;
 
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +39,6 @@ import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
 import org.springblade.manager.feign.ProjectClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -452,4 +452,14 @@ public class ArchivesAutoController extends BladeController {
 		return R.data(archivesAutoService.getCarrierTypeByDict());
 	}
 
+	/**
+	 * 获取档案销毁人列表
+	 */
+	@GetMapping("/getArchiveDestroyUser")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "获取档案销毁人列表", notes = "获取档案销毁人列表")
+	public R getArchiveDestroyUser(){
+		return R.data(archivesAutoService.getArchiveDestroyUser());
+	}
+
 }

+ 8 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchiveInspectionMapper.java

@@ -0,0 +1,8 @@
+package org.springblade.archive.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.archive.entity.ArchiveInspection;
+
+public interface ArchiveInspectionMapper extends BaseMapper<ArchiveInspection> {
+
+}

+ 11 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchiveInspectionMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.archive.mapper.ArchiveInspectionMapper">
+
+    <!-- 这里可以定义各种SQL语句 -->
+    <!-- 示例:查询所有记录 -->
+    <select id="selectAll" resultType="org.springblade.archive.entity.ArchiveInspection">
+        SELECT * FROM u_archive_inspection
+    </select>
+
+</mapper>

+ 1 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -48,6 +48,7 @@
         <result column="auto_file_sort" property="autoFileSort"/>
         <result column="filing_unit" property="filingUnit"/>
         <result column="file_size" property="fileSize"/>
+        <result column="is_reviewed" property="isReviewed"/>
         <collection property="approvalFileList" javaType="java.util.List"
                     select="approvalFile"
                     column="{archiveId=id}">

+ 8 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchiveInspectionService.java

@@ -0,0 +1,8 @@
+package org.springblade.archive.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.archive.entity.ArchiveInspection;
+
+public interface IArchiveInspectionService extends IService<ArchiveInspection> {
+
+}

+ 2 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/service/IArchivesAutoService.java

@@ -22,6 +22,7 @@ import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.system.entity.DictBiz;
+import org.springblade.system.user.entity.User;
 
 import java.util.List;
 import java.util.Map;
@@ -81,4 +82,5 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
 
 	void archiveAutoMethodThread(Long projectId, Long contractId, Long nodeId);
 
+	List<User> getArchiveDestroyUser();
 }

+ 13 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveInspectionServiceImpl.java

@@ -0,0 +1,13 @@
+package org.springblade.archive.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springblade.archive.entity.ArchiveInspection;
+import org.springblade.archive.mapper.ArchiveInspectionMapper;
+import org.springblade.archive.service.IArchiveInspectionService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ArchiveInspectionServiceImpl extends BaseServiceImpl<ArchiveInspectionMapper, ArchiveInspection> implements IArchiveInspectionService {
+
+}

+ 6 - 2
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -59,6 +59,7 @@ import org.springblade.manager.feign.ProjectClient;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -625,7 +626,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 				}
 				for(ContractInfo c:contracts){
 					if(c.getContractType()==3){
-						if(nodeContract.getSecurityLevel()==null){
+						if(c.getSecurityLevel()==null){
 							secretLevel="4";
 						}else{
 							secretLevel = c.getSecurityLevel().toString();
@@ -1667,6 +1668,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 			}
 		});
 	}
-
+	@Override
+	public List<User> getArchiveDestroyUser() {
+		return autoMapper.getArchiveDestroyUser();
+	}
 
 }

+ 2 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1653,7 +1653,9 @@ public class InformationWriteQueryController extends BladeController {
                         //更新redis缓存
                         informationQueryService.delAsyncWbsTree(contractId);
                     }
+                    String nodeName = vo.getNeedCopyNodeName();
                     StringBuilder addNames = new StringBuilder();
+                    addNames.append(nodeName+"-");
                     addNames.append("[");
                     for (WbsTreeContract node : toCopyNodes) {
                         addNames.append(node.getNodeName() + "-");

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

@@ -57,6 +57,7 @@
         <result column="is_element" property="isElement"/>
         <result column="pdf_page_url" property="pdfPageUrl"/>
         <result column="fid" property="fid"/>
+        <result column="rectification" property="rectification"/>
     </resultMap>
     <update id="recoveryByIds">
         update u_archive_file set is_deleted = 0 where