扫描文件

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ScanFile.java

@@ -0,0 +1,43 @@
+package org.springblade.archive.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@TableName(value = "scan_file")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScanFile {
+    @TableId(
+            value = "id",
+            type = IdType.ASSIGN_ID
+    )
+    private Long id;
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "合同id")
+    private Long contractId;
+    @ApiModelProperty(value = "文件夹id")
+    private Long folderId;
+    @ApiModelProperty(value = "序号")
+    private Integer sort;
+    @ApiModelProperty(value = "数字编号")
+    private Integer digitalNum;
+    @ApiModelProperty(value = "文件编号")
+    private Integer fileNum;
+    @ApiModelProperty(value = "文件题名")
+    private String fileName;
+    @ApiModelProperty(value = "文件页数")
+    private Integer fileSize;
+    @ApiModelProperty(value = "文件日期")
+    private String fileDate;
+    @ApiModelProperty(value = "负责人")
+    private String responsible;
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDeleted;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ScanFolder.java

@@ -0,0 +1,33 @@
+package org.springblade.archive.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@TableName("scan_folder")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ScanFolder {
+    @TableId(
+            value = "id",
+            type = IdType.ASSIGN_ID
+    )
+    @ApiModelProperty(value = "id")
+    private Long id;
+    @ApiModelProperty(value = "父级id")
+    private Long parentId;
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+    @ApiModelProperty(value = "合同id")
+    private Long contractId;
+    @ApiModelProperty(value = "文件夹名称")
+    private String folderName;
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDeleted;
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ScanFileController.java

@@ -0,0 +1,21 @@
+package org.springblade.archive.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.archive.entity.ScanFolder;
+import org.springblade.archive.service.ScanFileService;
+import org.springblade.archive.service.ScanFolderService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/scanFile")
+@Api(value = "扫描文件接口", tags = "扫描文件接口")
+public class ScanFileController {
+    private final ScanFileService scanFileService;
+    private final ScanFolderService scanFolderService;
+
+
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ScanFileMapper.java

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

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ScanFolderMapper.java

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

blade-service/blade-archive/src/main/java/org/springblade/archive/service/ScanFileService.java

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

blade-service/blade-archive/src/main/java/org/springblade/archive/service/ScanFolderService.java

@@ -0,0 +1,4 @@
+package org.springblade.archive.service;
+
+public interface ScanFolderService {
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ScanFileServiceImpl.java

@@ -0,0 +1,14 @@
+package org.springblade.archive.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.archive.entity.ScanFile;
+import org.springblade.archive.mapper.ScanFileMapper;
+import org.springblade.archive.service.ScanFileService;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ScanFileServiceImpl  extends ServiceImpl<ScanFileMapper, ScanFile> implements ScanFileService {
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ScanFolderServiceImpl.java

@@ -0,0 +1,16 @@
+package org.springblade.archive.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
+import org.springblade.archive.entity.ArchivesAuto;
+import org.springblade.archive.entity.ScanFolder;
+import org.springblade.archive.mapper.ArchivesAutoMapper;
+import org.springblade.archive.service.ScanFolderService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.manager.entity.WbsTreeSynchronousRecord;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ScanFolderServiceImpl  implements ScanFolderService {
+}

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/ScrDataServiceImpl.java

@@ -242,7 +242,9 @@ public class ScrDataServiceImpl implements ScrDataService {
                     total = Func.toInt(map.get("total"));
                     pCount = Func.toInt(map.get("pCount"));
                 }
-                if(map.get("initiative").equals("2") && map.get("status").equals("2")){
+                Object o = map.get("initiative");
+                Object o1 = map.get("status");
+                if((map.get("initiative")+"").equals("2") && (map.get("status")+"").equals("2")){
                     strArray.add(map.get("task_user").toString());
                 }
             }
@@ -278,7 +280,6 @@ public class ScrDataServiceImpl implements ScrDataService {
                         System.out.println("东方中讯--签字--" + sqlinfo);
                     }
                     maps2 = jdbcTemplate.queryForList(sqlinfo);
-                    maps2 = jdbcTemplate.queryForList(sqlinfo);
                 }
                 if(CollectionUtil.isNotEmpty(maps2)) {
                     Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()