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

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

@@ -19,7 +19,7 @@ public interface ReceiptMapper {
             "left join SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO = prod_card_t.accept_no\n" +
             "left join task on task.task_id =SPECIAL_CARD.task_id \n" +
             "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
-            "where prod_card_t.id_no='110105201209259835' \n" +
+            "where prod_card_t.id_no=#{id} \n" +
             "group by prod_group_t.group_no, prod_card_t.accept_no, subStr(prod_card_t.UPLOAD_NO,0,9), GAJG_DM.GAJG_MC, task.CARD_TYPE, \n" +
             "task.OLD_CARD_TYPE ")
     public Map<String,Object> selectReceiptListDate(String id);
@@ -90,7 +90,6 @@ public interface ReceiptMapper {
 
 
 
-
     //生成交接单详单
     @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID)" +
             "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID})")

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

@@ -874,7 +874,7 @@ public interface TaskListMapper {
             "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no  " +
-            " where SPECIAL_CARD.SPECIAL_TYPE =2  and task.TASK_STATE_ID =#{process} " +
+            " where SPECIAL_CARD.SPECIAL_TYPE =1  and task.TASK_STATE_ID =#{process} " +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
             "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
@@ -882,7 +882,7 @@ public interface TaskListMapper {
 
     /**
      * 任务单查询
-     *  辅助库、制证库 余证
+     *  辅助库、制证库 余证 电写入
      * @param process 工序
      * @return
      */