搜索框查询任务单信息去除特证导致的重复，添加上分拣时间和质检时间；

废证登记添加重做返回原因

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

@@ -19,7 +19,7 @@ public interface FailedCardMapper {
      *
      * @return
      */
-    @Select("select * from FAILED_CARD_REASON_DIC ")
+    @Select("select * from FAILED_CARD_REASON_DIC ORDER BY FAILED_CARD_REASON_ID")
     public List<FailedCardReasonDicEntity> selectFailedCardDic();
 
     /**

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

@@ -163,6 +163,16 @@ public interface ReceiptMapper {
             "where id=#{receiptId}")
     public boolean updateReceiptList(@Param("receiptId") String receiptId,@Param("checkName") String checkName,@Param("date") Date date);
 
+    @Select("select GROUP_NO.TASK_ID from RECEIPT_LIST \n" +
+            "left join GROUP_NO ON RECEIPT_LIST.QR_CODE = GROUP_NO.GROUP_NO \n" +
+            "WHERE RECEIPT_LIST.ID = #{receiptId}\n")
+    public String selectTaskId(@Param("receiptId") String receiptId);
+
+    //回写任务单的质检时间
+    @Update("update TASK set QUALITY_TEST_DATE = #{date},QUALITY_TEST_NAME = #{checkName} " +
+            "where TASK.TASK_ID=#{taskId}")
+    public boolean updateTaskListWithZJSJ(@Param("taskId") String taskId,@Param("checkName") String checkName,@Param("date") Date date);
+
     //根据传入的交接单ID和复核人ID插入复核人、复核时间
     @Update("update receipt_list set \n" +
             "RECEIPT_DATE = sysdate ,IS_PRINT=1 \n" +

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

@@ -29,7 +29,8 @@ public interface SelectSerialNumberMapper {
             "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
             "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
             "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count ,task.WORK_GROUP\n" +
-            "from TASK \n" +
+            "from SPECIAL_CARD \n" +
+            "LEFT JOIN TASK on SPECIAL_CARD.TASK_ID =  TASK.TASK_ID\n" +
             "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
             "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID =  TASK.TASK_ID\n" +
             "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +

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

@@ -86,6 +86,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     @Override
     public boolean updateReceiptList(String receiptId, String checkName, Date date) {
         receiptMapper.updateReceiptList(receiptId, checkName, date);
+        String taskId = receiptMapper.selectTaskId(receiptId);
+        receiptMapper.updateTaskListWithZJSJ(taskId,checkName,date);
         return true;
     }
     @Override

src/main/resources/static/views/searchCard/searchCard.html

@@ -44,8 +44,8 @@
                             <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                            <td>{{item.SORTING_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.QUALITY_TEST_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td>{{item.OUT_STORAGE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                         </tr>
                         </tbody>
                     </table>
@@ -160,4 +160,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>