交接单

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

@@ -36,10 +36,8 @@ public class ReceiptApi {
     @RequestMapping("createReceiptList")
     @Transactional(rollbackFor = Exception.class)
     public boolean createReceiptList(@RequestParam("id") String id) {
-        System.out.println("11111111111111111111111111111111111");
             //判断是否是特证
             if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
-                System.out.println("222222222222222222222222222222222");
                 //查询这个受理号是否生成了交接单
                 int countAccept = receiptService.selectCountById(id);
                 //判断是否生成了交接单
@@ -75,12 +73,10 @@ public class ReceiptApi {
                     //已经生成特证交接单，不做操作。
                 }
             } else {
-                //判断组里有几个特证，去掉特证的交接单
-//                if (
-//
-//                ){}else()
+                //根据身份证号查组号
+               String groupNo= receiptService.selectGroupNoById(id);
                 //查询交接单所需数据
-                Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
+                Map<String, Object> receiptListDate = receiptService.selectReceiptListDate2(groupNo);
                 ReceiptListEntity receiptListEntity = new ReceiptListEntity();
                 receiptListEntity.setPoliceCode(receiptListDate.get("GAJG_DM").toString());
                 receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)receiptListDate.get("CARD_TYPE")+""));
@@ -146,6 +142,10 @@ public class ReceiptApi {
         return true;
     }
 
+
+
+
+
     /**
      * 查询交接单数据
      * @return
@@ -164,19 +164,6 @@ public class ReceiptApi {
         return resultMap;
     }
 
-//    /**
-//     * 根据身份证号查询任务单
-//     * @param id
-//     * @return
-//     */
-//    @RequestMapping("selectReceipt")
-//    public Map<String,Object> selectReceipt(@RequestParam("id") String id){
-//        Map<String,Object> resultMap=receiptService.selectReceiptListOfSpecialCard(id);
-//        if (resultMap==null){
-//            resultMap= receiptService.selectReceiptList(id);
-//        }
-//        return resultMap;
-//    }
 
     /**
      * 根据任务单查询详细信息

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

@@ -11,20 +11,38 @@ import java.util.Map;
 @Mapper
 public interface ReceiptMapper {
 
-    //根据身份证号查询交接单信息
-    @Select("select prod_group_t.group_no,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,9) as GAJG_DM," +
-            "prod_group_t.valid_count,GAJG_DM.GAJG_MC,\n" +
-            "task.CARD_TYPE,task.OLD_CARD_TYPE\n" +
-            "from prod_card_t@PROD_LINK\n" +
+    //根据身份证号查询特证交接单信息
+    @Select("select prod_group_t.group_no,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,9) as GAJG_DM,\n" +
+            "count(prod_card_t.accept_no) valid_count,GAJG_DM.GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE \n" +
+            "from prod_card_t@PROD_LINK \n" +
             "left join prod_group_t@PROD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
-            "left join group_no on prod_group_t.group_no = group_no.group_no \n"+
-            "left join task on  task.task_id =group_no.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=#{id}" +
-            "")
+            "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" +
+            "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);
 
+    //根据身份证号查组号
+    @Select("select subStr(ACCEPT_NO,0,8) as groupNo from prod_card_t where ID_NO=#{id}")
+    public String selectGroupNoById(String id);
+
+    //根据组号查询普通证交接单信息
+    @Select("select prod_group_t.group_no,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,9) as GAJG_DM,\n" +
+            "count(prod_card_t.accept_no) valid_count,GAJG_DM.GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE \n" +
+            "from prod_card_t@PROD_LINK \n" +
+            "left join prod_group_t@PROD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
+            "left join group_no on group_no.group_no = prod_group_t.group_no \n" +
+            "left join task on task.task_id =group_no.task_id \n" +
+            "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
+            "where prod_group_t.group_no=#{id} and prod_card_t.accept_no not  in (select accept_no from SPECIAL_CARD ) \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> selectReceiptListDate2(String id);
+
+
+
     //查询这个组号是否已经生成交接单
     @Select("select count(*) from receipt_list where QR_CODE=#{groupNo}")
     public int selectByGroupNo(String groupNo);
@@ -43,8 +61,6 @@ public interface ReceiptMapper {
     public boolean createReceiptList(ReceiptListEntity receiptListEntity);
 
 
-
-
     //根据身份证号查询交接单详单信息
     @Select("select prod_card_t.upload_no," +
             "PROD_CARD_T.ACCEPT_NO," +
@@ -140,8 +156,6 @@ public interface ReceiptMapper {
     public int selectReceiptById(@Param("id") String id);
 
 
-
-
     @Select("select \n" +
             "count(prod_trace_t.download_no)as download,\n" +
             "count(prod_trace_t.checker_no) as  checkerCount,\n" +
@@ -185,4 +199,9 @@ public interface ReceiptMapper {
     @Update("update DETAIL_RECEIPT_LIST set NOTE = #{note} WHERE ACCEPT_NO=#{acceptNo}")
     public boolean updateDetail(@Param("acceptNo")String accept,@Param("note")String note);
 
+
+
+
+
+
 }

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

@@ -67,4 +67,8 @@ public interface ReceiptService {
 
     public Map<String,Object>selectDetailedData2(String id);
 
+    public Map<String,Object> selectReceiptListDate2(String id);
+
+    public String selectGroupNoById(String id);
+
 }

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

@@ -174,6 +174,18 @@ public class ReceiptServiceImpl implements ReceiptService {
         return resultMap;
     }
 
+    @Override
+    public Map<String, Object> selectReceiptListDate2(String id) {
+        Map<String,Object> resultMap = receiptMapper.selectReceiptListDate2(id);
+        return resultMap;
+    }
+
+    @Override
+    public String selectGroupNoById(String id) {
+        String groupNo=receiptMapper.selectGroupNoById(id);
+        return groupNo;
+    }
+
     private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
         Map<String, Object> typeMap = new LinkedHashMap<>();
         for (Map o : maplist) {