调整测试问题修复导出相关问题

ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>invest-admin</artifactId>
 
     <description>
         web服务入口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectChannelController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -12,6 +13,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.invest.domain.TProjectChannel;
 import com.ruoyi.invest.service.ITProjectChannelService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -52,7 +54,7 @@ public class TProjectChannelController extends BaseController
     private ITUnifyFileService tUnifyFileService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询渠道信息列表
@@ -76,7 +78,13 @@ public class TProjectChannelController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectChannel tProjectChannel)
     {
-        List<TProjectChannel> list = tProjectChannelService.selectTProjectChannelList(tProjectChannel);
+        List<TProjectChannel> list = tProjectChannelService.selectTProjectChannelList(tProjectChannel)
+                .stream().map(n -> {
+                    n.setChannelType(dictDataService.selectDictLabel("CHANNEL_TYPE",n.getChannelType()));
+                    n.setStatus(dictDataService.selectDictLabel("channel_status",n.getStatus()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectChannel> util = new ExcelUtil<TProjectChannel>(TProjectChannel.class);
         util.exportExcel(response, list, "渠道信息数据");
     }
@@ -103,7 +111,7 @@ public class TProjectChannelController extends BaseController
     {
         tProjectChannel.setId(IdUtils.fastSimpleUUID());
         tProjectChannel.setCreateBy(getNickName());
-        int number = tProjectChannelService.selectTProjectChannelCode(DateUtils.dateTimeNow("YYYY"));
+        int number = tProjectChannelService.selectTProjectChannelCode(DateUtils.lastTwoDigits()+"");
         tProjectChannel.setChannelCode(tProjectChannel.getChannelGroup()+"-"+ DateUtils.lastTwoDigits() +"-"+ String.format("%03d",number+1));
         // todo 保存附件信息
         List<TUnifyFile> tUnifyFileList = tProjectChannel.getListFile();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectCirculationController.java

@@ -117,7 +117,6 @@ public class TProjectCirculationController extends BaseController
      * 根据项目ID获取项目流转记录
      */
     @ApiOperation("根据项目ID获取项目流转记录")
-    @PreAuthorize("@ss.hasPermi('invest:circulation:query')")
     @GetMapping(value = "/listProjectPoolId")
     public AjaxResult listProjectPoolId(String projectPoolId)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectContractController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -11,6 +12,7 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.service.ITProjectCirculationService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -55,6 +57,9 @@ public class TProjectContractController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 查询合同管理列表
      */
@@ -77,7 +82,14 @@ public class TProjectContractController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectContract tProjectContract)
     {
-        List<TProjectContract> list = tProjectContractService.selectTProjectContractList(tProjectContract);
+        List<TProjectContract> list = tProjectContractService.selectTProjectContractList(tProjectContract)
+                .stream().map(n -> {
+                    n.setProjectPoolId(n.gettProjectPool().getProjectName());
+//                    n.setContractType(dictDataService.selectDictLabel("file_type",n.getFileType()));
+                    n.setProjectStage(dictDataService.selectDictLabel("project_stage",n.getProjectStage()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectContract> util = new ExcelUtil<TProjectContract>(TProjectContract.class);
         util.exportExcel(response, list, "合同管理数据");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectInformationController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -13,6 +14,7 @@ import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectInformation;
 import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectInformationService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -55,6 +57,9 @@ public class TProjectInformationController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 查询文件资料列表
      */
@@ -77,7 +82,14 @@ public class TProjectInformationController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectInformation tProjectInformation)
     {
-        List<TProjectInformation> list = tProjectInformationService.selectTProjectInformationList(tProjectInformation);
+        List<TProjectInformation> list = tProjectInformationService.selectTProjectInformationList(tProjectInformation)
+                .stream().map(n -> {
+                    n.setProjectPoolId(n.gettProjectPool().getProjectName());
+                    n.setFileType(dictDataService.selectDictLabel("file_type",n.getFileType()));
+                    n.setProjectStage(dictDataService.selectDictLabel("project_stage",n.getProjectStage()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectInformation> util = new ExcelUtil<TProjectInformation>(TProjectInformation.class);
         util.exportExcel(response, list, "文件资料数据");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectMeetingController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -15,6 +16,7 @@ import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectMeeting;
 import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectMeetingService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -57,6 +59,9 @@ public class TProjectMeetingController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 查询会议记录列表
      */
@@ -80,7 +85,13 @@ public class TProjectMeetingController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectMeeting tProjectMeeting)
     {
-        List<TProjectMeeting> list = tProjectMeetingService.selectTProjectMeetingList(tProjectMeeting);
+        List<TProjectMeeting> list = tProjectMeetingService.selectTProjectMeetingList(tProjectMeeting)
+                .stream().map(n -> {
+                    n.setProjectPoolId(n.gettProjectPool().getProjectName());
+                    n.setMeetingType(dictDataService.selectDictLabel("MEETING_TYPE",n.getMeetingType()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectMeeting> util = new ExcelUtil<TProjectMeeting>(TProjectMeeting.class);
         util.exportExcel(response, list, "会议记录数据");
     }
@@ -108,10 +119,11 @@ public class TProjectMeetingController extends BaseController
         tProjectMeeting.setId(IdUtils.fastSimpleUUID());
         tProjectMeeting.setCreateBy(getNickName());
 
-        int number = tProjectMeetingService.selectTProjectMeetingCode(DateUtils.dateTimeNow("YYYY"));
         if(tProjectMeeting.getMeetingType().equals("LX")||tProjectMeeting.getMeetingType().equals("TJ")){
+            int number = tProjectMeetingService.selectTProjectMeetingCode(DateUtils.lastTwoDigits()+"-");
             tProjectMeeting.setMeetingCode(tProjectMeeting.getProjectGroup()+"-"+ DateUtils.lastTwoDigits() +"-"+tProjectMeeting.getMeetingType()+"-"+ String.format("%03d",number+1));
         }else{
+            int number = tProjectMeetingService.selectTProjectMeetingCode(DateUtils.dateTimeNow("YYYY"));
             tProjectMeeting.setMeetingCode(DateUtils.dateNow()+ String.format("%03d",number+1));
         }
         // todo 保存附件信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectPoolController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -17,6 +18,7 @@ import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectCompanyService;
 import com.ruoyi.invest.service.ITProjectContactsService;
 import com.ruoyi.invest.service.ITProjectPoolService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -66,7 +68,7 @@ public class TProjectPoolController extends BaseController
     private ITUnifyFileService tUnifyFileService;
 
     @Autowired
-    private ServerConfig serverConfig;
+    private ISysDictDataService dictDataService;
 
     /**
      * 查询项目池列表
@@ -90,7 +92,20 @@ public class TProjectPoolController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectPool tProjectPool)
     {
-        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool);
+        List<TProjectPool> list = tProjectPoolService.selectTProjectPoolList(tProjectPool)
+                .stream().map(n -> {
+                    n.setChannel(n.gettProjectChannel().getChannelName());
+                    n.setIndustry(dictDataService.selectDictLabel("CUSTOMER_TRADE",n.getIndustry()));
+                    n.setCompany(n.gettProjectCompany().getCompanyName());
+                    n.setProjectContacts(n.gettProjectContacts().getName());
+                    n.setInvestType(dictDataService.selectDictLabel("INVEST_TYPE",n.getInvestType()));
+                    n.setInvestPloy(dictDataService.selectDictLabel("INVEST_PLOY",n.getInvestPloy()));
+                    n.setInvestWorth(dictDataService.selectDictLabel("INVEST_WORTH",n.getInvestWorth()));
+                    n.setProjectStage(dictDataService.selectDictLabel("PROJECT_STAGE",n.getProjectStage()));
+                    n.setProjectState(dictDataService.selectDictLabel("PROJECT_STATE",n.getProjectState()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectPool> util = new ExcelUtil<TProjectPool>(TProjectPool.class);
         util.exportExcel(response, list, "项目池数据");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectRecordController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.config.RuoYiConfig;
@@ -13,6 +14,7 @@ import com.ruoyi.invest.domain.TProjectCirculation;
 import com.ruoyi.invest.domain.TProjectRecord;
 import com.ruoyi.invest.service.ITProjectCirculationService;
 import com.ruoyi.invest.service.ITProjectRecordService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.tool.domain.TUnifyFile;
 import com.ruoyi.tool.service.ITUnifyFileService;
 import io.swagger.annotations.Api;
@@ -55,6 +57,9 @@ public class TProjectRecordController extends BaseController
     @Autowired
     private ITUnifyFileService tUnifyFileService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 查询跟进记录列表
      */
@@ -77,7 +82,13 @@ public class TProjectRecordController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, TProjectRecord tProjectRecord)
     {
-        List<TProjectRecord> list = tProjectRecordService.selectTProjectRecordList(tProjectRecord);
+        List<TProjectRecord> list = tProjectRecordService.selectTProjectRecordList(tProjectRecord)
+                .stream().map(n -> {
+                    n.setProjectId(n.gettProjectPool().getProjectName());
+                    n.setUpWay(dictDataService.selectDictLabel("UP_WAY",n.getUpWay()));
+                    return n;
+                })
+                .collect(Collectors.toList());
         ExcelUtil<TProjectRecord> util = new ExcelUtil<TProjectRecord>(TProjectRecord.class);
         util.exportExcel(response, list, "跟进记录数据");
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/invest/TProjectScoringController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.invest;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.utils.StringUtils;

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.215:3306/tony-invest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://47.103.79.143:3306/tony-invest?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: oneportal
-                password: Shanghai_1
+                password: Dgtis_oneportal
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -8,8 +8,8 @@ ruoyi:
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/quizgo/invest/uploadPath）
+  profile: /home/quizgo/invest/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/Users/2y/zhj/logs" />
+    <property name="log.path" value="/home/quizgo/invest/logs" />
 
     <!-- 彩色日志 -->
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
@@ -33,7 +33,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -55,7 +55,7 @@
             <!-- 日志文件名格式 -->
             <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
@@ -77,7 +77,7 @@
             <!-- 按天回滚 daily -->
             <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
+            <maxHistory>7</maxHistory>
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectContract.java

@@ -30,7 +30,7 @@ public class TProjectContract extends BaseEntity
     private String contractType;
 
     /** 项目ID */
-    @Excel(name = "项目ID")
+    @Excel(name = "项目名称")
     private String projectPoolId;
 
     /** 项目阶段 */
@@ -38,7 +38,7 @@ public class TProjectContract extends BaseEntity
     private String projectStage;
 
     /** 会议编号 */
-    @Excel(name = "会议编号")
+//    @Excel(name = "会议编号")
     private String meetingCode;
 
     /** 状态 */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectInformation.java

@@ -30,6 +30,7 @@ public class TProjectInformation extends BaseEntity
     private String fileType;
 
     /** 项目ID */
+    @Excel(name = "项目名称")
     private String projectPoolId;
 
     /** 项目阶段 */
@@ -37,7 +38,7 @@ public class TProjectInformation extends BaseEntity
     private String projectStage;
 
     /** 会议编号 */
-    @Excel(name = "会议编号")
+//    @Excel(name = "会议编号")
     private String meetingCode;
 
     /** 附件业务ID */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectMeeting.java

@@ -32,10 +32,11 @@ public class TProjectMeeting extends BaseEntity
     private String meetingCode;
 
     /** 类别 */
-    @Excel(name = "类别")
+    @Excel(name = "会议类别")
     private String meetingType;
 
     /** 项目ID */
+    @Excel(name = "项目名称")
     private String projectPoolId;
 
     /** 会议开始时间 */
@@ -57,10 +58,10 @@ public class TProjectMeeting extends BaseEntity
     private String promoter;
 
     /** 会议发起人ID */
-    @Excel(name = "会议发起人")
     private String promoterId;
 
     /** 会议参与人 */
+    @Excel(name = "会议参与人")
     private String participants;
 
     /** 会议参与人ID */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -37,7 +37,7 @@ public class TProjectPool extends BaseEntity
     private Date recordDate;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+//    @Excel(name = "项目编号")
     private String projectCode;
 
     /** 渠道 */

ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectRecord.java

@@ -29,7 +29,7 @@ public class TProjectRecord extends BaseEntity
 
     /** 项目ID */
     @ApiModelProperty("项目ID")
-    @Excel(name = "项目ID")
+    @Excel(name = "项目名称")
     private String projectId;
 
     /** 联系人 */
@@ -55,6 +55,7 @@ public class TProjectRecord extends BaseEntity
 
     /** 跟进内容 */
     @ApiModelProperty("跟进内容")
+    @Excel(name = "跟进内容")
     private String upContent;
 
     /** 备注 */

ry.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-# ./ry.sh start 启动 stop 停止 restart 重启 status 状态
-AppName=ruoyi-admin.jar
+#./ry.sh start 启动 stop 停止 restart 重启 status 状态
+AppName=invest-admin.jar
 
 # JVM参数
 JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"