Merge remote-tracking branch 'origin/dev' into dev

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

@@ -18,7 +18,7 @@ import java.util.Map;
 @RequestMapping("specialCardInfo")
 public class SelectApi {
     /**
-     * 根据 组号8、受理号10、身份证号18、任务单号查询11
+     * 根据 组号8、受理号10、身份证号18、任务单号11查询
      *
      */
     @Autowired
@@ -31,7 +31,6 @@ public class SelectApi {
         if (id.length() == 11) {
             List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByWorkOrderFromYX(id);
             List<Map<String, Object>> ACCdata = new ArrayList<>();
-
             List<Map<String, Object>> PRODData = new ArrayList<>();
             resultMap.put("workOrderData", workOrderData);
             resultMap.put("ACCdata", ACCdata);
@@ -49,7 +48,6 @@ public class SelectApi {
             List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
             List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
             List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
-
             resultMap.put("workOrderDate", workOrderData);
             resultMap.put("ACCdata", ACCdata);
             resultMap.put("PRODData", PRODData);

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

@@ -9,7 +9,7 @@ import java.util.Map;
 @Mapper
 public interface SelectSerialNumberMapper {
 
-    @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.DOWNLOAD_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
+    @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
             "            from TASK \n" +
             "            LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
             "            LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
@@ -17,7 +17,7 @@ public interface SelectSerialNumberMapper {
     public List<Map<String,Object>> selectByWorkOrder(String id);
 
 
-    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.DOWNLOAD_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
+    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
             "from TASK\n" +
             "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
             "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
@@ -25,7 +25,7 @@ public interface SelectSerialNumberMapper {
             "WHERE GROUP_NO =#{id}")
     public List<Map<String,Object>> selectByGroupNo(String id);
 
-    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.DOWNLOAD_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
+    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
             "from TASK\n" +
             "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
             "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +