资料管理系统删去专题表

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

@@ -8,11 +8,11 @@ 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 com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +38,7 @@ public class FilesAchievementController extends BaseController
     private IFilesAchievementService filesAchievementService;
 
     @Autowired
-    private IFilesProjectService filesProjectService;
+    private ICmcProjectService cmcProjectService;
 
     @Autowired
     private IFilesStorageService filesStorageService;
@@ -51,22 +51,8 @@ public class FilesAchievementController extends BaseController
     @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);
+        startPage();
+        List<FilesAchievement> list = filesAchievementService.selectFilesAchievementList(filesAchievement);
         return getDataTable(list);
     }
 
@@ -142,10 +128,10 @@ public class FilesAchievementController extends BaseController
             {
                 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());
+                CmcProject cmcProject = new CmcProject();
+                cmcProject = cmcProjectService.selectCmcProjectByProjectNumber(filesAchievement.getProjectNumber());
+                if(cmcProject != null){
+                    filesAchievement.setProjectId(cmcProject.getProjectId());
                 }else{
                     filesAchievement.setProjectId(null);
                 }
@@ -196,10 +182,10 @@ public class FilesAchievementController extends BaseController
             }
         }
         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());
+            CmcProject cmcProject = new CmcProject();
+            cmcProject.setProjectNumber(filesAchievement.getProjectNumber());
+            if (cmcProjectService.selectCmcProjectList(cmcProject).size() > 0)
+                filesAchievement.setProjectId(cmcProjectService.selectCmcProjectList(cmcProject).get(0).getProjectId());
         }
         if (uploadKmlFile(filesAchievement, uploadKmlFile)) return AjaxResult.error("文件内容为空");
         filesAchievement.setId(new SnowFlake().generateId());
@@ -216,9 +202,9 @@ public class FilesAchievementController extends BaseController
         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());
+        CmcProject cmcProject = new CmcProject();
+        cmcProject = cmcProjectService.selectCmcProjectByProjectId(filesAchievement.getProjectId());
+        filesAchievement.setProjectNumber(cmcProject.getProjectNumber());
         if (uploadKmlFile(filesAchievement, uploadKmlFile))
             return AjaxResult.error("文件内容为空");
         return toAjax(filesAchievementService.updateFilesAchievement(filesAchievement));

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

@@ -7,12 +7,9 @@ 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 com.ruoyi.oa.domain.CmcProject;
+import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -34,10 +31,7 @@ import java.util.List;
 @RequestMapping("/file/project")
 public class FilesProjectController extends BaseController {
     @Autowired
-    private IFilesProjectService filesProjectService;
-
-    @Autowired
-    private IFilesTopicService filesTopicService;
+    private ICmcProjectService cmcProjectService;
 
     @Autowired
     private IFilesStorageService filesStorageService;
@@ -49,20 +43,9 @@ public class FilesProjectController extends BaseController {
      * 查询项目管理列表
      */
     @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());
-        }
+    public TableDataInfo list(CmcProject cmcProject) {
+        startPage();
+        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
         return getDataTable(list);
     }
 
@@ -71,9 +54,9 @@ public class FilesProjectController extends BaseController {
      */
     @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);
+    public void export(HttpServletResponse response, CmcProject cmcProject) {
+        List<CmcProject> list = cmcProjectService.selectCmcProjectList(cmcProject);
+        ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "项目管理数据");
     }
 
@@ -82,12 +65,12 @@ public class FilesProjectController extends BaseController {
      */
     @Log(title = "成果表", businessType = BusinessType.EXPORT)
     @PostMapping("/exportBatch/{ids}")
-    public void exportBatch(HttpServletResponse response, FilesProject filesProject, @PathVariable("ids") String[] ids)
+    public void exportBatch(HttpServletResponse response, CmcProject cmcProject, @PathVariable("ids") String[] ids)
     {
-        List<FilesProject> list = new ArrayList<>();
+        List<CmcProject> list = new ArrayList<>();
         for (String projectId : ids)
-            list.add(filesProjectService.selectFilesProjectById(projectId));
-        ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+            list.add(cmcProjectService.selectCmcProjectByProjectId(projectId));
+        ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "成果表数据");
     }
 
@@ -97,7 +80,7 @@ public class FilesProjectController extends BaseController {
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response)
     {
-        ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
+        ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.importTemplateExcel(response, "项目表模板");
     }
 
@@ -106,20 +89,7 @@ public class FilesProjectController extends BaseController {
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(filesProjectService.selectFilesProjectById(id));
-    }
-
-    /**
-     * 获取专题对应项目列表
-     */
-    @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));
+        return AjaxResult.success(cmcProjectService.selectCmcProjectByProjectId(id));
     }
 
     /**
@@ -130,20 +100,20 @@ public class FilesProjectController extends BaseController {
         if (file.isEmpty()) {
             return AjaxResult.error("文件内容为空！");
         } else {
-            ExcelUtil<FilesProject> util = new ExcelUtil<FilesProject>(FilesProject.class);
-            List<FilesProject> filesProjectList = util.importExcel(file.getInputStream());
+            ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
+            List<CmcProject> cmcProjectList = util.importExcel(file.getInputStream());
             List<String> IdList = new ArrayList<>();
-            for (FilesProject fileProject :  filesProjectService.selectFilesProjectList(new FilesProject())) {
-                IdList.add(fileProject.getId());
+            for (CmcProject fileProject :  cmcProjectService.selectCmcProjectList(new CmcProject())) {
+                IdList.add(fileProject.getProjectId());
             }
-            for (FilesProject fileProject : filesProjectList)
+            for (CmcProject fileProject : cmcProjectList)
             {
-                if (fileProject.getId() == null || !IdList.contains(fileProject.getId()))
-                    fileProject.setId(new SnowFlake().generateId());
-                if (IdList.contains(fileProject.getId()))
-                    filesProjectService.updateFilesProject(fileProject);
+                if (fileProject.getProjectId() == null || !IdList.contains(fileProject.getProjectId()))
+                    fileProject.setProjectId(new SnowFlake().generateId());
+                if (IdList.contains(fileProject.getProjectId()))
+                    cmcProjectService.updateCmcProject(fileProject);
                 else
-                    filesProjectService.insertFilesProject(fileProject);
+                    cmcProjectService.insertCmcProject(fileProject);
             }
             return AjaxResult.success("上传成功");
         }
@@ -154,17 +124,16 @@ public class FilesProjectController extends BaseController {
      */
     @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) )
