Skip to content

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

[清退 file] 代码修改提交

上级 2b3bc09e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 419 行增加 和 12 行删除
dev-config/src/main/java/com/tykj/dev/config/LogType.java
浏览文件 @ c051268e
......@@ -207,7 +207,8 @@ public enum LogType {
RETRIEVE_2(9011,RETRIEVE.id,RETRIEVE1400.id,RETRIEVE1401.id,"确认了装备找回上报"),
RETRIEVE_3(9012,RETRIEVE.id,RETRIEVE1400.id,END.id,"确认了装备找回上报,找回任务结束"),
RETRIEVE_4(9013,RETRIEVE.id,ORIGIN_STATUS.id,END.id,"省装备找回报告发起记录"),
RETRIEVE_5(9014,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1401.id,"发起丢失装备上报"),
RETRIEVE_5(9014,RETRIEVE.id,ORIGIN_STATUS.id,RETRIEVE1401.id,"发起装备找回上报"),
RETRIEVE_6(9015,RETRIEVE.id,RETRIEVE1401.id,END.id,"审核装备找回完成，查看找回结果"),
WORK_H1(79, WORK_HANDOVER.id, ORIGIN_STATUS.id, WORKHANDOVER1011.id, "工作交接任务生成完成,等待上传交接单"),
......
dev-file/src/main/java/com/tykj/dev/device/file/entity/ConfirmDevice.java
浏览文件 @ c051268e
......@@ -25,5 +25,68 @@ public class ConfirmDevice {
private String securityClassification;
private String applicationField;
public ConfirmDevice toConfirmDevice(){
switch (parts){
case "1":
parts="密码机";
break;
case "2":
parts="密码模块";
break;
case "3":
parts="密码芯片";
break;
case "4":
parts="说明书";
break;
case "5":
parts="U盘";
break;
case "6":
parts="光盘";
break;
case "7":
parts="密码软件";
break;
default:
parts="密码卡";
break;
}
switch (securityClassification){
case "1":
securityClassification="绝密";
break;
case "2":
securityClassification="机密";
break;
case "3":
securityClassification="秘密";
break;
default:
securityClassification="无";
break;
}
switch (applicationField){
case "1":
applicationField="省一级";
break;
case "2":
applicationField="市一级";
break;
case "3":
applicationField="县一级";
break;
default:
applicationField="无";
break;
}
return this;
}
}
dev-file/src/main/java/com/tykj/dev/device/file/entity/DestructionDevice.java
浏览文件 @ c051268e
package com.tykj.dev.device.file.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -14,22 +16,97 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Data
@ApiModel(value = "单据涉及装备实体", description = "单据涉及装备实体")
public class DestructionDevice {
@ApiModelProperty(name = "型号")
private String model;
@ApiModelProperty(name = "部件")
private String parts;
@ApiModelProperty(name = "类型")
private String category;
@ApiModelProperty(name = "密级")
private String securityClassification;
@ApiModelProperty(name = "应用领域")
private String applicationField;
@ApiModelProperty(name = "数量")
private Integer count;
@ApiModelProperty(name = "装备序列号")
private String deviceSerialNumber;
@ApiModelProperty(name = "生产序列号")
private String productionSerialNumber;
@ApiModelProperty(name = "备注")
private String remark;
public DestructionDevice toDestructionDevice(){
switch (parts){
case "1":
parts="密码机";
break;
case "2":
parts="密码模块";
break;
case "3":
parts="密码芯片";
break;
case "4":
parts="说明书";
break;
case "5":
parts="U盘";
break;
case "6":
parts="光盘";
break;
case "7":
parts="密码软件";
break;
default:
parts="密码卡";
break;
}
switch (securityClassification){
case "1":
securityClassification="绝密";
break;
case "2":
securityClassification="机密";
break;
case "3":
securityClassification="秘密";
break;
default:
securityClassification="无";
break;
}
switch (applicationField){
case "1":
applicationField="省一级";
break;
case "2":
applicationField="市一级";
break;
case "3":
applicationField="县一级";
break;
default:
applicationField="无";
break;
}
return this;
}
}
dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java
浏览文件 @ c051268e
......@@ -44,5 +44,68 @@ public class DocumentDevice {
@ApiModelProperty(name = "备注")
private String remark;
public DocumentDevice toDocumentDevice(){
switch (parts){
case "1":
parts="密码机";
break;
case "2":
parts="密码模块";
break;
case "3":
parts="密码芯片";
break;
case "4":
parts="说明书";
break;
case "5":
parts="U盘";
break;
case "6":
parts="光盘";
break;
case "7":
parts="密码软件";
break;
default:
parts="密码卡";
break;
}
switch (securityClassification){
case "1":
securityClassification="绝密";
break;
case "2":
securityClassification="机密";
break;
case "3":
securityClassification="秘密";
break;
default:
securityClassification="无";
break;
}
switch (applicationField){
case "1":
applicationField="省一级";
break;
case "2":
applicationField="市一级";
break;
case "3":
applicationField="县一级";
break;
default:
applicationField="无";
break;
}
return this;
}
}
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ c051268e
......@@ -207,7 +207,7 @@ public class JavaToPdfHtmlFreeMarker {
data.put("receiveUnit",documents.getReceiveUnit());
data.put("replyNum",documents.getReplyNum());
data.put("senderUnit",documents.getSenderUnit());
data.put("documentDevices",list);
data.put("documentDevices",list.stream().map(DocumentDevice::toDocumentDevice));
return data;
}
......@@ -215,7 +215,7 @@ public class JavaToPdfHtmlFreeMarker {
private static Map<String,Object> toConfirmMap(Confirm confirm, List<ConfirmDevice> list){
Map<String,Object> data = new HashMap();
data.put("title",confirm.getTitle());
data.put("documentDevices",list);
data.put("documentDevices",list.stream().map(ConfirmDevice::toConfirmDevice));
return data;
}
......@@ -225,7 +225,7 @@ public class JavaToPdfHtmlFreeMarker {
data.put("title",destruction.getTitle());
data.put("ul",test);
data.put("unitName",destruction.getDisposeUnitName());
data.put("documentDevices",list);
data.put("documentDevices",list.stream().map(DestructionDevice::toDestructionDevice));
return data;
}
......
dev-file/src/main/resources/bill.html
浏览文件 @ c051268e
......@@ -320,11 +320,11 @@
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<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><th>备注</th>
</tr>
<#list documentDevices as dev>
<tr>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.productionSerialNumber}</td><td>${dev.remark}</td>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.remark}</td>
</tr>
</#list>
</table>
......
dev-file/src/main/resources/bill1.html
浏览文件 @ c051268e
......@@ -314,11 +314,11 @@
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<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><th>备注</th>
</tr>
<#list documentDevices as dev>
<tr>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.productionSerialNumber}</td><td>${dev.remark}</td>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.remark}</td>
</tr>
</#list>
</table>
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ c051268e
......@@ -252,7 +252,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepelDetail deviceRepelDetail=new DeviceRepelDetail();
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= cityInitiateTask(unitsFather.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle());
TaskBto taskBto= cityInitiateTask(unitsFather.getUnitId(),deviceRepelDetailService.saveDeviceRepelDetail(deviceRepelDetail).getId(),deviceRepel.getTitle(),userId);
// repelTaskStatisticalService.saveRepelTaskStatistical(new RepelTaskStatistical(deviceRepel1.getId(),null,taskBto.getId(),null,area.getName()));
// Set<ModelCount> modelCounts=new HashSet<>();
......@@ -328,6 +328,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
list.add(StatusEnum.SEND_BACK_1203);
list.add(StatusEnum.SEND_BACK_1202);
list.add(StatusEnum.SEND_BACK_1201);
list.add(StatusEnum.SEND_BACK_1206);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),list);
......@@ -683,9 +684,10 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
* @param title
* @return
*/
private TaskBto cityInitiateTask(Integer unitId,Integer repelDetailId,String title){
private TaskBto cityInitiateTask(Integer unitId,Integer repelDetailId,String title,Integer userId){
//省清退任务待市提交
List<Integer> list=new ArrayList<>();
list.add(unitId);
list.add(0);
return taskService.start(new TaskBto(StatusEnum.SEND_BACK_1211.id, title, null, ".", repelDetailId, BusinessEnum.SEND_BACK_STATISTICAL.id, unitId, 0, "", list));
}
......
dev-union/src/main/resources/bill.html
浏览文件 @ c051268e
......@@ -320,11 +320,11 @@
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<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><th>装备序列号</th><th>备注</th>
</tr>
<#list documentDevices as dev>
<tr>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.category}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.productionSerialNumber}</td><td>${dev.remark}</td>
<td>${dev.model}</td><td>${dev.parts}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td><td>${dev.count}</td><td>${dev.deviceSerialNumber}</td><td>${dev.remark}</td>
</tr>
</#list>
</table>
......
dev-union/src/main/resources/bill1.html 0 → 100755
浏览文件 @ c051268e
差异被折叠。
dev-union/src/main/resources/bill2.html 0 → 100755
浏览文件 @ c051268e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<title>Document</title>
<style>
body{
font-family:SimHei;
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page {
size:210mm 297mm;
/*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/
/*-fs-flow-right: "right";*/
/*border: thin solid black;*/
/*padding: 1em;*/
}
#footer {
font-size: 90%; font-style: italic;
position: absolute; top: 0; left: 0;
-fs-move-to-flow: "footer";
}
#pagenumber:before {
content: counter(page);
}
#pagecount:before {content: counter(pages);
}
.returnTablePrint{
width: 100%;
height: 100%;
overflow: hidden;
color: #000;
cursor: default;
}
.returnTablePrint .content{
width: 100%;
height: 100%;
/* background: url("../../../assets/img/detailsBg.png") no-repeat; */
/*background-size: 100% 100%;*/
/*padding: 30px;*/
/*box-sizing: border-box;*/
}
.returnTablePrint .content>div{
width: 100%;
height: 100%;
background: #fff;
/* padding: 30px; */
box-sizing: border-box;
}
.returnTablePrint .content>p{
width: 100%;
text-align: center;
font-size: 22px;
font-weight: bold;
color: #4a475d;
}
.returnTablePrint .listWrapper{
/* width: 92%; */
margin: 0 auto;
/* padding: 0px 20px 20px 20px; */
height: calc(100% - 70px);
/*padding: 10px 30px;*/
box-sizing: border-box;
}
.returnTablePrint .list{
/* width: 92%; */
margin: 0 auto;
/* padding: 0px 20px 20px 20px; */
/* height: calc(100% - 75px); */
height:calc(100% - 12px)
}
.returnTablePrint .title{
width: 100%;
font-size: 20px;
text-align: center;
position: relative;
margin: 0 0 15px;
padding:0 20px;
box-sizing: border-box;
}
.returnTablePrint .title span:nth-child(2){
font-size: 28px;
color: #000000;
}
.returnTablePrint .title span:nth-child(2) span{
font-size: 20px;
color: #141414;
}
.returnTablePrint .main-title {
font-size: 28px;
color: #000000;
margin-bottom: 20px;
text-align: center;
}
table.altrowstable {
width: 100%;
font-size:20px;
color:#141414;
border-width: 0px;
border-color: #a9c6c9;
border-collapse: collapse;
text-align: center;
/*table-layout: fixed;*/
/*word-break:break-all;*/
}
table.altrowstable th {
border-width: 0px;
padding: 8px;
border-style: solid;
border-color: #a9c6c9;
}
table.altrowstable td {
border-width: 0px;
padding: 8px;
border-style: solid;
border-color: #a9c6c9;
/*word-break:break-all;*/
/*word-wrap : break-word;*/
}
.oddrowcolor{
background-color:#fff;
}
.evenrowcolor{
background-color:#fafafa;
}
.person{
color: #4a475b;
text-align: right;
font-size: 18pt;
}
.person > span{
display: inline-block;
margin-right: 30pt;
}
tr:nth-child(odd) {
background: #fafafa;
}
</style>
</head>
<body>
<!--<div id="footer" style=""> Page <span id="pagenumber"/> of <span id="pagecount"/> </div>-->
<div class="returnTablePrint">
<div class="content">
<div>
<div class="listWrapper">
<div class="list">
<p class="title">
<div class="main-title">
<span>
${title}
</span>
</div>
</p>
<table class="altrowstable" id="alternatecolor">
<tr>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>装备序列号</th>
</tr>
<#list documentDevices as dev>
<tr>
<td>${dev.model}</td><td>${dev.model}</td><td>${dev.parts}</td><td>${dev.category}</td><td>${dev.securityClassification}</td><td>${dev.applicationField}</td>
</tr>
</#list>
</table>
</div>
<p class="person" style="margin-top: 50px">
<span style="width: 200px;text-align: left">经办人：</span>
<span style="width: 200px;text-align: left">审核人：</span>
</p>
</div>
</div>
</div>
</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');-->
<!--}-->
<!--</script>-->
</body>
</html>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论