push

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

@@ -280,7 +280,7 @@ public class ReceiptApi {
         JSONArray jsonArray = JSONArray.fromObject(jsonStr);
         for (int i = 0; i < jsonArray.size(); i++) {
             Map<String, Object> resultMap = (Map<String, Object>) jsonArray.get(i);
-            receiptService.updateDetail(resultMap.get("acceptNo").toString(), resultMap.get("note").toString());
+            receiptService.updateDetail(formateAcceptNo(resultMap.get("acceptNo").toString()), resultMap.get("note").toString());
         }
         return true;
     }
@@ -347,6 +347,14 @@ public class ReceiptApi {
         } else return str;
     }
 
+    /**
+     * 格式化受理组号
+     * @param acceptNo
+     * @return
+     */
+    private String formateAcceptNo(String acceptNo){
+        return acceptNo.replace("e", "E").replace("g", "G").replace("l","L");
+    }
     /**
      * 去除字符串中中线
      *

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

@@ -22,7 +22,7 @@ public interface DetailReceiptListMapper {
      */
     @Select("select DETAIL_RECEIPT_LIST.id,DETAIL_RECEIPT_LIST.ACCEPT_NO,DETAIL_RECEIPT_LIST.NAME,DETAIL_RECEIPT_LIST.UPLOAD_NO,\n" +
             "DETAIL_RECEIPT_LIST.sex,DETAIL_RECEIPT_LIST.CARD_ID,DETAIL_RECEIPT_LIST.POLICE_CODE,\n" +
-            "to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER\n" +
+            "to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') CHECK_DATE,RECEIPT_LIST.CHECK_NAME,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.OLD_CARD_TYPE_ID,PERSON_POST.WAYBILL_NUMBER,DETAIL_RECEIPT_LIST.note\n" +
             "from DETAIL_RECEIPT_LIST left join RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.ID\n" +
             "left join PERSON_POST on PERSON_POST.FIRST_WHITE = DETAIL_RECEIPT_LIST.UPLOAD_NO\n" +
             "where to_char(RECEIPT_LIST.CHECK_DATE,'yyyyMMdd') =#{date}")

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

@@ -234,7 +234,7 @@ public interface ReceiptMapper {
     public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
 
 
-    @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo}")
+    @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo} or CARD_ID= #{acceptNo}")
     public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
 
     /**

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

@@ -24,7 +24,7 @@ public interface TaskListMapper {
     @Select("select DISTINCT CARD_TYPE_DIC.*, ACC_GROUP_T.* ,'000000' COUNTY_CODE,'0000' COUNTYNAME from ACC_CARD_T@ACCUYD_LINK \n" +
             "left join ACC_GROUP_T@ACCUYD_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
             "left join ACC_GROUP_RELATION_T@ACCUYD_LINK on ACC_GROUP_RELATION_T.group_no =ACC_GROUP_T.group_no\n" +
-            "left join CARD_TYPE_DIC on decode(substr(UPLOAD_NO,18,1),6,5,substr(UPLOAD_NO,18,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join CARD_TYPE_DIC on decode(substr(ORIGINAL_NO,21,1),6,5,substr(ORIGINAL_NO,21,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "where " +
             "ACC_GROUP_T.group_no not in (select group_no from group_no)\n" +
             "and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')=#{submitDate} \n" +
@@ -84,7 +84,7 @@ public interface TaskListMapper {
             "from ACC_CARD_T@ACCUYD_LINK \n" +
             "left join ACC_GROUP_T@ACCUYD_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no\n" +
             "left join ACC_GROUP_RELATION_T@ACCUYD_LINK on ACC_GROUP_RELATION_T.group_no =ACC_GROUP_T.group_no\n" +
-            "left join CARD_TYPE_DIC on decode(substr(UPLOAD_NO,18,1),6,5,substr(UPLOAD_NO,18,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "left join CARD_TYPE_DIC on decode(substr(ORIGINAL_NO,21,1),6,5,substr(ORIGINAL_NO,21,1)) =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "left join county_dic on substr(acc_card_t.upload_no,0,6)=  county_dic.COUNTY_CODE\n" +
             "where county_dic.COUNTY_CODE is not null and ACC_GROUP_T.deal_flag =3 and to_char(ACC_GROUP_T.IMPORT_TIME,'yyyyMMdd')= #{date}\n" +
             "and decode(substr(UPLOAD_NO,18,1),6,5,substr(UPLOAD_NO,18,1)) =#{typeCode} and substr(acc_card_t.upload_no,0,6) =#{countyCode}")

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

@@ -146,8 +146,8 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public boolean updateDetail(String accept, String note) {
-        receiptMapper.updateDetail(accept,note);
-        return false;
+
+        return receiptMapper.updateDetail(accept,note);
     }
 
     @Override