Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/resources/application-test.yml

@@ -14,12 +14,12 @@ ruoyi:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: char
+  captchaType: math
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9098
+  port: 9011
   servlet:
     # 应用的访问路径
     context-path: /
@@ -134,7 +134,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 6
+    database: 15
     # 密码
     password: zfTFIJjaN#6xB83r
     # 连接超时时间
@@ -194,11 +194,11 @@ xss:
 
 dsk:
   open:
-    endPoint: 120.27.13.145:8865
-    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
-    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
-#    endPoint: openapi.jiansheku.com
+#    endPoint: 120.27.13.145:8865
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-#    protocol: https
+#    protocol: http
+    endPoint: openapi.jiansheku.com
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: https

dsk-system/src/main/java/com/dsk/system/service/impl/ReadBusinessInfoExcel.java

 package com.dsk.system.service.impl;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.dsk.system.domain.BusinessExcelDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -13,6 +8,11 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author lxl
  * @Description:
@@ -120,28 +120,32 @@ public class ReadBusinessInfoExcel {
             for (int c = 0; c < this.totalCells; c++) {
                 Cell cell = row.getCell(c);
                 if (null != cell) {
+                    //项目名称
                     if (c == 0) {
                         //如果是纯数字,比如你写的是25,cell.getNumericCellValue()获得是25.0,通过截取字符串去掉.0获得25
                         if (cell.getCellType() == CellType.NUMERIC) {
                             String name = String.valueOf(cell.getNumericCellValue());
-                            businessExcelDto.setProjectName(name.substring(0, name.length() - 2 > 0 ? name.length() - 2 : 1));//项目名称
+                            businessExcelDto.setProjectName(name.substring(0, name.length() - 2 > 0 ? name.length() - 2 : 1));
                         } else {
-                            businessExcelDto.setProjectName(cell.getStringCellValue());//名称
+                            businessExcelDto.setProjectName(cell.getStringCellValue());
                         }
+                        //业主单位
                     } else if (c == 1) {
                         if (cell.getCellType() == CellType.NUMERIC) {
                             String company = String.valueOf(cell.getNumericCellValue());
-                            businessExcelDto.setOwnerCompany(company.substring(0, company.length() - 2 > 0 ? company.length() - 2 : 1));//业主单位
+                            businessExcelDto.setOwnerCompany(company.substring(0, company.length() - 2 > 0 ? company.length() - 2 : 1));
                         } else {
-                            businessExcelDto.setOwnerCompany(cell.getStringCellValue());//性别
+                            businessExcelDto.setOwnerCompany(cell.getStringCellValue());
                         }
+                        //投资估算（万元）
                     } else if (c == 2) {
-                        if (cell.getCellType() == CellType.NUMERIC) {
+                        businessExcelDto.setInvestmentAmount(cell.getStringCellValue());
+/*                        if (cell.getCellType() == CellType.NUMERIC) {
                             String amount = String.valueOf(cell.getNumericCellValue());
-                            businessExcelDto.setInvestmentAmount(amount.substring(0, amount.length() - 2 > 0 ? amount.length() - 2 : 1));//投资估算（万元）
+                            businessExcelDto.setInvestmentAmount(amount.substring(0, amount.length() - 2 > 0 ? amount.length() - 2 : 1));
                         } else {
                             businessExcelDto.setInvestmentAmount(cell.getStringCellValue());
-                        }
+                        }*/
                     }
                 }
             }

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -102,7 +102,7 @@
         LEFT JOIN sys_user u on u.user_id = f.user_id
         <where>
             <if test="userId != null">
-                and bu.user_id = #{userId}
+                bu.user_id = #{userId}
             </if>
             <if test="projectType != null and projectType != ''">
                 and i.project_type in
@@ -110,15 +110,15 @@
                     #{projectType}
                 </foreach>
             </if>
-            <if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
+            <if test="minAmount != null and minAmount != '' and minAmount != '0' and maxAmount != minAmount">
                 and i.investment_amount &gt; #{minAmount}
             </if>
-            <if test="minAmount == 0 and maxAmount != minAmount">
+            <if test="minAmount == '0'  and maxAmount != minAmount">
                 and ((i.investment_amount &gt; #{minAmount}
                 and i.investment_amount &lt;= #{maxAmount})
                 or i.investment_amount is null)
             </if>
-            <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != 0">
+            <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != '0'">
                 and i.investment_amount &lt;= #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">