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

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

@@ -40,6 +40,14 @@ public interface DetailReceiptListMapper {
             "where RECEIPT_LIST.id in (${str}) ")
     public boolean updateReceiptListEntityByCardId(@Param("str") String str, @Param("name") String name);
 
+    /**
+     * 查询制证类型
+     * @return
+     */
+    @Select("SELECT CARD_TYPE_ID,OLD_CARD_TYPE_ID,QR_CODE FROM RECEIPT_LIST \n" +
+            "WHERE ID in (${str})")
+    public List<Map<String,Object>> selectCardTypeMap(@Param("str") String str);
+
     /**
      * 查询交接单
      * @return
@@ -48,9 +56,16 @@ public interface DetailReceiptListMapper {
             "POLICE_CODE,FINISH_COUNT,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "from RECEIPT_LIST \n" +
             "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
-            "left join CARD_TYPE_DIC  on RECEIPT_LIST.CARD_TYPE_ID  = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
-            "where  RECEIPT_LIST.id in (${str}) order by receipt_date")
-    public List<Map<String, Object>> selectPoliceDataById(@Param("str") String str);
+            "left join CARD_TYPE_DIC on RECEIPT_LIST.CARD_TYPE_ID  = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "where RECEIPT_LIST.QR_CODE = #{groupNo} order by receipt_date")
+    public Map<String, Object> selectPoliceDataById(@Param("groupNo") String groupNo);
+
+    @Select("select QR_CODE,to_char(receipt_date,'yyyyMMddHH24') receipt_date ,\n" +
+            "POLICE_CODE,FINISH_COUNT,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,'异地速递' CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "from RECEIPT_LIST \n" +
+            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO = RECEIPT_LIST.POLICE_CODE\n" +
+            "where RECEIPT_LIST.QR_CODE = #{groupNo} order by receipt_date")
+    public Map<String, Object> selectPoliceDataById0(@Param("groupNo") String groupNo);
 
     /**
      * 查询详单信息

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

@@ -5,7 +5,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yxproject.start.service.DetailReceiptListService;
 import com.yxproject.start.mapper.DetailReceiptListMapper;
+import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +31,20 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
                 str+=stringList.get(i)+",";
             }
         }
-        return detailReceiptListMapper.selectPoliceDataById(str);
+        List<Map<String,Object>> cardTypeListMap = detailReceiptListMapper.selectCardTypeMap(str);
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (Map<String,Object> cardTypeMap : cardTypeListMap){
+            Map<String, Object> map = new HashMap<>();
+            String groupNo = cardTypeMap.get("QR_CODE").toString();
+            if (StringUtils.isEmpty(cardTypeMap.get("OLD_CARD_TYPE_ID"))){
+                map = detailReceiptListMapper.selectPoliceDataById(groupNo);
+                list.add(map);
+            }else {
+                map = detailReceiptListMapper.selectPoliceDataById0(groupNo);
+                list.add(map);
+            }
+        }
+        return list;
     }
 
     @Override