push

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

@@ -134,7 +134,7 @@ public class ReceiptApi {
      * @return
      */
     @RequestMapping("selectRecriptData")
-    public List<Map<String, Object>> selectRecriptData() {
+    public List<Map<String, Object>> selectRecriptData(@RequestParam("name")String name) {
         //返回交接单数据
         List<Map<String, Object>> resultMap = receiptService.selectReceiptListOfSpecialCard();
         for (int i = 0; i < resultMap.size(); i++) {

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

@@ -1473,10 +1473,10 @@ 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) asum,sum(bsum) 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" +
+    @Select("select sum(asum) bsum,sum(bsum) asum  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(ISSUED_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" +
+            "select sum(decode(TASK.WORK_GROUP,1,0,1)) bsum,sum(decode(TASK.WORK_GROUP,2,0,1)) asum from SPECIAL_CARD left join TASK on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
             "where to_char(ISSUED_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd'))")
     public List<Map<String,Object>> getPrintOutCount();