自动项目编号修改，一张图加水系

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

@@ -146,8 +146,14 @@ public class CmcProjectController extends BaseController
     public AjaxResult getProjectNumberByYear(CmcProject cmcProject)
     {
         List<CmcProject> list = cmcProjectService.selectCmcAllProjectList(cmcProject);
-        String number = list.get(0).getProjectNumber().substring(5);
-        String projectNumber = cmcProject.getProjectNumber() + (Integer.parseInt(number) + 1);
+        String number = "0";
+        String projectNumber = "";
+        if (list.size() > 0)
+            number = list.get(0).getProjectNumber().substring(5);
+        if (Integer.parseInt(number) < 9)
+            projectNumber = cmcProject.getProjectNumber() + "0" + (Integer.parseInt(number) + 1);
+        else
+            projectNumber = cmcProject.getProjectNumber() + (Integer.parseInt(number) + 1);
         return success(projectNumber);
     }
 

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

@@ -4,12 +4,13 @@
  * @Author: ysh
  * @Date: 2022-10-20 17:27:09
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-04 15:01:44
+ * @LastEditTime: 2025-01-02 09:29:11
 -->
 <template>
   <div class="layer-box">
     <div class="checkList">
       <el-checkbox-group v-model="checkList">
+        <el-checkbox label="水系" @change="checkedSx" />
         <el-checkbox label="范围" @change="checkedRange" />
         <el-checkbox label="控制点" @change="checkedCp" />
       </el-checkbox-group>
@@ -66,6 +67,21 @@ export default {
   data() {
     return {
       kmlPath: process.env.VUE_APP_BASE_API,
+      sxLayer: new VectorLayer({
+              style: new Style({
+                stroke: new Stroke({
+                  color: '#0000ff',
+                  width: 2
+                })
+              }),
+              source: new VectorSource({
+                url: process.env.VUE_APP_BASE_API + "/profile/upload/uploadKmlFiles/shuixi.kml",
+                format: new KML({
+                  extractStyles: false
+                }),
+                projection: 'EPSG:4326'
+              })
+            }),
       treeDatas: [],
       selectedNodeKey: [],
       allNodeKey: [],
@@ -154,6 +170,8 @@ export default {
           this.allNodeKey = selectList;
         }
       })
+      this.sxLayer.setVisible(false);
+      this.$store.getters.map.addLayer(this.sxLayer);
     },
     /* 全选 */
     handleAllSelect() {
@@ -202,6 +220,9 @@ export default {
         }, 200);
       }
     },
+    checkedSx(val) {
+      this.sxLayer.setVisible(val);
+    },
     checkedRange(val) {
       let datas = this.$refs.projectTree.getCheckedNodes();
       for (let d of datas) {