更新

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

 package com.tykj.dev.device.file.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -16,41 +17,54 @@ import lombok.NoArgsConstructor;
 @Data
 public class ConfirmDevice {
 
+    @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 String deviceSerialNumber;
+
+    @ApiModelProperty(name = "备注")
+    private String remark;
+
+
     public ConfirmDevice toConfirmDevice(){
-        switch (parts){
+        switch (category){
             case "1":
-                parts="密码机";
+                category="密码机";
                 break;
             case "2":
-                parts="密码模块";
+                category="密码模块";
                 break;
             case "3":
-                parts="密码芯片";
+                category="密码芯片";
                 break;
             case "4":
-                parts="说明书";
+                category="说明书";
                 break;
             case "5":
-                parts="U盘";
+                category="U盘";
                 break;
             case "6":
-                parts="光盘";
+                category="光盘";
                 break;
             case "7":
-                parts="密码软件";
+                category="密码软件";
                 break;
 
             default:
-                parts="密码卡";
+                category="密码卡";
                 break;
 
         }

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

@@ -46,31 +46,31 @@ public class DestructionDevice {
     private String remark;
 
     public DestructionDevice toDestructionDevice(){
-        switch (parts){
+        switch (category){
             case "1":
-                parts="密码机";
+                category="密码机";
                 break;
             case "2":
-                parts="密码模块";
+                category="密码模块";
                 break;
             case "3":
-                parts="密码芯片";
+                category="密码芯片";
                 break;
             case "4":
-                parts="说明书";
+                category="说明书";
                 break;
             case "5":
-                parts="U盘";
+                category="U盘";
                 break;
             case "6":
-                parts="光盘";
+                category="光盘";
                 break;
             case "7":
-                parts="密码软件";
+                category="密码软件";
                 break;
 
                 default:
-                    parts="密码卡";
+                    category="密码卡";
                     break;
 
         }

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

@@ -45,31 +45,31 @@ public class DocumentDevice {
     @ApiModelProperty(name = "备注")
     private String remark;
     public DocumentDevice toDocumentDevice(){
-        switch (parts){
+        switch (category){
             case "1":
-                parts="密码机";
+                category="密码机";
                 break;
             case "2":
-                parts="密码模块";
+                category="密码模块";
                 break;
             case "3":
-                parts="密码芯片";
+                category="密码芯片";
                 break;
             case "4":
-                parts="说明书";
+                category="说明书";
                 break;
             case "5":
-                parts="U盘";
+                category="U盘";
                 break;
             case "6":
-                parts="光盘";
+                category="光盘";
                 break;
             case "7":
-                parts="密码软件";
+                category="密码软件";
                 break;
 
             default:
-                parts="密码卡";
+                category="密码卡";
                 break;
 
         }

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

@@ -150,7 +150,7 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     public List<ModelNameGroup> retiredList(RepelManagementVo repelManagementVo) {
         Units units=  unitsService.findById(repelManagementVo.getUnitId());
 
-        return toModelNameGroup(deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),DeviceLifeStatus.RETIRE.id).stream().filter(deviceLibrary -> deviceLibrary.getUpdateTime().getTime()>=repelManagementVo.getTime()&&deviceLibrary.getUpdateTime().getTime()<=repelManagementVo.getEndTime()).collect(Collectors.toList()));
+        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()));
 
     }
 

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

@@ -329,7 +329,7 @@
                                     </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.remark}</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.remark}</td>
                                     </tr>
                                 </#list>
                                 </table>