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

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

@@ -82,6 +82,7 @@ public class ReceiptApi {
                 map.put("msg","已生成交接单");
                 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"));
                 return map;
             }
         } else {
@@ -144,6 +145,7 @@ public class ReceiptApi {
                     map.put("state",2);
                     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"));
                     return map;
                 }
             }

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

@@ -42,7 +42,7 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectReceiptListDate2(String id);
 
     //查询这个组号是否已经生成交接单
-    @Select("select id ,check_name from receipt_list where QR_CODE=#{groupNo}")
+    @Select("select id ,check_name ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=#{groupNo}")
     public List<Map<String,Object>> selectByGroupNo(String groupNo);
 
     //生成交接单
@@ -142,7 +142,7 @@ public interface ReceiptMapper {
     public boolean updateReceiptDateByReceiptId(@Param("receiptId") String receiptId);
 
     //根据输入id查询交接单是否生成
-    @Select("select id,CHECK_NAME from RECEIPT_LIST where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id}) ")
+    @Select("select id,CHECK_NAME ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id}) ")
     public List<Map<String,Object>> selectCountById(@Param("id") String id);
 
     //根据输入id查询是否生成详单