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

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

@@ -42,12 +42,13 @@ public class ReceiptApi {
                 Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
                 String acceptNo = (String) resultDate.get("ACCEPT_NO");
                 String GAJG_DM = (String) resultDate.get("GAJG_DM");
+                String GAJG_MC = (String) resultDate.get("GAJG_MC");
                 String cardType = (String) resultDate.get("CARD_TYPE");
                 String oldCardType = (String) resultDate.get("OLD_CARD_TYPE");
                 int state = 0;
                 int count = (int) resultDate.get("COUNT");
                 //生成特证交接单
-                receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType);
+                receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC);
                 //查询特证详单所需数据
                 Map<String, Object> detailedData = receiptService.selectDetailedData(id);
                 String uploadNo = (String) detailedData.get("UPLOAD_NO");
@@ -65,8 +66,10 @@ public class ReceiptApi {
         } else {
             //查询交接单所需数据
             Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
+            System.out.println("111111111111111111111"+receiptListDate);
             String groupNo = (String) receiptListDate.get("GROUP_NO");
             String GAJG_DM = (String) receiptListDate.get("GAJG_DM");
+            String GAJG_MC = (String) receiptListDate.get("GAJG_MC");
             String cardType = (String) receiptListDate.get("CARD_TYPE");
             String oldCardType = (String) receiptListDate.get("OLD_CARD_TYPE");
             int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString());
@@ -76,7 +79,7 @@ public class ReceiptApi {
             //没有生成交接单
             if (countGroup == 0) {
                 //生成交接单
-                receiptService.createReceiptList(groupNo, GAJG_DM, count, state,cardType,oldCardType);
+                receiptService.createReceiptList(groupNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC);
                 //查询这个身份证是否生成了详单
                 int receiptCount = receiptService.selectReceiptById(id);
                 //没有生成交接单详单
@@ -138,6 +141,7 @@ public class ReceiptApi {
             Map<String,Object> map=  receiptService.selectCountTime(groupNo);
             System.out.println("22222222222222222222222222222"+map.get("download"));
             resultMap.get(i).put("download",map.get("download"));
+//            resultMap.get(i).put("",map.get(""));
             resultMap.get(i).put("checkerCount",map.get("checkerCount"));
             resultMap.get(i).put("electricCount",map.get("electricCount"));
         }

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

@@ -10,12 +10,14 @@ import java.util.Map;
 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," +
+    @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" +
-            "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"+
-            "left join task on  task.task_id =group_no.task_id"+
+            "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}")
     public Map<String,Object> selectReceiptListDate(String id);
 
@@ -25,7 +27,7 @@ public interface ReceiptMapper {
 
     //生成交接单
     @Insert("INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,OLD_CARD_TYPE_ID)VALUES(#{GROUP_NO},#{GAJG_DM},#{count},#{state},#{cardType},#{oldCardType})")
-    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType);
+    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType,@Param("GAJG_MC")String GAJG_MC);
 
 
 
@@ -33,7 +35,7 @@ public interface ReceiptMapper {
     @Select("select prod_card_t.upload_no," +
             "PROD_CARD_T.ACCEPT_NO," +
             "prod_card_t.name," +
-            "prod_card_t.sex"+
+            "prod_card_t.SEX_NO,"+
             "prod_card_t.id_no," +
             "subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
             "receipt_list.ID\n" +
@@ -70,7 +72,7 @@ public interface ReceiptMapper {
 
 
     //查询未复核交接单
-    @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST where state=0\n")
+    @Select("SELECT RECEIPT_LIST.* ,GAJG_DM.GAJG_MC FROM RECEIPT_LIST LEFT JOIN GAJG_DM ON RECEIPT_LIST.POLICE_CODE=GAJG_DM.GAJG_DM where state=0\n")
     public List<Map<String,Object>>selectReceiptListOfSpecialCard ();
 
     //根据身份证号查询普通证交接单

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

@@ -10,7 +10,7 @@ public interface ReceiptService {
 
     public Map<String,Object> selectReceiptListDate(String id);
 
-    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType);
+    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")String cardType,@Param("oldCardType")String oldCardType,@Param("GAJG_MC")String GAJG_MC);
 
     public Map<String,Object>selectDetailedData(String id);
 

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

@@ -21,8 +21,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,String cardType,String oldCardType) {
-        receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType);
+    public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,String cardType,String oldCardType, String GAJG_MC) {
+        receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType,GAJG_MC);
         return true;
     }