+    public AjaxResult add(CmcProject cmcProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
+        cmcProject.setProjectId(new SnowFlake().generateId());
+        if (uploadProjectKmlFile(cmcProject, uploadProjectKmlFile) )
             return AjaxResult.error("项目范围kml文件内容为空");
-        if (uploadCpKmlFile(filesProject, uploadCpKmlFile))
+        if (uploadCpKmlFile(cmcProject, uploadCpKmlFile))
             return AjaxResult.error("项目控制点kml文件内容为空");
-        return toAjax(filesProjectService.insertFilesProject(filesProject));
+        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
-    private boolean uploadProjectKmlFile(FilesProject filesProject, MultipartFile uploadProjectKmlFile) throws IOException {
+    private boolean uploadProjectKmlFile(CmcProject cmcProject, MultipartFile uploadProjectKmlFile) throws IOException {
         if (uploadProjectKmlFile != null) {
             if (!uploadProjectKmlFile.isEmpty()) {
                 File profilePath = new File(profile);
@@ -173,7 +142,7 @@ public class FilesProjectController extends BaseController {
                 File transferFile = new File( profilePath + "\\" + uploadProjectKmlFile.getOriginalFilename());
                 if (!transferFile.exists())
                     uploadProjectKmlFile.transferTo(transferFile);
-                filesProject.setProjectKml(transferFile.getName());
+                cmcProject.setProjectKml(transferFile.getName());
             }
             else
                 return true;
@@ -181,7 +150,7 @@ public class FilesProjectController extends BaseController {
         return false;
     }
 
-    private boolean uploadCpKmlFile(FilesProject filesProject, MultipartFile uploadCpKmlFile) throws IOException {
+    private boolean uploadCpKmlFile(CmcProject cmcProject, MultipartFile uploadCpKmlFile) throws IOException {
         if (uploadCpKmlFile != null) {
             if (!uploadCpKmlFile.isEmpty()) {
                 File profilePath = new File(profile);
@@ -190,7 +159,7 @@ public class FilesProjectController extends BaseController {
                 File transferFile = new File( profilePath + "\\" + uploadCpKmlFile.getOriginalFilename());
                 if (!transferFile.exists())
                     uploadCpKmlFile.transferTo(transferFile);
-                filesProject.setProjectCp(transferFile.getName());
+                cmcProject.setProjectCp(transferFile.getName());
             }
             else
                 return true;
@@ -198,49 +167,17 @@ public class FilesProjectController extends BaseController {
         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);
-            }
-        }
-    }
-
     /**
      * 修改项目管理
      */
     @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) )
+    public AjaxResult edit(CmcProject cmcProject, @RequestParam(value = "kmlfile",required = false) MultipartFile uploadProjectKmlFile, @RequestParam(value = "cpfile",required = false) MultipartFile uploadCpKmlFile) throws IOException {
+        if (uploadProjectKmlFile(cmcProject, uploadProjectKmlFile) )
             return AjaxResult.error("项目范围kml文件内容为空");
-        if (uploadCpKmlFile(filesProject, uploadCpKmlFile))
+        if (uploadCpKmlFile(cmcProject, uploadCpKmlFile))
             return AjaxResult.error("项目控制点kml文件内容为空");
-        return toAjax(filesProjectService.updateFilesProject(filesProject));
+        return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 
     /**
@@ -249,13 +186,6 @@ public class FilesProjectController extends BaseController {
     @Log(title = "项目管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids) {
-        return toAjax(filesProjectService.deleteFilesProjectByIds(ids));
-    }
-    /**
-     * 根据项目编号查询项目信息
-     */
-    @GetMapping("/query/{projectNumbers}")
-    public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers){
-        return AjaxResult.success(filesProjectService.selectFilesProjectByNumbers(projectNumbers));
+        return toAjax(cmcProjectService.deleteCmcProjectByProjectIds(ids));
     }
 }

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

@@ -34,6 +34,7 @@ public class FilesStorageController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FilesStorage filesStorage)
     {
+        startPage();
         List<FilesStorage> list = filesStorageService.selectFilesStorageList(filesStorage);
         return getDataTable(list);
     }

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

@@ -1,92 +0,0 @@
-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.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;
-
-    /**
-     * 查询专题管理列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(FilesTopic filesTopic)
-    {
-        List<FilesTopic> list = filesTopicService.selectFilesTopicList(filesTopic);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出专题管理列表
-     */
-    @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, "专题管理数据");
-    }
-
-    /**
-     * 获取专题管理详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
-        return AjaxResult.success(filesTopicService.selectFilesTopicById(id));
-    }
-
-    /**
-     * 新增专题管理
-     */
-    @Log(title = "专题管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FilesTopic filesTopic)
-    {
-        filesTopic.setId(new SnowFlake().generateId());
-        return toAjax(filesTopicService.insertFilesTopic(filesTopic));
-    }
-
-    /**
-     * 修改专题管理
-     */
-    @Log(title = "专题管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FilesTopic filesTopic)
-    {
-        return toAjax(filesTopicService.updateFilesTopic(filesTopic));
-    }
-
-    /**
-     * 删除专题管理
-     */
-    @Log(title = "专题管理", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
-        return toAjax(filesTopicService.deleteFilesTopicByIds(ids));
-    }
-}

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

@@ -39,7 +39,7 @@ public class FilesAchievement extends BaseEntity
 
     /** 比例尺或等级 */
     @Excel(name = "比例尺或等级")
-    private String scaleOrder;
+    private String scaleGrade;
 
     /** 成果类型 */
     @Excel(name = "成果类型")
@@ -144,14 +144,14 @@ public class FilesAchievement extends BaseEntity
     {
         return dataYear;
     }
-    public void setScaleOrder(String scaleOrder) 
+    public void setScaleGrade(String scaleGrade) 
     {
-        this.scaleOrder = scaleOrder;
+        this.scaleGrade = scaleGrade;
     }
 
-    public String getScaleOrder() 
+    public String getScaleGrade() 
     {
-        return scaleOrder;
+        return scaleGrade;
     }
     public void setResultType(String resultType) { this.resultType = resultType; }
 
@@ -284,7 +284,7 @@ public class FilesAchievement extends BaseEntity
             .append("projectId", getProjectId())
             .append("achiName", getAchiName())
             .append("dataYear", getDataYear())
-            .append("scaleOrder", getScaleOrder())
+            .append("scaleGrade", getScaleGrade())
             .append("resultType", getResultType())
             .append("kmlUrl", getKmlUrl())
             .append("kmlLng", getKmlLng())

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

@@ -1,635 +0,0 @@
-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/FilesTopic.java

@@ -1,51 +0,0 @@
-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/FilesProjectMapper.java

@@ -1,73 +0,0 @@
-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/FilesTopicMapper.java

@@ -1,62 +0,0 @@
-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/IFilesProjectService.java

@@ -1,79 +0,0 @@
-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/IFilesTopicService.java

@@ -1,62 +0,0 @@
-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/FilesProjectServiceImpl.java

@@ -1,123 +0,0 @@
-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/FilesTopicServiceImpl.java

@@ -1,94 +0,0 @@
-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/java/com/ruoyi/oa/domain/CmcProject.java

@@ -117,6 +117,22 @@ public class CmcProject extends BaseEntity
     @Excel(name = "撤场时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date exitTime;
 
+    /** 范围kml地址 */
+    @Excel(name = "范围kml地址")
+    private String projectKml;
+
+    /** 控制点kml地址 */
+    @Excel(name = "控制点kml地址")
+    private String projectCp;
+
+    /** kml文件的中心位置经度 */
+    @Excel(name = "kml文件的中心位置经度")
+    private String kmlLng;
+
+    /** kml文件的中心位置纬度 */
+    @Excel(name = "kml文件的中心位置纬度")
+    private String kmlLat;
+
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -351,6 +367,42 @@ public class CmcProject extends BaseEntity
     {
         return qualityInspectorUser;
     }
+    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 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;
+    }
 
     @Override
     public String toString() {
@@ -375,6 +427,10 @@ public class CmcProject extends BaseEntity
                 .append("entryTime", getEntryTime())
                 .append("exitTime", getExitTime())
                 .append("remark", getRemark())
+                .append("projectKml", getProjectKml())
+                .append("projectCp", getProjectCp())
+                .append("kmlLng", getKmlLng())
+                .append("kmlLat", getKmlLat())
                 .toString();
     }
 }

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

