修复导出字段不全

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/DecisionTaskServiceImpl.java

@@ -452,7 +452,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
         List<NpoiHelper.TableTitle> tableTitles = getTableTitlesByType(type,typeName);
         
         // 准备表格数据
-        List<Map<String, Object>> tableData = prepareTableData(dataList, type);
+        List<Map<String, Object>> tableData = prepareTableData(dataList, type,typeName);
 
         // 生成表格
         createTable(document, tableTitles, tableData);
@@ -684,7 +684,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
     /**
      * 准备表格数据
      */
-    private List<Map<String, Object>> prepareTableData(List<Map<String, Object>> dataList, Integer type) {
+    private List<Map<String, Object>> prepareTableData(List<Map<String, Object>> dataList, Integer type,String name) {
         List<Map<String, Object>> result = new ArrayList<>();
         
         if (CollectionUtils.isEmpty(dataList)) {
@@ -703,14 +703,26 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
                 row.put("qlrsjsyrlxm", getStringValue(data, "qlrsjsyrlxm"));
             } else if (type == 6) {
                 // 供地数据
-                row.put("srf", getStringValue(data, "srf"));
-                row.put("shapearea", getDoubleValue(data, "shapearea"));
-                row.put("hbcrht_date", getStringValue(data, "hbcrht_date"));
+                if(name.equalsIgnoreCase("供地数据")){
+                    row.put("srr", getStringValue(data, "srr"));
+                    row.put("shapearea", getDoubleValue(data, "shapearea"));
+                    row.put("nf", getStringValue(data, "nf"));
+                }else {
+                    row.put("srf", getStringValue(data, "srf"));
+                    row.put("shapearea", getDoubleValue(data, "shapearea"));
+                    row.put("hbcrht_date", getStringValue(data, "hbcrht_date"));
+                }
             } else if (type == 7) {
                 // 报批数据
-                row.put("project_name", getStringValue(data, "project_name"));
-                row.put("shapearea", getDoubleValue(data, "shapearea"));
-                row.put("xmlx", getStringValue(data, "xmlx"));
+                if(name.equalsIgnoreCase("报批数据")) {
+                    row.put("xmmc", getStringValue(data, "xmmc"));
+                    row.put("shapearea", getDoubleValue(data, "shapearea"));
+                    row.put("tdyt", getStringValue(data, "tdyt"));
+                }else {
+                    row.put("project_name", getStringValue(data, "project_name"));
+                    row.put("shapearea", getDoubleValue(data, "shapearea"));
+                    row.put("xmlx", getStringValue(data, "xmlx"));
+                }
             } else {
                 // 默认：复制所有数据
                 row.putAll(data);

siwei-modules/siwei-apply/src/main/resources/mapper/DecisionTaskMapper.xml

@@ -165,7 +165,7 @@
     </delete>
 
     <select id="getJoinDetails" resultType="map">
-        SELECT  d.* , public.st_asewkt(geom) geom2  FROM  ${tableName}  d  WHERE   d.${fieldName}::varchar = #{fieldValue}
+        SELECT  d.* , public.st_asewkt(geom) geom2  FROM  ${tableName}  d  WHERE   d.${fieldName}::varchar = #{fieldValue}  LiMIT 1
     </select>