[文件模版] 提交更新

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -179,7 +179,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         TaskBto taskBto = taskService.get(taskId);
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SCRAP_2222);
         Scrap scrap=scrapService.findScrap(taskBto.getBillId());
-        scrap.setBillFile(FilesUtil.stringFileToList(storageScrap.getFileRets()));
+        scrap.setOutboundFile(FilesUtil.stringFileToList(storageScrap.getOutFiles()));
         List<String> seqNumbers=new ArrayList<>();
         JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
                 scriptSaveVo -> {
@@ -203,6 +203,12 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         if (storageScrap.getUserAName()!=null) {
             scrap.setReceiveUserA(storageScrap.getUserAName());
         }
+        if (storageScrap.getSenderId()!=null){
+            scrap.setSendUserbId(storageScrap.getSenderId());
+        }
+        if (storageScrap.getSenderName()!=null){
+            scrap.setSenderUserB(storageScrap.getSenderName());
+        }
         taskBto = taskService.moveToEnd(taskBto);
         scrap.setScrapStatus(taskBto.getBillStatus());
 

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

@@ -383,15 +383,11 @@
                                     <#list documentDevices as dev>
                                         <tr class="altrowstableTr">
                                             <td>
-                                                <#if dev.code != 0>
-                                                ${dev.code}
-                                            </#if>
+                                                ${dev.code!}
                                             </td>
                                             <td>${dev.model!}</td><td>${dev.category!}</td><td>${dev.securityClassification!}</td><td>${dev.applicationField!}</td>
                                             <td>
-                                                <#if dev.count != 0>
-                                                ${dev.count}
-                                            </#if>
+                                                ${dev.count!}
                                             </td>
                                             <td>${dev.deviceSerialNumber!}</td>
                                             <td>${dev.remark!}</td>
@@ -442,7 +438,7 @@
                                             <span class="value">${nameB1!}</span>
                                         </span>
                                     </div>
-                                    <div style="position: relative;left: 280px;top: 38px;">
+                                    <div style="position: relative;left: 250px;top: 38px;">
                                         <i>
                                             <span style="color: #646464">
                                                 <span style="margin-bottom: 5px;">(公章)</span>

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

@@ -191,7 +191,7 @@
                                     <th style="width: 150px;">型号</th>
                                     <th>形态</th>
                                     <th>密级</th>
-                                    <th>应用领域</th>
+                                    <th>状态</th>
                                     <th style="width: 150px;">装备序列号</th>
                                 </tr>
                                 <#list documentDevices as dev>