[清退 文件] 代码提交

dev-file/src/main/java/com/tykj/dev/device/file/entity/ConfirmDevice.java

@@ -62,9 +62,10 @@ public class ConfirmDevice {
             case "7":
                 category="密码软件";
                 break;
-
-            default:
+            case "8":
                 category="密码卡";
+            default:
+                category="-";
                 break;
 
         }

dev-file/src/main/java/com/tykj/dev/device/file/entity/DestructionDevice.java

@@ -69,9 +69,11 @@ public class DestructionDevice {
                 category="密码软件";
                 break;
 
-                default:
-                    category="密码卡";
-                    break;
+            case "8":
+                category="密码卡";
+            default:
+                category="-";
+                break;
 
         }
 

dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java

@@ -18,6 +18,10 @@ import lombok.NoArgsConstructor;
 @Data
 @ApiModel(value = "单据涉及装备实体", description = "单据涉及装备实体")
 public class DocumentDevice {
+
+    @ApiModelProperty(name = "序号")
+    private Integer code;
+
     @ApiModelProperty(name = "型号")
     private String model;
 
@@ -68,12 +72,14 @@ public class DocumentDevice {
                 category="密码软件";
                 break;
 
-            default:
+            case "8":
                 category="密码卡";
+
+            default:
+                category="-";
                 break;
 
         }
-
         switch (securityClassification){
             case "1":
                 securityClassification="绝密";
@@ -89,7 +95,6 @@ public class DocumentDevice {
                 break;
 
         }
-
         switch (applicationField){
             case "1":
                 applicationField="省一级";
@@ -103,9 +108,7 @@ public class DocumentDevice {
             default:
                 applicationField="无";
                 break;
-
         }
-
         return this;
     }
 }

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -16,6 +16,7 @@ import org.xhtmlrenderer.pdf.ITextRenderer;
 
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -208,6 +209,13 @@ public class JavaToPdfHtmlFreeMarker {
         data.put("receiveUnit",documents.getReceiveUnit());
         data.put("replyNum",documents.getReplyNum());
         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()));
         return data;
     }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java

@@ -632,9 +632,11 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
         Units units=unitsService.findById(user.getUnitsId());
         DeviceRepelDetail deviceRepelDetail=orderOutData.toTrainDetailsVo();
         deviceRepelDetail.setDeviceIds(StringUtils.ListToString(orderOutData.getDevIds()));
-        deviceRepelDetail.setNum("NO:第"+ LocalDateTime.now().getYear()+"QT"+deviceRepelDetail.getId());
         deviceRepelDetail.setOutboundFile(FilesUtil.stringFileToList(orderOutData.getOutboundFileList()));
         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()));
         sendOutSuperior(units.getUnitId(),deviceRepelDetail.getId(),null);
         return deviceRepelDetail;
@@ -715,7 +717,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
     private TaskBto cityInitiateTask(Integer unitId,Integer repelDetailId,String title,Integer userId){
         //省清退任务待市提交
         List<Integer> list=new ArrayList<>();
-        list.add(unitId);
+        list.add(userId);
         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-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -94,7 +94,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<ModelNameGroup> toRepelList(RepelManagementVo repelManagementVo) {
         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){

dev-union/src/main/resources/bill1.html

@@ -314,7 +314,7 @@
                             <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>
                                     </tr>
                                     <#list documentDevices as dev>
                                     <tr>