辅助审核报批数据，用途编码转换为文字展示

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

@@ -14,6 +14,7 @@ import com.siwei.common.core.exception.ServiceException;
 import com.siwei.common.core.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.util.Units;
@@ -210,7 +211,7 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
 
             List<Map<String, Object>> dataList = decisionTaskMapper.getDetailsList(param);
             if (CollectionUtils.isNotEmpty(dataList)) {
-                if(decisionType.getCode().equalsIgnoreCase("7")){
+                if(decisionType.getCode().equalsIgnoreCase("7") && decisionType.getSourceId().equalsIgnoreCase("node_id") ){
                     //这里把用途转为名称展示
                     for(Map<String,Object> data : dataList){
                         if(data.get("tdyt") != null){
@@ -264,8 +265,12 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
         }
 
         if (typeEnum != null) {
-            //todo 这里需要返回项目信息，根据nodeId
-            return decisionTaskMapper.getJoinDetails(typeEnum.getTable(),typeEnum.getSourceId(),currentId);
+            Map<String,Object> resMap = decisionTaskMapper.getJoinDetails(typeEnum.getTable(),typeEnum.getSourceId(),currentId);
+            if(MapUtils.isNotEmpty(resMap)){
+                resMap.put("geom",resMap.get("geom2"));//这里直接把geom转为字符串返回，前端展示用
+                resMap.remove("geom2");//这里直接把geom转为字符串返回，前端展示用
+            }
+            return resMap;
         }
         return null;
     }