Commit 39beb846 authored by huyuchen's avatar huyuchen

Merge branch 'MVP1.5.8' into MVP1.5.9

parents 8c23f466 a1a8e758
...@@ -20,8 +20,8 @@ spring: ...@@ -20,8 +20,8 @@ spring:
type: com.zaxxer.hikari.HikariDataSource type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: root username: root
password: ekp!@#123 password: ll_mysql
jdbc-url: jdbc:mysql://36.7.147.19:20023/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true jdbc-url: jdbc:mysql://192.168.1.122:33306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari: hikari:
minimum-idle: 10 # 最小空闲连接数量 minimum-idle: 10 # 最小空闲连接数量
idle-timeout: 60000 # 空闲连接存活最大时间,默认600000(10分钟) idle-timeout: 60000 # 空闲连接存活最大时间,默认600000(10分钟)
......
...@@ -151,4 +151,16 @@ public class SysMenu extends BaseEntity { ...@@ -151,4 +151,16 @@ public class SysMenu extends BaseEntity {
*/ */
@Schema(description = "是否开关(0开、1关)") @Schema(description = "是否开关(0开、1关)")
private String isOpen; private String isOpen;
/**
* 表名,用来先查结果集
*/
@Schema(description = "表名,用来先查结果集")
private String tableName;
/**
* 查询字段维度,如果fdId超长,则使用本字段
*/
@Schema(description = "查询字段维度,如果fdId超长,则使用本字段")
private String queryFields;
} }
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="isOpen" column="IS_OPEN"/> <result property="isOpen" column="IS_OPEN"/>
<result property="tableName" column="TABLE_NAME"/>
<result property="queryFields" column="QUERY_FIELDS"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -51,7 +53,9 @@ ...@@ -51,7 +53,9 @@
a.IS_OPEN, a.IS_OPEN,
a.TWO_LEVEL_ID, a.TWO_LEVEL_ID,
a.VIEW_ID, a.VIEW_ID,
a.CREATE_TIME a.CREATE_TIME,
a.TABLE_NAME,
a.QUERY_FIELDS
</sql> </sql>
<sql id="sysMenu_where"> <sql id="sysMenu_where">
<if test="sysMenu != null"> <if test="sysMenu != null">
......
...@@ -541,6 +541,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -541,6 +541,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
sendMap.put("fd_3b3d3ec85bfeb0", s.getSalaryMonth().substring(0, 4) sendMap.put("fd_3b3d3ec85bfeb0", s.getSalaryMonth().substring(0, 4)
+ CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4, 6)); + CommonConstants.CENTER_SPLIT_LINE_STRING + s.getSalaryMonth().substring(4, 6));
sendMap.put("fd_3b73e18ad34090", "否"); sendMap.put("fd_3b73e18ad34090", "否");
sendMap.put("fd_3c3fd0da14ed9a", s.getCreateName());
if (Common.isNotNull(s.getIssueStatus()) && s.getIssueStatus() == 1) { if (Common.isNotNull(s.getIssueStatus()) && s.getIssueStatus() == 1) {
sendMap.put("fd_3b73e18ad34090", "是"); sendMap.put("fd_3b73e18ad34090", "是");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment