交接单5.5

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

@@ -42,15 +42,16 @@ public class ReceiptApi {
                 if (countAccept == 0) {
                     //查询特证交接单所需数据
                     Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
+                    System.out.println("111111111111111111111111resultDate"+resultDate);
                     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 cardType = (int) resultDate.get("CARD_TYPE");
+                    int oldCardType = (int) resultDate.get("OLD_CARD_TYPE");
                     int state = 0;
                     int count = (int) resultDate.get("COUNT");
                     //生成特证交接单
-                    receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC);
+                    receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType);
+
                     //查询特证详单所需数据
                     Map<String, Object> detailedData = receiptService.selectDetailedData(id);
                     String uploadNo = (String) detailedData.get("UPLOAD_NO");
@@ -71,17 +72,17 @@ public class ReceiptApi {
                 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 cardType = (int) receiptListDate.get("CARD_TYPE");
+                int oldCardType = (int) receiptListDate.get("OLD_CARD_TYPE");
                 int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString());
                 int state = 0;
                 //查询这个组号是否生成了交接单
                 int countGroup = receiptService.selectByGroupNo(groupNo);
+                System.out.println("222222222222222countGroup"+countGroup);
                 //没有生成交接单
                 if (countGroup == 0) {
                     //生成交接单
-                    receiptService.createReceiptList(groupNo, GAJG_DM, count, state,cardType,oldCardType,GAJG_MC);
+                    receiptService.createReceiptList(groupNo,GAJG_DM,count,state,cardType,oldCardType);
                     //查询这个身份证是否生成了详单
                     int receiptCount = receiptService.selectReceiptById(id);
                     //没有生成交接单详单

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

@@ -27,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,@Param("GAJG_MC")String GAJG_MC);
+    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")int cardType,@Param("oldCardType")int oldCardType);
 
 
 

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,@Param("GAJG_MC")String GAJG_MC);
+    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")int cardType,@Param("oldCardType")int oldCardType);
 
     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, String GAJG_MC) {
-        receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType,GAJG_MC);
+    public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,int cardType,int oldCardType) {
+        receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType);
         return true;
     }