Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
1acf5f4f
提交
1acf5f4f
authored
4月 25, 2021
作者:
133
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[用户 决算 核查] 用户添加判断是否为已冻结的账号 决算 查询标题接口修改为标题和截止时间 决算标题 改为 xx-xx决算报告
上级
722f3a25
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
229 行增加
和
121 行删除
+229
-121
DeviceCheckController.java
...device/confirmcheck/controller/DeviceCheckController.java
+3
-3
CheckTitleAndTimeVo.java
...ev/device/confirmcheck/entity/vo/CheckTitleAndTimeVo.java
+26
-0
FinalCheckServiceImpl.java
...device/finalcheck/service/impl/FinalCheckServiceImpl.java
+1
-1
DeviceLibraryServiceImpl.java
...device/library/service/impl/DeviceLibraryServiceImpl.java
+1
-1
DeviceChange.java
...m/tykj/dev/device/library/subject/domin/DeviceChange.java
+1
-2
DeviceLibrary.java
.../tykj/dev/device/library/subject/domin/DeviceLibrary.java
+1
-1
ScrapBusinessServiceImpl.java
...v/device/scrap/service/impl/ScrapBusinessServiceImpl.java
+1
-1
ConditionsTrainVo.java
...om/tykj/dev/device/train/entity/vo/ConditionsTrainVo.java
+5
-5
TrainThemeServiceImpl.java
.../dev/device/train/service/impl/TrainThemeServiceImpl.java
+3
-3
TrainTask.java
...c/main/java/com/tykj/dev/device/train/task/TrainTask.java
+49
-36
bill.html
dev-union/src/main/resources/bill.html
+0
-0
bill1.html
dev-union/src/main/resources/bill1.html
+0
-0
bill2.html
dev-union/src/main/resources/bill2.html
+104
-62
bill22222.html
dev-union/src/main/resources/bill22222.html
+0
-0
bill3.html
dev-union/src/main/resources/bill3.html
+0
-0
UserConditionsVo.java
...a/com/tykj/dev/device/user/base/ret/UserConditionsVo.java
+5
-5
AreaController.java
...kj/dev/device/user/subject/controller/AreaController.java
+7
-0
UserArchivesController.java
...evice/user/subject/controller/UserArchivesController.java
+1
-1
AreaService.java
...com/tykj/dev/device/user/subject/service/AreaService.java
+2
-0
AreaServiceImpl.java
...dev/device/user/subject/service/impl/AreaServiceImpl.java
+19
-0
UserServiceImpl.java
...dev/device/user/subject/service/impl/UserServiceImpl.java
+0
-0
没有找到文件。
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java
浏览文件 @
1acf5f4f
...
...
@@ -179,9 +179,9 @@ public class DeviceCheckController {
Integer
provId
=
taskService
.
get
(
examJobId
).
getParentTaskId
();
// 检查的job id 找到 father 进而找到 father的billid 进而找到title Id
Integer
statId
=
taskService
.
get
(
provId
).
getBillId
();
String
title
=
statRepo
.
getOne
(
statId
).
getTitle
(
);
return
ResponseEntity
.
ok
(
title
);
DeviceCheckStat
deviceCheckStat
=
statRepo
.
getOne
(
statId
);
String
title
=
deviceCheckStat
.
getTitle
();
return
ResponseEntity
.
ok
(
new
CheckTitleAndTimeVo
(
title
,
deviceCheckStat
.
getEndTime
())
);
}
@ApiOperation
(
value
=
"发起自动核查"
,
notes
=
"发起自动核查"
)
...
...
dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/vo/CheckTitleAndTimeVo.java
0 → 100644
浏览文件 @
1acf5f4f
package
com
.
tykj
.
dev
.
device
.
confirmcheck
.
entity
.
vo
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.time.LocalDateTime
;
/**
* @author zjm
* @version 1.0.0
* @ClassName CheckTitleAndTimeVo.java
* @Description TODO
* @createTime 2021年04月24日 17:52:00
*/
@AllArgsConstructor
@NoArgsConstructor
@Data
public
class
CheckTitleAndTimeVo
{
@ApiModelProperty
(
"标题"
)
private
String
title
;
@ApiModelProperty
(
"截止时间"
)
private
LocalDateTime
createTime
;
}
dev-finalcheck/src/main/java/com/tykj/dev/device/finalcheck/service/impl/FinalCheckServiceImpl.java
浏览文件 @
1acf5f4f
...
...
@@ -55,7 +55,7 @@ public class FinalCheckServiceImpl implements FinalCheckService {
@Override
public
FinalReportVo
generateReport
(
LocalDate
startTime
,
LocalDate
endTime
)
{
String
name
=
LocalDate
.
now
().
getYear
()
+
"决算报告"
;
String
name
=
startTime
+
"~"
+
endTime
+
"决算报告"
;
String
unitName
=
userService
.
getCurrentUserUnitName
();
String
operatorName
=
userService
.
getCurrentUserName
();
FinalReport
report
=
new
FinalReport
(
name
,
unitName
,
startTime
,
endTime
,
LocalDateTime
.
now
(),
operatorName
);
...
...
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @
1acf5f4f
...
...
@@ -495,7 +495,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
@Override
public
void
judgeSeqNumbersInNotEqualLifeStatus
(
List
<
String
>
seqNumbers
,
Integer
leftStatus
)
{
if
(!
deviceLibraryDao
.
existsAllBySeqNumberInAndLifeStatus
(
seqNumbers
,
leftStatus
)){
if
(!
deviceLibraryDao
.
existsAllBySeqNumberInAndLifeStatus
(
seqNumbers
,
leftStatus
)){
throw
new
ApiException
(
ResponseEntity
.
status
(
303
).
body
(
"装备已被其他同单位专管员操作"
));
}
}
...
...
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceChange.java
浏览文件 @
1acf5f4f
...
...
@@ -22,8 +22,7 @@ import javax.persistence.*;
public
class
DeviceChange
{
@Id
@GeneratedValue
@ApiModelProperty
(
name
=
"主键id"
)
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
)
@ApiModelProperty
(
name
=
"主键id"
)
@Column
(
columnDefinition
=
"integer NOT NULL AUTO_INCREMENT"
)
private
Integer
id
;
...
...
dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java
浏览文件 @
1acf5f4f
...
...
@@ -135,7 +135,7 @@ public class DeviceLibrary {
@ApiModelProperty
(
value
=
"管理状态,0-不再所属单位,1-在所属单位"
)
private
Integer
manageStatus
;
/**
* 生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失
* 生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失
12.清退
*/
@ApiModelProperty
(
value
=
"生命状态,0-入库待审核,1-入库审核失败,2-在库,3-配发,4-维修,5,维修失败,6-退回,7-待退装,8-退装,9-待销毁,10-已销毁,11-丢失"
)
private
Integer
lifeStatus
;
...
...
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @
1acf5f4f
...
...
@@ -276,7 +276,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
private
TaskBto
sealOfAuditTask
(
Integer
unitId
,
Integer
repelDetailId
,
Integer
userId
){
List
<
Integer
>
list
=
new
ArrayList
<>();
list
.
add
(
userId
);
return
taskService
.
start
(
new
TaskBto
(
StatusEnum
.
SCRAP_2224
.
id
,
"报废任务"
,
null
,
"."
,
repelDetailId
,
BusinessEnum
.
SCRAP
.
id
,
unitId
,
0
,
""
,
list
));
return
taskService
.
start
(
new
TaskBto
(
StatusEnum
.
SCRAP_2224
.
id
,
"报废
设备
任务"
,
null
,
"."
,
repelDetailId
,
BusinessEnum
.
SCRAP
.
id
,
unitId
,
0
,
""
,
list
));
}
/**
...
...
dev-train/src/main/java/com/tykj/dev/device/train/entity/vo/ConditionsTrainVo.java
浏览文件 @
1acf5f4f
...
...
@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
/**
...
...
@@ -30,16 +31,15 @@ public class ConditionsTrainVo {
@ApiModelProperty
(
value
=
"开始时间"
,
example
=
"bmxx"
,
name
=
"statusTime"
)
private
String
dimName
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
value
=
"开始时间"
,
example
=
"bmxx"
,
name
=
"statusTime"
)
private
Date
status
Time
;
private
LocalDateTime
start
Time
;
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd
HH:mm:ss
"
,
timezone
=
"GMT+8"
)
@ApiModelProperty
(
value
=
"结束时间"
,
example
=
"bmxx"
,
name
=
"endTime"
)
private
Dat
e
endTime
;
private
LocalDateTim
e
endTime
;
@ApiModelProperty
(
value
=
"单位id"
,
example
=
"unitId"
,
name
=
"statusTime"
)
private
Integer
unitId
;
}
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java
浏览文件 @
1acf5f4f
...
...
@@ -244,9 +244,9 @@ public class TrainThemeServiceImpl implements TrainThemeService {
private
Page
<
TrainTheme
>
getContacts
(
ConditionsTrainVo
conditionsTrainVo
,
Pageable
pageable
)
{
PredicateBuilder
<
TrainTheme
>
predicateBuilder
=
Specifications
.
and
();
if
(
conditionsTrainVo
.
getEndTime
()
!=
null
&&
conditionsTrainVo
.
getSta
tus
Time
()
!=
null
)
{
predicateBuilder
.
gt
(
"
startTime"
,
conditionsTrainVo
.
getStatus
Time
());
predicateBuilder
.
lt
(
"
end
Time"
,
conditionsTrainVo
.
getEndTime
());
if
(
conditionsTrainVo
.
getEndTime
()
!=
null
&&
conditionsTrainVo
.
getSta
rt
Time
()
!=
null
)
{
predicateBuilder
.
gt
(
"
createTime"
,
conditionsTrainVo
.
getStart
Time
());
predicateBuilder
.
lt
(
"
create
Time"
,
conditionsTrainVo
.
getEndTime
());
}
predicateBuilder
.
eq
(
"unitsId"
,
conditionsTrainVo
.
getUnitId
());
if
(
conditionsTrainVo
.
getDimName
()
!=
null
)
{
...
...
dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java
浏览文件 @
1acf5f4f
package
com
.
tykj
.
dev
.
device
.
train
.
task
;
import
com.tykj.dev.device.task.service.TaskService
;
import
com.tykj.dev.device.task.subject.bto.TaskBto
;
import
com.tykj.dev.device.train.dao.TrainThemeDao
;
import
com.tykj.dev.device.train.entity.TrainTheme
;
import
com.tykj.dev.device.train.service.TrainTaskService
;
import
com.tykj.dev.device.train.service.TrainThemeService
;
import
com.tykj.dev.device.user.subject.dao.UnitsDao
;
import
com.tykj.dev.device.user.subject.service.MgrcertService
;
import
com.tykj.dev.device.user.subject.service.UserService
;
import
com.tykj.dev.misc.base.BusinessEnum
;
import
com.tykj.dev.misc.base.StatusEnum
;
import
com.tykj.dev.socket.MyWebSocket
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.scheduling.annotation.Scheduled
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
java.util.Date
;
...
...
@@ -40,60 +46,67 @@ public class TrainTask {
@Autowired
MyWebSocket
myWebSocket
;
@Autowired
TrainThemeDao
trainThemeDao
;
@Scheduled
(
cron
=
"0 0/1 * * * ?"
)
private
void
signUpDeadline
()
{
trainThemeService
.
findAllStatus
(
1
).
forEach
(
trainThemeService
.
findAllStatus
(
StatusEnum
.
TRAIN1000
.
id
).
forEach
(
trainTheme
->
{
log
.
info
(
"[培训] 检查报名时间是否结束"
);
long
time
=
new
Date
().
getTime
();
if
(
trainTheme
.
getTrainTime
().
getTime
()
>
time
)
{
//查询所有必须报名而没有报名的task 状态直接转为待培训
trainTaskService
.
selectBillidAndBillType
(
trainTheme
.
getTrainId
(),
13
,
StatusEnum
.
TRAIN1001
.
id
).
forEach
(
taskBto
->
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1003
,
-
1
)
);
trainTaskService
.
selectBillidAndBillType
(
trainTheme
.
getTrainId
(),
13
,
StatusEnum
.
TRAIN1002
.
id
).
forEach
(
taskBto
->
taskService
.
moveToEnd
(
taskBto
)
);
trainTaskService
.
selectBillidAndBillType
(
trainTheme
.
getTrainId
(),
13
,
StatusEnum
.
TRAIN1000
.
id
).
forEach
(
taskBto
->
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1010
)
);
trainTheme
.
setTrainStatus
(
StatusEnum
.
TRAIN1010
.
id
);
trainThemeService
.
save
(
trainTheme
);
myWebSocket
.
sendMessage1
();
if
(
trainTheme
.
getTrainTime
().
getTime
()
<=
time
)
{
log
.
info
(
"[培训] 检查报名时间{}"
,
trainTheme
.
getTrainId
());
signUpEnd
(
trainTheme
.
getTrainId
());
}
}
);
}
public
void
signUpEnd
(
Integer
trainId
)
{
TrainTheme
trainTheme
=
trainThemeService
.
findById
(
trainId
);
//查询所有必须报名而没有报名的task 状态直接转为待培训
trainTaskService
.
selectBillidAndBillType
(
trainId
,
BusinessEnum
.
TRAIN
.
id
,
StatusEnum
.
TRAIN1002
.
id
).
forEach
(
taskBto
->
{
taskService
.
moveToEnd
(
taskBto
);
}
);
//查询主task
TaskBto
taskBto
=
trainTaskService
.
selectFatherIsNullAndBillidAndBillType
(
trainTheme
.
getTrainId
(),
BusinessEnum
.
TRAIN
.
id
);
//主task往下推待培训状态,0
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1010
,
0
);
//5 待培训
trainTheme
.
setTrainStatus
(
StatusEnum
.
TRAIN1010
.
id
);
trainThemeService
.
save
(
trainTheme
);
}
@Scheduled
(
cron
=
"0 0/1 * * * ?"
)
private
void
trainingStarted
()
{
trainThemeService
.
findAllStatus
(
2
).
forEach
(
long
time
=
new
Date
().
getTime
();
trainThemeService
.
findAllStatus
(
StatusEnum
.
TRAIN1010
.
id
).
forEach
(
trainTheme
->
{
//5 培训中
trainTaskService
.
selectBillidAndBillType
(
trainTheme
.
getTrainId
(),
13
,
StatusEnum
.
TRAIN1010
.
id
).
forEach
(
taskBto
->
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1004
)
);
trainTheme
.
setTrainStatus
(
StatusEnum
.
TRAIN1004
.
id
);
trainThemeService
.
save
(
trainTheme
);
if
(
trainTheme
.
getStartTime
().
getTime
()
<=
time
){
inTraining
(
trainTheme
.
getTrainId
());
}
});
}
@Scheduled
(
cron
=
"0 0/1 * * * ?"
)
private
void
trainingEnd
()
{
trainT
hemeService
.
findAllStatus
(
3
).
forEach
(
t
rainTheme
->
{
trainTaskService
.
selectBillidAndBillType
(
trainTheme
.
getTrainId
(),
13
,
StatusEnum
.
TRAIN1004
.
id
).
forEach
(
taskBto
->
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1008
)
);
//5 录入成绩
trainTheme
.
setTrainStatus
(
StatusEnum
.
TRAIN1008
.
id
);
trainThemeService
.
save
(
trainTheme
);
}
);
private
void
inTraining
(
Integer
trainId
)
{
TrainTheme
trainTheme
=
trainThemeService
.
findById
(
trainId
);
trainT
askService
.
selectBillidAndBillType
(
trainId
,
BusinessEnum
.
TRAIN
.
id
,
StatusEnum
.
TRAIN1010
.
id
).
forEach
(
t
askBto
->
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1004
,
taskBto
.
getInvolveUserIdList
().
get
(
0
))
);
//5 培训中
TaskBto
taskBto
=
trainTaskService
.
selectFatherIsNullAndBillidAndBillType
(
trainTheme
.
getTrainId
(),
BusinessEnum
.
TRAIN
.
id
);
// //主task往下推待培训状态,0
taskService
.
moveToSpecial
(
taskBto
,
StatusEnum
.
TRAIN1004
,
0
);
trainTheme
.
setTrainStatus
(
StatusEnum
.
TRAIN1004
.
id
);
trainThemeService
.
save
(
trainTheme
);
}
// @Scheduled(cron = "10 * * * * ?")
// private void trainingEnd1() {
// log.info("定时启动web推送");
...
...
dev-union/src/main/resources/bill.html
100644 → 100755
浏览文件 @
1acf5f4f
差异被折叠。
点击展开。
dev-union/src/main/resources/bill1.html
浏览文件 @
1acf5f4f
差异被折叠。
点击展开。
dev-union/src/main/resources/bill2.html
浏览文件 @
1acf5f4f
<!DOCTYPE html>
<html
lang=
"en"
>
<head>
<meta
charset=
"UTF-8"
/>
<meta
charset=
"UTF-8"
/>
<title>
Document
</title>
<style>
body
{
font-family
:
SimHei
;
body
{
margin
:
0
;
padding
:
0
;
font-family
:
SimHei
;
}
.bottomTxt
{
text-align
:
center
;
font-size
:
10px
;
...
...
@@ -14,9 +18,10 @@
height
:
10px
;
line-height
:
10px
;
}
/*
@page
{
size
:
297mm
210mm
;}
<!
--
设置
PDF
页面大小,此配置只对生成
PDF
文件有效,不会对页面显示生效
--
>*/
@page
{
size
:
210mm
297mm
;
size
:
210mm
297mm
;
/*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/
...
...
@@ -24,14 +29,16 @@
/*border: thin solid black;*/
/*padding: 1em;*/
}
.returnTablePrint
{
.returnTablePrint
{
width
:
100%
;
height
:
100%
;
overflow
:
hidden
;
color
:
#000
;
cursor
:
default
;
}
.returnTablePrint
.content
{
.returnTablePrint
.content
{
width
:
100%
;
height
:
100%
;
/* background: url("../../../assets/img/detailsBg.png") no-repeat; */
...
...
@@ -39,14 +46,16 @@
/*padding: 30px;*/
/*box-sizing: border-box;*/
}
.returnTablePrint
.content
>
div
{
.returnTablePrint
.content
>
div
{
width
:
100%
;
height
:
100%
;
background
:
#fff
;
/* padding: 30px; */
box-sizing
:
border-box
;
}
.returnTablePrint
.content
>
p
{
.returnTablePrint
.content
>
p
{
width
:
100%
;
text-align
:
center
;
font-size
:
22px
;
...
...
@@ -54,7 +63,7 @@
color
:
#4a475d
;
}
.returnTablePrint
.listWrapper
{
.returnTablePrint
.listWrapper
{
/* width: 92%; */
margin
:
0
auto
;
/* padding: 0px 20px 20px 20px; */
...
...
@@ -62,142 +71,174 @@
/*padding: 10px 30px;*/
box-sizing
:
border-box
;
}
.returnTablePrint
.list
{
.returnTablePrint
.list
{
/* width: 92%; */
margin
:
0
auto
;
/* padding: 0px 20px 20px 20px; */
/* height: calc(100% - 75px); */
height
:
calc
(
100%
-
12px
)
height
:
calc
(
100%
-
12px
)
}
.returnTablePrint
.title
{
.returnTablePrint
.title
{
width
:
100%
;
font-size
:
20px
;
text-align
:
center
;
position
:
relative
;
margin
:
0
0
15px
;
padding
:
0
20px
;
margin
:
0
;
padding
:
0
;
box-sizing
:
border-box
;
margin-top
:
9px
;
}
.returnTablePrint
.title
span
:nth-child
(
2
)
{
.returnTablePrint
.title
span
:nth-child
(
2
)
{
font-size
:
28px
;
color
:
#000000
;
}
.returnTablePrint
.title
span
:nth-child
(
2
)
span
{
.returnTablePrint
.title
span
:nth-child
(
2
)
span
{
font-size
:
20px
;
color
:
#141414
;
}
.returnTablePrint
.main-title
{
font-size
:
22
px
;
font-size
:
17
px
;
color
:
#000000
;
margin-bottom
:
20px
;
text-align
:
center
;
}
table
.altrowstable
{
width
:
100%
;
font-size
:
14px
;
color
:
#141414
;
font-size
:
14px
;
color
:
#141414
;
border-width
:
0px
;
border-color
:
#a9c6c9
;
border-collapse
:
collapse
;
text-align
:
center
;
table-layout
:
fixed
;
word-break
:
break-all
;
word-break
:
break-all
;
}
table
.altrowstable
th
{
border-width
:
0px
;
padding
:
8px
;
border-style
:
solid
;
border-color
:
#a9c6c9
;
background-color
:
#dedede
;
height
:
20px
;
line-height
:
20px
;
font-size
:
10px
;
}
table
.altrowstable
td
{
border-width
:
0px
;
padding
:
8px
;
border-style
:
solid
;
border-color
:
#a9c6c9
;
word-break
:
break-all
;
word-wrap
:
break-word
;
word-break
:
break-all
;
word-wrap
:
break-word
;
height
:
20px
;
line-height
:
20px
;
font-size
:
10px
;
width
:
100%
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.oddrowcolor
{
background-color
:
#fff
;
.oddrowcolor
{
background-color
:
#fff
;
}
.evenrowcolor
{
background-color
:
#fafafa
;
.evenrowcolor
{
background-color
:
#fafafa
;
}
.person
{
.person
{
color
:
#4a475b
;
text-align
:
right
;
font-size
:
16px
;
}
.person
>
span
{
.person
>
span
{
display
:
inline-block
;
margin-right
:
30pt
;
}
tr
:nth-child
(
odd
)
{
background
:
#fafafa
;
}
</style>
</head>
<body>
<div
class=
"returnTablePrint"
>
<div
class=
"content"
>
<div>
<div
class=
"listWrapper"
>
<div
class=
"list"
>
<p
class=
"title"
>
<p
class=
"title"
style=
"margin-bottom:20px"
>
<div
class=
"main-title"
>
<span>
${title}
</span>
</div>
</p>
<div
style=
"height:
825
px;"
>
<div
style=
"height:
900
px;"
>
<table
class=
"altrowstable"
id=
"alternatecolor"
>
<tr>
<th>
序号
</th><th
style=
"width: 150px;"
>
型号
</th><th>
形态
</th><th>
密级
</th><th>
应用领域
</th><th
style=
"width: 150px;"
>
装备序列号
</th>
<th>
序号
</th>
<th
style=
"width: 150px;"
>
型号
</th>
<th>
形态
</th>
<th>
密级
</th>
<th>
应用领域
</th>
<th
style=
"width: 150px;"
>
装备序列号
</th>
</tr>
<
#
list
documentDevices
as
dev
>
<tr>
<td>
<
#
if
dev
.
code
!=
0
>
${dev.code}
</
#
if>
</td>
<td>
${dev.model}
</td><td>
${dev.category}
</td><td>
${dev.securityClassification}
</td><td>
${dev.applicationField}
</td><td>
${dev.deviceSerialNumber}
</td>
</tr>
</
#
list>
<tr>
<td>
${dev.code!}
</td>
<td>
${dev.model}
</td>
<td>
${dev.category}
</td>
<td>
${dev.securityClassification}
</td>
<td>
${dev.applicationField}
</td>
<td>
${dev.deviceSerialNumber}
</td>
</tr>
</
#
list>
</table>
</div>
</div>
<p
class=
"person"
style=
"margin-top: 20px"
>
<p
class=
"person"
style=
"margin-top: 20px
;font-size: 10px;
"
>
<span
style=
"width: 200px;text-align: left"
>
经办人:
</span>
<span
style=
"width: 200px;text-align: left"
>
审核人:
</span>
</p>
</div>
</div>
</div>
<p
class=
"bottomTxt"
>
第${page}页/共${count}页
</p
>
<p
class=
"bottomTxt"
>
第${page}页/共${count}页
</p
>
</div>
<!--<script type="text/javascript">-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--function altRows(id){-->
<!--if(document.getElementsByTagName){-->
<!--var table = document.getElementById(id);-->
<!--var rows = table.getElementsByTagName("tr");-->
<!--for(i = 0; i < rows.length; i++){-->
<!--if(i % 2 == 0){-->
<!--rows[i].className = "evenrowcolor";-->
<!--}else{-->
<!--rows[i].className = "oddrowcolor";-->
<!--}-->
<!--}-->
<!--}-->
<!--}-->
<!--window.onload=function(){-->
<!--altRows('alternatecolor');-->
<!--}-->
<!--</script>-->
</body>
</html>
\ No newline at end of file
dev-union/src/main/resources/bill22222.html
0 → 100644
浏览文件 @
1acf5f4f
差异被折叠。
点击展开。
dev-union/src/main/resources/bill3.html
浏览文件 @
1acf5f4f
差异被折叠。
点击展开。
dev-user/src/main/java/com/tykj/dev/device/user/base/ret/UserConditionsVo.java
浏览文件 @
1acf5f4f
package
com
.
tykj
.
dev
.
device
.
user
.
base
.
ret
;
import
com.tykj.dev.misc.base.CustomPage
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
...
...
@@ -19,14 +20,13 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@ApiModel
(
value
=
"用户查询条件对象"
,
description
=
"用户查询条件信息"
)
@Builder
public
class
UserConditionsVo
{
public
class
UserConditionsVo
extends
CustomPage
{
@ApiModelProperty
(
value
=
"单位id"
,
name
=
"unitsId"
,
example
=
"12321L"
)
private
Integer
unitsId
;
@ApiModelProperty
(
value
=
"页码"
,
name
=
"page"
,
example
=
"12321L"
)
private
Integer
page
;
@ApiModelProperty
(
value
=
"条数"
,
name
=
"size"
,
example
=
"12321L"
)
private
Integer
size
;
@ApiModelProperty
(
value
=
"模糊搜索"
,
name
=
"dim"
,
example
=
"12321L"
)
private
String
dim
;
@ApiModelProperty
(
value
=
"类型"
,
name
=
"type"
)
private
Integer
type
;
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/AreaController.java
浏览文件 @
1acf5f4f
...
...
@@ -74,4 +74,11 @@ public class AreaController {
return
ResponseEntity
.
ok
(
areaService
.
selectPage
(
page
,
size
));
}
@GetMapping
(
"/page/{size}"
)
@ApiOperation
(
value
=
"1111111"
,
notes
=
"成功返回区域对象"
)
public
ResponseEntity
selectPage1
(
@PathVariable
Integer
size
){
return
ResponseEntity
.
ok
(
areaService
.
findIdQuerySubordinateIds
(
size
));
}
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/controller/UserArchivesController.java
浏览文件 @
1acf5f4f
...
...
@@ -44,7 +44,7 @@ public class UserArchivesController {
@Autowired
LogoutUtil
logout
;
//
@PostMapping
(
value
=
"/archives/summary/page"
)
@ApiOperation
(
value
=
"根据单位id查询用户接口(分页)"
,
notes
=
"成功返回用户对象集合"
)
...
...
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/AreaService.java
浏览文件 @
1acf5f4f
...
...
@@ -32,4 +32,6 @@ public interface AreaService extends PublicService<Area> {
Area
findByid
(
Integer
areaId
);
List
<
Integer
>
findIdQuerySubordinateIds
(
Integer
areaId
);
}
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/AreaServiceImpl.java
浏览文件 @
1acf5f4f
...
...
@@ -120,6 +120,25 @@ public class AreaServiceImpl implements AreaService {
return
areaDao
.
findById
(
areaId
).
get
();
}
@Override
public
List
<
Integer
>
findIdQuerySubordinateIds
(
Integer
areaId
)
{
List
<
Integer
>
ids
=
new
ArrayList
<>();
return
areaId
(
ids
,
areaId
);
}
private
List
<
Integer
>
areaId
(
List
<
Integer
>
ids
,
Integer
areaId
){
List
<
Area
>
areas
=
areaDao
.
findAllByFatherId
(
areaId
);
ids
.
add
(
areaId
);
if
(
areas
!=
null
&&
areas
.
size
()!=
0
){
areas
.
forEach
(
area
->
{
areaId
(
ids
,
area
.
getId
());
}
);
}
return
ids
;
}
private
List
<
UnitsVo
>
subordinateAllUnits
(
List
<
UnitsVo
>
units
,
Area
area
)
{
List
<
Area
>
list
=
areaDao
.
findAllByFatherId
(
area
.
getId
());
if
(
list
.
size
()
==
0
)
{
...
...
dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java
浏览文件 @
1acf5f4f
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论