成果资料管理系统导入

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesAchievementController.java

@@ -0,0 +1,324 @@
+package com.ruoyi.web.controller.file;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.file.domain.FilesAchievement;
+import com.ruoyi.file.domain.FilesProject;
+import com.ruoyi.file.domain.FilesStorage;
+import com.ruoyi.file.service.IFilesAchievementService;
+import com.ruoyi.file.service.IFilesProjectService;
+import com.ruoyi.file.service.IFilesStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 成果表Controller
+ *
+ * @author cmc
+ * @date 2022-09-06
+ */
+@RestController
+@RequestMapping("/file/achievement")
+public class FilesAchievementController extends BaseController
+{
+    @Autowired
+    private IFilesAchievementService filesAchievementService;
+
+    @Autowired
+    private IFilesProjectService filesProjectService;
+
+    @Autowired
+    private IFilesStorageService filesStorageService;
+
+    @Value("${ruoyi.profile}")
+    private String profile;
+    /**
+     * 查询成果表列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FilesAchievement filesAchievement)
+    {
+        List<FilesAchievement> list = new ArrayList<>();
+//        if (filesAchievement.getProjectNumber() != null && !filesAchievement.getProjectNumber().equals("")) {
+//            FilesProject filesProject = new FilesProject();
+//            filesProject.setProjectNumber(filesAchievement.getProjectNumber());
+//            if (filesProjectService.selectFilesProjectList(filesProject).size() > 0) {
+//                filesAchievement.setProjectId(filesProjectService.selectFilesProjectList(filesProject).get(0).getId());
+//                filesAchievement.setProjectNumber(null);
+//            }
+//        }
+        if (filesAchievement.getStorageAddress() != null && !filesAchievement.getStorageAddress().equals("")) {
+            FilesStorage filesStorage = new FilesStorage();
+            filesStorage.setStorageAddress(filesAchievement.getStorageAddress());
+            if (filesStorageService.selectFilesStorageList(filesStorage).size() > 0)
+                filesAchievement.setStorageId(filesStorageService.selectFilesStorageList(filesStorage).get(0).getId());
+        }
+        list = filesAchievementService.selectFilesAchievementList(filesAchievement);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出成果表列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:export')")
+    @Log(title = "成果表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FilesAchievement filesAchievement)
+    {
+        List<FilesAchievement> list = filesAchievementService.selectFilesAchievementList(filesAchievement);
+        ExcelUtil<FilesAchievement> util = new ExcelUtil<FilesAchievement>(FilesAchievement.class);
+        util.exportExcel(response, list, "成果表数据");
+    }
+
+    /**
+     * 导出选中成果表列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:export')")
+    @Log(title = "成果表", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportBatch/{ids}")
+    public void exportBatch(HttpServletResponse response, FilesAchievement filesAchievement, @PathVariable("ids") String[] ids)
+    {
+        List<FilesAchievement> list = new ArrayList<>();
+        for (String achievementId : ids)
+            list.add(filesAchievementService.selectFilesAchievementById(achievementId));
+        ExcelUtil<FilesAchievement> util = new ExcelUtil<FilesAchievement>(FilesAchievement.class);
+        util.exportExcel(response, list, "成果表数据");
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<FilesAchievement> util = new ExcelUtil<FilesAchievement>(FilesAchievement.class);
+        util.importTemplateExcel(response, "成果表模板");
+    }
+
+    /**
+     * 获取成果表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(filesAchievementService.selectFilesAchievementById(id));
+    }
+
+    /**
+     * 获取项目对应成果列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
+    @GetMapping( "/getAchievementByProject")
+    public AjaxResult getAchievementByProject(String projectId)
+    {
+        FilesAchievement filesAchievement = new FilesAchievement();
+        filesAchievement.setProjectId(projectId);
+        return AjaxResult.success(filesAchievementService.selectFilesAchievementList(filesAchievement));
+    }
+
+    /**
+     * 上传成果excel文件
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:query')")
+    @PostMapping("/uploadSheet")
+    public AjaxResult uploadAchievementSheet(MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            return AjaxResult.error("文件内容为空！");
+        }
+        else {
+            ExcelUtil<FilesAchievement> util = new ExcelUtil<FilesAchievement>(FilesAchievement.class);
+            List<FilesAchievement> filesAchievementList = util.importExcel(file.getInputStream());
+            List<String> IdList = new ArrayList<>();
+            for (FilesAchievement filesAchievement :  filesAchievementService.selectFilesAchievementList(new FilesAchievement())) {
+                IdList.add(filesAchievement.getId());
+            }
+            for (FilesAchievement filesAchievement : filesAchievementList)
+            {
+                if (filesAchievement.getId() == null || !IdList.contains(filesAchievement.getId()))
+                    filesAchievement.setId(new SnowFlake().generateId());
+                FilesProject filesProject = new FilesProject();
+                filesProject = filesProjectService.selectFilesProjectByNumber(filesAchievement.getProjectNumber());
+                if(filesProject != null){
+                    filesAchievement.setProjectId(filesProject.getId());
+                }else{
+                    filesAchievement.setProjectId(null);
+                }
+                String storageAddress = filesAchievement.getStorageAddress();
+                if (storageAddress != null && !storageAddress.equals("")) {
+                    filesAchievement.setStorageId(new SnowFlake().generateId());
+                    FilesStorage storage = new FilesStorage();
+                    storage.setStorageAddress(storageAddress);
+                    if (filesStorageService.selectFilesStorageListE(storage).size() > 0)
+                        filesAchievement.setStorageId(filesStorageService.selectFilesStorageListE(storage).get(0).getId());
+                    else {
+                        FilesStorage filesStorage = new FilesStorage();
+                        filesStorage.setId(filesAchievement.getStorageId());
+                        filesStorage.setStorageAddress(filesAchievement.getStorageAddress());
+                        filesStorage.setAdministrator(getLoginUser().getUsername());
+                        filesStorage.setRemark("");
+                        filesStorageService.insertFilesStorage(filesStorage);
+                    }
+                }
+                if (IdList.contains(filesAchievement.getId()))
+                    filesAchievementService.updateFilesAchievement(filesAchievement);
+                else
+                    filesAchievementService.insertFilesAchievement(filesAchievement);
+            }
+//            File profilePath = new File(profile);
+//            if (!profilePath.exists())//若此目录不存在，则创建之
+//                profilePath.mkdirs();
+//            File transferFile = new File( profilePath + "\\" + file.getOriginalFilename());
+//            file.transferTo(transferFile);
+//            InputStream in = new FileInputStream(transferFile);
+//            XSSFSheet sheetAt = null;
+//            HSSFSheet sheetAt1 = null;
+//            int rowNumber = 0;
+//            boolean xlsx = Objects.requireNonNull(file.getOriginalFilename()).endsWith("xlsx");
+//            if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xlsx")) {
+//                sheetAt = new XSSFWorkbook(in).getSheetAt(0);
+//                rowNumber = sheetAt.getPhysicalNumberOfRows();
+//            }
+//            else if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xls")) {
+//                sheetAt1 = new HSSFWorkbook(in).getSheetAt(0);
+//                rowNumber = sheetAt1.getPhysicalNumberOfRows();
+//            }
+//            FilesAchievement filesAchievement = new FilesAchievement();
+//            for (int i = 0; i < rowNumber - 1;) {
+//                i++;
+//                String column0 = xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(0));
+//                if (column0 != null && !column0.equals("")) {
+//                    filesAchievement.setId(new SnowFlake().generateId());
+//                    FilesProject filesProject = new FilesProject();
+//                    filesProject.setProjectNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(0)));
+//                    filesAchievement.setProjectId(null);
+//                    if (filesProjectService.selectFilesProjectList(filesProject).size() > 0)
+//                        filesAchievement.setProjectId(filesProjectService.selectFilesProjectList(filesProject).get(0).getId());
+//                    filesAchievement.setDataYear(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(1)).substring(0,4): ExcelUtils.getString(sheetAt1.getRow(i).getCell(1)).substring(0,4));
+//                    filesAchievement.setAchiName(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(2)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(2)));
+//                    filesAchievement.setScaleOrder(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(3)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(3)));
+//                    filesAchievement.setResultType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(4)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(4)));
+//                    filesAchievement.setFileType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(5)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(5)));
+//                    String storageAddress = xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(6));
+//                    filesAchievement.setStorageId(null);
+//                    if (storageAddress != null && !storageAddress.equals("")) {
+//                        filesAchievement.setStorageId(new SnowFlake().generateId());
+//                        FilesStorage storage = new FilesStorage();
+//                        storage.setStorageAddress(storageAddress);
+//                        if (filesStorageService.selectFilesStorageListE(storage).size() > 0)
+//                            filesAchievement.setStorageId(filesStorageService.selectFilesStorageListE(storage).get(0).getId());
+//                        else {
+//                            FilesStorage filesStorage = new FilesStorage();
+//                            filesStorage.setId(filesAchievement.getStorageId());
+//                            filesStorage.setStorageAddress(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(6)));
+//                            filesStorage.setAdministrator(getLoginUser().getUsername());
+//                            filesStorage.setRemark("");
+//                            filesStorageService.insertFilesStorage(filesStorage);
+//                        }
+//                    }
+////                    filesAchievement.setKmlUrl(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
+//                    filesAchievement.setWorkLoad(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
+//                    filesAchievement.setUnit(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(8)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(8)));
+//                    filesAchievement.setDataSource(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(9)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(9)));
+//                    filesAchievement.setProductionTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(10)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(10)));
+////                    filesAchievement.setSubmitDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(11)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(11)));
+//                    filesAchievement.setRemark(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(12)): ExcelUtils.getString(sheetAt1.getRow(i).getCell(12)));
+//                    filesAchievementService.insertFilesAchievement(filesAchievement);
+//                }
+//            }
+            return AjaxResult.success("上传成功");
+        }
+    }
+
+    /**
+     * 新增成果表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:add')")
+    @Log(title = "成果表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(FilesAchievement filesAchievement, MultipartFile uploadKmlFile) throws IOException {
+        FilesStorage storage = new FilesStorage();
+        storage.setStorageAddress(filesAchievement.getStorageAddress());
+        if (filesAchievement.getStorageAddress() != null && !filesAchievement.getStorageAddress().equals("")) {
+            filesAchievement.setStorageId(new SnowFlake().generateId());
+            if (filesStorageService.selectFilesStorageListE(storage).size() > 0)
+                filesAchievement.setStorageId(filesStorageService.selectFilesStorageListE(storage).get(0).getId());
+            else {
+                FilesStorage filesStorage = new FilesStorage();
+                filesStorage.setId(filesAchievement.getStorageId());
+                filesStorage.setStorageAddress(filesAchievement.getStorageAddress());
+                filesStorage.setAdministrator(getLoginUser().getUsername());
+                filesStorage.setRemark("");
+                filesStorageService.insertFilesStorage(filesStorage);
+            }
+        }
+        if (filesAchievement.getProjectNumber() != null && !filesAchievement.getProjectNumber().equals("")) {
+            FilesProject filesProject = new FilesProject();
+            filesProject.setProjectNumber(filesAchievement.getProjectNumber());
+            if (filesProjectService.selectFilesProjectList(filesProject).size() > 0)
+                filesAchievement.setProjectId(filesProjectService.selectFilesProjectList(filesProject).get(0).getId());
+        }
+        if (uploadKmlFile(filesAchievement, uploadKmlFile)) return AjaxResult.error("文件内容为空");
+        filesAchievement.setId(new SnowFlake().generateId());
+        return toAjax(filesAchievementService.insertFilesAchievement(filesAchievement));
+    }
+
+    /**
+     * 修改成果表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:edit')")
+    @Log(title = "成果表", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(FilesAchievement filesAchievement, MultipartFile uploadKmlFile) throws IOException {
+        FilesStorage filesStorage = new FilesStorage();
+        filesStorage.setStorageAddress(filesAchievement.getStorageAddress());
+        if (filesStorageService.selectFilesStorageListE(filesStorage).size() > 0)
+            filesAchievement.setStorageId(filesStorageService.selectFilesStorageListE(filesStorage).get(0).getId());
+        FilesProject filesProject = new FilesProject();
+        filesProject = filesProjectService.selectFilesProjectById(filesAchievement.getProjectId());
+        filesAchievement.setProjectNumber(filesProject.getProjectNumber());
+        if (uploadKmlFile(filesAchievement, uploadKmlFile))
+            return AjaxResult.error("文件内容为空");
+        return toAjax(filesAchievementService.updateFilesAchievement(filesAchievement));
+    }
+
+    private boolean uploadKmlFile(FilesAchievement filesAchievement, MultipartFile uploadKmlFile) throws IOException {
+        if (uploadKmlFile != null) {
+            if (!uploadKmlFile.isEmpty()) {
+                File profilePath = new File(profile);
+                if (!profilePath.exists())//若此目录不存在，则创建之
+                    profilePath.mkdirs();
+                File transferFile = new File( profilePath + "\\" + uploadKmlFile.getOriginalFilename());
+                if (!transferFile.exists())
+                    uploadKmlFile.transferTo(transferFile);
+                filesAchievement.setKmlUrl(transferFile.getName());
+            }
+            else
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * 删除成果表
+     */
+    @PreAuthorize("@ss.hasPermi('file:achievement:remove')")
+    @Log(title = "成果表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(filesAchievementService.deleteFilesAchievementByIds(ids));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -0,0 +1,329 @@
+package com.ruoyi.web.controller.file;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.file.domain.FilesProject;
+import com.ruoyi.file.domain.FilesStorage;
+import com.ruoyi.file.domain.FilesTopic;
+import com.ruoyi.file.service.IFilesProjectService;
+import com.ruoyi.file.service.IFilesStorageService;
+import com.ruoyi.file.service.IFilesTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 项目管理Controller
+ *
+ * @author cmc
+ * @date 2022-09-05
+ */
+@RestController
+@RequestMapping("/file/project")
+public class FilesProjectController extends BaseController {
+    @Autowired
+    private IFilesProjectService filesProjectService;
+
+    @Autowired
+    private IFilesTopicService filesTopicService;
+
+    @Autowired
+    private IFilesStorageService filesStorageService;
+
+    @Value("${ruoyi.profile}")
+    private String profile;
+
+    /**
+     * 查询项目管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FilesProject filesProject) {
+        List<FilesProject> list = filesProjectService.selectFilesProjectList(filesProject);
+        if (filesProject.getStorageAddress() != null && !filesProject.getStorageAddress().equals("")) {
+            FilesStorage filesStorage = new FilesStorage();
+            filesStorage.setStorageAddress(filesProject.getStorageAddress());
+            if (filesStorageService.selectFilesStorageList(filesStorage).size() > 0)
+                filesProject.setStorageId(filesStorageService.selectFilesStorageList(filesStorage).get(0).getId());
+        }
+        if (filesProject.getTopicName() != null && !filesProject.getTopicName().equals("")) {
+            FilesTopic filesTopic = new FilesTopic();
+            filesTopic.setTopicName(filesProject.getTopicName());
+            if (filesTopicService.selectFilesTopicList(filesTopic).size() > 0)
+                filesProject.setTopicId(filesTopicService.selectFilesTopicList(filesTopic).get(0).getId());
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:export')")
+    @Log(title = "项目管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FilesProject filesProject) {
+        List<FilesProject> list = filesProjectService.selectFilesProjectList(filesProject);
+        ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+        util.exportExcel(response, list, "项目管理数据");
+    }
+
+    /**
+     * 导出选中项目管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:export')")
+    @Log(title = "成果表", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportBatch/{ids}")
+    public void exportBatch(HttpServletResponse response, FilesProject filesProject, @PathVariable("ids") String[] ids)
+    {
+        List<FilesProject> list = new ArrayList<>();
+        for (String projectId : ids)
+            list.add(filesProjectService.selectFilesProjectById(projectId));
+        ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+        util.exportExcel(response, list, "成果表数据");
+    }
+
+    /**
+     * 下载项目表模版
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response)
+    {
+        ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+        util.importTemplateExcel(response, "项目表模板");
+    }
+
+    /**
+     * 获取项目管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return AjaxResult.success(filesProjectService.selectFilesProjectById(id));
+    }
+
+    /**
+     * 获取专题对应项目列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:query')")
+    @GetMapping("/topicName")
+    public AjaxResult getProjectByTopic(String topicName) {
+        FilesTopic filesTopic = new FilesTopic();
+        filesTopic.setTopicName(topicName);
+        String topicId = filesTopicService.selectFilesTopicList(filesTopic).get(0).getId();
+        FilesProject filesProject = new FilesProject();
+        filesProject.setTopicId(topicId);
+        return AjaxResult.success(filesProjectService.selectFilesProjectList(filesProject));
+    }
+
+    /**
+     * 上传项目excel文件
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:add')")
+    @PostMapping("/uploadSheet")
+    public AjaxResult uploadProjectSheet(MultipartFile file) throws Exception {
+        if (file.isEmpty()) {
+            return AjaxResult.error("文件内容为空！");
+        } else {
+//            File profilePath = new File(profile);
+//            if (!profilePath.exists())//若此目录不存在，则创建之
+//                profilePath.mkdirs();
+//            File transferFile = new File(profilePath + "\\" + file.getOriginalFilename());
+//            file.transferTo(transferFile);
+//            InputStream in = new FileInputStream(transferFile);
+//            XSSFSheet sheetAt = null;
+//            HSSFSheet sheetAt1 = null;
+//            int rowNumber = 0;
+//            boolean xlsx = Objects.requireNonNull(file.getOriginalFilename()).endsWith("xlsx");
+//            if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xlsx")) {
+//                sheetAt = new XSSFWorkbook(in).getSheetAt(0);
+//                rowNumber = sheetAt.getLastRowNum();
+//            } else if (file.getOriginalFilename() != null && file.getOriginalFilename().endsWith("xls")) {
+//                sheetAt1 = new HSSFWorkbook(in).getSheetAt(0);
+//                rowNumber = sheetAt1.getLastRowNum();
+//            }
+            ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+            List<FilesProject> filesProjectList = util.importExcel(file.getInputStream());
+            List<String> IdList = new ArrayList<>();
+            for (FilesProject fileProject :  filesProjectService.selectFilesProjectList(new FilesProject())) {
+                IdList.add(fileProject.getId());
+            }
+            for (FilesProject fileProject : filesProjectList)
+            {
+                if (fileProject.getId() == null || !IdList.contains(fileProject.getId()))
+                    fileProject.setId(new SnowFlake().generateId());
+                if (IdList.contains(fileProject.getId()))
+                    filesProjectService.updateFilesProject(fileProject);
+                else
+                    filesProjectService.insertFilesProject(fileProject);
+            }
+//            FilesProject filesProject = new FilesProject();
+//            for (int i = 0; i < rowNumber - 1; ) {
+//                i++;
+//                filesProject.setId(new SnowFlake().generateId());
+//                filesProject.setProjectNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(0)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(0)));
+//                filesProject.setProjectName(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(1)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(1)));
+//                filesProject.setCurrentProgress(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(2)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(2)));
+//                filesProject.setProjectSource(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(3)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(3)));
+//                filesProject.setPartyA(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(4)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(4)));
+//                filesProject.setContactPerson(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(5)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(5)));
+//                filesProject.setTelephone(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(6)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(6)));
+//                filesProject.setContractCode(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(7)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(7)));
+//                filesProject.setContractNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(8)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(8)));
+//                filesProject.setProjectType(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(9)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(9)));
+//                filesProject.setExpectedPrice(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(10)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(10)));
+//                filesProject.setProjectLevel(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(11)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(11)));
+//                filesProject.setTechnicalDirector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(12)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(12)));
+//                filesProject.setTechinicalDesigner(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(13)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(13)));
+//                filesProject.setQualityInspector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(14)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(14)));
+//                filesProject.setUndertakingSector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(15)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(15)));
+//                filesProject.setProjectLeader(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(16)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(16)));
+//                filesProject.setFund(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(17)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(17)));
+//                filesProject.setApprovalDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(18)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(18)));
+//                filesProject.setApproachTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(19)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(19)));
+//                filesProject.setWithdrawalTime(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(20)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(20)));
+//                filesProject.setRequiredCompletionDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(21)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(21)));
+//                filesProject.setSubmissionDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(22)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(22)));
+//                filesProject.setLicensePlateNumber(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(23)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(23)));
+//                filesProject.setMileage(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(24)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(24)));
+//                filesProject.setFuelExpense(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(25)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(25)));
+//                filesProject.setMainEquipment(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(26)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(26)));
+//                filesProject.setProjectParticipants(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(27)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(27)));
+//                filesProject.setCurrentProcessing(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(28)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(28)));
+//                filesProject.setCurrentHandler(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(29)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(29)));
+//                filesProject.setProjectRegistrant(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(30)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(30)));
+//                filesProject.setRegistrationDate(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(31)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(31)));
+//                filesProject.setLeadingSector(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(32)) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(32)));
+//                filesProject.setYear(xlsx ? ExcelUtils.getString(sheetAt.getRow(i).getCell(33)).substring(0,4) : ExcelUtils.getString(sheetAt1.getRow(i).getCell(33)).substring(0,4));
+//                filesProjectService.insertFilesProject(filesProject);
+//            }
+            return AjaxResult.success("上传成功");
+        }
+    }
+
+    /**
+     * 新增项目管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:add')")
+    @Log(title = "项目管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(FilesProject filesProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
+        ConvertToId(filesProject);
+        filesProject.setId(new SnowFlake().generateId());
+        if (uploadProjectKmlFile(filesProject, uploadProjectKmlFile) )
+            return AjaxResult.error("项目范围kml文件内容为空");
+        if (uploadCpKmlFile(filesProject, uploadCpKmlFile))
+            return AjaxResult.error("项目控制点kml文件内容为空");
+        return toAjax(filesProjectService.insertFilesProject(filesProject));
+    }
+
+    private boolean uploadProjectKmlFile(FilesProject filesProject, MultipartFile uploadProjectKmlFile) throws IOException {
+        if (uploadProjectKmlFile != null) {
+            if (!uploadProjectKmlFile.isEmpty()) {
+                File profilePath = new File(profile);
+                if (!profilePath.exists())//若此目录不存在，则创建之
+                    profilePath.mkdirs();
+                File transferFile = new File( profilePath + "\\" + uploadProjectKmlFile.getOriginalFilename());
+                if (!transferFile.exists())
+                    uploadProjectKmlFile.transferTo(transferFile);
+                filesProject.setProjectKml(transferFile.getName());
+            }
+            else
+                return true;
+        }
+        return false;
+    }
+
+    private boolean uploadCpKmlFile(FilesProject filesProject, MultipartFile uploadCpKmlFile) throws IOException {
+        if (uploadCpKmlFile != null) {
+            if (!uploadCpKmlFile.isEmpty()) {
+                File profilePath = new File(profile);
+                if (!profilePath.exists())//若此目录不存在，则创建之
+                    profilePath.mkdirs();
+                File transferFile = new File( profilePath + "\\" + uploadCpKmlFile.getOriginalFilename());
+                if (!transferFile.exists())
+                    uploadCpKmlFile.transferTo(transferFile);
+                filesProject.setProjectCp(transferFile.getName());
+            }
+            else
+                return true;
+        }
+        return false;
+    }
+
+    private void ConvertToId(FilesProject filesProject) {
+        FilesStorage storage = new FilesStorage();
+        storage.setStorageAddress(filesProject.getStorageAddress());
+        if (filesProject.getStorageAddress() != null && !filesProject.getStorageAddress().equals("")) {
+            filesProject.setStorageId(new SnowFlake().generateId());
+            if (filesStorageService.selectFilesStorageListE(storage).size() > 0)
+                filesProject.setStorageId(filesStorageService.selectFilesStorageListE(storage).get(0).getId());
+            else {
+                FilesStorage filesStorage = new FilesStorage();
+                filesStorage.setId(filesProject.getStorageId());
+                filesStorage.setStorageAddress(filesProject.getStorageAddress());
+                filesStorage.setAdministrator(getLoginUser().getUsername());
+                filesStorage.setRemark("");
+                filesStorageService.insertFilesStorage(filesStorage);
+            }
+        }
+        FilesTopic topic = new FilesTopic();
+        topic.setTopicName(filesProject.getTopicName());
+        if (filesProject.getTopicName() != null && !filesProject.getTopicName().equals("")) {
+            filesProject.setTopicId(new SnowFlake().generateId());
+            if (filesTopicService.selectFilesTopicList(topic).size() > 0)
+                filesProject.setTopicId(filesTopicService.selectFilesTopicList(topic).get(0).getId());
+            else {
+                FilesTopic filesTopic = new FilesTopic();
+                filesTopic.setId(filesProject.getTopicId());
+                filesTopic.setTopicName(filesProject.getTopicName());
+                filesTopicService.insertFilesTopic(filesTopic);
+            }
+        }
+    }
+
+    /**
+     * 修改项目管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:edit')")
+    @Log(title = "项目管理", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(FilesProject filesProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
+        ConvertToId(filesProject);
+        if (uploadProjectKmlFile(filesProject, uploadProjectKmlFile) )
+            return AjaxResult.error("项目范围kml文件内容为空");
+        if (uploadCpKmlFile(filesProject, uploadCpKmlFile))
+            return AjaxResult.error("项目控制点kml文件内容为空");
+        return toAjax(filesProjectService.updateFilesProject(filesProject));
+    }
+
+    /**
+     * 删除项目管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:remove')")
+    @Log(title = "项目管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(filesProjectService.deleteFilesProjectByIds(ids));
+    }
+    /**
+     * 根据项目编号查询项目信息
+     */
+    @PreAuthorize("@ss.hasPermi('file:project:query')")
+    @GetMapping("/query/{projectNumbers}")
+    public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers){
+        return AjaxResult.success(filesProjectService.selectFilesProjectByNumbers(projectNumbers));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesStorageController.java

@@ -0,0 +1,99 @@
+package com.ruoyi.web.controller.file;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.file.domain.FilesStorage;
+import com.ruoyi.file.service.IFilesStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 存放表Controller
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+@RestController
+@RequestMapping("/file/storage")
+public class FilesStorageController extends BaseController
+{
+    @Autowired
+    private IFilesStorageService filesStorageService;
+
+    /**
+     * 查询存放表列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FilesStorage filesStorage)
+    {
+        List<FilesStorage> list = filesStorageService.selectFilesStorageList(filesStorage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出存放表列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:export')")
+    @Log(title = "存放表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FilesStorage filesStorage)
+    {
+        List<FilesStorage> list = filesStorageService.selectFilesStorageList(filesStorage);
+        ExcelUtil<FilesStorage> util = new ExcelUtil<FilesStorage>(FilesStorage.class);
+        util.exportExcel(response, list, "存放表数据");
+    }
+
+    /**
+     * 获取存放表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(filesStorageService.selectFilesStorageById(id));
+    }
+
+    /**
+     * 新增存放表
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:add')")
+    @Log(title = "存放表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FilesStorage filesStorage)
+    {
+        filesStorage.setId(new SnowFlake().generateId());
+        return toAjax(filesStorageService.insertFilesStorage(filesStorage));
+    }
+
+    /**
+     * 修改存放表
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:edit')")
+    @Log(title = "存放表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FilesStorage filesStorage)
+    {
+        return toAjax(filesStorageService.updateFilesStorage(filesStorage));
+    }
+
+    /**
+     * 删除存放表
+     */
+    @PreAuthorize("@ss.hasPermi('file:storage:remove')")
+    @Log(title = "存放表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(filesStorageService.deleteFilesStorageByIds(ids));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesTopicController.java

@@ -0,0 +1,99 @@
+package com.ruoyi.web.controller.file;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SnowFlake;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.file.domain.FilesTopic;
+import com.ruoyi.file.service.IFilesTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 专题管理Controller
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+@RestController
+@RequestMapping("/file/topic")
+public class FilesTopicController extends BaseController
+{
+    @Autowired
+    private IFilesTopicService filesTopicService;
+
+    /**
+     * 查询专题管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FilesTopic filesTopic)
+    {
+        List<FilesTopic> list = filesTopicService.selectFilesTopicList(filesTopic);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出专题管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:export')")
+    @Log(title = "专题管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, FilesTopic filesTopic)
+    {
+        List<FilesTopic> list = filesTopicService.selectFilesTopicList(filesTopic);
+        ExcelUtil<FilesTopic> util = new ExcelUtil<FilesTopic>(FilesTopic.class);
+        util.exportExcel(response, list, "专题管理数据");
+    }
+
+    /**
+     * 获取专题管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(filesTopicService.selectFilesTopicById(id));
+    }
+
+    /**
+     * 新增专题管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:add')")
+    @Log(title = "专题管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FilesTopic filesTopic)
+    {
+        filesTopic.setId(new SnowFlake().generateId());
+        return toAjax(filesTopicService.insertFilesTopic(filesTopic));
+    }
+
+    /**
+     * 修改专题管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:edit')")
+    @Log(title = "专题管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FilesTopic filesTopic)
+    {
+        return toAjax(filesTopicService.updateFilesTopic(filesTopic));
+    }
+
+    /**
+     * 删除专题管理
+     */
+    @PreAuthorize("@ss.hasPermi('file:topic:remove')")
+    @Log(title = "专题管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(filesTopicService.deleteFilesTopicByIds(ids));
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallArchiveActivityExecutionListener.java

@@ -0,0 +1,18 @@
+package com.ruoyi.flowable.oa;
+
+import org.flowable.common.engine.impl.identity.Authentication;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component("CallArchiveActivityExecutionListener")
+public class CallArchiveActivityExecutionListener implements ExecutionListener {
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        Map<String, Object> variables = delegateExecution.getVariables();
+        Authentication.setAuthenticatedUserId(variables.get("archiveInitiator").toString());
+        delegateExecution.setVariable("approval", variables.get("archiveInitiator").toString());
+    }
+}

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSettleActivityExecutionListener.java

@@ -0,0 +1,18 @@
+package com.ruoyi.flowable.oa;
+
+import org.flowable.common.engine.impl.identity.Authentication;
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.ExecutionListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component("CallSettleActivityExecutionListener")
+public class CallSettleActivityExecutionListener implements ExecutionListener {
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+        Map<String, Object> variables = delegateExecution.getVariables();
+        Authentication.setAuthenticatedUserId(variables.get("settleInitiator").toString());
+        delegateExecution.setVariable("approval", variables.get("settleInitiator").toString());
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesAchievement.java

@@ -0,0 +1,300 @@
+package com.ruoyi.file.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 成果表对象 files_achievement
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public class FilesAchievement extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 成果id */
+    @Excel(name = "序号")
+    private String id;
+
+    /** 项目id */
+//    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    /** 数据年份 */
+    @Excel(name = "数据年份")
+    private String dataYear;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String achiName;
+
+    /** 比例尺或等级 */
+    @Excel(name = "比例尺或等级")
+    private String scaleOrder;
+
+    /** 成果类型 */
+    @Excel(name = "成果类型")
+    private String resultType;
+
+    /** 文件类型 */
+    @Excel(name = "文件类型")
+    private String fileType;
+
+    /** KML地址 */
+//    @Excel(name = "KML地址")
+    private String kmlUrl;
+
+    /** kml文件的中心位置经度 */
+//    @Excel(name = "kml文件的中心位置经度")
+    private String kmlLng;
+
+    /** kml文件的中心位置纬度 */
+//    @Excel(name = "kml文件的中心位置纬度")
+    private String kmlLat;
+
+    /** 工作量 */
+    @Excel(name = "工作量")
+    private String workLoad;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 数据来源 */
+    @Excel(name = "数据来源")
+    private String dataSource;
+
+    /** 数据类型（0原始数据，1成果数据，2过程数据） */
+    @Excel(name = "数据类型", readConverterExp = "0=原始数据，1成果数据，2过程数据")
+    private String dataType;
+
+    /** 生产日期 */
+    @Excel(name = "生产日期")
+    private String productionTime;
+
+    /** 存放地址id */
+//    @Excel(name = "存放地址id")
+    private String storageId;
+
+    /** 存放地址 */
+    @Excel(name = "存放地址")
+    private String storageAddress;
+
+    /** 成果提交时间 */
+    @Excel(name = "成果提交时间")
+    private Date submitDate;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "分辨率（米）")
+    private String resolution;
+
+    @Excel(name = "大地基准")
+    private String geodeticDatum;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setProjectNumber(String projectNumber)
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber()
+    {
+        return projectNumber;
+    }
+    public void setAchiName(String achiName) 
+    {
+        this.achiName = achiName;
+    }
+
+    public String getAchiName() 
+    {
+        return achiName;
+    }
+    public void setDataYear(String dataYear) { this.dataYear = dataYear; }
+
+    public String getDataYear() 
+    {
+        return dataYear;
+    }
+    public void setScaleOrder(String scaleOrder) 
+    {
+        this.scaleOrder = scaleOrder;
+    }
+
+    public String getScaleOrder() 
+    {
+        return scaleOrder;
+    }
+    public void setResultType(String resultType) { this.resultType = resultType; }
+
+    public String getResultType() 
+    {
+        return resultType;
+    }
+    public void setFileType(String fileType) { this.fileType = fileType; }
+
+    public String getFileType()
+    {
+        return fileType;
+    }
+    public void setKmlUrl(String kmlUrl) 
+    {
+        this.kmlUrl = kmlUrl;
+    }
+
+    public String getKmlUrl() 
+    {
+        return kmlUrl;
+    }
+    public void setKmlLng(String kmlLng) 
+    {
+        this.kmlLng = kmlLng;
+    }
+
+    public String getKmlLng() 
+    {
+        return kmlLng;
+    }
+    public void setKmlLat(String kmlLat) 
+    {
+        this.kmlLat = kmlLat;
+    }
+
+    public String getKmlLat() 
+    {
+        return kmlLat;
+    }
+    public void setWorkLoad(String workLoad) 
+    {
+        this.workLoad = workLoad;
+    }
+
+    public String getWorkLoad() 
+    {
+        return workLoad;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setDataSource(String dataSource) 
+    {
+        this.dataSource = dataSource;
+    }
+
+    public String getDataSource() 
+    {
+        return dataSource;
+    }
+    public void setDataType(String dataType) 
+    {
+        this.dataType = dataType;
+    }
+
+    public String getDataType() 
+    {
+        return dataType;
+    }
+    public void setStorageId(String storageId) 
+    {
+        this.storageId = storageId;
+    }
+
+    public String getStorageId() 
+    {
+        return storageId;
+    }
+    public void setStorageAddress(String storageAddress)
+    {
+        this.storageAddress = storageAddress;
+    }
+
+    public String getStorageAddress()
+    {
+        return storageAddress;
+    }
+    public void setSubmitDate(Date submitDate) { this.submitDate = submitDate; }
+
+    public Date getSubmitDate()
+    {
+        return submitDate;
+    }
+    public void setProductionTime(String productionTime) { this.productionTime = productionTime; }
+
+    public String getProductionTime()
+    {
+        return productionTime;
+    }
+    public void setRemark(String remark) { this.remark = remark; }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+    public void setResolution(String resolution) { this.resolution = resolution; }
+
+    public String getResolution()
+    {
+        return resolution;
+    }
+    public void setGeodeticDatum(String geodeticDatum) { this.geodeticDatum = geodeticDatum; }
+
+    public String getGeodeticDatum()
+    {
+        return geodeticDatum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("achiName", getAchiName())
+            .append("dataYear", getDataYear())
+            .append("scaleOrder", getScaleOrder())
+            .append("resultType", getResultType())
+            .append("kmlUrl", getKmlUrl())
+            .append("kmlLng", getKmlLng())
+            .append("kmlLat", getKmlLat())
+            .append("workLoad", getWorkLoad())
+            .append("unit", getUnit())
+            .append("dataSource", getDataSource())
+            .append("dataType", getDataType())
+            .append("storageId", getStorageId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesProject.java

@@ -0,0 +1,635 @@
+package com.ruoyi.file.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 项目管理对象 files_project
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public class FilesProject extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 项目唯一标识 */
+    @Excel(name = "序号")
+    private String id;
+
+    /** 项目编号 */
+    @Excel(name = "项目编号")
+    private String projectNumber;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 项目是否结束 */
+    @Excel(name = "项目是否结束")
+    private String isFinish;
+
+    /** 项目负责人 */
+    @Excel(name = "项目负责人")
+    private String projectLeader;
+
+    /** 项目年份 */
+    @Excel(name = "项目年份")
+    private String year;
+
+    /** 当前进度 */
+    @Excel(name = "当前进度")
+    private String currentProgress;
+
+    /** 项目来源 */
+    @Excel(name = "项目来源")
+    private String projectSource;
+
+    /** 甲方单位 */
+    @Excel(name = "甲方单位")
+    private String partyA;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telephone;
+
+    /** 合同编码 */
+    @Excel(name = "合同编码")
+    private String contractCode;
+
+    /** 合同编号 */
+    @Excel(name = "合同编号")
+    private String contractNumber;
+
+    /** 项目类型 */
+    @Excel(name = "项目类型")
+    private String projectType;
+
+    /** 预计价款 */
+    @Excel(name = "预计价款")
+    private String expectedPrice;
+
+    /** 项目级别 */
+    @Excel(name = "项目级别")
+    private String projectLevel;
+
+    /** 技术负责人 */
+    @Excel(name = "技术负责人")
+    private String technicalDirector;
+
+    /** 技术设计人 */
+    @Excel(name = "技术设计人")
+    private String techinicalDesigner;
+
+    /** 质量检查员 */
+    @Excel(name = "质量检查员")
+    private String qualityInspector;
+
+    /** 承担部门 */
+    @Excel(name = "承担部门")
+    private String undertakingSector;
+
+    /** 经费合计 */
+    @Excel(name = "经费合计")
+    private String fund;
+
+    /** 领导批准时间 */
+    @Excel(name = "领导批准时间")
+    private String approvalDate;
+
+    /** 进场时间 */
+    @Excel(name = "进场时间")
+    private String approachTime;
+
+    /** 撤场时间 */
+    @Excel(name = "撤场时间")
+    private String withdrawalTime;
+
+    /** 项目要求完成日期 */
+    @Excel(name = "项目要求完成日期")
+    private String requiredCompletionDate;
+
+    /** 资料提交日期 */
+    @Excel(name = "资料提交日期")
+    private String submissionDate;
+
+    /** 使用车辆（车牌号） */
+    @Excel(name = "使用车辆", readConverterExp = "车=牌号")
+    private String licensePlateNumber;
+
+    /** 项目行车公里数 */
+    @Excel(name = "项目行车公里数")
+    private String mileage;
+
+    /** 项目燃油使用费 */
+    @Excel(name = "项目燃油使用费")
+    private String fuelExpense;
+
+    /** 主要设备 */
+    @Excel(name = "主要设备")
+    private String mainEquipment;
+
+    /** 项目参与人员 */
+    @Excel(name = "项目参与人员")
+    private String projectParticipants;
+
+    /** 当前处理环节 */
+    @Excel(name = "当前处理环节")
+    private String currentProcessing;
+
+    /** 当前处理人 */
+    @Excel(name = "当前处理人")
+    private String currentHandler;
+
+    /** 项目登记人 */
+    @Excel(name = "项目登记人")
+    private String projectRegistrant;
+
+    /** 项目登记日期 */
+    @Excel(name = "项目登记日期")
+    private String registrationDate;
+
+    /** 牵头部门 */
+    @Excel(name = "牵头部门")
+    private String leadingSector;
+
+
+
+    /** 所属专题id */
+//    @Excel(name = "所属专题id")
+    private String topicId;
+
+    /** 专题名称 */
+//    @Excel(name = "专题名称")
+    private String topicName;
+
+    /** 存放地址的id */
+//    @Excel(name = "存放地址的id")
+    private String storageId;
+
+    /** 存放地址 */
+//    @Excel(name = "存放地址")
+    private String storageAddress;
+
+    /** 项目kml */
+//    @Excel(name = "项目kml")
+    private String projectKml;
+
+    /** 项目控制点 */
+//    @Excel(name = "项目控制点")
+    private String projectCp;
+
+    /** kml文件的中心位置经度 */
+//    @Excel(name = "kml文件的中心位置经度")
+    private String kmlLng;
+
+    /** kml文件的中心位置纬度 */
+//    @Excel(name = "kml文件的中心位置纬度")
+    private String kmlLat;
+
+
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProjectNumber(String projectNumber) 
+    {
+        this.projectNumber = projectNumber;
+    }
+
+    public String getProjectNumber() 
+    {
+        return projectNumber;
+    }
+    public void setProjectName(String projectName) 
+    {
+        this.projectName = projectName;
+    }
+
+    public String getProjectName() 
+    {
+        return projectName;
+    }
+    public void setCurrentProgress(String currentProgress) 
+    {
+        this.currentProgress = currentProgress;
+    }
+
+    public String getCurrentProgress() 
+    {
+        return currentProgress;
+    }
+    public void setProjectSource(String projectSource) 
+    {
+        this.projectSource = projectSource;
+    }
+
+    public String getProjectSource() 
+    {
+        return projectSource;
+    }
+    public void setPartyA(String partyA) 
+    {
+        this.partyA = partyA;
+    }
+
+    public String getPartyA() 
+    {
+        return partyA;
+    }
+    public void setContactPerson(String contactPerson) 
+    {
+        this.contactPerson = contactPerson;
+    }
+
+    public String getContactPerson() 
+    {
+        return contactPerson;
+    }
+    public void setTelephone(String telephone) 
+    {
+        this.telephone = telephone;
+    }
+
+    public String getTelephone() 
+    {
+        return telephone;
+    }
+    public void setContractCode(String contractCode) 
+    {
+        this.contractCode = contractCode;
+    }
+
+    public String getContractCode() 
+    {
+        return contractCode;
+    }
+    public void setContractNumber(String contractNumber) 
+    {
+        this.contractNumber = contractNumber;
+    }
+
+    public String getContractNumber() 
+    {
+        return contractNumber;
+    }
+    public void setProjectType(String projectType) 
+    {
+        this.projectType = projectType;
+    }
+
+    public String getProjectType() 
+    {
+        return projectType;
+    }
+    public void setExpectedPrice(String expectedPrice) 
+    {
+        this.expectedPrice = expectedPrice;
+    }
+
+    public String getExpectedPrice() 
+    {
+        return expectedPrice;
+    }
+    public void setProjectLevel(String projectLevel) 
+    {
+        this.projectLevel = projectLevel;
+    }
+
+    public String getProjectLevel() 
+    {
+        return projectLevel;
+    }
+    public void setTechnicalDirector(String technicalDirector) 
+    {
+        this.technicalDirector = technicalDirector;
+    }
+
+    public String getTechnicalDirector() 
+    {
+        return technicalDirector;
+    }
+    public void setTechinicalDesigner(String techinicalDesigner) 
+    {
+        this.techinicalDesigner = techinicalDesigner;
+    }
+
+    public String getTechinicalDesigner() 
+    {
+        return techinicalDesigner;
+    }
+    public void setQualityInspector(String qualityInspector) 
+    {
+        this.qualityInspector = qualityInspector;
+    }
+
+    public String getQualityInspector() 
+    {
+        return qualityInspector;
+    }
+    public void setUndertakingSector(String undertakingSector) 
+    {
+        this.undertakingSector = undertakingSector;
+    }
+
+    public String getUndertakingSector() 
+    {
+        return undertakingSector;
+    }
+    public void setProjectLeader(String projectLeader) 
+    {
+        this.projectLeader = projectLeader;
+    }
+
+    public String getProjectLeader() 
+    {
+        return projectLeader;
+    }
+    public void setFund(String fund) 
+    {
+        this.fund = fund;
+    }
+
+    public String getFund() 
+    {
+        return fund;
+    }
+    public void setApprovalDate(String approvalDate) 
+    {
+        this.approvalDate = approvalDate;
+    }
+
+    public String getApprovalDate() 
+    {
+        return approvalDate;
+    }
+    public void setApproachTime(String approachTime) 
+    {
+        this.approachTime = approachTime;
+    }
+
+    public String getApproachTime() 
+    {
+        return approachTime;
+    }
+    public void setWithdrawalTime(String withdrawalTime) 
+    {
+        this.withdrawalTime = withdrawalTime;
+    }
+
+    public String getWithdrawalTime() 
+    {
+        return withdrawalTime;
+    }
+    public void setRequiredCompletionDate(String requiredCompletionDate) { this.requiredCompletionDate = requiredCompletionDate; }
+
+    public String getRequiredCompletionDate() 
+    {
+        return requiredCompletionDate;
+    }
+    public void setSubmissionDate(String submissionDate) 
+    {
+        this.submissionDate = submissionDate;
+    }
+
+    public String getSubmissionDate() 
+    {
+        return submissionDate;
+    }
+    public void setLicensePlateNumber(String licensePlateNumber) 
+    {
+        this.licensePlateNumber = licensePlateNumber;
+    }
+
+    public String getLicensePlateNumber() 
+    {
+        return licensePlateNumber;
+    }
+    public void setMileage(String mileage) 
+    {
+        this.mileage = mileage;
+    }
+
+    public String getMileage() 
+    {
+        return mileage;
+    }
+    public void setFuelExpense(String fuelExpense) 
+    {
+        this.fuelExpense = fuelExpense;
+    }
+
+    public String getFuelExpense() 
+    {
+        return fuelExpense;
+    }
+    public void setMainEquipment(String mainEquipment) 
+    {
+        this.mainEquipment = mainEquipment;
+    }
+
+    public String getMainEquipment() 
+    {
+        return mainEquipment;
+    }
+    public void setProjectParticipants(String projectParticipants) 
+    {
+        this.projectParticipants = projectParticipants;
+    }
+
+    public String getProjectParticipants() 
+    {
+        return projectParticipants;
+    }
+    public void setCurrentProcessing(String currentProcessing) 
+    {
+        this.currentProcessing = currentProcessing;
+    }
+
+    public String getCurrentProcessing() 
+    {
+        return currentProcessing;
+    }
+    public void setCurrentHandler(String currentHandler) 
+    {
+        this.currentHandler = currentHandler;
+    }
+
+    public String getCurrentHandler() 
+    {
+        return currentHandler;
+    }
+    public void setProjectRegistrant(String projectRegistrant) 
+    {
+        this.projectRegistrant = projectRegistrant;
+    }
+
+    public String getProjectRegistrant() 
+    {
+        return projectRegistrant;
+    }
+    public void setRegistrationDate(String registrationDate) 
+    {
+        this.registrationDate = registrationDate;
+    }
+
+    public String getRegistrationDate() 
+    {
+        return registrationDate;
+    }
+    public void setLeadingSector(String leadingSector) 
+    {
+        this.leadingSector = leadingSector;
+    }
+
+    public String getLeadingSector() 
+    {
+        return leadingSector;
+    }
+    public void setYear(String year) 
+    {
+        this.year = year;
+    }
+
+    public String getYear() 
+    {
+        return year;
+    }
+    public void setTopicId(String topicId) 
+    {
+        this.topicId = topicId;
+    }
+
+    public String getTopicId() 
+    {
+        return topicId;
+    }
+    public void setTopicName(String topicName)
+    {
+        this.topicName = topicName;
+    }
+
+    public String getTopicName()
+    {
+        return topicName;
+    }
+    public void setStorageAddress(String storageAddress)
+    {
+        this.storageAddress = storageAddress;
+    }
+
+    public String getStorageAddress()
+    {
+        return storageAddress;
+    }
+    public void setStorageId(String storageId)
+    {
+        this.storageId = storageId;
+    }
+
+    public String getStorageId()
+    {
+        return storageId;
+    }
+    public void setProjectKml(String projectKml)
+    {
+        this.projectKml = projectKml;
+    }
+
+    public String getProjectKml()
+    {
+        return projectKml;
+    }
+    public void setProjectCp(String projectCp)
+    {
+        this.projectCp = projectCp;
+    }
+
+    public String getProjectCp()
+    {
+        return projectCp;
+    }
+
+    public String getKmlLng()
+    {
+        return kmlLng;
+    }
+    public void setKmlLng(String kmlLng)
+    {
+        this.kmlLng = kmlLng;
+    }
+
+    public String getKmlLat()
+    {
+        return kmlLat;
+    }
+    public void setKmlLat(String kmlLat)
+    {
+        this.kmlLat = kmlLat;
+    }
+
+    public void setIsFinish(String isFinish)
+    {
+        this.isFinish = isFinish;
+    }
+
+    public String getIsFinish()
+    {
+        return isFinish;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectNumber", getProjectNumber())
+            .append("projectName", getProjectName())
+            .append("currentProgress", getCurrentProgress())
+            .append("projectSource", getProjectSource())
+            .append("partyA", getPartyA())
+            .append("contactPerson", getContactPerson())
+            .append("telephone", getTelephone())
+            .append("contractCode", getContractCode())
+            .append("contractNumber", getContractNumber())
+            .append("projectType", getProjectType())
+            .append("expectedPrice", getExpectedPrice())
+            .append("projectLevel", getProjectLevel())
+            .append("technicalDirector", getTechnicalDirector())
+            .append("techinicalDesigner", getTechinicalDesigner())
+            .append("qualityInspector", getQualityInspector())
+            .append("undertakingSector", getUndertakingSector())
+            .append("projectLeader", getProjectLeader())
+            .append("fund", getFund())
+            .append("approvalDate", getApprovalDate())
+            .append("approachTime", getApproachTime())
+            .append("withdrawalTime", getWithdrawalTime())
+            .append("requiredCompletionDate", getRequiredCompletionDate())
+            .append("submissionDate", getSubmissionDate())
+            .append("licensePlateNumber", getLicensePlateNumber())
+            .append("mileage", getMileage())
+            .append("fuelExpense", getFuelExpense())
+            .append("mainEquipment", getMainEquipment())
+            .append("projectParticipants", getProjectParticipants())
+            .append("currentProcessing", getCurrentProcessing())
+            .append("currentHandler", getCurrentHandler())
+            .append("projectRegistrant", getProjectRegistrant())
+            .append("registrationDate", getRegistrationDate())
+            .append("leadingSector", getLeadingSector())
+            .append("year", getYear())
+            .append("topicId", getTopicId())
+            .append("storageId", getStorageId())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesStorage.java

@@ -0,0 +1,66 @@
+package com.ruoyi.file.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 存放表对象 files_storage
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public class FilesStorage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 存放地址id */
+    private String id;
+
+    /** 存放地址 */
+    @Excel(name = "存放地址")
+    private String storageAddress;
+
+    /** 管理人 */
+    @Excel(name = "管理人")
+    private String administrator;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setStorageAddress(String storageAddress) 
+    {
+        this.storageAddress = storageAddress;
+    }
+
+    public String getStorageAddress() 
+    {
+        return storageAddress;
+    }
+    public void setAdministrator(String administrator) 
+    {
+        this.administrator = administrator;
+    }
+
+    public String getAdministrator() 
+    {
+        return administrator;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("storageAddress", getStorageAddress())
+            .append("administrator", getAdministrator())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/domain/FilesTopic.java

@@ -0,0 +1,51 @@
+package com.ruoyi.file.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 专题管理对象 files_topic
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public class FilesTopic extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 专题id */
+    private String id;
+
+    /** 专题名称 */
+    @Excel(name = "专题名称")
+    private String topicName;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setTopicName(String topicName) 
+    {
+        this.topicName = topicName;
+    }
+
+    public String getTopicName() 
+    {
+        return topicName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("topicName", getTopicName())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/mapper/FilesAchievementMapper.java

@@ -0,0 +1,70 @@
+package com.ruoyi.file.mapper;
+
+import com.ruoyi.file.domain.FilesAchievement;
+
+import java.util.List;
+
+/**
+ * 成果表Mapper接口
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public interface FilesAchievementMapper 
+{
+    /**
+     * 查询成果表
+     * 
+     * @param id 成果表主键
+     * @return 成果表
+     */
+    public FilesAchievement selectFilesAchievementById(String id);
+
+    /**
+     * 查询成果表列表
+     * 
+     * @param filesAchievement 成果表
+     * @return 成果表集合
+     */
+    public List<FilesAchievement> selectFilesAchievementList(FilesAchievement filesAchievement);
+
+    /**
+     * 新增成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    public int insertFilesAchievement(FilesAchievement filesAchievement);
+
+    /**
+     * 修改成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    public int updateFilesAchievement(FilesAchievement filesAchievement);
+
+    /**
+     * 删除成果表
+     * 
+     * @param id 成果表主键
+     * @return 结果
+     */
+    public int deleteFilesAchievementById(String id);
+
+    /**
+     * 批量删除成果表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFilesAchievementByIds(String[] ids);
+
+    /**
+     * 根据项目id批量删除对应的成果列表
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFilesAchievementByProjectIds(String[] ids);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/mapper/FilesProjectMapper.java

@@ -0,0 +1,73 @@
+package com.ruoyi.file.mapper;
+
+import com.ruoyi.file.domain.FilesProject;
+
+import java.util.List;
+
+/**
+ * 项目管理Mapper接口
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public interface FilesProjectMapper 
+{
+    /**
+     * 查询项目管理
+     * 
+     * @param id 项目管理主键
+     * @return 项目管理
+     */
+    public FilesProject selectFilesProjectById(String id);
+
+    /**
+     * 查询项目
+     *
+     * @param projectNumber 项目编号
+     * @return 项目管理
+     */
+    public FilesProject selectFilesProjectByNumber(String projectNumber);
+    /**
+     * 查询项目管理列表
+     * 
+     * @param filesProject 项目管理
+     * @return 项目管理集合
+     */
+    public List<FilesProject> selectFilesProjectList(FilesProject filesProject);
+
+    /**
+     * 新增项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    public int insertFilesProject(FilesProject filesProject);
+
+    /**
+     * 修改项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    public int updateFilesProject(FilesProject filesProject);
+
+    /**
+     * 删除项目管理
+     * 
+     * @param id 项目管理主键
+     * @return 结果
+     */
+    public int deleteFilesProjectById(String id);
+
+    /**
+     * 批量删除项目管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFilesProjectByIds(String[] ids);
+
+    int selectAllCount(FilesProject filesProject);
+
+    public List<FilesProject> selectFilesProjectByNumbers(String[] ids);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/mapper/FilesStorageMapper.java

@@ -0,0 +1,70 @@
+package com.ruoyi.file.mapper;
+
+import com.ruoyi.file.domain.FilesStorage;
+
+import java.util.List;
+
+/**
+ * 存放表Mapper接口
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public interface FilesStorageMapper 
+{
+    /**
+     * 查询存放表
+     * 
+     * @param id 存放表主键
+     * @return 存放表
+     */
+    public FilesStorage selectFilesStorageById(String id);
+
+    /**
+     * 查询存放表列表
+     * 
+     * @param filesStorage 存放表
+     * @return 存放表集合
+     */
+    public List<FilesStorage> selectFilesStorageList(FilesStorage filesStorage);
+
+    /**
+     * 查询存放表列表
+     *
+     * @param filesStorage 存放表
+     * @return 存放表集合
+     */
+    public List<FilesStorage> selectFilesStorageListE(FilesStorage filesStorage);
+
+    /**
+     * 新增存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    public int insertFilesStorage(FilesStorage filesStorage);
+
+    /**
+     * 修改存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    public int updateFilesStorage(FilesStorage filesStorage);
+
+    /**
+     * 删除存放表
+     * 
+     * @param id 存放表主键
+     * @return 结果
+     */
+    public int deleteFilesStorageById(String id);
+
+    /**
+     * 批量删除存放表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFilesStorageByIds(String[] ids);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/mapper/FilesTopicMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.file.mapper;
+
+import com.ruoyi.file.domain.FilesTopic;
+
+import java.util.List;
+
+/**
+ * 专题管理Mapper接口
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public interface FilesTopicMapper 
+{
+    /**
+     * 查询专题管理
+     * 
+     * @param id 专题管理主键
+     * @return 专题管理
+     */
+    public FilesTopic selectFilesTopicById(String id);
+
+    /**
+     * 查询专题管理列表
+     * 
+     * @param filesTopic 专题管理
+     * @return 专题管理集合
+     */
+    public List<FilesTopic> selectFilesTopicList(FilesTopic filesTopic);
+
+    /**
+     * 新增专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    public int insertFilesTopic(FilesTopic filesTopic);
+
+    /**
+     * 修改专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    public int updateFilesTopic(FilesTopic filesTopic);
+
+    /**
+     * 删除专题管理
+     * 
+     * @param id 专题管理主键
+     * @return 结果
+     */
+    public int deleteFilesTopicById(String id);
+
+    /**
+     * 批量删除专题管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteFilesTopicByIds(String[] ids);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/IFilesAchievementService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.file.service;
+
+import com.ruoyi.file.domain.FilesAchievement;
+
+import java.util.List;
+
+/**
+ * 成果表Service接口
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public interface IFilesAchievementService 
+{
+    /**
+     * 查询成果表
+     * 
+     * @param id 成果表主键
+     * @return 成果表
+     */
+    public FilesAchievement selectFilesAchievementById(String id);
+
+    /**
+     * 查询成果表列表
+     * 
+     * @param filesAchievement 成果表
+     * @return 成果表集合
+     */
+    public List<FilesAchievement> selectFilesAchievementList(FilesAchievement filesAchievement);
+
+    /**
+     * 新增成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    public int insertFilesAchievement(FilesAchievement filesAchievement);
+
+    /**
+     * 修改成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    public int updateFilesAchievement(FilesAchievement filesAchievement);
+
+    /**
+     * 批量删除成果表
+     * 
+     * @param ids 需要删除的成果表主键集合
+     * @return 结果
+     */
+    public int deleteFilesAchievementByIds(String[] ids);
+
+    /**
+     * 删除成果表信息
+     * 
+     * @param id 成果表主键
+     * @return 结果
+     */
+    public int deleteFilesAchievementById(String id);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/IFilesProjectService.java

@@ -0,0 +1,79 @@
+package com.ruoyi.file.service;
+
+import com.ruoyi.file.domain.FilesProject;
+
+import java.util.List;
+
+/**
+ * 项目管理Service接口
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public interface IFilesProjectService 
+{
+    /**
+     * 查询项目管理
+     * 
+     * @param id 项目管理主键
+     * @return 项目管理
+     */
+    public FilesProject selectFilesProjectById(String id);
+    /**
+     * 查询项目
+     *
+     * @param id 项目管理主键
+     * @return 项目管理
+     */
+    public FilesProject selectFilesProjectByNumber(String projectNumber);
+
+    /**
+     * 查询项目管理列表
+     * 
+     * @param filesProject 项目管理
+     * @return 项目管理集合
+     */
+    public List<FilesProject> selectFilesProjectList(FilesProject filesProject);
+
+    /**
+     * 新增项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    public int insertFilesProject(FilesProject filesProject);
+
+    /**
+     * 修改项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    public int updateFilesProject(FilesProject filesProject);
+
+    /**
+     * 批量删除项目管理
+     * 
+     * @param ids 需要删除的项目管理主键集合
+     * @return 结果
+     */
+    public int deleteFilesProjectByIds(String[] ids);
+
+    /**
+     * 删除项目管理信息
+     * 
+     * @param id 项目管理主键
+     * @return 结果
+     */
+    public int deleteFilesProjectById(String id);
+
+    int selectAllCount(FilesProject filesProject);
+
+    /**
+     *根据项目编号获取项目信息
+     *
+     * @param ids 项目编号
+     * @return 结果
+     */
+    public List<FilesProject> selectFilesProjectByNumbers(String[] ids);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/IFilesStorageService.java

@@ -0,0 +1,70 @@
+package com.ruoyi.file.service;
+
+import com.ruoyi.file.domain.FilesStorage;
+
+import java.util.List;
+
+/**
+ * 存放表Service接口
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+public interface IFilesStorageService 
+{
+    /**
+     * 查询存放表
+     * 
+     * @param id 存放表主键
+     * @return 存放表
+     */
+    public FilesStorage selectFilesStorageById(String id);
+
+    /**
+     * 查询存放表列表
+     * 
+     * @param filesStorage 存放表
+     * @return 存放表集合
+     */
+    public List<FilesStorage> selectFilesStorageList(FilesStorage filesStorage);
+
+    /**
+     * 查询存放表列表
+     *
+     * @param filesStorage 存放表
+     * @return 存放表集合
+     */
+    public List<FilesStorage> selectFilesStorageListE(FilesStorage filesStorage);
+
+    /**
+     * 新增存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    public int insertFilesStorage(FilesStorage filesStorage);
+
+    /**
+     * 修改存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    public int updateFilesStorage(FilesStorage filesStorage);
+
+    /**
+     * 批量删除存放表
+     * 
+     * @param ids 需要删除的存放表主键集合
+     * @return 结果
+     */
+    public int deleteFilesStorageByIds(String[] ids);
+
+    /**
+     * 删除存放表信息
+     * 
+     * @param id 存放表主键
+     * @return 结果
+     */
+    public int deleteFilesStorageById(String id);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/IFilesTopicService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.file.service;
+
+import com.ruoyi.file.domain.FilesTopic;
+
+import java.util.List;
+
+/**
+ * 专题管理Service接口
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+public interface IFilesTopicService 
+{
+    /**
+     * 查询专题管理
+     * 
+     * @param id 专题管理主键
+     * @return 专题管理
+     */
+    public FilesTopic selectFilesTopicById(String id);
+
+    /**
+     * 查询专题管理列表
+     * 
+     * @param filesTopic 专题管理
+     * @return 专题管理集合
+     */
+    public List<FilesTopic> selectFilesTopicList(FilesTopic filesTopic);
+
+    /**
+     * 新增专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    public int insertFilesTopic(FilesTopic filesTopic);
+
+    /**
+     * 修改专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    public int updateFilesTopic(FilesTopic filesTopic);
+
+    /**
+     * 批量删除专题管理
+     * 
+     * @param ids 需要删除的专题管理主键集合
+     * @return 结果
+     */
+    public int deleteFilesTopicByIds(String[] ids);
+
+    /**
+     * 删除专题管理信息
+     * 
+     * @param id 专题管理主键
+     * @return 结果
+     */
+    public int deleteFilesTopicById(String id);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/impl/FilesAchievementServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.file.service.impl;
+
+import com.ruoyi.file.domain.FilesAchievement;
+import com.ruoyi.file.mapper.FilesAchievementMapper;
+import com.ruoyi.file.service.IFilesAchievementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 成果表Service业务层处理
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+@Service
+public class FilesAchievementServiceImpl implements IFilesAchievementService 
+{
+    @Autowired
+    private FilesAchievementMapper filesAchievementMapper;
+
+    /**
+     * 查询成果表
+     * 
+     * @param id 成果表主键
+     * @return 成果表
+     */
+    @Override
+    public FilesAchievement selectFilesAchievementById(String id)
+    {
+        return filesAchievementMapper.selectFilesAchievementById(id);
+    }
+
+    /**
+     * 查询成果表列表
+     * 
+     * @param filesAchievement 成果表
+     * @return 成果表
+     */
+    @Override
+    public List<FilesAchievement> selectFilesAchievementList(FilesAchievement filesAchievement)
+    {
+        return filesAchievementMapper.selectFilesAchievementList(filesAchievement);
+    }
+
+    /**
+     * 新增成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    @Override
+    public int insertFilesAchievement(FilesAchievement filesAchievement)
+    {
+        return filesAchievementMapper.insertFilesAchievement(filesAchievement);
+    }
+
+    /**
+     * 修改成果表
+     * 
+     * @param filesAchievement 成果表
+     * @return 结果
+     */
+    @Override
+    public int updateFilesAchievement(FilesAchievement filesAchievement)
+    {
+        return filesAchievementMapper.updateFilesAchievement(filesAchievement);
+    }
+
+    /**
+     * 批量删除成果表
+     * 
+     * @param ids 需要删除的成果表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesAchievementByIds(String[] ids)
+    {
+        return filesAchievementMapper.deleteFilesAchievementByIds(ids);
+    }
+
+    /**
+     * 删除成果表信息
+     * 
+     * @param id 成果表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesAchievementById(String id)
+    {
+        return filesAchievementMapper.deleteFilesAchievementById(id);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/impl/FilesProjectServiceImpl.java

@@ -0,0 +1,123 @@
+package com.ruoyi.file.service.impl;
+
+import com.ruoyi.file.domain.FilesProject;
+import com.ruoyi.file.mapper.FilesAchievementMapper;
+import com.ruoyi.file.mapper.FilesProjectMapper;
+import com.ruoyi.file.service.IFilesProjectService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目管理Service业务层处理
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+@Service
+public class FilesProjectServiceImpl implements IFilesProjectService 
+{
+    @Autowired
+    private FilesProjectMapper filesProjectMapper;
+    @Autowired
+    private FilesAchievementMapper filesAchievementMapper;
+    /**
+     * 查询项目管理
+     * 
+     * @param id 项目管理主键
+     * @return 项目管理
+     */
+    @Override
+    public FilesProject selectFilesProjectById(String id)
+    {
+        return filesProjectMapper.selectFilesProjectById(id);
+    }
+
+    /**
+     * 查询项目管理
+     *
+     * @param projectNumber 项目编号
+     * @return 项目管理
+     */
+    @Override
+    public FilesProject selectFilesProjectByNumber(String projectNumber)
+    {
+        return filesProjectMapper.selectFilesProjectByNumber(projectNumber);
+    }
+
+    /**
+     * 查询项目管理列表
+     * 
+     * @param filesProject 项目管理
+     * @return 项目管理
+     */
+    @Override
+    public List<FilesProject> selectFilesProjectList(FilesProject filesProject)
+    {
+        return filesProjectMapper.selectFilesProjectList(filesProject);
+    }
+
+    /**
+     * 新增项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    @Override
+    public int insertFilesProject(FilesProject filesProject)
+    {
+        return filesProjectMapper.insertFilesProject(filesProject);
+    }
+
+    /**
+     * 修改项目管理
+     * 
+     * @param filesProject 项目管理
+     * @return 结果
+     */
+    @Override
+    public int updateFilesProject(FilesProject filesProject)
+    {
+        return filesProjectMapper.updateFilesProject(filesProject);
+    }
+
+    /**
+     * 批量删除项目管理
+     * 
+     * @param ids 需要删除的项目管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesProjectByIds(String[] ids)
+    {
+        try{
+            filesAchievementMapper.deleteFilesAchievementByProjectIds(ids);
+            return filesProjectMapper.deleteFilesProjectByIds(ids);
+        }catch (Exception e) {
+            throw new RuntimeException();
+        }
+    }
+
+    /**
+     * 删除项目管理信息
+     * 
+     * @param id 项目管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesProjectById(String id)
+    {
+        return filesProjectMapper.deleteFilesProjectById(id);
+    }
+
+    @Override
+    public int selectAllCount(FilesProject filesProject) {
+        return filesProjectMapper.selectAllCount(filesProject);
+    }
+
+    @Override
+    public List<FilesProject> selectFilesProjectByNumbers(String[] ids){
+        return filesProjectMapper.selectFilesProjectByNumbers(ids);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/impl/FilesStorageServiceImpl.java

@@ -0,0 +1,106 @@
+package com.ruoyi.file.service.impl;
+
+import com.ruoyi.file.domain.FilesStorage;
+import com.ruoyi.file.mapper.FilesStorageMapper;
+import com.ruoyi.file.service.IFilesStorageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 存放表Service业务层处理
+ * 
+ * @author cmc
+ * @date 2022-09-06
+ */
+@Service
+public class FilesStorageServiceImpl implements IFilesStorageService 
+{
+    @Autowired
+    private FilesStorageMapper filesStorageMapper;
+
+    /**
+     * 查询存放表
+     * 
+     * @param id 存放表主键
+     * @return 存放表
+     */
+    @Override
+    public FilesStorage selectFilesStorageById(String id)
+    {
+        return filesStorageMapper.selectFilesStorageById(id);
+    }
+
+    /**
+     * 查询存放表列表
+     * 
+     * @param filesStorage 存放表
+     * @return 存放表
+     */
+    @Override
+    public List<FilesStorage> selectFilesStorageList(FilesStorage filesStorage)
+    {
+        return filesStorageMapper.selectFilesStorageList(filesStorage);
+    }
+
+    /**
+     * 查询存放表列表
+     *
+     * @param filesStorage 存放表
+     * @return 存放表
+     */
+    @Override
+    public List<FilesStorage> selectFilesStorageListE(FilesStorage filesStorage)
+    {
+        return filesStorageMapper.selectFilesStorageListE(filesStorage);
+    }
+
+    /**
+     * 新增存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    @Override
+    public int insertFilesStorage(FilesStorage filesStorage)
+    {
+        return filesStorageMapper.insertFilesStorage(filesStorage);
+    }
+
+    /**
+     * 修改存放表
+     * 
+     * @param filesStorage 存放表
+     * @return 结果
+     */
+    @Override
+    public int updateFilesStorage(FilesStorage filesStorage)
+    {
+        return filesStorageMapper.updateFilesStorage(filesStorage);
+    }
+
+    /**
+     * 批量删除存放表
+     * 
+     * @param ids 需要删除的存放表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesStorageByIds(String[] ids)
+    {
+        return filesStorageMapper.deleteFilesStorageByIds(ids);
+    }
+
+    /**
+     * 删除存放表信息
+     * 
+     * @param id 存放表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesStorageById(String id)
+    {
+        return filesStorageMapper.deleteFilesStorageById(id);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/file/service/impl/FilesTopicServiceImpl.java

@@ -0,0 +1,94 @@
+package com.ruoyi.file.service.impl;
+
+import com.ruoyi.file.domain.FilesTopic;
+import com.ruoyi.file.mapper.FilesTopicMapper;
+import com.ruoyi.file.service.IFilesTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 专题管理Service业务层处理
+ * 
+ * @author cmc
+ * @date 2022-09-05
+ */
+@Service
+public class FilesTopicServiceImpl implements IFilesTopicService 
+{
+    @Autowired
+    private FilesTopicMapper filesTopicMapper;
+
+    /**
+     * 查询专题管理
+     * 
+     * @param id 专题管理主键
+     * @return 专题管理
+     */
+    @Override
+    public FilesTopic selectFilesTopicById(String id)
+    {
+        return filesTopicMapper.selectFilesTopicById(id);
+    }
+
+    /**
+     * 查询专题管理列表
+     * 
+     * @param filesTopic 专题管理
+     * @return 专题管理
+     */
+    @Override
+    public List<FilesTopic> selectFilesTopicList(FilesTopic filesTopic)
+    {
+        return filesTopicMapper.selectFilesTopicList(filesTopic);
+    }
+
+    /**
+     * 新增专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    @Override
+    public int insertFilesTopic(FilesTopic filesTopic)
+    {
+        return filesTopicMapper.insertFilesTopic(filesTopic);
+    }
+
+    /**
+     * 修改专题管理
+     * 
+     * @param filesTopic 专题管理
+     * @return 结果
+     */
+    @Override
+    public int updateFilesTopic(FilesTopic filesTopic)
+    {
+        return filesTopicMapper.updateFilesTopic(filesTopic);
+    }
+
+    /**
+     * 批量删除专题管理
+     * 
+     * @param ids 需要删除的专题管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesTopicByIds(String[] ids)
+    {
+        return filesTopicMapper.deleteFilesTopicByIds(ids);
+    }
+
+    /**
+     * 删除专题管理信息
+     * 
+     * @param id 专题管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFilesTopicById(String id)
+    {
+        return filesTopicMapper.deleteFilesTopicById(id);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesAchievementMapper.xml

@@ -0,0 +1,168 @@
+<?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="com.ruoyi.file.mapper.FilesAchievementMapper">
+    
+    <resultMap type="FilesAchievement" id="FilesAchievementResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="achiName"    column="achi_name"    />
+        <result property="dataYear"    column="data_year"    />
+        <result property="scaleOrder"    column="scale_order"    />
+        <result property="resultType"    column="result_type"    />
+        <result property="fileType"    column="file_type"    />
+        <result property="kmlUrl"    column="kml_url"    />
+        <result property="kmlLng"    column="kml_lng"    />
+        <result property="kmlLat"    column="kml_lat"    />
+        <result property="workLoad"    column="work_load"    />
+        <result property="unit"    column="unit"    />
+        <result property="dataSource"    column="data_source"    />
+        <result property="dataType"    column="data_type"    />
+        <result property="storageId"    column="storage_id"    />
+        <result property="storageAddress"    column="storage_address"    />
+        <result property="remark"    column="remark"    />
+        <result property="submitDate"    column="submit_date"    />
+        <result property="productionTime"    column="production_time"    />
+        <result property="resolution"    column="resolution"    />
+        <result property="geodeticDatum"    column="geodetic_datum"    />
+    </resultMap>
+
+    <sql id="selectFilesAchievementVo">
+        select id, project_id, achi_name, data_year, scale_order, result_type, file_type, kml_url, kml_lng, kml_lat, work_load, unit, data_source, data_type, storage_id, remark, submit_date, production_time, resolution, geodetic_datum from files_achievement
+    </sql>
+
+    <sql id="Base_Column_List" >
+        a.id, a.project_id, p.project_number, a.achi_name, a.data_year, a.scale_order, a.result_type, a.file_type, a.kml_url, a.kml_lng, a.kml_lat, a.work_load, a.unit, a.data_source, a.data_type, a.storage_id, s.storage_address, a.remark, a.submit_date, a.production_time, a.resolution, a.geodetic_datum
+    </sql>
+
+    <sql id="selectFilesAchievementAllVo">
+        select <include refid="Base_Column_List"/> from files_achievement a
+        left join files_storage s on a.storage_id = s.id
+        left join files_project p on a.project_id = p.id
+    </sql>
+
+    <select id="selectFilesAchievementList" parameterType="FilesAchievement" resultMap="FilesAchievementResult">
+        <include refid="selectFilesAchievementAllVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="achiName != null  and achiName != ''"> and achi_name like concat('%', #{achiName}, '%')</if>
+            <if test="dataYear != null  and dataYear != ''"> and data_year like concat('%', #{dataYear}, '%')</if>
+            <if test="scaleOrder != null  and scaleOrder != ''"> and scale_order like concat('%', #{scaleOrder}, '%')</if>
+            <if test="resultType != null  and resultType != ''"> and result_type like concat('%', #{resultType}, '%')</if>
+            <if test="fileType != null  and fileType != ''"> and file_type like concat('%', #{fileType}, '%')</if>
+            <if test="kmlUrl != null  and kmlUrl != ''"> and kml_url like concat('%', #{kmlUrl}, '%')</if>
+            <if test="kmlLng != null  and kmlLng != ''"> and kml_lng like concat('%', #{kmlLng}, '%')</if>
+            <if test="kmlLat != null  and kmlLat != ''"> and kml_lat like concat('%', #{kmlLat}, '%')</if>
+            <if test="workLoad != null  and workLoad != ''"> and work_load = #{workLoad}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="dataSource != null  and dataSource != ''"> and data_source like concat('%', #{dataSource}, '%')</if>
+            <if test="dataType != null  and dataType != ''"> and data_type like concat('%', #{dataType}, '%')</if>
+            <if test="storageId != null  and storageId != ''"> and storage_id like concat('%', #{storageId}, '%')</if>
+            <if test="submitDate != null  and submitDate != ''"> and submit_date like concat('%', #{submitDate}, '%')</if>
+            <if test="productionTime != null  and productionTime != ''"> and production_time like concat('%', #{productionTime}, '%')</if>
+            <if test="resolution != null  and resolution != ''"> and resolution like concat('%', #{resolution}, '%')</if>
+            <if test="geodeticDatum != null  and geodeticDatum != ''"> and geodetic_datum like concat('%', #{geodeticDatum}, '%')</if>
+        </where>
+        order by p.project_number desc
+    </select>
+    
+    <select id="selectFilesAchievementById" parameterType="String" resultMap="FilesAchievementResult">
+        <include refid="selectFilesAchievementAllVo"/>
+        where a.id = #{id}
+    </select>
+    <insert id="insertFilesAchievement" parameterType="FilesAchievement">
+        insert into files_achievement
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="achiName != null">achi_name,</if>
+            <if test="dataYear != null">data_year,</if>
+            <if test="scaleOrder != null">scale_order,</if>
+            <if test="resultType != null">result_type,</if>
+            <if test="fileType != null">file_type,</if>
+            <if test="kmlUrl != null">kml_url,</if>
+            <if test="kmlLng != null">kml_lng,</if>
+            <if test="kmlLat != null">kml_lat,</if>
+            <if test="workLoad != null">work_load,</if>
+            <if test="unit != null">unit,</if>
+            <if test="dataSource != null">data_source,</if>
+            <if test="dataType != null">data_type,</if>
+            <if test="storageId != null">storage_id,</if>
+            <if test="remark != null">remark,</if>
+            <if test="submitDate != null">submit_date,</if>
+            <if test="productionTime != null">production_time,</if>
+            <if test="resolution != null">resolution,</if>
+            <if test="geodeticDatum != null">geodetic_datum,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="achiName != null">#{achiName},</if>
+            <if test="dataYear != null">#{dataYear},</if>
+            <if test="scaleOrder != null">#{scaleOrder},</if>
+            <if test="resultType != null">#{resultType},</if>
+            <if test="fileType != null">#{fileType},</if>
+            <if test="kmlUrl != null">#{kmlUrl},</if>
+            <if test="kmlLng != null">#{kmlLng},</if>
+            <if test="kmlLat != null">#{kmlLat},</if>
+            <if test="workLoad != null">#{workLoad},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="dataSource != null">#{dataSource},</if>
+            <if test="dataType != null">#{dataType},</if>
+            <if test="storageId != null">#{storageId},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="submitDate != null">#{submitDate},</if>
+            <if test="productionTime != null">#{productionTime},</if>
+            <if test="resolution != null">#{resolution},</if>
+            <if test="geodeticDatum != null">#{geodeticDatum},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFilesAchievement" parameterType="FilesAchievement">
+        update files_achievement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="achiName != null">achi_name = #{achiName},</if>
+            <if test="dataYear != null">data_year = #{dataYear},</if>
+            <if test="scaleOrder != null">scale_order = #{scaleOrder},</if>
+            <if test="resultType != null">result_type = #{resultType},</if>
+            <if test="fileType != null">file_type = #{fileType},</if>
+            <if test="kmlUrl != null">kml_url = #{kmlUrl},</if>
+            <if test="kmlLng != null">kml_lng = #{kmlLng},</if>
+            <if test="kmlLat != null">kml_lat = #{kmlLat},</if>
+            <if test="workLoad != null">work_load = #{workLoad},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="dataSource != null">data_source = #{dataSource},</if>
+            <if test="dataType != null">data_type = #{dataType},</if>
+            <if test="storageId != null">storage_id = #{storageId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="submitDate != null">submit_date = #{submitDate},</if>
+            <if test="productionTime != null">production_time = #{productionTime},</if>
+            <if test="resolution != null">resolution = #{resolution},</if>
+            <if test="resolution != null">resolution = #{resolution},</if>
+            <if test="geodeticDatum != null">geodetic_datum = #{geodeticDatum},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFilesAchievementById" parameterType="String">
+        delete from files_achievement where id = #{id}
+    </delete>
+
+    <delete id="deleteFilesAchievementByProjectIds" parameterType="String">
+        delete from files_achievement where project_id  in
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteFilesAchievementByIds" parameterType="String">
+        delete from files_achievement where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesProjectMapper.xml

@@ -0,0 +1,326 @@
+<?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="com.ruoyi.file.mapper.FilesProjectMapper">
+    
+    <resultMap type="com.ruoyi.file.domain.FilesProject" id="FilesProjectResult">
+        <result property="id"    column="ID"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="currentProgress"    column="current_progress"    />
+        <result property="projectSource"    column="project_source"    />
+        <result property="partyA"    column="party_a"    />
+        <result property="contactPerson"    column="contact_person"    />
+        <result property="telephone"    column="telephone"    />
+        <result property="contractCode"    column="contract_code"    />
+        <result property="contractNumber"    column="contract_number"    />
+        <result property="projectType"    column="project_type"    />
+        <result property="expectedPrice"    column="expected_price"    />
+        <result property="projectLevel"    column="project_level"    />
+        <result property="technicalDirector"    column="technical_director"    />
+        <result property="techinicalDesigner"    column="techinical_designer"    />
+        <result property="qualityInspector"    column="quality_inspector"    />
+        <result property="undertakingSector"    column="undertaking_sector"    />
+        <result property="projectLeader"    column="project_leader"    />
+        <result property="fund"    column="fund"    />
+        <result property="approvalDate"    column="approval_date"    />
+        <result property="approachTime"    column="approach_time"    />
+        <result property="withdrawalTime"    column="withdrawal_time"    />
+        <result property="requiredCompletionDate"    column="required_completion_date"    />
+        <result property="submissionDate"    column="submission_date"    />
+        <result property="licensePlateNumber"    column="license_plate_number"    />
+        <result property="mileage"    column="mileage"    />
+        <result property="fuelExpense"    column="fuel_expense"    />
+        <result property="mainEquipment"    column="main_equipment"    />
+        <result property="projectParticipants"    column="project_participants"    />
+        <result property="currentProcessing"    column="current_processing"    />
+        <result property="currentHandler"    column="current_handler"    />
+        <result property="projectRegistrant"    column="project_registrant"    />
+        <result property="registrationDate"    column="registration_date"    />
+        <result property="leadingSector"    column="leading_sector"    />
+        <result property="year"    column="year"    />
+        <result property="topicId"    column="topic_id"    />
+        <result property="topicName"    column="topic_name"    />
+        <result property="storageId"    column="storage_id"    />
+        <result property="storageAddress"    column="storage_address"    />
+        <result property="projectKml"    column="project_kml"    />
+        <result property="projectCp"    column="project_cp"    />
+        <result property="kmlLng"    column="kml_lng"    />
+        <result property="kmlLat"    column="kml_lat"    />
+        <result property="isFinish"    column="is_finish"    />
+    </resultMap>
+
+    <sql id="selectFilesProjectVo">
+        select ID, project_number, project_name, current_progress, project_source, party_a, contact_person, telephone, contract_code, contract_number, project_type, expected_price, project_level, technical_director, techinical_designer, quality_inspector, undertaking_sector, project_leader, fund, approval_date, approach_time, withdrawal_time, required_completion_date, submission_date, license_plate_number, mileage, fuel_expense, main_equipment, project_participants, current_processing, current_handler, project_registrant, registration_date, leading_sector, year, topic_id, storage_id, project_kml, project_cp, kml_lng,kml_lat, is_finish from files_project
+    </sql>
+    <sql id="Base_Column_List" >
+        p.ID, p.project_number, p.project_name, p.current_progress, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_code, p.contract_number, p.project_type, p.expected_price, p.project_level, p.technical_director, p.techinical_designer, p.quality_inspector, p.undertaking_sector, p.project_leader, p.fund, p.approval_date, p.approach_time, p.withdrawal_time, p.required_completion_date, p.submission_date, p.license_plate_number, p.mileage, p.fuel_expense, p.main_equipment, p.project_participants, p.current_processing, p.current_handler, p.project_registrant, p.registration_date, p.leading_sector, p.year, p.topic_id,t.topic_name, p.storage_id,s.storage_address, p.project_kml, p.project_cp,  p.kml_lng,p.kml_lat, p.is_finish
+    </sql>
+    <sql id="selectFilesProjectAllVo">
+        select <include refid="Base_Column_List"/> from files_project  p
+            left join files_storage s on p.storage_id = s.id
+            left join files_topic t on p.topic_id = t.id
+    </sql>
+
+    <select id="selectFilesProjectList" parameterType="FilesProject" resultMap="FilesProjectResult">
+        <include refid="selectFilesProjectAllVo"/>
+        <where>  
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="currentProgress != null  and currentProgress != ''"> and current_progress = #{currentProgress}</if>
+            <if test="projectSource != null  and projectSource != ''"> and project_source like concat('%', #{projectSource}, '%')</if>
+            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="contractCode != null  and contractCode != ''"> and contract_code like concat('%', #{contractCode}, '%')</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and contract_number like concat('%', #{contractNumber}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
+            <if test="expectedPrice != null  and expectedPrice != ''"> and expected_price = #{expectedPrice}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and project_level like concat('%', #{projectLevel}, '%')</if>
+            <if test="technicalDirector != null  and technicalDirector != ''"> and technical_director like concat('%', #{technicalDirector}, '%')</if>
+            <if test="techinicalDesigner != null  and techinicalDesigner != ''"> and techinical_designer like concat('%', #{techinicalDesigner}, '%')</if>
+            <if test="qualityInspector != null  and qualityInspector != ''"> and quality_inspector like concat('%', #{qualityInspector}, '%')</if>
+            <if test="undertakingSector != null  and undertakingSector != ''"> and undertaking_sector like concat('%', #{undertakingSector}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and project_leader like concat('%', #{projectLeader}, '%')</if>
+            <if test="fund != null  and fund != ''"> and fund = #{fund}</if>
+            <if test="approvalDate != null  and approvalDate != ''"> and approval_date = #{approvalDate}</if>
+            <if test="approachTime != null  and approachTime != ''"> and approach_time = #{approachTime}</if>
+            <if test="withdrawalTime != null  and withdrawalTime != ''"> and withdrawal_time = #{withdrawalTime}</if>
+            <if test="requiredCompletionDate != null  and requiredCompletionDate != ''"> and required_completion_date = #{requiredCompletionDate}</if>
+            <if test="submissionDate != null  and submissionDate != ''"> and submission_date = #{submissionDate}</if>
+            <if test="licensePlateNumber != null  and licensePlateNumber != ''"> and license_plate_number like concat('%', #{licensePlateNumber}, '%')</if>
+            <if test="mileage != null  and mileage != ''"> and mileage = #{mileage}</if>
+            <if test="fuelExpense != null  and fuelExpense != ''"> and fuel_expense = #{fuelExpense}</if>
+            <if test="mainEquipment != null  and mainEquipment != ''"> and main_equipment like concat('%', #{mainEquipment}, '%')</if>
+            <if test="projectParticipants != null  and projectParticipants != ''"> and project_participants like concat('%', #{projectParticipants}, '%')</if>
+            <if test="currentProcessing != null  and currentProcessing != ''"> and current_processing like concat('%', #{currentProcessing}, '%')</if>
+            <if test="currentHandler != null  and currentHandler != ''"> and current_handler like concat('%', #{currentHandler}, '%')</if>
+            <if test="projectRegistrant != null  and projectRegistrant != ''"> and project_registrant like concat('%', #{projectRegistrant}, '%')</if>
+            <if test="registrationDate != null  and registrationDate != ''"> and registration_date = #{registrationDate}</if>
+            <if test="leadingSector != null  and leadingSector != ''"> and leading_sector like concat('%', #{leadingSector}, '%')</if>
+            <if test="year != null  and year != ''"> and year like concat('%', #{year}, '%')</if>
+            <if test="topicId != null  and topicId != ''"> and topic_id = #{topicId}</if>
+            <if test="storageId != null  and storageId != ''"> and storage_id like concat('%', #{storageId}, '%')</if>
+            <if test="projectKml != null  and projectKml != ''"> and project_kml like concat('%', #{projectKml}, '%')</if>
+            <if test="projectCp != null  and projectCp != ''"> and project_cp like concat('%', #{projectCp}, '%')</if>
+            <if test="kmlLng != null  and kmlLng != ''"> and kml_lng like concat('%', #{kmlLng}, '%')</if>
+            <if test="kmlLat != null  and kmlLat != ''"> and kml_lat like concat('%', #{kmlLat}, '%')</if>
+            <if test="isFinish != null  and isFinish != ''"> and is_finish like concat('%', #{isFinish}, '%')</if>
+        </where>
+        order by project_number desc
+    </select>
+    
+    <select id="selectFilesProjectById" parameterType="String" resultMap="FilesProjectResult">
+        <include refid="selectFilesProjectAllVo"/>
+        where p.ID = #{id}
+    </select>
+    <select id="selectFilesProjectByNumber" parameterType="String" resultMap="FilesProjectResult">
+        <include refid="selectFilesProjectAllVo"/>
+        where p.project_number = #{projectNumber}
+    </select>
+    <select id="selectAllCount" resultType="java.lang.Integer">
+        select count(1) from files_project  p
+        left join files_storage s on p.storage_id = s.id
+        left join files_topic t on p.topic_id = t.id
+        <where>
+            <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
+            <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
+            <if test="currentProgress != null  and currentProgress != ''"> and current_progress = #{currentProgress}</if>
+            <if test="projectSource != null  and projectSource != ''"> and project_source like concat('%', #{projectSource}, '%')</if>
+            <if test="partyA != null  and partyA != ''"> and party_a like concat('%', #{partyA}, '%')</if>
+            <if test="contactPerson != null  and contactPerson != ''"> and contact_person like concat('%', #{contactPerson}, '%')</if>
+            <if test="telephone != null  and telephone != ''"> and telephone like concat('%', #{telephone}, '%')</if>
+            <if test="contractCode != null  and contractCode != ''"> and contract_code like concat('%', #{contractCode}, '%')</if>
+            <if test="contractNumber != null  and contractNumber != ''"> and contract_number like concat('%', #{contractNumber}, '%')</if>
+            <if test="projectType != null  and projectType != ''"> and project_type like concat('%', #{projectType}, '%')</if>
+            <if test="expectedPrice != null  and expectedPrice != ''"> and expected_price = #{expectedPrice}</if>
+            <if test="projectLevel != null  and projectLevel != ''"> and project_level like concat('%', #{projectLevel}, '%')</if>
+            <if test="technicalDirector != null  and technicalDirector != ''"> and technical_director like concat('%', #{technicalDirector}, '%')</if>
+            <if test="techinicalDesigner != null  and techinicalDesigner != ''"> and techinical_designer like concat('%', #{techinicalDesigner}, '%')</if>
+            <if test="qualityInspector != null  and qualityInspector != ''"> and quality_inspector like concat('%', #{qualityInspector}, '%')</if>
+            <if test="undertakingSector != null  and undertakingSector != ''"> and undertaking_sector like concat('%', #{undertakingSector}, '%')</if>
+            <if test="projectLeader != null  and projectLeader != ''"> and project_leader like concat('%', #{projectLeader}, '%')</if>
+            <if test="fund != null  and fund != ''"> and fund = #{fund}</if>
+            <if test="approvalDate != null  and approvalDate != ''"> and approval_date = #{approvalDate}</if>
+            <if test="approachTime != null  and approachTime != ''"> and approach_time = #{approachTime}</if>
+            <if test="withdrawalTime != null  and withdrawalTime != ''"> and withdrawal_time = #{withdrawalTime}</if>
+            <if test="requiredCompletionDate != null  and requiredCompletionDate != ''"> and required_completion_date = #{requiredCompletionDate}</if>
+            <if test="submissionDate != null  and submissionDate != ''"> and submission_date = #{submissionDate}</if>
+            <if test="licensePlateNumber != null  and licensePlateNumber != ''"> and license_plate_number like concat('%', #{licensePlateNumber}, '%')</if>
+            <if test="mileage != null  and mileage != ''"> and mileage = #{mileage}</if>
+            <if test="fuelExpense != null  and fuelExpense != ''"> and fuel_expense = #{fuelExpense}</if>
+            <if test="mainEquipment != null  and mainEquipment != ''"> and main_equipment like concat('%', #{mainEquipment}, '%')</if>
+            <if test="projectParticipants != null  and projectParticipants != ''"> and project_participants like concat('%', #{projectParticipants}, '%')</if>
+            <if test="currentProcessing != null  and currentProcessing != ''"> and current_processing like concat('%', #{currentProcessing}, '%')</if>
+            <if test="currentHandler != null  and currentHandler != ''"> and current_handler like concat('%', #{currentHandler}, '%')</if>
+            <if test="projectRegistrant != null  and projectRegistrant != ''"> and project_registrant like concat('%', #{projectRegistrant}, '%')</if>
+            <if test="registrationDate != null  and registrationDate != ''"> and registration_date = #{registrationDate}</if>
+            <if test="leadingSector != null  and leadingSector != ''"> and leading_sector like concat('%', #{leadingSector}, '%')</if>
+            <if test="year != null  and year != ''"> and year like concat('%', #{year}, '%')</if>
+            <if test="topicId != null  and topicId != ''"> and topic_id = #{topicId}</if>
+            <if test="storageId != null  and storageId != ''"> and storage_id like concat('%', #{storageId}, '%')</if>
+            <if test="projectKml != null  and projectKml != ''"> and project_kml like concat('%', #{projectKml}, '%')</if>
+            <if test="projectCp != null  and projectCp != ''"> and project_cp like concat('%', #{projectCp}, '%')</if>
+            <if test="kmlLng != null  and kmlLng != ''"> and kml_lng like concat('%', #{kmlLng}, '%')</if>
+            <if test="kmlLat != null  and kmlLat != ''"> and kml_lat like concat('%', #{kmlLat}, '%')</if>
+            <if test="isFinish != null  and isFinish != ''"> and is_finish like concat('%', #{isFinish}, '%')</if>
+        </where>
+    </select>
+    <select id="selectFilesProjectByNumbers" resultMap="FilesProjectResult" parameterType="String">
+        <include refid="selectFilesProjectVo"/> where project_number in
+        <foreach item="projectNumber" collection="array" open="(" separator="," close=")">
+            #{projectNumber}
+        </foreach>
+    </select>
+    <insert id="insertFilesProject" parameterType="FilesProject">
+        insert into files_project
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">ID,</if>
+            <if test="projectNumber != null">project_number,</if>
+            <if test="projectName != null">project_name,</if>
+            <if test="currentProgress != null">current_progress,</if>
+            <if test="projectSource != null">project_source,</if>
+            <if test="partyA != null">party_a,</if>
+            <if test="contactPerson != null">contact_person,</if>
+            <if test="telephone != null">telephone,</if>
+            <if test="contractCode != null">contract_code,</if>
+            <if test="contractNumber != null">contract_number,</if>
+            <if test="projectType != null">project_type,</if>
+            <if test="expectedPrice != null">expected_price,</if>
+            <if test="projectLevel != null">project_level,</if>
+            <if test="technicalDirector != null">technical_director,</if>
+            <if test="techinicalDesigner != null">techinical_designer,</if>
+            <if test="qualityInspector != null">quality_inspector,</if>
+            <if test="undertakingSector != null">undertaking_sector,</if>
+            <if test="projectLeader != null">project_leader,</if>
+            <if test="fund != null">fund,</if>
+            <if test="approvalDate != null">approval_date,</if>
+            <if test="approachTime != null">approach_time,</if>
+            <if test="withdrawalTime != null">withdrawal_time,</if>
+            <if test="requiredCompletionDate != null">required_completion_date,</if>
+            <if test="submissionDate != null">submission_date,</if>
+            <if test="licensePlateNumber != null">license_plate_number,</if>
+            <if test="mileage != null">mileage,</if>
+            <if test="fuelExpense != null">fuel_expense,</if>
+            <if test="mainEquipment != null">main_equipment,</if>
+            <if test="projectParticipants != null">project_participants,</if>
+            <if test="currentProcessing != null">current_processing,</if>
+            <if test="currentHandler != null">current_handler,</if>
+            <if test="projectRegistrant != null">project_registrant,</if>
+            <if test="registrationDate != null">registration_date,</if>
+            <if test="leadingSector != null">leading_sector,</if>
+            <if test="year != null">year,</if>
+            <if test="topicId != null">topic_id,</if>
+            <if test="storageId != null">storage_id,</if>
+            <if test="projectKml != null">project_kml,</if>
+            <if test="projectCp != null">project_cp,</if>
+            <if test="kmlLng != null">kml_lng,</if>
+            <if test="kmlLat != null">kml_lat,</if>
+            <if test="isFinish != null">is_finish,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="projectNumber != null">#{projectNumber},</if>
+            <if test="projectName != null">#{projectName},</if>
+            <if test="currentProgress != null">#{currentProgress},</if>
+            <if test="projectSource != null">#{projectSource},</if>
+            <if test="partyA != null">#{partyA},</if>
+            <if test="contactPerson != null">#{contactPerson},</if>
+            <if test="telephone != null">#{telephone},</if>
+            <if test="contractCode != null">#{contractCode},</if>
+            <if test="contractNumber != null">#{contractNumber},</if>
+            <if test="projectType != null">#{projectType},</if>
+            <if test="expectedPrice != null">#{expectedPrice},</if>
+            <if test="projectLevel != null">#{projectLevel},</if>
+            <if test="technicalDirector != null">#{technicalDirector},</if>
+            <if test="techinicalDesigner != null">#{techinicalDesigner},</if>
+            <if test="qualityInspector != null">#{qualityInspector},</if>
+            <if test="undertakingSector != null">#{undertakingSector},</if>
+            <if test="projectLeader != null">#{projectLeader},</if>
+            <if test="fund != null">#{fund},</if>
+            <if test="approvalDate != null">#{approvalDate},</if>
+            <if test="approachTime != null">#{approachTime},</if>
+            <if test="withdrawalTime != null">#{withdrawalTime},</if>
+            <if test="requiredCompletionDate != null">#{requiredCompletionDate},</if>
+            <if test="submissionDate != null">#{submissionDate},</if>
+            <if test="licensePlateNumber != null">#{licensePlateNumber},</if>
+            <if test="mileage != null">#{mileage},</if>
+            <if test="fuelExpense != null">#{fuelExpense},</if>
+            <if test="mainEquipment != null">#{mainEquipment},</if>
+            <if test="projectParticipants != null">#{projectParticipants},</if>
+            <if test="currentProcessing != null">#{currentProcessing},</if>
+            <if test="currentHandler != null">#{currentHandler},</if>
+            <if test="projectRegistrant != null">#{projectRegistrant},</if>
+            <if test="registrationDate != null">#{registrationDate},</if>
+            <if test="leadingSector != null">#{leadingSector},</if>
+            <if test="year != null">#{year},</if>
+            <if test="topicId != null">#{topicId},</if>
+            <if test="storageId != null">#{storageId},</if>
+            <if test="projectKml != null">#{projectKml},</if>
+            <if test="projectCp != null">#{projectCp},</if>
+            <if test="kmlLng != null">#{kmlLng},</if>
+            <if test="kmlLat != null">#{kmlLat},</if>
+            <if test="isFinish != null">#{isFinish},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFilesProject" parameterType="FilesProject">
+        update files_project
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectNumber != null">project_number = #{projectNumber},</if>
+            <if test="projectName != null">project_name = #{projectName},</if>
+            <if test="currentProgress != null">current_progress = #{currentProgress},</if>
+            <if test="projectSource != null">project_source = #{projectSource},</if>
+            <if test="partyA != null">party_a = #{partyA},</if>
+            <if test="contactPerson != null">contact_person = #{contactPerson},</if>
+            <if test="telephone != null">telephone = #{telephone},</if>
+            <if test="contractCode != null">contract_code = #{contractCode},</if>
+            <if test="contractNumber != null">contract_number = #{contractNumber},</if>
+            <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="expectedPrice != null">expected_price = #{expectedPrice},</if>
+            <if test="projectLevel != null">project_level = #{projectLevel},</if>
+            <if test="technicalDirector != null">technical_director = #{technicalDirector},</if>
+            <if test="techinicalDesigner != null">techinical_designer = #{techinicalDesigner},</if>
+            <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
+            <if test="undertakingSector != null">undertaking_sector = #{undertakingSector},</if>
+            <if test="projectLeader != null">project_leader = #{projectLeader},</if>
+            <if test="fund != null">fund = #{fund},</if>
+            <if test="approvalDate != null">approval_date = #{approvalDate},</if>
+            <if test="approachTime != null">approach_time = #{approachTime},</if>
+            <if test="withdrawalTime != null">withdrawal_time = #{withdrawalTime},</if>
+            <if test="requiredCompletionDate != null">required_completion_date = #{requiredCompletionDate},</if>
+            <if test="submissionDate != null">submission_date = #{submissionDate},</if>
+            <if test="licensePlateNumber != null">license_plate_number = #{licensePlateNumber},</if>
+            <if test="mileage != null">mileage = #{mileage},</if>
+            <if test="fuelExpense != null">fuel_expense = #{fuelExpense},</if>
+            <if test="mainEquipment != null">main_equipment = #{mainEquipment},</if>
+            <if test="projectParticipants != null">project_participants = #{projectParticipants},</if>
+            <if test="currentProcessing != null">current_processing = #{currentProcessing},</if>
+            <if test="currentHandler != null">current_handler = #{currentHandler},</if>
+            <if test="projectRegistrant != null">project_registrant = #{projectRegistrant},</if>
+            <if test="registrationDate != null">registration_date = #{registrationDate},</if>
+            <if test="leadingSector != null">leading_sector = #{leadingSector},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="topicId != null">topic_id = #{topicId},</if>
+            <if test="storageId != null">storage_id = #{storageId},</if>
+            <if test="projectKml != null">project_kml = #{projectKml},</if>
+            <if test="projectCp != null">project_cp = #{projectCp},</if>
+            <if test="kmlLng != null">kml_lng = #{kmlLng},</if>
+            <if test="kmlLat != null">kml_lat = #{kmlLat},</if>
+            <if test="isFinish != null">is_finish = #{isFinish},</if>
+        </trim>
+        where ID = #{id}
+    </update>
+
+    <delete id="deleteFilesProjectById" parameterType="String">
+        delete from files_project where ID = #{id}
+    </delete>
+
+    <delete id="deleteFilesProjectByIds" parameterType="String">
+        delete from files_project where ID in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesStorageMapper.xml

@@ -0,0 +1,75 @@
+<?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="com.ruoyi.file.mapper.FilesStorageMapper">
+    
+    <resultMap type="FilesStorage" id="FilesStorageResult">
+        <result property="id"    column="id"    />
+        <result property="storageAddress"    column="storage_address"    />
+        <result property="administrator"    column="administrator"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectFilesStorageVo">
+        select id, storage_address, administrator, remark from files_storage
+    </sql>
+
+    <select id="selectFilesStorageList" parameterType="FilesStorage" resultMap="FilesStorageResult">
+        <include refid="selectFilesStorageVo"/>
+        <where>  
+            <if test="storageAddress != null  and storageAddress != ''"> and storage_address like concat('%', #{storageAddress}, '%')</if>
+            <if test="administrator != null  and administrator != ''"> and administrator like concat('%', #{administrator}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectFilesStorageListE" parameterType="FilesStorage" resultMap="FilesStorageResult">
+        <include refid="selectFilesStorageVo"/>
+        <where>
+            <if test="storageAddress != null  and storageAddress != ''"> and storage_address = #{storageAddress}</if>
+            <if test="administrator != null  and administrator != ''"> and administrator = #{administrator}</if>
+        </where>
+    </select>
+
+    <select id="selectFilesStorageById" parameterType="String" resultMap="FilesStorageResult">
+        <include refid="selectFilesStorageVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFilesStorage" parameterType="FilesStorage">
+        insert into files_storage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="storageAddress != null">storage_address,</if>
+            <if test="administrator != null">administrator,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="storageAddress != null">#{storageAddress},</if>
+            <if test="administrator != null">#{administrator},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFilesStorage" parameterType="FilesStorage">
+        update files_storage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="storageAddress != null">storage_address = #{storageAddress},</if>
+            <if test="administrator != null">administrator = #{administrator},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFilesStorageById" parameterType="String">
+        delete from files_storage where id = #{id}
+    </delete>
+
+    <delete id="deleteFilesStorageByIds" parameterType="String">
+        delete from files_storage where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/file/FilesTopicMapper.xml

@@ -0,0 +1,58 @@
+<?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="com.ruoyi.file.mapper.FilesTopicMapper">
+    
+    <resultMap type="FilesTopic" id="FilesTopicResult">
+        <result property="id"    column="id"    />
+        <result property="topicName"    column="topic_name"    />
+    </resultMap>
+
+    <sql id="selectFilesTopicVo">
+        select id, topic_name from files_topic
+    </sql>
+
+    <select id="selectFilesTopicList" parameterType="FilesTopic" resultMap="FilesTopicResult">
+        <include refid="selectFilesTopicVo"/>
+        <where>  
+            <if test="topicName != null  and topicName != ''"> and topic_name like concat('%', #{topicName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectFilesTopicById" parameterType="String" resultMap="FilesTopicResult">
+        <include refid="selectFilesTopicVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFilesTopic" parameterType="FilesTopic">
+        insert into files_topic
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="topicName != null">topic_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="topicName != null">#{topicName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFilesTopic" parameterType="FilesTopic">
+        update files_topic
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="topicName != null">topic_name = #{topicName},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFilesTopicById" parameterType="String">
+        delete from files_topic where id = #{id}
+    </delete>
+
+    <delete id="deleteFilesTopicByIds" parameterType="String">
+        delete from files_topic where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/files.sql

@@ -0,0 +1,134 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : mysql
+ Source Server Type    : MySQL
+ Source Server Version : 80028
+ Source Host           : localhost:3306
+ Source Schema         : cmc_oa
+
+ Target Server Type    : MySQL
+ Target Server Version : 80028
+ File Encoding         : 65001
+
+ Date: 08/05/2024 17:42:34
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for files_achievement
+-- ----------------------------
+DROP TABLE IF EXISTS `files_achievement`;
+CREATE TABLE `files_achievement`  (
+  `id` char(19) NOT NULL COMMENT '成果id',
+  `project_id` char(19) NULL DEFAULT NULL COMMENT '项目id',
+  `achi_name` varchar(255) NULL DEFAULT NULL COMMENT '成果名称',
+  `data_year` char(10) NULL DEFAULT NULL COMMENT '数据年份',
+  `scale_order` char(10) NULL DEFAULT NULL COMMENT '比例尺或等级',
+  `result_type` char(20) NULL DEFAULT NULL COMMENT '成果类型',
+  `file_type` char(20) NULL DEFAULT NULL COMMENT '文件类型',
+  `submit_date` datetime NULL DEFAULT NULL COMMENT '成果提交时间',
+  `kml_url` varchar(255) NULL DEFAULT NULL COMMENT 'KML地址',
+  `kml_lng` varchar(255) NULL DEFAULT NULL COMMENT 'kml文件的中心位置经度',
+  `kml_lat` varchar(255) NULL DEFAULT NULL COMMENT 'kml文件的中心位置纬度',
+  `work_load` char(20) NULL DEFAULT NULL COMMENT '工作量',
+  `unit` char(10) NULL DEFAULT NULL COMMENT '单位',
+  `data_source` varchar(100) NULL DEFAULT NULL COMMENT '数据来源',
+  `data_type` char(10) NULL DEFAULT NULL COMMENT '数据类型（0原始数据，1成果数据，2过程数据）',
+  `storage_id` char(19) NULL DEFAULT NULL COMMENT '存放地址id',
+  `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注',
+  `production_time` char(20) NULL DEFAULT NULL COMMENT '生产日期',
+  `resolution` char(10) NULL DEFAULT NULL COMMENT '分辨率（米）',
+  `geodetic_datum` char(40) NULL DEFAULT NULL COMMENT '大地基准',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of files_achievement
+-- ----------------------------
+-- ----------------------------
+-- Table structure for files_project
+-- ----------------------------
+DROP TABLE IF EXISTS `files_project`;
+CREATE TABLE `files_project`  (
+  `ID` varchar(32) NOT NULL COMMENT '项目唯一标识',
+  `project_number` varchar(100) NULL DEFAULT NULL COMMENT '项目编号',
+  `project_name` varchar(255) NULL DEFAULT NULL COMMENT '项目名称',
+  `current_progress` varchar(255) NULL DEFAULT NULL COMMENT '当前进度',
+  `project_source` varchar(255) NULL DEFAULT NULL COMMENT '项目来源',
+  `party_a` varchar(255) NULL DEFAULT NULL COMMENT '甲方单位',
+  `contact_person` varchar(255) NULL DEFAULT NULL COMMENT '联系人',
+  `telephone` varchar(255) NULL DEFAULT NULL COMMENT '联系电话',
+  `contract_code` varchar(255) NULL DEFAULT NULL COMMENT '合同编码',
+  `contract_number` varchar(255) NULL DEFAULT NULL COMMENT '合同编号',
+  `project_type` varchar(255) NULL DEFAULT NULL COMMENT '项目类型',
+  `expected_price` varchar(255) NULL DEFAULT NULL COMMENT '预计价款',
+  `project_level` varchar(255) NULL DEFAULT NULL COMMENT '项目级别',
+  `technical_director` varchar(255) NULL DEFAULT NULL COMMENT '技术负责人',
+  `techinical_designer` varchar(50) NULL DEFAULT NULL COMMENT '技术设计人',
+  `quality_inspector` varchar(50) NULL DEFAULT NULL COMMENT '质量检察员',
+  `undertaking_sector` varchar(255) NULL DEFAULT NULL COMMENT '承担部门',
+  `project_leader` varchar(50) NULL DEFAULT NULL COMMENT '项目负责人',
+  `fund` varchar(255) NULL DEFAULT NULL COMMENT '经费合计',
+  `approval_date` varchar(255) NULL DEFAULT NULL COMMENT '领导批准时间',
+  `approach_time` varchar(255) NULL DEFAULT NULL COMMENT '进场时间',
+  `withdrawal_time` varchar(255) NULL DEFAULT NULL COMMENT '撤场时间',
+  `required_completion_date` varchar(255) NULL DEFAULT NULL COMMENT '项目要求完成日期',
+  `submission_date` varchar(255) NULL DEFAULT NULL COMMENT '资料提交日期',
+  `license_plate_number` varchar(255) NULL DEFAULT NULL COMMENT '使用车辆（车牌号）',
+  `mileage` varchar(255) NULL DEFAULT NULL COMMENT '项目行车公里数',
+  `fuel_expense` varchar(255) NULL DEFAULT NULL COMMENT '项目燃油使用费',
+  `main_equipment` varchar(255) NULL DEFAULT NULL COMMENT '主要设备',
+  `project_participants` varchar(255) NULL DEFAULT NULL COMMENT '项目参与人员',
+  `current_processing` varchar(255) NULL DEFAULT NULL COMMENT '当前处理环节',
+  `current_handler` varchar(50) NULL DEFAULT NULL COMMENT '当前处理人',
+  `project_registrant` varchar(50) NULL DEFAULT NULL COMMENT '项目登记人',
+  `registration_date` varchar(255) NULL DEFAULT NULL COMMENT '项目登记日期',
+  `leading_sector` varchar(255) NULL DEFAULT NULL COMMENT '牵头项目',
+  `year` varchar(255) NULL DEFAULT NULL COMMENT '项目年份',
+  `topic_id` char(19) NULL DEFAULT NULL COMMENT '所属专题id',
+  `storage_id` char(19) NULL DEFAULT NULL COMMENT '存放地址的id',
+  `project_kml` varchar(255) NULL DEFAULT NULL COMMENT '范围kml地址',
+  `project_cp` varchar(255) NULL DEFAULT NULL COMMENT '控制点kml地址',
+  `kml_lng` varchar(255) NULL DEFAULT NULL COMMENT 'kml文件的中心位置经度',
+  `kml_lat` varchar(255) NULL DEFAULT NULL COMMENT 'kml文件的中心位置纬度',
+  `is_finish` char(1) NULL DEFAULT NULL COMMENT '项目是否结束（0进行，1结束）',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of files_project
+-- ----------------------------
+-- ----------------------------
+-- Table structure for files_storage
+-- ----------------------------
+DROP TABLE IF EXISTS `files_storage`;
+CREATE TABLE `files_storage`  (
+  `id` char(19) NOT NULL COMMENT '存放地址id',
+  `storage_address` varchar(255) NULL DEFAULT NULL COMMENT '存放地址',
+  `administrator` char(10) NULL DEFAULT NULL COMMENT '管理人',
+  `remark` varchar(255) NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of files_storage
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for files_topic
+-- ----------------------------
+DROP TABLE IF EXISTS `files_topic`;
+CREATE TABLE `files_topic`  (
+  `id` char(19) NOT NULL COMMENT '专题id',
+  `topic_name` varchar(100) NULL DEFAULT NULL COMMENT '专题名称',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of files_topic
+-- ----------------------------
+
+SET FOREIGN_KEY_CHECKS = 1;

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -2,16 +2,11 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <h2 class="text-center">成果归档表</h2>
+        <h2 class="text-center">成果归档记录表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="项目id" prop="projectId">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '成果上传'" clearable>
-              <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
-              </el-option>
-            </el-select>
-            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
+          <el-form-item label="项目信息" prop="projectId">
+            <el-descriptions border style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
               }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
@@ -220,12 +215,13 @@ export default {
         archiveComment: null
       },
       // 表单参数
-      form: {},
+      form: {
+        submitTime: undefined,
+      },
       // 表单校验
       rules: {
       },
       chooseProject: {},
-      isSelect: false,
       formTotal: 0,
       flowData: {},
       projectList: [],
@@ -252,7 +248,7 @@ export default {
       this.archiveUser = this.$store.getters.name;
       this.archiveTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    this.getProjectList();
+    this.getProjectInfo();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -273,7 +269,6 @@ export default {
           if (res.data.projectId) {
             getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
-              this.isSelect = true;
               listProjectContract({ projectId: response.data.projectId }).then(res => {
                 if (res.rows.length > 0) {
                   for (let row of res.rows) {
@@ -311,22 +306,10 @@ export default {
       this.open = false;
       this.reset();
     },
-    // 查询项目列表
-    getProjectList() {
-      this.loading = true
-      listProject({
-        pageNum: 1,
-        pageSize: 99999999
-      }).then(response => {
-        this.projectList = response.rows;
-      })
-    },
-    // 选择项目
-    handleSelectProject(val) {
-      if (val != "" && val != undefined && val != null) {
-        getProject(val).then(response => {
+    // 查询项目信息
+    getProjectInfo() {
+      getProject(this.taskForm.formId).then(response => {
           this.chooseProject = response.data;
-          this.isSelect = true;
           listProjectContract({ projectId: response.data.projectId }).then(res => {
             if (res.rows.length > 0) {
               for (let row of res.rows) {
@@ -345,9 +328,6 @@ export default {
               this.contractCode = '';
           })
         })
-      } else {
-        this.isSelect = false
-      }
     },
     isEmptyObject(obj) {
       for (var key in obj) {
@@ -432,7 +412,7 @@ export default {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
                 });
-              }              
+              }
               if (this.taskName == '质检审核') {
                 getUsersDeptLeaderByDept({ deptId: 110 }).then(res => {
                   let userId = res.data.userId;
@@ -442,14 +422,14 @@ export default {
                     this.$emit('goBack')
                   });
                 });
-              }              
+              }
               if (this.taskName == '技术部审核') {
                 this.$set(this.taskForm.variables, "approval", '57');
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);
                   this.$emit('goBack')
                 });
-              }              
+              }
               if (this.taskName == '成果归档') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);

oa-ui/src/views/flowable/form/projectProcess/inProgress.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
- * @LastEditors: 
- * @LastEditTime: 2024-05-07 17:06:16
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-08 16:01:53
 -->
 <!--
  * @Author: ysh
@@ -75,8 +75,7 @@
                   value-format="yyyy-MM-dd"></el-date-picker>
               </td>
               <td>
-                <el-input-number v-model="progress.percentage" :controls="false"
-                  style="width: 120px"></el-input-number>%
+                <el-input-number v-model="progress.percentage" :controls="false" style="width: 120px"></el-input-number>%
               </td>
               <td>
                 <el-input v-model="progress.situation" type="textarea"></el-input>
@@ -216,7 +215,7 @@ export default {
           this.form.exitTime = res.data.exitTime;
         }
       });
-      listProjectProgress({projectId: this.taskForm.formId}).then(res => {
+      listProjectProgress({ projectId: this.taskForm.formId }).then(res => {
         this.oldProgressList = res.rows
         if (res.rows.length != 0) {
           this.progressList = res.rows;
@@ -231,7 +230,7 @@ export default {
         } else {
           this.noBudget = false;
           this.budgetId = res.rows[0].budgetId;
-          listBudgetCar({budgetId: this.budgetId}).then(res => {
+          listBudgetCar({ budgetId: this.budgetId }).then(res => {
             let carArr = [];
             let carDriverList = [];
             for (let i of res.rows) {
@@ -243,7 +242,7 @@ export default {
             }
             this.form.licensePlate = carArr.join("、");
           });
-          listBudgetStaff({budgetId: this.budgetId}).then(res => {
+          listBudgetStaff({ budgetId: this.budgetId }).then(res => {
             let userArr = [];
             for (let u of res.rows) {
               userArr.push(u.user.nickName);
@@ -301,7 +300,23 @@ export default {
         this.userList = res.rows
       })
     },
-    submitNextFlow() { },
+    submitNextFlow() {
+      const params = { taskId: this.taskForm.taskId };
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        getProject(this.taskForm.formId).then(res => {
+          if (res.data) {
+            this.$set(this.taskForm.variables, "formId", this.taskForm.formId);
+            this.$set(this.taskForm.variables, "archiveInitiator", res.data.projectLeader);
+            this.$set(this.taskForm.variables, "settleInitiator", res.data.projectLeader);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit('goBack');
+            });
+          }
+        })
+      })
+    },
   },
 };
 </script>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-30 10:05:21
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-08 15:34:14
 -->
 <template>
   <div class="app-container">
@@ -465,7 +465,7 @@ export default {
     },
     // 子流程不可以删除
     beDeleted(row) {
-      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
+      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.procDefName == '成果归档' || row.procDefName == '项目结算' || row.finishTime != null) {
         return true
       } else if (row.procDefName == '项目流转' && row.taskName != '项目登记') {
         return true

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-18 15:14:45
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-28 14:58:44
+ * @LastEditTime: 2024-05-08 15:39:42
 -->
 <template>
   <div>
@@ -77,7 +77,7 @@ export default {
           this.treeData[0].children.push(i);
         }
         else if (i.category == "project") {
-          if (i.name != "安全交底" && i.name != "技术交底" && i.name != "项目预算") 
+          if (i.name == "项目流转") 
             this.treeData[1].children.push(i);
         } else if (i.category == "finance") {
           this.treeData[2].children.push(i);