@@ -19,6 +19,14 @@ public interface CmcProjectMapper
      */
     public CmcProject selectCmcProjectByProjectId(String projectId);
 
+    /**
+     * 查询cmc项目
+     *
+     * @param projectNumber cmc项目编号
+     * @return cmc项目
+     */
+    public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
+
     /**
      * 获取项目负责人负责的项目详细信息
      *

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

@@ -20,6 +20,14 @@ public interface ICmcProjectService
      */
     public CmcProject selectCmcProjectByProjectId(String projectId);
 
+    /**
+     * 查询cmc项目
+     *
+     * @param projectNumber cmc项目编号
+     * @return cmc项目
+     */
+    public CmcProject selectCmcProjectByProjectNumber(String projectNumber);
+
     /**
      * 获取项目负责人负责的项目详细信息
      *

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

@@ -24,7 +24,7 @@ public class CmcProjectServiceImpl implements ICmcProjectService
 
     /**
      * 查询cmc项目
-     * 
+     *
      * @param projectId cmc项目主键
      * @return cmc项目
      */
@@ -34,6 +34,18 @@ public class CmcProjectServiceImpl implements ICmcProjectService
         return cmcProjectMapper.selectCmcProjectByProjectId(projectId);
     }
 
+    /**
+     * 查询cmc项目
+     *
+     * @param projectNumber cmc项目编号
+     * @return cmc项目
+     */
+    @Override
+    public CmcProject selectCmcProjectByProjectNumber(String projectNumber)
+    {
+        return cmcProjectMapper.selectCmcProjectByProjectNumber(projectNumber);
+    }
+
     /**
      * 获取项目负责人负责的项目详细信息
      *

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

@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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="scaleGrade"    column="scale_grade"    />
         <result property="resultType"    column="result_type"    />
         <result property="fileType"    column="file_type"    />
         <result property="kmlUrl"    column="kml_url"    />
@@ -30,17 +30,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        select id, project_id, achi_name, data_year, scale_grade, 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
+        a.id, a.project_id, p.project_number, a.achi_name, a.data_year, a.scale_grade, 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
+        left join cmc_project p on a.project_id = p.project_id
     </sql>
 
     <select id="selectFilesAchievementList" parameterType="FilesAchievement" resultMap="FilesAchievementResult">
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="scaleGrade != null  and scaleGrade != ''"> and scale_grade like concat('%', #{scaleGrade}, '%')</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>
@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="scaleGrade != null">scale_grade,</if>
             <if test="resultType != null">result_type,</if>
             <if test="fileType != null">file_type,</if>
             <if test="kmlUrl != null">kml_url,</if>
@@ -102,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="scaleGrade != null">#{scaleGrade},</if>
             <if test="resultType != null">#{resultType},</if>
             <if test="fileType != null">#{fileType},</if>
             <if test="kmlUrl != null">#{kmlUrl},</if>
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="scaleGrade != null">scale_grade = #{scaleGrade},</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>

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

@@ -1,326 +0,0 @@
-<?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/FilesTopicMapper.xml

@@ -1,58 +0,0 @@
-<?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/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -25,6 +25,10 @@
         <result property="entryTime"    column="entry_time"    />
         <result property="exitTime"    column="exit_time"    />
         <result property="remark"    column="remark"    />
+        <result property="projectKml"    column="project_kml"    />
+        <result property="projectCp"    column="project_cp"    />
+        <result property="kmlLng"    column="kml_lng"    />
+        <result property="kmlLat"    column="kml_lat"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
@@ -54,7 +58,8 @@
     <sql id="selectCmcProjectVo">
         select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time,
-               p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name, u3.user_id as inspector_user_id from cmc_project as p
+               p.entry_time, p.exit_time, p.remark, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name, u3.user_id as inspector_user_id,
+               p.project_kml, p.project_cp, p.kml_lng, p.kml_lat from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical as c on c.project_id = p.project_id
@@ -90,6 +95,11 @@
         where p.project_id = #{projectId}
     </select>
 
+    <select id="selectCmcProjectByProjectNumber" parameterType="String" resultMap="CmcProjectResult">
+        <include refid="selectCmcProjectVo"/>
+        where p.project_number = #{projectNumber}
+    </select>
+
     <insert id="insertCmcProject" parameterType="CmcProject">
         insert into cmc_project
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -113,6 +123,10 @@
             <if test="entryTime != null">entry_time,</if>
             <if test="exitTime != null">exit_time,</if>
             <if test="remark != null">remark,</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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
@@ -135,6 +149,10 @@
             <if test="entryTime != null">#{entryTime},</if>
             <if test="exitTime != null">#{exitTime},</if>
             <if test="remark != null">#{remark},</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>
         </trim>
     </insert>
 
@@ -160,6 +178,10 @@
             <if test="entryTime != null">entry_time = #{entryTime},</if>
             <if test="exitTime != null">exit_time = #{exitTime},</if>
             <if test="remark != null">remark = #{remark},</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>
         </trim>
         where project_id = #{projectId}
     </update>

oa-back/sql/cmc_project.sql

@@ -0,0 +1,59 @@
+/*
+ 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: 10/05/2024 17:08:11
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for cmc_project
+-- ----------------------------
+DROP TABLE IF EXISTS `cmc_project`;
+CREATE TABLE `cmc_project`  (
+  `project_id` char(19) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目id',
+  `project_number` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编号',
+  `project_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目名称',
+  `project_leader` bigint NULL DEFAULT NULL COMMENT '项目负责人',
+  `is_finished` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目状态（0进行中、1已结束）',
+  `project_source` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目来源（0院内、1院外）',
+  `party_a` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '甲方单位',
+  `contact_person` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系人',
+  `telephone` char(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '联系电话',
+  `project_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目类型',
+  `project_level` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目级别（0一般项目、1重大项目）',
+  `project_registrant` bigint NULL DEFAULT NULL COMMENT '项目登记人',
+  `undertaking_dept` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '承担部门',
+  `project_planner` bigint NULL DEFAULT NULL COMMENT '项目安排人',
+  `site_leader` bigint NULL DEFAULT NULL COMMENT '现场负责人',
+  `organize_document` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '组织交底文档',
+  `register_time` date NULL DEFAULT NULL COMMENT '项目登记时间',
+  `organize_time` date NULL DEFAULT NULL COMMENT '组织交底时间',
+  `plan_time` date NULL DEFAULT NULL COMMENT '项目安排时间',
+  `entry_time` date NULL DEFAULT NULL COMMENT '进场时间',
+  `exit_time` date NULL DEFAULT NULL COMMENT '撤场时间',
+  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目备注',
+  `topic_id` char(19) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '所属专题id',
+  `project_kml` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '范围kml地址',
+  `project_cp` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '控制点kml地址',
+  `kml_lng` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'kml文件的中心位置经度',
+  `kml_lat` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'kml文件的中心位置纬度',
+  PRIMARY KEY (`project_id`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = 'cmc项目表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of cmc_project
+-- ----------------------------
+
+SET FOREIGN_KEY_CHECKS = 1;

oa-ui/src/api/file/achievement.js

@@ -0,0 +1,70 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-06 22:30:46
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-21 17:33:35
+ */
+import request from '@/utils/request'
+
+// 点击项目获取对应的成果
+export function getAchievementByProject(params){
+  return request({
+    url: '/file/achievement/getAchievementByProject',
+    method: 'get',
+    params: params
+  })
+}
+// 查询成果列表
+export function listAchievement(params){
+  return request({
+    url: '/file/achievement/list',
+    method: 'get',
+    params: params
+  })
+}
+// 新增成果列表
+export function addAchievement(data) {
+  return request({
+    url: '/file/achievement',
+    headers:{
+			'Content-Type': 'multipart/form-data'
+		},
+    method: 'post',
+    data: data
+  })
+}
+// 修改成果列表
+export function updateAchievement(data) {
+  return request({
+    url: '/file/achievement/edit',
+    headers:{
+			'Content-Type': 'multipart/form-data'
+		},
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除成果列表
+export function delAchievement(id) {
+  return request({
+    url: '/file/achievement/' + id,
+    method: 'delete'
+  })
+}
+
+// 上传成果表EXCEL
+export function uploadAchievementSheet(params){
+  return request({
+    url: '/file/achievement/uploadSheet',
+    method: 'post',
+    params: params
+  })
+}
+
+// 导出成果表
+export function exportAchievementSheet(){
+  
+}

oa-ui/src/api/file/project.js

@@ -0,0 +1,92 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-05 16:56:28
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-10 15:40:55
+ */
+import request from '@/utils/request'
+
+// 查询项目管理列表
+export function listProject(query) {
+  return request({
+    url: '/file/project/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目管理详细
+export function getProject(id) {
+  return request({
+    url: '/file/project/' + id,
+    method: 'get'
+  })
+}
+
+// 新增项目管理
+export function addProject(data) {
+  return request({
+    url: '/file/project',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目管理
+export function updateProject(data) {
+  return request({
+    url: '/file/project/edit',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除项目管理
+export function delProject(id) {
+  return request({
+    url: '/file/project/' + id,
+    method: 'delete'
+  })
+}
+
+// 上传项目KML文件
+export function uploadProjectKml(params) {
+  return request({
+    url: '/file/project/uploadKml',
+    method: 'post',
+    params: params
+  })
+}
+
+// 上传项目excel文件
+export function uploadProjectSheet(params) {
+  return request({
+    url: '/file/project/uploadSheet',
+    method: 'post',
+    params: params
+  })
+}
+
+export function downloadTemplate(url) {
+  return request({
+    url: url,
+    method: 'get',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    responseType: 'blob'
+  })
+}
+
+export function getProjectKml(url) {
+  return request({
+    url: url,
+    method: 'get',
+  })
+}

oa-ui/src/api/file/storage.js

@@ -0,0 +1,42 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-09 10:32:51
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-15 16:08:22
+ */
+import request from '@/utils/request'
+// 查询存储地址列表
+export function listStorage(query) {
+  return request({
+    url: '/file/storage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增存储地址列表
+export function addStorage(data) {
+  return request({
+    url: '/file/storage',
+    method: 'post',
+    data: data
+  })
+}
+// 修改存储地址列表
+export function updateStorage(data) {
+  return request({
+    url: '/file/storage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除存储地址列表
+export function delStorage(id) {
+  return request({
+    url: '/file/storage/' + id,
+    method: 'delete'
+  })
+}

oa-ui/src/views/file/filesProject/achievement.vue

@@ -0,0 +1,764 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-08 17:16:12
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-10 17:52:15
+-->
+<template>
+  <div>
+    <!-- 搜索栏 -->
+    <el-row>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+        <el-form-item label="项目编号" prop="projectNumber">
+          <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="成果名称" prop="achiName">
+          <el-input v-model="queryParams.achiName" placeholder="请输入成果名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="数据年份" prop="dataYear">
+          <el-input v-model="queryParams.dataYear" placeholder="请输入数据年份" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="成果类型" prop="resultType">
+          <el-input v-model="queryParams.resultType" placeholder="请输入成果类型" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <!-- 操作栏 -->
+    <el-row style="margin-bottom: 10px;">
+      <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddAchievement"
+        v-hasPermi="['file:achievement:add']">新增成果</el-button>
+      <el-button type="success" size="small" icon="el-icon-download" @click="handleExprot"
+        v-hasPermi="['file:achievement:export']">导出</el-button>
+      <el-button type="warning" size="small" icon="el-icon-upload" @click="uploadAchievement"
+        v-hasPermi="['file:achievement:add']">上传成果表</el-button>
+      <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
+        v-hasPermi="['file:achievement:edit']">批量删除
+      </el-button>
+    </el-row>
+    <!-- 表格 -->
+    <el-row>
+      <el-table :data="achiTableData" style="width: 100%" stripe v-loading="loading" :row-key="getRowKeys"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="50px" :reserve-selection="true" />
+        <el-table-column type="index" label="序号" width="50px" align="center" />
+        <el-table-column prop="projectNumber" label="项目编号" align="center" />
+        <el-table-column prop="achiName" label="成果名称" width="200px" align="center" />
+        <el-table-column prop="dataYear" label="数据年份" align="center">
+          <!-- <template #default="scope">
+              {{ parseInt(scope.row.dataYear)}}
+            </template> -->
+        </el-table-column>
+        <el-table-column prop="resultType" label="成果类型" align="center" />
+        <el-table-column prop="scaleGrade" label="比例尺或等级" align="center" />
+        <el-table-column prop="fileType" label="文件类型" align="center" />
+        <el-table-column prop="workLoad" label="工作量" align="center" />
+        <el-table-column prop="unit" label="单位" align="center" />
+        <el-table-column prop="dataSource" label="数据来源" align="center" />
+        <el-table-column prop="dataType" label="数据类型" align="center" />
+        <el-table-column prop="storageAddress" label="存储地址" align="center" />
+        <!-- <el-table-column prop="kmlUrl" label="KML地址" align="center" /> -->
+        <el-table-column label="有无KML" align="center" :formatter="formatterKmlurl"></el-table-column>
+        <el-table-column prop="remark" label="备注" align="center" />
+        <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['file:achievement:edit']">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['file:achievement:remove']">
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getAchiList" />
+    </el-row>
+    <!-- 新增成果表 -->
+    <el-dialog :title="addTitle" :visible.sync="addOpen" width="50%">
+      <el-form :model="form" ref="achiRef" label-width="110px" :rules="rules">
+        <el-row :gutter="20">
+          <el-col :span="7">
+            <el-form-item label="项目编号" prop="projectId">
+              <el-select v-model="form.projectId" placeholder="请选择" :style="{ width: '100%' }" clearable filterable
+                @change="selectNameByNumber">
+                <el-option v-for="item, index in projectList" :key="index" :label="item.projectNumber" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="数据年份" prop="dataYear">
+              <el-input v-model="form.dataYear" placeholder="请输入数据年份" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="成果名称" prop="achiName">
+              <el-input v-model="form.achiName" placeholder="请输入成果名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成果类型" prop="resultType">
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-select v-model="form.resultType" placeholder="请选择成果类型" :style="{ width: '100%' }" clearable
+                    multiple>
+                    <el-option v-for="dict in dict.type.cmc_achi_type" :key="dict.value" :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="2">
+                  <el-button icon="el-icon-plus" @click="handleResult">
+                  </el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="比例尺或等级" prop="scaleGrade">
+              <el-select v-model="form.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable multiple>
+                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                  :value="dict.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件类型" prop="fileType">
+              <el-input v-model="form.fileType" placeholder="请输入文件类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工作量" prop="workLoad">
+              <el-input v-model="form.workLoad" placeholder="请输入工作量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="form.unit" placeholder="请输入单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数据来源" prop="dataSource">
+              <el-input v-model="form.dataSource" placeholder="请输入数据来源" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数据类型" prop="dataType">
+              <el-select v-model="form.dataType" placeholder="请选择数据类型">
+                <el-option label="原始数据" value="原始数据" />
+                <el-option label="成果数据" value="成果数据" />
+                <el-option label="过程数据" value="过程数据" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="存储地址" prop="storageAddress">
+              <el-select v-model="form.storageAddress" placeholder="请选择" filterable allow-create clearable>
+                <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
+                  :value="item.storageAddress" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="KML地址" prop="kmlUrl">
+              <div style="display: flex;">
+                <div>
+                  <el-input v-model="kmlFileName" placeholder="请选择Kml文件" disabled />
+                </div>
+                <div>
+                  <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
+                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                    <el-button type="primary" icon="el-icon-plus"></el-button>
+                  </el-upload>
+                </div>
+              </div>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="生产日期" prop="productionTime">
+              <el-date-picker v-model="form.productionTime" type="month" placeholder="选择日期" format="YYYY年MM月"
+                value-format="YYYY年MM月" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="提交时间" prop="submitDate">
+              <el-date-picker v-model="form.submitDate" type="date" placeholder="选择日期" format="YYYY年MM月DD日"
+                value-format="YYYY年MM月DD日" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :max="250" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 修改成果 -->
+    <el-dialog :title="addTitle" :visible.sync="modifyOpen" width="50%">
+      <el-form :model="modifyForm" ref="achiModifyRef" label-width="110px" :rules="modifyRules">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectId">
+              <el-select allow-create v-model="modifyForm.projectId" placeholder="请选择" :style="{ width: '100%' }"
+                clearable filterable>
+                <el-option v-for="item, index in projectList" :key="index"
+                  :label="item.projectNumber + '-' + item.projectName" :value="item.projectId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成果名称" prop="achiName">
+              <el-input v-model="modifyForm.achiName" placeholder="请输入成果名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数据年份" prop="dataYear">
+              <el-input v-model="modifyForm.dataYear" placeholder="请输入数据年份" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="成果类型" prop="resultType">
+              <el-row :gutter="20">
+                <el-col :span="22">
+                  <el-select v-model="modifyForm.resultType" placeholder="请选择成果类型" :style="{ width: '100%' }" clearable
+                    multiple>
+                    <el-option v-for="dict in dict.type.cmc_achi_type" :key="dict.value" :label="dict.label"
+                      :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-col>
+                <el-col :span="2">
+                  <el-button icon="el-icon-plus" @click="handleResult">
+                  </el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="比例尺或等级" prop="scaleGrade">
+              <el-select v-model="modifyForm.scaleGrade" placeholder="请选择比例尺或等级" :style="{ width: '100%' }" clearable
+                multiple>
+                <el-option v-for="dict in dict.type.cmc_scale_grade" :key="dict.value" :label="dict.label"
+                  :value="dict.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件类型" prop="fileType">
+              <el-input v-model="modifyForm.fileType" placeholder="请输入文件类型" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="工作量" prop="workLoad">
+              <el-input v-model="modifyForm.workLoad" placeholder="请输入工作量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位" prop="unit">
+              <el-input v-model="modifyForm.unit" placeholder="请输入单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="数据来源" prop="dataSource">
+              <el-input v-model="modifyForm.dataSource" placeholder="请输入数据来源" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数据类型" prop="dataType">
+              <el-select v-model="modifyForm.dataType" placeholder="请选择数据类型">
+                <el-option label="原始数据" value="原始数据" />
+                <el-option label="成果数据" value="成果数据" />
+                <el-option label="过程数据" value="过程数据" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="存储地址" prop="storageAddress">
+              <el-select v-model="modifyForm.storageAddress" placeholder="请选择" filterable allow-create clearable>
+                <el-option v-for="item, index in storageList" :key="index" :label="item.storageAddress"
+                  :value="item.storageAddress" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="KML地址" prop="kmlUrl">
+              <div style="display: flex;">
+                <div>
+                  <el-input v-model="kmlFileName" placeholder="请选择Kml文件" disabled />
+                </div>
+                <div>
+                  <el-upload ref="uploadAchiKml" class="upload-demo" action="" :auto-upload="false"
+                    :on-success="successUploadAchiKml" accept=".kml" :on-change="changeUploadKml" :show-file-list="false">
+                    <el-button type="primary" icon="el-icon-plus"></el-button>
+                  </el-upload>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="提交时间" prop="submitDate">
+              <el-date-picker v-model="modifyForm.submitDate" type="date" placeholder="选择日期" format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="modifyForm.remark" placeholder="请输入备注" type="textarea" :max="250" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitModifyForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 用户上传excel -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px">
+      <el-upload ref="uploadRef" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-change="handleFileUploadChange"
+        :on-success="handleFileSuccess" :auto-upload="false" drag v-loading="uploadLoading"
+        element-loading-text="正在上传，请稍等">
+        <el-icon class="el-icon--upload">
+          <upload-filled />
+        </el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitUpload">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAchievement, uploadAchievementSheet, addAchievement, updateAchievement, delAchievement } from "@/api/file/achievement";
+import { listProject, getProject, downloadTemplate } from "@/api/file/project";
+import { saveAs } from 'file-saver'
+import { getToken } from "@/utils/auth";
+import { listStorage } from "@/api/file/storage";
+import { cloneDeep } from "lodash";
+import { listType } from '@/api/system/dict/type'
+export default {
+  name: "Achievement",
+  dicts: ['cmc_achi_type', 'cmc_scale_grade'],
+  data() {
+    return {
+      achiTableData: [],
+      loading: true,
+      total: 0,
+      multiple: true,
+      ids: [],
+      addOpen: false,
+      modifyOpen: false,
+      addTitle: '成果增加',
+      storageList: [],
+      projectList: [],
+      kmlFileName: '',
+      uploadLoading: false,
+      fileList: [],
+      form: {},
+      modifyForm: {},
+      uploadFormData: undefined,
+      submitFormData: undefined,
+      kmlfile: undefined,
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部'Content-Type': 'multipart/form-data', 
+        headers: { 'Authorization': "Bearer " + getToken() },
+        data: undefined,
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/achievement/uploadSheet"
+      },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: undefined,
+        projectId: undefined,
+        projectNumber: undefined,
+        achiName: undefined,
+        dataYear: undefined,
+        scaleGrade: undefined,
+        resultType: undefined,
+        fileType: undefined,
+        kmlUrl: undefined,
+        kmlLng: undefined,
+        kmlLat: undefined,
+        workLoad: undefined,
+        unit: undefined,
+        dataSource: undefined,
+        dataType: undefined,
+        storageId: undefined,
+        remark: undefined,
+      },
+      rules: {
+        projectNumber: [{ required: true, message: "项目编号不能为空", trigger: "change" }],
+        achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
+        dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
+        resultType: [{ required: true, message: "数据类型不能为空", trigger: "change" }],
+        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "change" }],
+      },
+      modifyRules: {
+        projectId: [{ required: true, message: "项目编号不能为空", trigger: "change" }],
+        achiName: [{ required: true, message: "成果名称不能为空", trigger: "blur" }],
+        dataYear: [{ required: true, message: "数据年份不能为空", trigger: "blur" }],
+        resultType: [{ required: true, message: "数据类型不能为空", trigger: "change" }],
+        scaleGrade: [{ required: true, message: "比例尺或等级不能为空", trigger: "change" }],
+      }
+    }
+  },
+
+  created() {
+    this.getAchiList();
+    this.getStorageList();
+    this.getProjectList();
+  },
+  /* ------------------------------------------------------------------------------------------------------------ */
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getAchiList();
+    },
+    getAchiList() {
+      this.loading = true;
+      listAchievement(this.queryParams).then(res => {
+        this.achiTableData = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      })
+    },
+    selectNameByNumber(val) {
+      getProject(val).then(res => {
+        let data = res.data;
+        this.form.projectName = data.projectName;
+        this.form.dataYear = data.projectNumber.substring(0, 4) + '年'
+      })
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.multiple = !selection.length;
+    },
+    /* 新增成果 */
+    handleAddAchievement() {
+      this.reset();
+      this.addOpen = true;
+      this.kmlFileName = '';
+      this.addTitle = "成果增加";
+    },
+    /* 修改成果按钮 */
+    handleUpdate(row) {
+      this.modifyForm = cloneDeep(row);
+      this.kmlFileName = "";
+      this.kmlFileName = row.kmlUrl;
+      if (typeof (this.modifyForm.resultType) == "string") {
+        if (this.modifyForm.resultType.indexOf(',') != -1) {
+          this.modifyForm.resultType = this.modifyForm.resultType.split(',');
+        } else {
+          this.modifyForm.resultType = this.modifyForm.resultType.split();
+        }
+      }
+      if (typeof (this.modifyForm.scaleGrade) == "string") {
+        if (this.modifyForm.scaleGrade.indexOf(',') != -1) {
+          this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split(',');
+        } else {
+          this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.split();
+        }
+      }
+      // let dates =  this.modifyForm.submitDate.slice(0,10)
+      // this.modifyForm.submitDate = dates;
+
+      this.addTitle = "成果修改"
+      this.modifyOpen = true;
+    },
+    /* 删除按钮 */
+    handleDelete(row) {
+      const achiIds = row.id;
+      const achiName = row.achiName
+      this.$modal.confirm('是否确认删除用户编号为"' + achiName + '"的数据项？').then(function () {
+        return delAchievement(achiIds);
+      }).then(() => {
+        this.getAchiList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /* 批量删除操作 */
+    handleDeleteMany() {
+      this.$modal.confirm('是否确认删除？').then(function () {
+        return delAchievement(this.ids);
+      }).then(() => {
+        this.getAchiList();
+        debugger
+        this.ids = [];
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /* 导出 */
+    handleExprot() {
+      // 为true时为导出所有表
+      if (this.multiple) {
+        this.download("/file/achievement/export", { ...this.queryParams }, `成果表_所有数据.xlsx`);
+      } else {
+        this.download("/file/achievement/exportBatch/" + this.ids, { ...this.queryParams }, `成果表_${this.ids.length}条.xlsx`);
+      }
+    },
+    /* 增加确定按钮 */
+    submitForm() {
+      this.submitFormData = new FormData();
+      this.submitFormData.append('uploadKmlFile', this.kmlfile);
+      this.$refs["achiRef"].validate(valid => {
+        if (valid) {
+          for (let i in this.form) {
+            this.submitFormData.append(i, this.form[i] == null ? "" : this.form[i]);
+          }
+          addAchievement(this.submitFormData).then(response => {
+            this.$modal.msgSuccess("新增成功");
+            this.addOpen = false;
+            this.getAchiList();
+          });
+        } else {
+          this.$modal.msgError("请完善必填项");
+        }
+      })
+    },
+
+    /* 修改确定按钮 */
+    submitModifyForm() {
+      this.submitFormData = new FormData();
+      this.submitFormData.append('uploadKmlFile', this.kmlfile);
+      this.$refs["achiModifyRef"].validate(valid => {
+        delete this.modifyForm.params;
+        for (let i in this.modifyForm) {
+          this.submitFormData.append(i, this.modifyForm[i] == null ? "" : this.modifyForm[i]);
+        }
+        this.modifyForm.resultType = this.modifyForm.resultType.toString();
+        this.modifyForm.scaleGrade = this.modifyForm.scaleGrade.toString();
+        updateAchievement(this.submitFormData).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.modifyOpen = false;
+          this.getAchiList();
+        });
+      })
+
+    },
+    /* 取消按钮 */
+    cancel() {
+      this.addOpen = false;
+      this.modifyOpen = false;
+    },
+    /* 重置新增和修改表单 */
+    reset() {
+      this.form = {
+        id: undefined,
+        projectId: undefined,
+        projectNumber: undefined,
+        achiName: undefined,
+        dataYear: undefined,
+        scaleGrade: [],
+        resultType: [],
+        fileType: undefined,
+        kmlUrl: undefined,
+        kmlLng: undefined,
+        kmlLat: undefined,
+        workLoad: undefined,
+        unit: undefined,
+        dataSource: undefined,
+        dataType: undefined,
+        storageId: undefined,
+        remark: undefined,
+      }
+      this.modifyForm = {
+        id: undefined,
+        projectId: undefined,
+        projectNumber: undefined,
+        achiName: undefined,
+        dataYear: undefined,
+        scaleGrade: [],
+        resultType: [],
+        fileType: undefined,
+        kmlUrl: undefined,
+        kmlLng: undefined,
+        kmlLat: undefined,
+        workLoad: undefined,
+        unit: undefined,
+        dataSource: undefined,
+        dataType: undefined,
+        storageId: undefined,
+        remark: undefined,
+      }
+      this.resetForm("achiRef");
+    },
+    // 上传成果excel
+    uploadAchievement() {
+      this.upload.title = "上传成果表";
+      this.upload.open = true;
+    },
+    /**Excel文件上传中处理 */
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadLoading = true;
+    },
+    /* Excel文件改变时 */
+    handleFileUploadChange(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.uploadFormData = new FormData();
+      this.uploadFormData.append("file", file);
+      this.upload.data = this.uploadFormData;
+    },
+    /* kml文件改变时 */
+    changeUploadKml(file, fileList) {
+      if (fileList.length > 1) {
+        fileList.splice(0, 1);
+      }
+      this.kmlFileName = file.name;
+      this.kmlfile = file.raw;
+    },
+    /* 下载模板 */
+    importTemplate() {
+      // const path = "http://127.0.0.1:8083/profile/template/cg-template.xlsx"
+      const path = "http://oa.sccehui.com:6104/prod-api/profile/template/cg-template.xlsx"
+      downloadTemplate(path).then(res => {
+        const blob = new Blob([res])
+        saveAs(blob, '成果表模版.xlsx');
+      });
+      // this.download("file/achievement/importTemplate", {
+      // }, `成果表模板.xlsx`);
+    },
+    /** Excel文件上传成功处理 */
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.uploadLoading = false;
+      this.fileList = [];
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$refs["uploadRef"].clearFiles();
+      this.getAchiList();
+    },
+    /* Excel上传提交按钮 */
+    submitUpload() {
+      this.$refs['uploadRef'].submit();
+    },
+    /* kml文件上传成功处理 */
+    successUploadAchiKml(response, file, fileList) {
+      this.$refs["uploadAchiKml"].clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+    },
+    /* 获取存储地址列表 */
+    getStorageList() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 999999;
+      listStorage(this.queryParams).then(response => {
+        this.storageList = response.rows;
+      })
+    },
+    /* 获取项目列表 */
+    getProjectList() {
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 999999;
+      listProject(this.queryParams).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+
+    formatterKmlurl(row, cloumn) {
+      if (row.kmlUrl == "" || row.kmlUrl == null) {
+        return "无";
+      } else {
+        return "有";
+      }
+    },
+    // 操作成果类型字典
+    handleResult() {
+      listType().then(res => {
+        if (res.code == 200) {
+          let datas = res.rows;
+          for (let d of datas) {
+            if (d.dictType == "cmc_achi_type") {
+              this.$router.push({ path: "/system/dict-data/index/" + d.dictId });
+              return
+            }
+          }
+        }
+      })
+
+    },
+    // 获取表格的row-key,
+    getRowKeys(row) {
+      return row.id;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/file/filesProject/index.vue

@@ -0,0 +1,52 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-05 16:56:02
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-10 10:16:22
+-->
+<template>
+  <div class="project-wrapper">
+    <el-tabs v-model="tablsActiveName" class="demo-tabs" @tab-click="handleTabsClick">
+      <el-tab-pane label="项目管理" name="project">
+        <Project ref="projectRef"></Project>
+      </el-tab-pane>
+      <el-tab-pane label="成果管理" name="achievement">
+        <Achievement ref="achievementRef"></Achievement>
+      </el-tab-pane>
+      <el-tab-pane label="存储地址" name="storage">
+        <Storage ref="storageRef"></Storage>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script >
+import Project from './project.vue'
+import Achievement from './achievement.vue'
+import Storage from './storage.vue'
+export default {
+  components: { Project, Achievement, Storage },
+  data() {
+    return {
+      tablsActiveName: "project",
+    }
+  },
+  methods: {
+    handleTabsClick() {
+      if (this.tablsActiveName == "project") {
+        this.$refs.projectRef.getProList();
+      } else if (this.tablsActiveName == "achievement") {
+        this.$refs.achievementRef.getAchiList();
+      }
+    }
+  },
+}
+
+
+
+</script>
+<style lang="scss" scoped>
+.project-wrapper {
+  padding: 10px 20px 0px;
+}</style>

oa-ui/src/views/file/filesProject/storage.vue

@@ -0,0 +1,202 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: ysh
+ * @Date: 2022-09-08 17:16:38
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-10 15:14:58
+-->
+<template>
+  <div>
+    <!-- 搜索栏 -->
+    <el-row>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
+        <el-form-item label="存储地址" prop="storageAddress">
+          <el-input v-model="queryParams.storageAddress" placeholder="请输入存储地址" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="管理员" prop="administrator">
+          <el-input v-model="queryParams.administrator" placeholder="请输入管理员" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <!-- 操作栏 -->
+    <el-row>
+      <el-button type="primary" size="small" icon="el-icon-plus" @click="handleAddAStorage"
+        v-hasPermi="['file:storage:add']">新增存储地址</el-button>
+      <el-button type="danger" size="small" icon="el-icon-delete" :disabled="multiple" @click="handleDeleteMany"
+        v-hasPermi="['file:storage:remove']">批量删除
+      </el-button>
+    </el-row>
+    <!-- 表格 -->
+    <el-row>
+      <el-table :data="storageTableData" style="width: 100%" stripe v-loading="loading"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="50px" />
+        <el-table-column type="index" label="序号" width="50px" align="center" />
+        <el-table-column prop="id" label="存储编号" align="center" />
+        <el-table-column prop="storageAddress" label="存储地址" align="center" />
+        <el-table-column prop="administrator" label="管理员" align="center" />
+        <el-table-column prop="remark" label="备注" align="center" />
+        <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-hasPermi="['file:storage:edit']">
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['file:storage:remove']">
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getStorageList" />
+    </el-row>
+    <!-- 新增和修改对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%">
+      <el-form :model="form" ref="formRef" label-width="105px">
+        <el-form-item label="存储地址" prop="storageAddress">
+          <el-input v-model="form.storageAddress" placeholder="请输入存储地址" />
+        </el-form-item>
+        <el-form-item label="管理人" prop="administrator">
+          <el-input v-model="form.administrator" placeholder="请输入管理人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="administrator">
+          <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :max="250" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listStorage, addStorage, updateStorage, delStorage } from "@/api/file/storage";
+export default {
+  nam: "Project",
+  data() {
+    return {
+      form: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        id: undefined,
+        storageAddress: undefined,
+        administrator: undefined,
+        remark: undefined
+      },
+      rules: {
+        storageAddress: [{ required: true, message: "存储地址不能为空", trigger: "blur" }],
+        administrator: [{ required: true, message: "管理员不能为空", trigger: "blur" }],
+      },
+      storageTableData: [],
+      loading: true,
+      total: 0,
+      title: '',
+      open: false,
+      multiple: true,
+      ids: [],
+    }
+  },
+  created() {
+    this.getStorageList();
+  },
+  /* ----------------------------------------------------------------------------------------------- */
+  /* 搜索按钮 */
+  methods: {
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getStorageList();
+    },
+    /* 获取存储列表 */
+    getStorageList() {
+      listStorage(this.queryParams).then(res => {
+        this.storageTableData = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      })
+    },
+    /* 新增存储 */
+    handleAddAStorage() {
+      this.open = true;
+      this.title = "增加存储地址";
+    },
+    /* 表单确定按钮 */
+    submitForm() {
+      this.$refs["formRef"].validate(valid => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            updateStorage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getStorageList();
+            });
+          } else {
+            addStorage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getStorageList();
+            });
+          }
+        }
+      })
+    },
+    /* 表单取消按钮 */
+    cancel() {
+      this.reset();
+      this.open = false;
+    },
+    /* 重置新增和修改表单 */
+    reset() {
+      this.form = {
+        id: undefined,
+        storageAddress: undefined,
+        administrator: undefined,
+        remark: undefined
+      }
+    },
+    /* 修改按钮 */
+    handleUpdate(row) {
+      this.form = row;
+      this.title = "修改存储地址"
+      this.open = true;
+    },
+    /* 删除按钮 */
+    handleDelete(row) {
+      const ids = row.id;
+      const storageAddress = row.storageAddress
+      this.$modal.confirm('是否确认删除用户编号为"' + storageAddress + '"的数据项？').then(() => {
+        return delStorage(ids);
+      }).then(() => {
+        this.getStorageList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /* 批量删除操作 */
+    handleDeleteMany() {
+      this.$modal.confirm('是否确认删除？').then(() => {
+        return delStorage(this.ids);
+      }).then(() => {
+        this.getStorageList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 多选框选中数据 */
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id);
+      this.multiple = !selection.length;
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -6,7 +6,12 @@
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="项目信息" prop="projectId">
-            <el-descriptions border style="margin-top: 10px;" :column="2" direction="vertical">
+            <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-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
               }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
@@ -222,6 +227,7 @@ export default {
       rules: {
       },
       chooseProject: {},
+      isSelect: false,
       formTotal: 0,
       flowData: {},
       projectList: [],
@@ -248,7 +254,7 @@ export default {
       this.archiveUser = this.$store.getters.name;
       this.archiveTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    this.getProjectInfo();
+    this.getProjectList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -269,6 +275,7 @@ 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) {
@@ -306,10 +313,22 @@ export default {
       this.open = false;
       this.reset();
     },
-    // 查询项目信息
-    getProjectInfo() {
-      getProject(this.taskForm.formId).then(response => {
+    // 查询项目列表
+    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 => {
           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) {
@@ -328,6 +347,9 @@ export default {
               this.contractCode = '';
           })
         })
+      } else {
+        this.isSelect = false
+      }
     },
     isEmptyObject(obj) {
       for (var key in obj) {