Преглед изворни кода

上传文件校验,按照目录格式,不对则提示

chenendian пре 3 месеци
родитељ
комит
3fa8fb4766

+ 1 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ProjectController.java

@@ -1,3 +1,4 @@
+
 package com.siwei.apply.controller;
 package com.siwei.apply.controller;
 
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONArray;

+ 1 - 1
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/enums/AloneWorkFlowEnum.java

@@ -11,7 +11,7 @@ public enum AloneWorkFlowEnum {
     NODE_4("4", "建设用地规划许可","t_jsydghxk"),
     NODE_4("4", "建设用地规划许可","t_jsydghxk"),
     NODE_5("5", "建设工程规划许可","t_jsgcghxk"),
     NODE_5("5", "建设工程规划许可","t_jsgcghxk"),
     NODE_6("6", "土地核验与规划核实","t_tdhyhs"),
     NODE_6("6", "土地核验与规划核实","t_tdhyhs"),
-    NODE_7("7", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfw");
+    NODE_7("7", "国有建设用地使用权及房屋所有权首次登记","t_gyjsydjfwscdj");
 
 
     private final String index;
     private final String index;
     private final String name;
     private final String name;

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

@@ -211,7 +211,7 @@ public class LandOneCodeServiceImpl implements LandOneCodeService {
                     Tdgy tdgy = tdgyMapper.getById(useNodeId);
                     Tdgy tdgy = tdgyMapper.getById(useNodeId);
                     globalTdgy = tdgy;
                     globalTdgy = tdgy;
                     if (StringUtils.isNotBlank(tdgy.getHasZz())) {
                     if (StringUtils.isNotBlank(tdgy.getHasZz())) {
-                        levyStatusCode = "是".equalsIgnoreCase(tdgy.getHasZz()) ? "2" : "否".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "";
+                        levyStatusCode = "未报未征".equalsIgnoreCase(tdgy.getHasZz()) ? "0" : "已报未征".equalsIgnoreCase(tdgy.getHasZz()) ? "1" : "2";
                     }
                     }
                 }
                 }
             }
             }

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

@@ -176,7 +176,7 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
 
 
         } catch (Exception e) {
         } catch (Exception e) {
             logger.error("处理文件并保存附件信息异常,filePath: {}", filePath, e);
             logger.error("处理文件并保存附件信息异常,filePath: {}", filePath, e);
-            return null;
+            throw new ServiceException("处理文件并保存附件信息异常,"+e.getMessage());
         }
         }
     }
     }
 
 

+ 5 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -14,6 +14,7 @@ import com.siwei.common.core.exception.ServiceException;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.siwei.apply.domain.res.LandTypeTreeRes;
 import com.siwei.apply.domain.res.LandTypeTreeRes;
@@ -65,6 +66,10 @@ public class TdgyImpl implements TdgyService {
         BeanUtils.copyProperties(tdgyVo, tdgy);
         BeanUtils.copyProperties(tdgyVo, tdgy);
         tdgy.generateId();
         tdgy.generateId();
         tdgy.setCreatorId(UserId);
         tdgy.setCreatorId(UserId);
+        //初始化默认值为出让
+        if(StringUtils.isBlank(tdgy.getGdType())){
+            tdgy.setGdType("出让");
+        }
         tdgyMapper.add(tdgy);
         tdgyMapper.add(tdgy);
         // 添加项目流程(仿照YdbpImpl)
         // 添加项目流程(仿照YdbpImpl)
         Integer projectType = projectMapper.getProjectTypeById(tdgy.getProjectId());
         Integer projectType = projectMapper.getProjectTypeById(tdgy.getProjectId());