交接单：

快证：
1.查询生成交接单所需数据的表连接方式改为
PROD_GROUP_RELATION_T表连接DIC_UPLOAD_UNIT_T；
2.查询交接详单所需数据的标的连接方式改为
FILES表连接PROD_GROUP_RELATION_T表；
非快证：同快证

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

@@ -59,7 +59,7 @@ public class ReceiptApi {
                 //判断是否生成了交接单
                 if(mapList.size() == 0){
                     try {
-                        //查询特证交接单所需数据
+                        //查询特证交接单所需数据(制证库)
                         Map <String, Object> resultDate=receiptService.selectReceiptListDate(id, replaceDate(beginDate), replaceDate(expireDate));
                         ReceiptListEntity receiptListEntity=new ReceiptListEntity();
                         //邮寄证的单位代码设为人口大队的
@@ -81,7 +81,7 @@ public class ReceiptApi {
                         receiptListEntity.setCheckName(name);
                         //生成特证交接单
                         long S=receiptService.createReceiptList(receiptListEntity);
-                        //查询特证详单所需数据
+                        //查询特证详单所需数据(盈信库)
                         Map <String, Object> detailedData=receiptService.selectDetailedData2(id, replaceDate(beginDate), replaceDate(expireDate));
                         String uploadNo=(String) detailedData.get("UPLOAD_NO");
                         String acceptNo2=(String) detailedData.get("ACCEPT_NO");
@@ -125,7 +125,7 @@ public class ReceiptApi {
                 try {
                     //根据身份证号查组号
                     String groupNo=receiptService.selectGroupNoById(id, replaceDate(beginDate), replaceDate(expireDate));
-                    //查询详单所需数据
+                    //查询详单所需数据(制证库)
                     List <Map <String, Object>> receiptListDate=receiptService.selectReceiptListDate2(groupNo);
                     for (int i=0; i < receiptListDate.size(); i++) {
 

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

@@ -12,15 +12,15 @@ import java.util.Map;
 public interface ReceiptMapper {
 
     //根据身份证号查询特证交接单信息
-    @Select("select prod_group_t.group_no,prod_card_t.accept_no,prod_card_t.UPLOAD_NO as GAJG_DM,\n" +
+    @Select("select PROD_GROUP_RELATION_T.GROUP_NO,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
             "count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE \n" +
             "from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
             "left join SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO = prod_card_t.accept_no\n" +
-            "left join GROUP_NO on GROUP_NO.GROUP_NO = SPECIAL_CARD.GROUP_NO \n" +
             "left join task on task.task_id =SPECIAL_CARD.task_id \n" +
-            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(prod_card_t.UPLOAD_NO,0,9)= subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) \n" +
+            "LEFT JOIN PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.GROUP_NO = subStr(prod_card_t.ACCEPT_NO,0,8) \n" +
+            "LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO  \n" +
             "where prod_card_t.id_no=#{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate} \n" +
-            "group by GROUP_NO.GROUP_NO, prod_card_t.accept_no, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE, task.OLD_CARD_TYPE ")
+            "group by PROD_GROUP_RELATION_T.GROUP_NO,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,DIC_UPLOAD_UNIT_T.UNIT_NAME,task.CARD_TYPE,task.OLD_CARD_TYPE")
     public Map<String,Object> selectReceiptListDate(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //根据身份证号查组号
@@ -29,13 +29,15 @@ public interface ReceiptMapper {
 
     //根据组号查询普通证交接单信息
     @Select("select subStr(prod_card_t.accept_no,0,8) group_no,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
-            "count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no   \n" +
+            "count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,\n" +
+            "task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no  \n" +
             "from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
             "left join group_no on group_no.group_no =subStr(prod_card_t.accept_no,0,8)\n" +
             "left join task on task.task_id =group_no.task_id \n" +
-            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(prod_card_t.UPLOAD_NO,0,9)= subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) \n" +
+            "left join PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on subStr(prod_card_t.accept_no,0,8) = PROD_GROUP_RELATION_T.GROUP_NO \n" +
+            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK ON PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO \n" +
             "where substr(prod_card_t.accept_no,0,8) =substr(#{groupNo},0,8) and prod_card_t.accept_no not  in (select accept_no from SPECIAL_CARD where accept_no like #{groupNo} ) \n" +
-            "group by prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no")
+            "group by subStr(prod_card_t.accept_no,0,8), prod_card_t.accept_no, DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO, DIC_UPLOAD_UNIT_T.UNIT_NAME, task.CARD_TYPE, task.OLD_CARD_TYPE, prod_card_t.id_no, prod_card_t.sex_no, prod_card_t.upload_no ")
     public List<Map<String,Object>> selectReceiptListDate2(String groupNo);
 
     //查询这个组号是否已经生成交接单
@@ -72,21 +74,21 @@ public interface ReceiptMapper {
 
     //根据身份证号查询交接单详单信息
     @Select("select prod_card_t.upload_no, PROD_CARD_T.ACCEPT_NO, prod_card_t.name," +
-            "prod_card_t.SEX_NO, prod_card_t.id_no, DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,"+
-            "PROD_CARD_T.SIGN_GOVT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO GAJG_DM,receipt_list.ID\n" +
+            "prod_card_t.SEX_NO, prod_card_t.id_no,FILES.DWMC AS GAJG_MC,"+
+            "PROD_CARD_T.SIGN_GOVT,FILES.DWDM AS GAJG_DM,receipt_list.ID\n" +
             "from PRODYD_DBA.prod_card_t@PRODYD_LINK\n" +
-            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = subStr(prod_card_t.UPLOAD_NO,0,9) "+
+            "LEFT JOIN PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.GROUP_NO = subStr(prod_card_t.ACCEPT_NO,0,8) \n" +
+            "LEFT JOIN FILES on PROD_GROUP_RELATION_T.ORIGINAL_NO = FILES.SOURCE_FILE_NAME \n" +
             "left join  receipt_list on receipt_list.QR_CODE = subStr(prod_card_t.accept_no,0,8) \n" +
             "where PROD_CARD_T.ACCEPT_NO=#{acceptNo}")
     public Map<String,Object>selectDetailedData(String acceptNo);
 
     //根据身份证号查询交接单详单信息
-    @Select("select prod_card_t.upload_no,PROD_CARD_T.ACCEPT_NO," +
-            "prod_card_t.name,prod_card_t.SEX_NO,prod_card_t.id_no," +
-            "DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC,PROD_CARD_T.SIGN_GOVT,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO AS GAJG_DM," +
-            "receipt_list.ID\n" +
+    @Select("select prod_card_t.upload_no,PROD_CARD_T.ACCEPT_NO,prod_card_t.name,prod_card_t.SEX_NO,prod_card_t.id_no," +
+            "FILES.DWMC AS GAJG_MC,PROD_CARD_T.SIGN_GOVT,FILES.DWDM AS GAJG_DM,receipt_list.ID\n" +
             "from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
-            "left join PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK on subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) = subStr(prod_card_t.UPLOAD_NO,0,9) "+
+            "LEFT JOIN PRODYD_DBA.PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_RELATION_T.GROUP_NO = subStr(prod_card_t.ACCEPT_NO,0,8) \n" +
+            "LEFT JOIN FILES on PROD_GROUP_RELATION_T.ORIGINAL_NO = FILES.SOURCE_FILE_NAME \n" +
             "left join  receipt_list on receipt_list.QR_CODE =prod_card_t.accept_no \n" +
             "where prod_card_t.id_no=#{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate}")
     public Map<String,Object>selectDetailedData2(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);