Bläddra i källkod

修改相关bug导出错误等

chenendian 1 månad sedan
förälder
incheckning
dd8bc11380

+ 1 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/JsgcghxkImpl.java

@@ -76,7 +76,7 @@ public class JsgcghxkImpl implements JsgcghxkService {
         projectWorkflow.setProjectId(jsgcghxk.getProjectId());
         projectWorkflow.setNodeId(jsgcghxk.getId());
         projectWorkflow.setNodeTableName(workflow.getTableName());
-        projectWorkflow.setWorkflowName(workflow.getTableName());
+        projectWorkflow.setWorkflowName(workflow.getName());
         projectWorkflowMapper.add(projectWorkflow);
         return jsgcghxk.getId();
     }

+ 15 - 2
siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -509,8 +509,21 @@
         SELECT COUNT(*)
         FROM (
                 SELECT
-                distinct
-                P."id" AS ID
+                P."id" AS ID,
+                P."name" AS NAME,
+                P."code" AS code,
+                P."company" AS company,
+                P."created_at" AS createAt,
+                P."updated_at" AS updateAt,
+                P."project_type" AS projectType,
+                P."on_chain_num" AS onChainNum,
+                P."creator_id" AS creatorId,
+                P."updated_at" AS updatedAt,
+                '1'  AS selectType,
+                '' AS attachmentId,
+                '' AS nodeId  ,
+                '' AS fileName,
+                '' AS  filePath
                 FROM  PUBLIC.t_project P
                 <where>
                     <if test="keyWords != null and keyWords.size() > 0">

+ 2 - 1
siwei-modules/siwei-spatial/src/main/java/com/siwei/spatial/utils/FileUtils.java

@@ -109,7 +109,8 @@ public class FileUtils {
                     if (lowerName.endsWith(".shp") || lowerName.endsWith(".dbf") || lowerName.endsWith(".prj") || lowerName.endsWith(".qix") || lowerName.endsWith(".shx")) {
                         String baseName = fileName.substring(0, fileName.lastIndexOf('.'));
                         String ext = fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
-                        groupedFiles.computeIfAbsent(baseName, k -> new HashMap<>()).put(ext, file.getAbsolutePath());
+                        groupedFiles.computeIfAbsent(baseName, k -> new HashMap<>()).put(ext, file.getPath());
+                        //groupedFiles.computeIfAbsent(baseName, k -> new HashMap<>()).put(ext, file.getAbsolutePath());
                     }
                 }
             }