格式调整

common/src/main/java/com/jpsoft/printing/modules/base/entity/Work.java

@@ -98,4 +98,8 @@ public class Work {
     private BigDecimal totalAmount;
     @ApiModelProperty(value = "有无账单")
     private Boolean haveBills;
+    @ApiModelProperty(value = "总卷数")
+    private Integer totalStock;
+    @ApiModelProperty(value = "总长度")
+    private BigDecimal totalLength;
 }

web/src/main/java/com/jpsoft/printing/modules/base/controller/WorkController.java

@@ -265,7 +265,7 @@ public class WorkController {
         }
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("process_date","desc"));
 
         Page<Work> page = workService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
         for(Work work : page.getResult()){
@@ -281,6 +281,14 @@ public class WorkController {
             else{
                 work.setHaveBills(false);
             }
+
+            BigDecimal totalLength = BigDecimal.ZERO;
+            List<Stock> stockList = stockService.findList(work.getId());
+            for(Stock stock : stockList) {
+                totalLength = totalLength.add(stock.getTagLength());
+            }
+            work.setTotalStock(stockList.size());
+            work.setTotalLength(totalLength);
         }
 
         msgResult.setResult(true);