Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
b350bce9
Commit
b350bce9
authored
Jun 26, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6
parents
9fdfd17b
b10ae14e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
11 deletions
+13
-11
TCompleteMonitorVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TCompleteMonitorVo.java
+2
-2
TCompleteMonitorServiceImpl.java
...fu/archives/service/impl/TCompleteMonitorServiceImpl.java
+7
-5
application-dev.yml
.../yifu-archives-biz/src/main/resources/application-dev.yml
+1
-1
application-prd.yml
.../yifu-archives-biz/src/main/resources/application-prd.yml
+1
-1
application-test.yml
...yifu-archives-biz/src/main/resources/application-test.yml
+1
-1
application.yml
...ives/yifu-archives-biz/src/main/resources/application.yml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TCompleteMonitorVo.java
View file @
b350bce9
...
@@ -78,7 +78,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
...
@@ -78,7 +78,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
* 信息是否完整
* 信息是否完整
*/
*/
@Length
(
max
=
1
,
message
=
"信息是否完整 不能超过1 个字符"
)
@Length
(
max
=
1
,
message
=
"信息是否完整 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"信息是否完整"
,
maxLength
=
1
,
readConverterExp
=
"0=
否,1=是
"
)
@ExcelAttribute
(
name
=
"信息是否完整"
,
maxLength
=
1
,
readConverterExp
=
"0=
是,1=否
"
)
@Schema
(
description
=
"信息是否完整"
)
@Schema
(
description
=
"信息是否完整"
)
@ExcelProperty
(
"信息是否完整"
)
@ExcelProperty
(
"信息是否完整"
)
private
String
isComplete
;
private
String
isComplete
;
...
@@ -112,7 +112,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
...
@@ -112,7 +112,7 @@ public class TCompleteMonitorVo extends RowIndex implements Serializable {
* 6月及后入职信息是否完整
* 6月及后入职信息是否完整
*/
*/
@Length
(
max
=
1
,
message
=
"6月及后入职信息是否完整 不能超过1 个字符"
)
@Length
(
max
=
1
,
message
=
"6月及后入职信息是否完整 不能超过1 个字符"
)
@ExcelAttribute
(
name
=
"6月及后入职信息是否完整"
,
maxLength
=
1
,
readConverterExp
=
"0=
否,1=是
"
)
@ExcelAttribute
(
name
=
"6月及后入职信息是否完整"
,
maxLength
=
1
,
readConverterExp
=
"0=
是,1=否
"
)
@Schema
(
description
=
"6月及后入职信息是否完整"
)
@Schema
(
description
=
"6月及后入职信息是否完整"
)
@ExcelProperty
(
"6月及后入职信息是否完整"
)
@ExcelProperty
(
"6月及后入职信息是否完整"
)
private
String
afterIsComplete
;
private
String
afterIsComplete
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCompleteMonitorServiceImpl.java
View file @
b350bce9
...
@@ -60,7 +60,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -60,7 +60,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
*/
*/
@Override
@Override
public
void
listExport
(
HttpServletResponse
response
,
TCompleteMonitorSearchVo
searchVo
){
public
void
listExport
(
HttpServletResponse
response
,
TCompleteMonitorSearchVo
searchVo
){
String
fileName
=
"档案完整度监控
批量导出
"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
String
fileName
=
"档案完整度监控
列表
"
+
DateUtil
.
getThisTime
()
+
".xlsx"
;
//获取要导出的列表
//获取要导出的列表
List
<
TCompleteMonitorVo
>
list
=
new
ArrayList
<>();
List
<
TCompleteMonitorVo
>
list
=
new
ArrayList
<>();
long
count
=
baseMapper
.
getExportCount
(
searchVo
);
long
count
=
baseMapper
.
getExportCount
(
searchVo
);
...
@@ -87,7 +87,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -87,7 +87,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
}
}
if
(
Common
.
isNotNull
(
list
)){
if
(
Common
.
isNotNull
(
list
)){
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"档案完整度监控"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"档案完整度监控
列表
"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
index
++;
index
++;
}
}
...
@@ -97,7 +97,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -97,7 +97,7 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
}
}
}
else
{
}
else
{
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"档案完整度监控"
+
index
).
build
();
WriteSheet
writeSheet
=
EasyExcel
.
writerSheet
(
"档案完整度监控
列表
"
+
index
).
build
();
excelWriter
.
write
(
list
,
writeSheet
);
excelWriter
.
write
(
list
,
writeSheet
);
}
}
if
(
Common
.
isNotNull
(
list
)){
if
(
Common
.
isNotNull
(
list
)){
...
@@ -135,8 +135,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -135,8 +135,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
}
}
//批量更新
//批量更新
if
(!
projectIdList
.
isEmpty
())
if
(!
projectIdList
.
isEmpty
())
{
projectMapper
.
batchUpdateEmpProjectCompleteStatus
(
projectIdList
);
projectMapper
.
batchUpdateEmpProjectCompleteStatus
(
projectIdList
);
}
}
}
//查询项目维度的信息
//查询项目维度的信息
...
@@ -171,8 +172,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
...
@@ -171,8 +172,9 @@ public class TCompleteMonitorServiceImpl extends ServiceImpl<TCompleteMonitorMap
}
}
}
}
//批量更新
//批量更新
if
(!
projectIdList
.
isEmpty
())
if
(!
projectIdList
.
isEmpty
())
{
projectMapper
.
batchUpdateEmpProjectCompleteStatus
(
projectIdList
);
projectMapper
.
batchUpdateEmpProjectCompleteStatus
(
projectIdList
);
}
}
}
//删除项目监控表数据
//删除项目监控表数据
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application-dev.yml
View file @
b350bce9
...
@@ -14,7 +14,7 @@ spring:
...
@@ -14,7 +14,7 @@ spring:
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
username
:
root
username
:
root
password
:
yf_zsk
password
:
yf_zsk
url
:
jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&
rewriteBatchedStatements=true&
nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://119.96.147.6:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://119.96.147.6:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application-prd.yml
View file @
b350bce9
...
@@ -14,7 +14,7 @@ spring:
...
@@ -14,7 +14,7 @@ spring:
driver-class-name
:
com.mysql.cj.jdbc.Driver
driver-class-name
:
com.mysql.cj.jdbc.Driver
username
:
root
username
:
root
password
:
yf_zsk
password
:
yf_zsk
url
:
jdbc:mysql://192.168.0.222:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.0.222:22306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&
rewriteBatchedStatements=true&
nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari
:
hikari
:
driver-class-name
:
${spring.datasource.driver-class-name}
driver-class-name
:
${spring.datasource.driver-class-name}
jdbc-url
:
${spring.datasource.url}
jdbc-url
:
${spring.datasource.url}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application-test.yml
View file @
b350bce9
...
@@ -15,7 +15,7 @@ spring:
...
@@ -15,7 +15,7 @@ spring:
username
:
root
username
:
root
password
:
yf_zsk
password
:
yf_zsk
#url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#url: jdbc:mysql://127.0.0.1:3306/yifu_upms?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
url
:
jdbc:mysql://192.168.1.65:43306/mvp_archives?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&
rewriteBatchedStatements=true&
nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
hikari
:
hikari
:
driver-class-name
:
${spring.datasource.driver-class-name}
driver-class-name
:
${spring.datasource.driver-class-name}
jdbc-url
:
${spring.datasource.url}
jdbc-url
:
${spring.datasource.url}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/application.yml
View file @
b350bce9
...
@@ -26,7 +26,7 @@ mybatis-plus:
...
@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value
:
0
logic-not-delete-value
:
0
configuration
:
configuration
:
map-underscore-to-camel-case
:
true
map-underscore-to-camel-case
:
true
log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
#
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置
# spring security 配置
security
:
security
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment