Parcourir la source

宗地修改报错问题

chenendian il y a 3 jours
Parent
commit
5c682e46c2

+ 9 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -4,6 +4,7 @@ import com.siwei.apply.domain.NodeAttachment;
 import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.domain.YdbpData;
 import com.siwei.apply.domain.res.TdgyRes;
+import com.siwei.apply.domain.vo.TdgyUpdateVo;
 import com.siwei.apply.enums.AloneWorkFlowEnum;
 import com.siwei.apply.service.NodeAttachmentService;
 import com.siwei.apply.service.ProjectService;
@@ -346,6 +347,14 @@ public class NodeAttachmentController extends BaseController {
             }
             NodeAttachment nodeAttachment = null;
             TdgyRes tdgyRes =  tdgyService.getById(nodeId);
+
+            //这里先修改供地类型,再删除原有附件信息,增加新附件信息 (修复附件上传错误)
+            TdgyUpdateVo updateVo = new TdgyUpdateVo();
+            updateVo.setId(nodeId);
+            updateVo.setGdType(gdType);
+            tdgyService.update(updateVo);
+
+
             if (Objects.nonNull(tdgyRes)) {
                 //1.先删除当前节点
                 nodeAttachmentService.deleteByNodeId(nodeId);

+ 13 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -1423,6 +1423,19 @@ public class CadastreManageServiceImpl implements CadastreManageService {
 
     @Override
     public String tableRowUpdate(String tableName, List<Map<String,Object>> list) {
+        for (Map<String, Object> row : list) {
+            row.replaceAll((k, v) -> {
+                if (v instanceof String) {
+                    String sv = (String) v;
+                    try {
+                        return new java.math.BigDecimal(sv);
+                    } catch (NumberFormatException e) {
+                        return v;
+                    }
+                }
+                return v;
+            });
+        }
          int res = cadastreFileMapper.batchUpdateByBsm(tableName,list);
         return res+"";
     }

+ 2 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -170,6 +170,8 @@ public class ProjectImpl implements ProjectService {
         projectOverviewRes.setProjectSupplyList(projectSupplyList);
         // 获取项目进度
         ProjectFilterVo projectFilterVo = new ProjectFilterVo();
+        projectFilterVo.setPageNum(1);
+        projectFilterVo.setPageSize(10000);
         projectFilterVo.setIsOnchain(true);
         List<Project> projectList = projectMapper.getList(projectFilterVo);
         Map<String, Integer> progressMap = new LinkedHashMap<>();