push

src/main/java/com/yxproject/start/api/TaskListApi.java

@@ -450,6 +450,15 @@ public class TaskListApi {
         return list;
     }
 
+    /**
+     * 查询已转出数量
+     */
+    @RequestMapping("getPrintOutCount")
+    public List<Map<String, Object>> getPrintOutCount() {
+        List<Map<String, Object>> printOutCount = taskListService.getPrintOutCount();
+        return printOutCount;
+    }
+
 
 //    /**
 //     *

src/main/java/com/yxproject/start/entity/ReceiptListEntity.java

@@ -22,8 +22,6 @@ public class ReceiptListEntity {
     private Long cardTypeId;
     private Long oldCardTypeId;
     private long isPrint;
-    private String recheckName;
-    private Time recheckDate;
 
     @Id
     @Column(name = "ID")
@@ -135,25 +133,6 @@ public class ReceiptListEntity {
         this.isPrint = isPrint;
     }
 
-    @Basic
-    @Column(name = "RECHECK_NAME")
-    public String getRecheckName() {
-        return recheckName;
-    }
-
-    public void setRecheckName(String recheckName) {
-        this.recheckName = recheckName;
-    }
-
-    @Basic
-    @Column(name = "RECHECK_DATE")
-    public Time getRecheckDate() {
-        return recheckDate;
-    }
-
-    public void setRecheckDate(Time recheckDate) {
-        this.recheckDate = recheckDate;
-    }
 
     @Override
     public boolean equals(Object o) {
@@ -170,13 +149,11 @@ public class ReceiptListEntity {
                 Objects.equals(checkDate, that.checkDate) &&
                 Objects.equals(checkName, that.checkName) &&
                 Objects.equals(cardTypeId, that.cardTypeId) &&
-                Objects.equals(oldCardTypeId, that.oldCardTypeId) &&
-                Objects.equals(recheckName, that.recheckName) &&
-                Objects.equals(recheckDate, that.recheckDate);
+                Objects.equals(oldCardTypeId, that.oldCardTypeId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state, cardTypeId, oldCardTypeId, isPrint, recheckName, recheckDate);
+        return Objects.hash(id, qrCode, receiptDate, policeCode, finishCount, checkDate, checkName, state, cardTypeId, oldCardTypeId, isPrint);
     }
 }

src/main/java/com/yxproject/start/mapper/TaskListMapper.java

@@ -1473,7 +1473,12 @@ public interface TaskListMapper {
             "WHERE TO_CHAR(TASK.QUALITY_TEST_DATE,'yyyy-MM-dd')=#{date}")
     public String selectCountQuality2(@Param("date")String date);
 
-
+    @Select("select sum(asum),sum(bsum) from (select sum(decode(TASK.WORK_GROUP,1,0,valid_count)) asum,sum(decode(TASK.WORK_GROUP,2,0,valid_count)) bsum from TASK left join GROUP_NO on GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
+            "where to_char(PRINT_OUT_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd')\n" +
+            "UNION all\n" +
+            "select sum(decode(TASK.WORK_GROUP,1,0,1)) asum,sum(decode(TASK.WORK_GROUP,2,0,1)) bsum from SPECIAL_CARD left join TASK on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
+            "where to_char(PRINT_OUT_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd'))")
+    public List<Map<String,Object>> getPrintOutCount();
 
 
 

src/main/java/com/yxproject/start/service/TaskListService.java

@@ -100,4 +100,6 @@ public interface TaskListService {
 
     public String selectCountQuality2(@Param("date")String date);
 
+    public List<Map<String,Object>> getPrintOutCount();
+
 }

src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java

@@ -819,6 +819,12 @@ public class TaskListServiceImpl implements TaskListService {
     }
 
 
+    @Override
+    public List<Map<String, Object>> getPrintOutCount() {
+        taskListMapper.getPrintOutCount();
+        return null;
+    }
+
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {
             String groupNo = "";