更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/AllotBillSelectController.java

@@ -67,7 +67,9 @@ public class AllotBillSelectController {
     @ApiOperation(value = "查询配发单详情页", notes = "可以通过这个接口查询配发单")
     @GetMapping(value = "/archives/allot/detail/{id}")
     public ResponseEntity selectAllotBillDetail(@PathVariable("id") int id) {
+        //获取所有装备id map
         Map<Integer,DeviceLibrary> deviceLibraryMap = deviceLibraryService.getAllDeviceMap();
+        //返回的数组
         List<Object> list = new ArrayList<>();
         //set账单用户名称并添加
         AllotBill allotBillEntity = allotBillService.getOne(id);
@@ -79,10 +81,12 @@ public class AllotBillSelectController {
         if (allotBillEntity.getReceiveUserbId() != null) {
             allotBillEntity.setReceiveUserB(userService.getOne(allotBillEntity.getReceiveUserbId()).getName());
         }
+        //转换文件
         allotBillEntity.setSendFileList(FilesUtil.stringFileToList(allotBillEntity.getSendFiles()));
         allotBillEntity.setReceiveFileList(FilesUtil.stringFileToList(allotBillEntity.getReceiveFiles()));
         allotBillEntity.setReplyFileList(FilesUtil.stringFileToList(allotBillEntity.getReplyFiles()));
         allotBillEntity.setApplyFileList(FilesUtil.stringFileToList(allotBillEntity.getApplyFiles()));
+        //转换单据
         if (allotBillEntity.getScriptJson()!=null){
             allotBillEntity.setScripts(JacksonUtil.readValue(allotBillEntity.getScriptJson(),new TypeReference<List<ScriptSaveVo>>() {}));
         }
@@ -101,7 +105,9 @@ public class AllotBillSelectController {
     @ApiOperation(value = "查询退回单详情页", notes = "可以通过这个接口查询退回单")
     @GetMapping(value = "/archives/back/detail/{id}")
     public ResponseEntity selectBackBillDetail(@PathVariable("id") int id) {
+        //获取所有装备id map
         Map<Integer,DeviceLibrary> deviceLibraryMap = deviceLibraryService.getAllDeviceMap();
+        //返回的数组
         List<Object> list = new ArrayList<>();
         //set账单用户名称并添加
         AllotBackBill allotBillEntity = allotBackBillService.getOne(id);

dev-allot/src/main/java/com/tykj/dev/device/allot/subject/domin/AllotBill.java

@@ -241,37 +241,47 @@ public class AllotBill {
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
 
+    @ApiModelProperty(value = "装备集合")
     @Transient
     private List<DeviceLibrary> deviceLibraries;
 
+    @ApiModelProperty(value = "批复文号文件")
     @Column(name = "reply_files",columnDefinition = "TEXT")
     private String replyFiles;
 
+    @ApiModelProperty(value = "申请文号文件")
     @Column(name = "apply_files",columnDefinition = "TEXT")
     private String applyFiles;
 
+    @ApiModelProperty(value = "发件方回执单")
     @Column(name = "send_files",columnDefinition = "TEXT")
     private String sendFiles;
 
+    @ApiModelProperty(value = "收件方签收单")
     @Column(name = "receive_files",columnDefinition = "TEXT")
     private String receiveFiles;
 
-
+    @ApiModelProperty(value = "单据集合json")
     @Column(name = "script_json",columnDefinition = "TEXT")
     private String scriptJson;
 
+    @ApiModelProperty(value = "单据集合")
     @Transient
     private List<ScriptSaveVo> scripts = new ArrayList<>();
 
+    @ApiModelProperty(value = "批复文号文件集合")
     @Transient
     private List<FileRet> replyFileList = new ArrayList<>();
 
+    @ApiModelProperty(value = "申请文号文件集合")
     @Transient
     private List<FileRet> applyFileList = new ArrayList<>();
 
+    @ApiModelProperty(value = "发件方回执单集合")
     @Transient
     private List<FileRet> sendFileList = new ArrayList<>();
 
+    @ApiModelProperty(value = "收件方签收单集合")
     @Transient
     private List<FileRet> receiveFileList = new ArrayList<>();
 }

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java

@@ -133,8 +133,20 @@ public class RepairBillSelectController {
     @ApiOperation(value = "查询领取单", notes = "可以通过这个接口查询领取单")
     @PostMapping(value = "/archives/repairBack/summary")
     public ResponseEntity selectRepairBackBill(@RequestBody RepairBillSelectVo repairBillSelectVo) {
-//        Page<RepairBackBill> page = repairBackBillService.getPage(repairBillSelectVo, repairBillSelectVo.getPageable());
-        return ResultUtil.success(repairBackBillService.getPage(repairBillSelectVo, repairBillSelectVo.getPageable()));
+        Page<RepairBackBill> repairBackBills =repairBackBillService.getPage(repairBillSelectVo, repairBillSelectVo.getPageable());
+        repairBackBills.getContent().forEach(repairBackBill -> {
+            if (repairBackBill.getStartUseraId() != null) {
+                repairBackBill.setStartUserA(userPublicService.getOne(repairBackBill.getStartUseraId()).getName());
+            }
+            repairBackBill.setStartUserB(repairBackBill.getAgent());
+            if (repairBackBill.getReceiveUseraId() != null) {
+                repairBackBill.setReceiveUserA(userPublicService.getOne(repairBackBill.getReceiveUseraId()).getName());
+            }
+            if (repairBackBill.getReceiveUserbId() != null) {
+                repairBackBill.setReceiveUserB(userPublicService.getOne(repairBackBill.getReceiveUserbId()).getName());
+            }
+        });
+        return ResultUtil.success(repairBackBills);
     }
 
     @ApiOperation(value = "查询维修单详情", notes = "可以通过这个接口查询维修单详情")

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

@@ -359,7 +359,7 @@
                                 </div>
                                 <div style="display:inline-block;text-align:center; width: 33%; font-size: 10px;"
                                     class="number">
-                                    <span>(${ul}!)</span>
+                                    <span>(${ul!})</span>
                                 </div>
                                 <div style="display:inline-block;text-align:right; width: 33%; font-size: 10px;"
                                     class="number">
@@ -449,8 +449,16 @@
                                             <span class="value">${nameB1!}</span>
                                         </span>
                                     </div>
-                                    <div style="position: relative;left: 250px;top: 38px;">
-                                        <i style="bottom: 30px;right: 90px;">
+                                    <div style="left: 250px;top: 38px;">
+<!--<div style="position: relative;left: 250px;top: 38px;">-->
+                                        <#if srcB=='"1"'> 
+                                             <i style="position: absolute;bottom: 10px;right: -150px;">
+                                            <#else>
+                                                 <i style="position: absolute;bottom: 10px;right: -85px;">
+                                        </#if>
+                                        
+                                       
+<!--<i style="bottom: 30px;right: 90px;"> -->
                                             <span style="color: #000">
                                                 <span style="margin-bottom: 5px;">(公章)</span>
                                                 <span><span style="color: #fff;">1234</span>年<span
@@ -458,7 +466,8 @@
                                                         style="color: #fff;">0232</span>日</span>
                                                 <!--<div class="rightImg">-->
                                                     <!--<div id="pos1">-->
-                                                        <img style="position: absolute;bottom: 0px;right: 150px;width:80px;height:80px" src=${srcB} />
+                                                        <img id="imgB" style="position: fixed;bottom: 38px;right: 164px;width:80px;height:80px" src=${srcB} />
+
                                                     <!--</div>-->
                                                 <!--</div>-->
                                             </span>
@@ -479,3 +488,6 @@
 </body>
  
 </html>
+
+
+