库容曲线查询修改,沿河居民户详情查询修改,危险区详情查询修改

src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java

@@ -101,7 +101,7 @@ public class AttResBaseController  extends AbstractCommonFileController {
     }
 
     @Operation(summary = "设计图纸和资料文件上传")
-    @GetMapping("/updateFile")
+    @PostMapping("/updateFile")
     public R<AttResBase> updateFile(@Validated(Update.class) @RequestBody AttResBase dto) {
         if (Objects.isNull(service.getById(dto.getResCode()))) {
             throw new IllegalArgumentException("当前数据不存在");

src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java

@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.gunshi.core.result.R;
 import com.gunshi.project.xyt.model.StZvarlB;
 import com.gunshi.project.xyt.service.StStbprpBService;
@@ -94,8 +95,13 @@ public class StZvarlBController {
 
     @Operation(summary = "列表")
     @PostMapping("/list")
-    public R<List<StZvarlB>> list() {
+    public R<List<StZvarlB>> list(@RequestBody StZvarlB dto) {
-        return R.ok(service.lambdaQuery().orderByDesc(StZvarlB::getMstm).list());
+        LambdaQueryChainWrapper<StZvarlB> q = service.lambdaQuery().orderByDesc(StZvarlB::getMstm);
+        String stcd = dto.getStcd();
+        if (StringUtils.isNotBlank(stcd)){
+            q.eq(StZvarlB::getStcd, stcd);
+        }
+        return R.ok(q.list());
     }
 
 //    @Operation(summary = "分页")

src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java

@@ -20,8 +20,9 @@ public interface IaCDanadMapper extends BaseMapper<IaCDanad> {
 
     @Select("""
             <script>
-            SELECT st.*,r.adnm FROM ia_c_danad st
+            SELECT st.*, r1.adnm||r2.adnm adnm FROM ia_c_danad st
-            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
             </script>
             """)
     List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis();

src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java

@@ -19,8 +19,9 @@ public interface IaCFlrvvlgMapper extends BaseMapper<IaCFlrvvlg> {
 
     @Select("""
             <script>
-            SELECT st.*,r.adnm FROM ia_c_flrvvlg st
+            SELECT st.*,r1.adnm||r2.adnm adnm  FROM ia_c_flrvvlg st
-            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 6 ), '000000000' ) = r1.adcd
+            LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
             WHERE st.adcd like '421181113%'
             </script>
             """)