Skip to content

D
device-back
提交 4c84fe6e authored 作者: 133's avatar 133
浏览文件
操作

[清退 文件] 代码提交

上级 a0b8e009
隐藏空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 74 行删除
dev-file/src/main/java/com/tykj/dev/device/file/entity/ConfirmDevice.java
浏览文件 @ 4c84fe6e
...@@ -62,9 +62,10 @@ public class ConfirmDevice { ...@@ -62,9 +62,10 @@ public class ConfirmDevice {
case "7": case "7":
category="密码软件"; category="密码软件";
break; break;
case "8":
default:
category="密码卡"; category="密码卡";
default:
category="-";
break; break;
} }
......
dev-file/src/main/java/com/tykj/dev/device/file/entity/DestructionDevice.java
浏览文件 @ 4c84fe6e
...@@ -69,9 +69,11 @@ public class DestructionDevice { ...@@ -69,9 +69,11 @@ public class DestructionDevice {
category="密码软件"; category="密码软件";
break; break;
default: case "8":
category="密码卡"; category="密码卡";
break; default:
category="-";
break;
} }
......
dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java
浏览文件 @ 4c84fe6e
...@@ -18,6 +18,10 @@ import lombok.NoArgsConstructor; ...@@ -18,6 +18,10 @@ import lombok.NoArgsConstructor;
@Data @Data
@ApiModel(value = "单据涉及装备实体", description = "单据涉及装备实体") @ApiModel(value = "单据涉及装备实体", description = "单据涉及装备实体")
public class DocumentDevice { public class DocumentDevice {
@ApiModelProperty(name = "序号")
private Integer code;
@ApiModelProperty(name = "型号") @ApiModelProperty(name = "型号")
private String model; private String model;
...@@ -68,12 +72,14 @@ public class DocumentDevice { ...@@ -68,12 +72,14 @@ public class DocumentDevice {
category="密码软件"; category="密码软件";
break; break;
default: case "8":
category="密码卡"; category="密码卡";
default:
category="-";
break; break;
} }
switch (securityClassification){ switch (securityClassification){
case "1": case "1":
securityClassification="绝密"; securityClassification="绝密";
...@@ -89,7 +95,6 @@ public class DocumentDevice { ...@@ -89,7 +95,6 @@ public class DocumentDevice {
break; break;
} }
switch (applicationField){ switch (applicationField){
case "1": case "1":
applicationField="省一级"; applicationField="省一级";
...@@ -103,9 +108,7 @@ public class DocumentDevice { ...@@ -103,9 +108,7 @@ public class DocumentDevice {
default: default:
applicationField="无"; applicationField="无";
break; break;
} }
return this; return this;
} }
} }
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ 4c84fe6e
...@@ -16,6 +16,7 @@ import org.xhtmlrenderer.pdf.ITextRenderer; ...@@ -16,6 +16,7 @@ import org.xhtmlrenderer.pdf.ITextRenderer;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -208,6 +209,13 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -208,6 +209,13 @@ public class JavaToPdfHtmlFreeMarker {
data.put("receiveUnit",documents.getReceiveUnit()); data.put("receiveUnit",documents.getReceiveUnit());
data.put("replyNum",documents.getReplyNum()); data.put("replyNum",documents.getReplyNum());
data.put("senderUnit",documents.getSenderUnit()); data.put("senderUnit",documents.getSenderUnit());
AtomicInteger i= new AtomicInteger(1);
list.forEach(
documentDevice -> {
documentDevice.setCode(i.get());
i.set(i.get() + 1);
}
);
data.put("documentDevices",list.stream().map(DocumentDevice::toDocumentDevice).collect(Collectors.toList())); data.put("documentDevices",list.stream().map(DocumentDevice::toDocumentDevice).collect(Collectors.toList()));
return data; return data;
} }
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ 4c84fe6e
...@@ -632,9 +632,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -632,9 +632,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
Units units=unitsService.findById(user.getUnitsId()); Units units=unitsService.findById(user.getUnitsId());
DeviceRepelDetail deviceRepelDetail=orderOutData.toTrainDetailsVo(); DeviceRepelDetail deviceRepelDetail=orderOutData.toTrainDetailsVo();
deviceRepelDetail.setDeviceIds(StringUtils.ListToString(orderOutData.getDevIds())); deviceRepelDetail.setDeviceIds(StringUtils.ListToString(orderOutData.getDevIds()));
deviceRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+deviceRepelDetail.getId());
deviceRepelDetail.setOutboundFile(FilesUtil.stringFileToList(orderOutData.getOutboundFileList())); deviceRepelDetail.setOutboundFile(FilesUtil.stringFileToList(orderOutData.getOutboundFileList()));
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail); deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
deviceRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+deviceRepelDetail.getId());
deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail);
deviceLibraryDao.upDateLeftStatusAndOwnUnitName(DeviceLifeStatus.REPEL.id,orderOutData.getReceiveUnit(),orderOutData.getDevIds());
deviceRepelDetail.setDeviceLibraryEntities(findInvoleDevice(deviceRepelDetail.getDeviceIds())); deviceRepelDetail.setDeviceLibraryEntities(findInvoleDevice(deviceRepelDetail.getDeviceIds()));
sendOutSuperior(units.getUnitId(),deviceRepelDetail.getId(),null); sendOutSuperior(units.getUnitId(),deviceRepelDetail.getId(),null);
return deviceRepelDetail; return deviceRepelDetail;
...@@ -715,7 +717,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -715,7 +717,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
private TaskBto cityInitiateTask(Integer unitId,Integer repelDetailId,String title,Integer userId){ private TaskBto cityInitiateTask(Integer unitId,Integer repelDetailId,String title,Integer userId){
//省清退任务待市提交 //省清退任务待市提交
List<Integer> list=new ArrayList<>(); List<Integer> list=new ArrayList<>();
list.add(unitId); list.add(userId);
list.add(0); list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1211.id, title, null, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 0, "", list)); return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1211.id, title, null, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 0, "", list));
} }
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ 4c84fe6e
...@@ -94,7 +94,7 @@ public class RepelQueryServiceImpl implements RepelQueryService { ...@@ -94,7 +94,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override @Override
public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) { public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) {
Units units= unitsService.findById(repelManagementVo.getUnitId()); Units units= unitsService.findById(repelManagementVo.getUnitId());
return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList())); return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),DeviceLifeStatus.REPEL.id).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
} }
private List<ModelNameGroup> toModelNameGroup(List<DeviceLibrary> deviceLibraries){ private List<ModelNameGroup> toModelNameGroup(List<DeviceLibrary> deviceLibraries){
......
dev-union/src/main/resources/bill.html
浏览文件 @ 4c84fe6e
...@@ -6,10 +6,12 @@ ...@@ -6,10 +6,12 @@
<style> <style>
body{ body{
font-family:SimHei; font-family:SimHei;
margin: 0;
padding: 0;
} }
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/ /*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page { @page {
size:297mm 210mm;//纸张大小A4 size:210mm 297mm;
/*margin: 0.25in;*/ /*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/ /*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/ /*-fs-flow-left: "left";*/
...@@ -58,18 +60,12 @@ ...@@ -58,18 +60,12 @@
} }
.returnTablePrint .listWrapper{ .returnTablePrint .listWrapper{
/* width: 92%; */ /*margin: 0 auto;*/
margin: 0 auto; /* height: calc(100% - 40px); */
/* padding: 0px 20px 20px 20px; */
height: calc(100% - 70px);
/*padding: 10px 30px;*/
box-sizing: border-box; box-sizing: border-box;
} }
.returnTablePrint .list{ .returnTablePrint .list{
/* width: 92%; */ /*margin: 0 auto;*/
margin: 0 auto;
/* padding: 0px 20px 20px 20px; */
/* height: calc(100% - 75px); */
height:calc(100% - 12px) height:calc(100% - 12px)
} }
.returnTablePrint .title{ .returnTablePrint .title{
...@@ -77,7 +73,7 @@ ...@@ -77,7 +73,7 @@
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
position: relative; position: relative;
margin: 0 0 15px; /* margin: 0 0 15px; */
padding:0 20px; padding:0 20px;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -90,8 +86,8 @@ ...@@ -90,8 +86,8 @@
color: #141414; color: #141414;
} }
.returnTablePrint .title .number{ .returnTablePrint .title .number{
font-size: 20px; font-size: 10px;
color: #646464; color: #646464;
} }
.returnTablePrint .other{ .returnTablePrint .other{
width: 100%; width: 100%;
...@@ -109,21 +105,21 @@ ...@@ -109,21 +105,21 @@
margin:0 40px 0 10px; margin:0 40px 0 10px;
} }
.returnTablePrint .listCon{ .returnTablePrint .listCon{
height: calc(100% - 90px); height: 100%;
border: 1px solid #7f7f7f; border: 1px solid #7f7f7f;
} }
.returnTablePrint .line1{ .returnTablePrint .line1{
width: 100%; width: 100%;
font-size: 20px; font-size: 10px;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
color:#000; color:#000;
line-height: 60px; line-height: 20px;
} }
.returnTablePrint .line1 .sendTo { .returnTablePrint .line1 .sendTo {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
text-indent: 20px; text-indent: 5px;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/ /*padding-left: 20px;*/
} }
...@@ -139,7 +135,7 @@ ...@@ -139,7 +135,7 @@
.returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){ .returnTablePrint .line1 .sendTo span:nth-child(2),.returnTablePrint .line1 .sendNum span:nth-child(2){
color: #4a475d; color: #4a475d;
display: inline-block; display: inline-block;
margin-left: 20px; margin-left: 5px;
} }
.returnTablePrint .line2{ .returnTablePrint .line2{
height: 100%; height: 100%;
...@@ -147,7 +143,7 @@ ...@@ -147,7 +143,7 @@
border-bottom: 1px solid #7f7f7f; border-bottom: 1px solid #7f7f7f;
} }
.returnTablePrint .tableList{ .returnTablePrint .tableList{
height: 300px; height: 825px;
} }
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) { .returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff; background-color:#fff;
...@@ -157,41 +153,35 @@ ...@@ -157,41 +153,35 @@
} }
.returnTablePrint .line3{ .returnTablePrint .line3{
width: 100%; width: 100%;
/* box-sizing: border-box; */
/*height:150px;*/
/*display: flex;*/
/* height:170px; */
/* padding:20px 0 20px 0; */
} }
.returnTablePrint .line3 .left { .returnTablePrint .line3 .left {
display: inline-block; display: inline-block;
width: 49%; width: 49%;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/
position: relative; position: relative;
padding-bottom: 80px; /* padding-bottom: 80px; */
} }
.returnTablePrint .line3 .right { .returnTablePrint .line3 .right {
display: inline-block; display: inline-block;
width: 50%; width: 49%;
box-sizing: border-box; box-sizing: border-box;
/*padding-left: 20px;*/
position: relative; position: relative;
padding-bottom: 80px; /* padding-bottom: 80px; */
} }
.returnTablePrint .line3 .left{ .returnTablePrint .line3 .left{
border-right: 1px solid #7f7f7f; border-right: 1px solid #7f7f7f;
/*padding-bottom: 40px;*/ height: 106px;
} }
.returnTablePrint .line3 .left>span { .returnTablePrint .line3 .left>span {
text-indent: 10px; text-indent: 10px;
} }
.returnTablePrint .line3 .left>span,.returnTablePrint .line3 .right>span{ .returnTablePrint .line3 .left>span,.returnTablePrint .line3 .right>span{
display: block; display: block;
margin: 15px 0px; margin: 6px 0px;
} }
.returnTablePrint .line3 .right{ .returnTablePrint .line3 .right{
height: 100%; height: 100%;
height: 106px;
} }
.returnTablePrint .line3 .left>span>span:nth-child(2),.returnTablePrint .line3 .right>span>span:nth-child(2){ .returnTablePrint .line3 .left>span>span:nth-child(2),.returnTablePrint .line3 .right>span>span:nth-child(2){
display: inline-block; display: inline-block;
...@@ -204,11 +194,10 @@ ...@@ -204,11 +194,10 @@
right: 5px; right: 5px;
bottom: 5px; bottom: 5px;
font-style: normal; font-style: normal;
font-size: 10px;
} }
.returnTablePrint .line3 .right i{ .returnTablePrint .line3 .right i{
font-style: normal; font-style: normal;
/* right: -10px;
bottom: -60px; */
} }
.returnTablePrint .line3 i>span>span{ .returnTablePrint .line3 i>span>span{
display: block; display: block;
...@@ -227,16 +216,16 @@ ...@@ -227,16 +216,16 @@
} }
.returnTablePrint .label{ .returnTablePrint .label{
color: #646464; color: #646464;
font-size: 20px;; font-size: 10px;
} }
.returnTablePrint .value{ .returnTablePrint .value{
color: #000; color: #000;
font-size: 20px;; font-size: 10px;
} }
.returnTablePrint .main-title { .returnTablePrint .main-title {
font-size: 28px; font-size: 18px;
color: #000000; color: #000000;
margin-bottom: 20px; line-height: 20px;
text-align: center; text-align: center;
} }
.returnTablePrint .footer{ .returnTablePrint .footer{
...@@ -250,28 +239,24 @@ ...@@ -250,28 +239,24 @@
} }
table.altrowstable { table.altrowstable {
width: 100%; width: 100%;
font-size:20px; font-size:9px;
color:#141414; color:#141414;
border-width: 0px; border-width: 0px;
border-color: #a9c6c9; border-color: #a9c6c9;
border-collapse: collapse; border-collapse: collapse;
text-align: center; text-align: center;
/*table-layout: fixed;*/
/*word-break:break-all;*/
} }
table.altrowstable th { table.altrowstable th {
border-width: 0px; border-width: 0px;
padding: 8px; padding: 5px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
} }
table.altrowstable td { table.altrowstable td {
border-width: 0px; border-width: 0px;
padding: 8px; padding: 5px;
border-style: solid; border-style: solid;
border-color: #a9c6c9; border-color: #a9c6c9;
/*word-break:break-all;*/
/*word-wrap : break-word;*/
} }
.oddrowcolor{ .oddrowcolor{
background-color:#fff; background-color:#fff;
...@@ -279,9 +264,9 @@ ...@@ -279,9 +264,9 @@
.evenrowcolor{ .evenrowcolor{
background-color:#fafafa; background-color:#fafafa;
} }
tr:nth-child(odd) { /*tr:nth-child(odd) {*/
background: #fafafa; /* background: #fafafa;*/
} /*}*/
</style> </style>
</head> </head>
<body> <body>
...@@ -293,24 +278,24 @@ ...@@ -293,24 +278,24 @@
<div> <div>
<div class="listWrapper"> <div class="listWrapper">
<div class="list"> <div class="list">
<p class="title"> <div class="title">
<div class="main-title"> <div class="main-title">
<span> <span>
${title} ${title}
</span> </span>
</div> </div>
<div style="width:100%;text-align:left"> <div style="width:100%;text-align:left">
<div style="text-align:left;display: inline-block; width: 33%" class="number"> <div style="text-align:left;display: inline-block; width: 32%" class="number">
<span class="number">${number}</span> <span class="number">${number}</span>
</div> </div>
<div style="text-align:center;display: inline-block; width: 29%" class="number"> <div style="text-align:center;display: inline-block; width: 32%" class="number">
<span >${ul}</span> <span >${ul}</span>
</div> </div>
<div style="text-align:right;display: inline-block; width: 33%" class="number"> <div style="text-align:right;display: inline-block; width: 28%" class="number">
<span>机密</span> <span>机密</span>
</div> </div>
</div> </div>
</p> </div>
<div class="listCon"> <div class="listCon">
<div class="line1"> <div class="line1">
<span class="sendTo"> <span class="sendTo">
...@@ -325,11 +310,12 @@ ...@@ -325,11 +310,12 @@
<div class="line2 tableList"> <div class="line2 tableList">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr>
<th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th>装备序列号</th><th>备注</th> <th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 300px">装备序列号</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr>
<td>${dev.model}</td><td>${dev.category}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.remark}</td> <td>${dev.code}</td><td>${dev.model}</td><td>${dev.category}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td>
<!-- <td>${dev.model}</td><td>${dev.category}</td><td>密码</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</td> -->
</tr> </tr>
</#list> </#list>
</table> </table>
...@@ -342,15 +328,15 @@ ...@@ -342,15 +328,15 @@
</span> </span>
<span> <span>
<span class="label">签发人:</span> <span class="label">签发人:</span>
<span class="value"></span> <span class="value">签发人</span>
</span> </span>
<span> <span>
<span class="label">经办人:</span> <span class="label">经办人:</span>
<span class="value"></span> <span class="value">经办人</span>
</span> </span>
<i> <i>
<span style="position: relative;color: #646464"> <span style="position: relative;color: #646464">
<span style="margin-bottom: 20px;">(公章)</span> <span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span> <span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span>
<div style="position: absolute"> <div style="position: absolute">
<div id="pos0" ></div> <div id="pos0" ></div>
...@@ -365,15 +351,15 @@ ...@@ -365,15 +351,15 @@
</span> </span>
<span> <span>
<span class="label">经办人:</span> <span class="label">经办人:</span>
<span class="value"></span> <span class="value">经办人</span>
</span> </span>
<span> <span>
<span class="label">经办人:</span> <span class="label">经办人:</span>
<span class="value"></span> <span class="value">经办人</span>
</span> </span>
<i> <i>
<span style="color: #646464"> <span style="color: #646464">
<span style="margin-bottom: 20px;">(公章)</span> <span style="margin-bottom: 5px;">(公章)</span>
<span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span> <span><span style="color: #fff;">1234</span>年<span style="color: #fff;">0121</span>月<span style="color: #fff;">0232</span>日</span>
</span> </span>
</i> </i>
......
dev-union/src/main/resources/bill1.html
浏览文件 @ 4c84fe6e
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
<div class="line2 tableList"> <div class="line2 tableList">
<table class="altrowstable" id="alternatecolor"> <table class="altrowstable" id="alternatecolor">
<tr> <tr>
<th>型号</th><th>形态</th>><th>密级</th><th>应用领域</th><th>数量</th><th>装备序列号</th><th>备注</th> <th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th>装备序列号</th><th>备注</th>
</tr> </tr>
<#list documentDevices as dev> <#list documentDevices as dev>
<tr> <tr>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论