From d27deb83b9320f2cfd34e62542661937ec3a3bf1 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Thu, 13 Jun 2024 10:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BsSgcjsjdBuiProInfoController.java        | 35 +++++--------------
 .../service/BsSgcjsjdBuiProInfoService.java   |  4 +--
 .../build/BsSgcjsjdBuiProInfoMapper.xml       |  4 +--
 3 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
index f51440c7..25a417bc 100644
--- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
+++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java
@@ -256,33 +256,14 @@ public class BsSgcjsjdBuiProInfoController extends BaseController
 
     @PostMapping("/importData")
     @Transactional
-    public AjaxResult importData(@RequestParam(value = "file") MultipartFile file) {
-        ExcelUtil<BsSgcjsjdBuiProInfo> util = new ExcelUtil<>(BsSgcjsjdBuiProInfo.class);
-        try {
-            List<BsSgcjsjdBuiProInfo> list = util.importExcel(file.getInputStream());
-            list.remove(0);
-            for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo:list){
-                if (bsSgcjsjdBuiProInfo.getProjectUnitLegal().contains("1")) {
-                    String[] split = bsSgcjsjdBuiProInfo.getProjectUnitLegal().split(
-                            bsSgcjsjdBuiProInfo.getProjectUnitLegal().substring(bsSgcjsjdBuiProInfo.getProjectUnitLegal().indexOf("1") - 1, bsSgcjsjdBuiProInfo.getProjectUnitLegal().indexOf("1")));
-
-                    if (split.length>=2){
-                        bsSgcjsjdBuiProInfo.setProjectUnitLegal(split[0]);
-                        bsSgcjsjdBuiProInfo.setProjectUnitLegalPhone(split[1]);
-                    }
-                    SysXzqh one = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("NAME",bsSgcjsjdBuiProInfo.getParentAcad()));
-                    if (ObjectUtil.isNotEmpty(one)){
-                        SysXzqh adcd = sysXzqhService.getOne(new QueryWrapper<SysXzqh>().eq("NAME",bsSgcjsjdBuiProInfo.getAdcd()).eq("PARENTID",one.getXzqhdm()));
-                        if (ObjectUtil.isNotEmpty(adcd)){
-                            bsSgcjsjdBuiProInfo.setAdcd(adcd.getXzqhdm());
-                        }
-                    }
-                }
-                bsSgcjsjdBuiProInfoService.saveOrUpdate(bsSgcjsjdBuiProInfo);
-            }
-            return AjaxResult.success(list);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+    public AjaxResult importData() {
+        List<BsSgcjsjdBuiProInfo> list = bsSgcjsjdBuiProInfoService.list(null);
+        for (BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo:list){
+            bsSgcjsjdBuiProInfo.setProNo(bsSgcjsjdBuiProInfo.getId());
+            bsSgcjsjdBuiProInfo.setProCode(bsSgcjsjdBuiProInfo.getId());
+            bsSgcjsjdBuiProInfo.setIsApproval("0");
+           bsSgcjsjdBuiProInfoService.saveOrUpdate(bsSgcjsjdBuiProInfo);
         }
+        return AjaxResult.success();
     }
 }
diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
index 60d31959..b680d8e8 100644
--- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
+++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jianwei.common.core.domain.AjaxResult;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.core.domain.entity.SysDept;
 import com.jianwei.common.core.domain.entity.SysUser;
@@ -453,9 +454,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
             }
         }
 
-
         BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo = bsSgcjsjdBuiProInfoMapper.selectOne(new QueryWrapper<BsSgcjsjdBuiProInfo>()
-                .eq("pro_no", sp.getData().getProNo()).eq("pro_code", sp.getData().getProCode()));
+                .eq("PRO_NO", sp.getData().getProNo()).eq("PRO_CODE", sp.getData().getProCode()));
         if (!ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo)) {
             if (!ObjectUtil.isEmpty(bsSgcjsjdBuiProInfo.getCommencementDate())) {
                 stageStatistics.setProjectStartedDate(bsSgcjsjdBuiProInfo.getCommencementDate());
diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
index 9bb42f7f..ac94e80d 100644
--- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
+++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml
@@ -147,7 +147,7 @@
                     AND user_id=#{userId})
                 </if>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pi.project_name like concat('%',#{projectName},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
@@ -156,7 +156,7 @@
         <if test="userType==00">
             <where>
                 <if test="projectName!=null and projectName!=''">
-                    and project_name like concat('%',#{projectName},'%')
+                    and pi.project_name like concat('%',#{projectName},'%')
                 </if>
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>