[zjm] 模版提交

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

@@ -24,7 +24,7 @@ public class Revenue {
     @ApiModelProperty(value = "型号")
     private String model;
 
-    @ApiModelProperty(value = "部件")
+    @ApiModelProperty(value = "名称")
     private String part;
 
     @ApiModelProperty(value = "横向")
@@ -54,4 +54,17 @@ public class Revenue {
     @ApiModelProperty(value = "报废")
     private Integer scrapped;
 
+    @ApiModelProperty(value = "销毁")
+    private Integer destory;
+
+
+    @ApiModelProperty(value = "丢失")
+    private Integer loss;
+
+    @ApiModelProperty(value = "丢失")
+    private String des;
+
+    private Integer oneCount;
+
+
 }

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

@@ -27,12 +27,6 @@ public class RevenueEntity {
     @ApiModelProperty(name = "决算单位")
     private String revenueUnit;
 
-    @ApiModelProperty(name = "决算专管员A")
-    private String revenueUserA;
-
-    @ApiModelProperty(name = "决算专管员B")
-    private String revenueUserB;
-
     @ApiModelProperty(name = "决算时间")
     private String time;
 }

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

@@ -298,27 +298,27 @@
                                         <td colspan="3" class="td13" style="text-align: left">${dev.seqStirng!}</td>
                                         <#elseif dev.oneCount == 14>
                                         <td colspan="3" class="td14" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 15>
                                         <td colspan="3" class="td15" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 16>
                                         <td colspan="3" class="td16" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 17>
                                         <td colspan="3" class="td17" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 18>
                                         <td colspan="3" class="td18" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 19>
                                         <td colspan="3" class="td19" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 20>
                                         <td colspan="3" class="td20" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 21>
                                         <td colspan="3" class="td21" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 22>
                                         <td colspan="3" class="td22" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 23>
                                         <td colspan="3" class="td23" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 24>
                                         <td colspan="3" class="td24" style="text-align: left">${dev.seqStirng!}</td>
-                                        <#elseif dev.oneCount == 14>
+                                        <#elseif dev.oneCount == 25>
                                         <td colspan="3" class="td25" style="text-align: left">${dev.seqStirng!}</td>
                                     </#if>
                                     </tr>
@@ -327,8 +327,11 @@
                         </div>
                     </div>
                     <p class="person" style="margin-top: 20px;font-size: 10px;width: 100%;text-align: left;">
-                        <span style="width: 200px;text-align: center;width: 49%;margin: 0;">制表单位：${unit!}</span>
-                        <span style="width: 200px;text-align: center;width: 49%;margin: 0;">制表时间：${time!}</span>
+                        <span style="width: 200px;text-align: center;width: 24%;margin: 0;">制表单位：${unit!}</span>
+                        <span style="width: 200px;text-align: center;width: 24%;margin: 0;">制表时间：${time!}</span>
+                        <span style="width: 200px;text-align: center;width: 24%;margin: 0;">经办人：</span>
+                        <span style="width: 200px;text-align: center;width: 24%;margin: 0;">审核人：</span>
+
                     </p>
                 </div>
             </div>