Skip to content

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

[file 清退] bug的修改

上级 65147bf2
隐藏空白字符变更
内嵌 并排
正在显示 包含 117 行增加 和 56 行删除
dev-file/src/main/java/com/tykj/dev/device/file/entity/Documents.java
浏览文件 @ fa7b1996
......@@ -37,4 +37,10 @@ public class Documents {
@ApiModelProperty(name = "签章数据")
private String srcB;
@ApiModelProperty(name = "发件方经办人")
private String nameA;
@ApiModelProperty(name = "接收方人员")
private String nameB;
}
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ fa7b1996
......@@ -198,8 +198,21 @@ public class JavaToPdfHtmlFreeMarker {
data.put("senderUnit",documents.getSenderUnit());
data.put("page",page);
data.put("count",count);
data.put("srcA",documents.getSrcA());
data.put("srcB",documents.getSrcB());
if (documents.getSrcA()==null||documents.getSrcA().equals("")){
data.put("srcA"," ");
data.put("nameA"," ");
}else {
data.put("srcA","\""+documents.getSrcA()+"\"");
data.put("nameA",documents.getNameA());
}
if (documents.getSrcB()==null||documents.getSrcB().equals("")){
data.put("srcB"," ");
data.put("nameB"," ");
}else {
data.put("srcB","\""+documents.getSrcA()+"\"");
data.put("nameB",documents.getNameB());
}
List<DocumentDevice> list1=new ArrayList<>();
AtomicInteger i= new AtomicInteger(1);
list.forEach(
......
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ fa7b1996
......@@ -90,5 +90,7 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
@Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.ownUnit = :unitName where o.id in :idList")
int upDateLeftStatusAndOwnUnitName(Integer lifeStatus,String unitName,@Param("idList") List<Integer> idList);
List<DeviceLibrary> findAllByLifeStatus(Integer status);
}
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java
浏览文件 @ fa7b1996
......@@ -95,41 +95,47 @@ public class DeviceRepelDetail extends BaseEntity {
* 经办人
*/
@ApiModelProperty(value = "发件方id(A岗位)")
private Integer sendUserAId;
private Integer sendUseraId;
/**
* 经办人 名称
*/
@ApiModelProperty(value = "发件方名称(A岗位)")
private String sendUserAName;
private String senderUsera;
/**
* 签发人
*/
@ApiModelProperty(value = "签发人(B岗位)")
private String sendUserBName;
private String senderUserb;
/**
* 签发人
*/
@ApiModelProperty(value = "签发人(B岗位)")
private String sendUserbId;
/**
* 收件方 经办人
*/
@ApiModelProperty(value = "收件方id(A岗位)")
private Integer receiveUserAId;
private Integer receiveUseraId;
/**
* 收件方 经办人名称
*/
@ApiModelProperty(value = "收件方名称(A岗位)")
private String receiveUserAName;
private String receiveUserA;
/**
* 收件方id(B岗位)
*/
@ApiModelProperty(value = "收件方名称(B岗位)")
private String receiveUserBName;
private String receiveUserB;
/**
* 收件方id(B岗位)
*/
@ApiModelProperty(value = "收件方id(B岗位)")
private Integer receiveUserBId;
private Integer receiveUserbId;
/**
* 出库附件文件
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DevRepelVo.java
浏览文件 @ fa7b1996
......@@ -45,8 +45,11 @@ public class DevRepelVo {
*/
private Integer type;
private String typeName;
/**
* 形态name
*/
private String typeName;
/**
* 清退时间
*/
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/DeviceChooseRepel.java
浏览文件 @ fa7b1996
......@@ -20,6 +20,7 @@ import java.util.List;
@NoArgsConstructor
@ApiModel("选择选择页面")
public class DeviceChooseRepel {
private List<DeviceLibrary> deviceLibraries;
private List<DeviceLibrary> deviceLibrariesAbnormal;
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/OrderOutData.java
浏览文件 @ fa7b1996
......@@ -71,41 +71,48 @@ public class OrderOutData {
* 经办人
*/
@ApiModelProperty(value = "发件方id(A岗位)")
private Integer sendUserAId;
private Integer sendUseraId;
/**
* 经办人 名称
*/
@ApiModelProperty(value = "发件方名称(A岗位)")
private String sendUserAName;
private String senderUsera;
/**
* 签发人
*/
@ApiModelProperty(value = "签发人(B岗位)")
private String sendUserBName;
private String senderUserb;
/**
* 签发人
*/
@ApiModelProperty(value = "签发人(B岗位)")
private String sendUserbId;
/**
* 收件方 经办人
*/
@ApiModelProperty(value = "收件方id(A岗位)")
private Integer receiveUserAId;
private Integer receiveUseraId;
/**
* 收件方 经办人名称
*/
@ApiModelProperty(value = "收件方名称(A岗位)")
private String receiveUserAName;
private String receiveUserA;
/**
* 收件方id(B岗位)
*/
@ApiModelProperty(value = "收件方名称(B岗位)")
private String receiveUserBName;
private String receiveUserB;
/**
* 收件方id(B岗位)
*/
@ApiModelProperty(value = "收件方id(B岗位)")
private Integer receiveUserBId;
private Integer receiveUserbId;
/**
* 出库附件文件
*/
......@@ -165,6 +172,10 @@ public class OrderOutData {
@ApiModelProperty(value = "清退单文件")
private List<FileRet> billFileList;
@ApiModelProperty(value = "发件单位签章id")
private String leftSignatureId;
@Transient
private List<FileRet> replyFileList = new ArrayList<>();
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/StorageDeviceRepel.java
浏览文件 @ fa7b1996
......@@ -35,6 +35,8 @@ public class StorageDeviceRepel {
*/
private List<FileRet> outFiles;
private Integer isIgnore;
private Integer userId;
private Integer taskId;
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/RepelBusinessService.java
浏览文件 @ fa7b1996
package com.tykj.dev.device.sendback.service;
import com.tykj.dev.device.file.entity.FileRet;
import com.tykj.dev.device.sendback.entity.domain.DeviceRepel;
import com.tykj.dev.device.sendback.entity.domain.DeviceRepelDetail;
import com.tykj.dev.device.sendback.entity.vo.OrderOutData;
......@@ -9,7 +8,6 @@ import com.tykj.dev.device.sendback.entity.vo.ResolveConfirm;
import com.tykj.dev.device.sendback.entity.vo.StorageDeviceRepel;
import com.tykj.dev.device.user.subject.entity.SecurityUser;
import java.util.List;
public interface RepelBusinessService {
......@@ -79,7 +77,6 @@ public interface RepelBusinessService {
*/
void oneselfRepel(Integer taskId,StorageDeviceRepel storageDeviceRepel,Integer userId);
/**
* 省直属任务等待上传
*/
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ fa7b1996
......@@ -482,7 +482,6 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
orderOutDataRepelDetail.setId(deviceRepelDetail.getId());
orderOutDataRepelDetail.setRepelId(deviceRepelDetail.getRepelId());
orderOutDataRepelDetail.setDeviceIds(deviceRepelDetail.getDeviceIds());
orderOutDataRepelDetail.setLeftSignatureId(UUID.randomUUID().toString());
orderOutDataRepelDetail.setRightSignatureId(UUID.randomUUID().toString());
orderOutDataRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+taskBto.getBillId());
orderOutDataRepelDetail.setReplyFiles(FilesUtil.stringFileToList(orderOutData.getReplyFileList()));
......@@ -514,16 +513,16 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
List<RepelDeviceUnit> list=new ArrayList<>();
TaskBto taskBto= taskService.get(taskId);
DeviceRepelDetail deviceRepelDetail = deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setReceiveUserBName(storageDeviceRepel.getUserBName());
deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
if (storageDeviceRepel.getUserB()!=null){
deviceRepelDetail.setReceiveUserBId(storageDeviceRepel.getUserB());
deviceRepelDetail.setReceiveUserbId(storageDeviceRepel.getUserB());
}
if (storageDeviceRepel.getUserA()!=null){
deviceRepelDetail.setReceiveUserAId(storageDeviceRepel.getUserA());
deviceRepelDetail.setReceiveUseraId(storageDeviceRepel.getUserA());
}
deviceRepelDetail.setReceiveUserAName(storageDeviceRepel.getUserBName());
deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserBName());
//判断是否为入库单据待补充 还是直接入库。
if (storageDeviceRepel.getFileRets()!=null&&storageDeviceRepel.getFileRets().size()!=0) {
List<StatusEnum> enumList=new ArrayList<>();
......@@ -534,11 +533,15 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
deviceRepelDetail.setRepelStatus(2);
taskService.moveToEnd(taskBto);
}else {
//判断当前状态是否为SEND_BACK_1209 清退装备等待入库
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SEND_BACK_1209);
taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1215,0);
}
} else {
if (storageDeviceRepel.getIsIgnore()==null) {
//判断当前状态是否为SEND_BACK_1209 清退装备等待入库
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), StatusEnum.SEND_BACK_1209);
taskService.moveToSpecial(taskBto, StatusEnum.SEND_BACK_1215, 0);
}else {
taskService.moveToEnd(taskBto);
}
}
//判断是否为 市提交 是则为在库
//否则为待清退
......@@ -675,9 +678,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepelDetail deviceRepelDetail=deviceRepelDetailService.findDeviceRepelDetail(taskBto.getBillId());
deviceRepelDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceRepel.getFileRets()));
// deviceRepelDetail.setReceiveUserAId(storageDeviceRepel.getUserA());
deviceRepelDetail.setReceiveUserAName(storageDeviceRepel.getUserAName());
deviceRepelDetail.setReceiveUserA(storageDeviceRepel.getUserAName());
// deviceRepelDetail.setReceiveUserBId(storageDeviceRepel.getUserB());
deviceRepelDetail.setReceiveUserBName(storageDeviceRepel.getUserBName());
deviceRepelDetail.setReceiveUserB(storageDeviceRepel.getUserBName());
taskService.moveToEnd(taskBto);
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java
浏览文件 @ fa7b1996
......@@ -70,7 +70,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
List<DeviceLibrary> deviceLibraries=new ArrayList<>();
List<DeviceLibrary> deviceLibrariesAbnormal=new ArrayList<>();
Units units= unitsService.findById(unitId);
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding,units.getName()).forEach(
deviceLibraryDao.findAllByPackingIdInAndOwnUnit(fielding,units.getName()).stream().map(DeviceLibrary::setConfigName).forEach(
deviceLibrary -> {
if (deviceLibrary.getOwnUnit().equals(deviceLibrary.getLocationUnit())){
if (deviceLibrary.getLifeStatus()==2||deviceLibrary.getLifeStatus()==15 ||deviceLibrary.getLifeStatus()==4) {
......@@ -81,7 +81,6 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
}
);
return new DeviceChooseRepel(deviceLibraries,deviceLibrariesAbnormal);
}
......@@ -123,17 +122,17 @@ public class RepelQueryServiceImpl implements RepelQueryService {
public List<DevRepelVo> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo) {
Units units= unitsService.findById(modelAndTypeVo.getUnitId());
if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream()
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
.map(this::devRepelVo).collect(Collectors.toList());
}else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
.map(this::devRepelVo).collect(Collectors.toList());
}else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream()
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
.filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
.map(this::devRepelVo).collect(Collectors.toList());
}else {
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
.filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
.map(this::devRepelVo).collect(Collectors.toList());
}
......@@ -149,9 +148,9 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override
public List<ModelNameGroup> retiredList(RepelManagementVo repelManagementVo) {
Units units= unitsService.findById(repelManagementVo.getUnitId());
// Units units= unitsService.findById(repelManagementVo.getUnitId());
return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),DeviceLifeStatus.RETIRE.id).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
return toModelNameGroup(deviceLibraryDao.findAllByLifeStatus(DeviceLifeStatus.RETIRE.id).stream().filter(deviceLibrary ->deviceLibrary.getUpdateTime()==null ||(deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime())).collect(Collectors.toList()));
}
......@@ -191,7 +190,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
@Override
public List<DevRepelVo> repelManagementListDetails(List<Integer> ids) {
return deviceLibraryDao.findAllById(ids).stream().map(this::devRepelVo).collect(Collectors.toList());
return deviceLibraryDao.findAllById(ids).stream().map(DeviceLibrary::setConfigName).map(this::devRepelVo).collect(Collectors.toList());
}
@Override
......@@ -222,7 +221,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
}
private DevRepelVo devRepelVo(DeviceLibrary deviceLibrary){
return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType(),deviceLibrary.setConfigName().getTypeName(),deviceLibrary.getUpdateTime());
return new DevRepelVo(deviceLibrary.getId(),deviceLibrary.getName(),deviceLibrary.getModel(),deviceLibrary.getSeqNumber(),deviceLibrary.getType(),deviceLibrary.getTypeName(),deviceLibrary.getUpdateTime());
}
private List<DeviceLibrary> findInvoleDevice(String involeDevice){
......
dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainController.java
浏览文件 @ fa7b1996
......@@ -57,4 +57,5 @@ public class TrainController {
return ResponseEntity.ok(trainThemeService.findById(trainThemeId));
}
}
dev-union/src/main/resources/bill.html
浏览文件 @ fa7b1996
......@@ -11,7 +11,7 @@
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page {
size:210mm 297mm;
size:297mm 210mm;
}
.bottomTxt {
text-align: center;
......@@ -130,7 +130,7 @@
border-bottom: 1px solid #7f7f7f;
}
.returnTablePrint .tableList{
height: 825px;
height: 500px;
}
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff;
......@@ -244,13 +244,23 @@
}
table.altrowstable td {
border-width: 0px;
padding: 5px;
padding: 2px 5px;
/*border-style: solid;*/
/*border-color: #a9c6c9;*/
word-break: break-all;
word-wrap: break-word;
border-bottom: 1px solid #bebebe;
}
.leftImg {
position: absolute;
top: -53px;
right: 85px;
}
.rightImg {
position: absolute;
bottom: 0px;
right: 70px;
}
.oddrowcolor{
background-color:#fff;
}
......@@ -302,7 +312,7 @@
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<tr>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 300px;">装备序列号</th>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th>
</tr>
<#list documentDevices as dev>
<tr>
......@@ -330,18 +340,20 @@
</span>
<span>
<span class="label">签发人:</span>
<span class="value">签发人</span>
<span class="value"></span>
</span>
<span>
<span class="label">经办人:</span>
<span class="value">经办人</span>
<span class="value">${nameA}</span>
</span>
<i>
<span style="position: relative;color: #646464">
<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>
<div style="position: absolute">
<div id="pos0" ></div>
<div class="leftImg">
<div id="pos0" >
<img style="width:80px;height:80px" src=${srcA} class="" id=""/>
</div>
</div>
</span>
</i>
......@@ -353,16 +365,21 @@
</span>
<span>
<span class="label">经办人:</span>
<span class="value">经办人</span>
<span class="value">${nameB}</span>
</span>
<span>
<span class="label">经办人:</span>
<span class="value">经办人</span>
<span class="value"></span>
</span>
<i>
<span style="color: #646464">
<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>
<div class="rightImg">
<div id="pos1" >
<img style="width:80px;height:80px" src=${srcB} class="" id=""/>
</div>
</div>
</span>
</i>
</span>
......
dev-union/src/main/resources/bill1.html
浏览文件 @ fa7b1996
......@@ -9,7 +9,7 @@
}
/*@page{size:297mm 210mm;}<!-- 设置PDF页面大小，此配置只对生成PDF文件有效，不会对页面显示生效 -->*/
@page {
size:210mm 297mm;
size:297mm 210mm;
/*margin: 0.25in;*/
/*-fs-flow-bottom: "footer";*/
/*-fs-flow-left: "left";*/
......@@ -142,7 +142,7 @@
border-bottom: 1px solid #7f7f7f;
}
.returnTablePrint .tableList{
height: 825px;
height: 500px;
}
.returnTablePrint .line2>>>.el-table tbody tr:nth-child(odd) {
background-color:#fff;
......@@ -252,7 +252,7 @@
}
table.altrowstable td {
border-width: 0px;
padding: 5px;
padding: 2px 5px;
/*border-style: solid;*/
/*border-color: #a9c6c9;*/
border: 1px solid #bebebe;
......@@ -310,7 +310,7 @@
<div class="line2 tableList">
<table class="altrowstable" id="alternatecolor">
<tr>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 300px;">装备序列号</th>
<th>序号</th><th>型号</th><th>形态</th><th>密级</th><th>应用领域</th><th>数量</th><th style="width: 420px;">装备序列号</th>
</tr>
<#list documentDevices as dev>
<tr>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论