From 08d0350119d9d4415d1a7f0bb5cbe7b7fb31517c Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 15 Aug 2024 09:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AE=B9=E6=9B=B2=E7=BA=BF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9,=E6=B2=BF=E6=B2=B3=E5=B1=85?=
 =?UTF-8?q?=E6=B0=91=E6=88=B7=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9,=E5=8D=B1=E9=99=A9=E5=8C=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/controller/AttResBaseController.java   |  2 +-
 .../project/xyt/controller/StZvarlBController.java     | 10 ++++++++--
 .../com/gunshi/project/xyt/mapper/IaCDanadMapper.java  |  5 +++--
 .../gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java    |  5 +++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java b/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java
index fbc862c..3e1c47c 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/AttResBaseController.java
+++ b/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("当前数据不存在");
diff --git a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java b/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java
index 5b135cc..87f3be5 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/StZvarlBController.java
+++ b/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() {
-        return R.ok(service.lambdaQuery().orderByDesc(StZvarlB::getMstm).list());
+    public R<List<StZvarlB>> list(@RequestBody StZvarlB dto) {
+        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 = "分页")
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
index 3135272..1b58267 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
+++ b/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
-            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            SELECT st.*, r1.adnm||r2.adnm adnm FROM ia_c_danad st
+            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();
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
index bd7e3ab..2911d69 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
+++ b/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
-            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            SELECT st.*,r1.adnm||r2.adnm adnm  FROM ia_c_flrvvlg st
+            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>
             """)