push

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

@@ -72,6 +72,7 @@ public class ReceiptApi {
                     }
                     receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
                     receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
+                    map.put("qrCode",resultDate.get("ACCEPT_NO").toString());
                     receiptListEntity.setState((long) 0);
                     receiptListEntity.setCheckName(name);
                     //生成特证交接单
@@ -102,6 +103,8 @@ public class ReceiptApi {
                     map.put("show",false);
                     map.put("state",2);
                     map.put("msg","已生成交接单");
+                    List<Map<String, Object>> list = receiptService.selectQrCodeByCardID( id, beginDate, expireDate);
+                    map.put("qrCode",(list.size()>0?list.get(0).get("QR_CODE"):null));
                     map.put("id",mapList.get(0).get("ID"));
                     map.put("checkName",mapList.get(0).get("CHECK_NAME"));
                     map.put("policeName",mapList.get(0).get("GAJG_MC"));
@@ -135,6 +138,7 @@ public class ReceiptApi {
                     }
                     receiptListEntity.setFinishCount((long) receiptListDate.size());
                     receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
+                    map.put("qrCode",receiptListDate.get(i).get("GROUP_NO").toString());
                     // 状态0未复核
                     receiptListEntity.setState((long) 0);
                     receiptListEntity.setCheckName(name);
@@ -179,6 +183,8 @@ public class ReceiptApi {
                             map.put("msg","已生成交接单");
                             map.put("state",2);
                             map.put("id",mapList.get(0).get("ID"));
+                            List<Map<String, Object>> list = receiptService.selectQrCodeByCardID(id, beginDate, expireDate);
+                            map.put("qrCode",(list.size()>0?list.get(0).get("QR_CODE"):null));
                             map.put("checkName",mapList.get(0).get("CHECK_NAME"));
                             map.put("policeName",mapList.get(0).get("GAJG_MC"));
                         }catch (Exception e){

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

@@ -277,5 +277,9 @@ public interface ReceiptMapper {
             "</script>")
     public List<DetailReceiptListEntity> selectDetailNote(@Param("startDate") String startDate,@Param("endDate") String endDate ,@Param("name")String name);
 
+    @Select("select RECEIPT_LIST.QR_CODE from RECEIPT_LIST \n" +
+            "left join DETAIL_RECEIPT_LIST on DETAIL_RECEIPT_LIST.RECEIPT_ID = RECEIPT_LIST.id\n" +
+            "where DETAIL_RECEIPT_LIST.CARD_ID = #{id}")
+    public List<Map<String, Object>> selectQrCodeByCardID(@Param("id") String id, @Param("beginDate")String beginDate, @Param("expireDate")String expireDate);
 
 }

src/main/java/com/yxproject/start/service/ReceiptService.java

@@ -86,4 +86,5 @@ public interface ReceiptService {
 
     public List<Map<String,Object>> selectPoliceDataByDownLoadDate(String startDate,String endDate);
 
+    public List<Map<String,Object>> selectQrCodeByCardID(String id,String beginDate,String expireDate);
 }

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

@@ -348,6 +348,13 @@ public class ReceiptServiceImpl implements ReceiptService {
         return detailReceiptListEntityList;
     }
 
+    @Override
+    public List<Map<String, Object>> selectQrCodeByCardID(String id, String beginDate, String expireDate) {
+        List<Map<String, Object>> list = receiptMapper.selectQrCodeByCardID(id, beginDate, expireDate);
+        return list;
+    }
+
+
     private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
         Map<String, Object> typeMap = new LinkedHashMap<>();
         for (Map o : maplist) {