交接单修改

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -44,44 +45,46 @@ public class ReceiptApi {
             //查询特证详单所需数据
             Map<String,Object>  detailedData= receiptService.selectDetailedData(id);
             String uploadNo = (String) detailedData.get("UPLOAD_NO");
-            String fileName = (String) detailedData.get("FILE_NAME");
-            String gajg_dm = (String) detailedData.get("GAJG_DM");
-            String cardId = (String) detailedData.get("CARD_ID");
-            String receiptId = (String) detailedData.get("RECIPT_ID");
+            String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
             String name = (String) detailedData.get("NAME");
+            String cardId = (String) detailedData.get("CARD_ID");
+            String gajg_dm = (String) detailedData.get("GAJG_DM");
+            int receiptId =Integer.parseInt((BigDecimal)detailedData.get("ID")+"");
             //生成特证详单
-            receiptService.createDetailedList(uploadNo,fileName,gajg_dm,cardId,receiptId,name);
+            System.out.println("22222222222222222222Name:"+name);
+            receiptService.createDetailedList(uploadNo,acceptNo2,name,id,gajg_dm,receiptId);
         }else {
             //查询交接单所需数据
             Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
             String groupNo = (String) receiptListDate.get("GROUP_NO");
             String GAJG_DM = (String) receiptListDate.get("GAJG_DM");
-            int count = (int) receiptListDate.get("COUNT");
+
+            int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString()) ;
             //查询这个组号是否生成了交接单
             int countGroup = receiptService.selectByGroupNo(groupNo);
             if (countGroup == 0) {
-                //生成交接单
-                receiptService.createReceiptList(groupNo, GAJG_DM, count);
-                Map<String, Object> detailedData = receiptService.selectDetailedData(id);
+                Map<String,Object>  detailedData= receiptService.selectDetailedData(id);
                 String uploadNo = (String) detailedData.get("UPLOAD_NO");
-                String fileName = (String) detailedData.get("FILE_NAME");
-                String gajg_dm = (String) detailedData.get("GAJG_DM");
-                String cardId = (String) detailedData.get("CARD_ID");
-                String receiptId = (String) detailedData.get("RECIPT_ID");
+                String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
                 String name = (String) detailedData.get("NAME");
-                //生成详单
-                receiptService.createDetailedList(uploadNo, fileName, gajg_dm, cardId, receiptId, name);
+                String cardId = (String) detailedData.get("CARD_ID");
+                String gajg_dm = (String) detailedData.get("GAJG_DM");
+                int receiptId =Integer.parseInt((BigDecimal)detailedData.get("ID")+"");
+                //生成特证详单
+                System.out.println("22222222222222222222Name:"+name);
+                receiptService.createDetailedList(uploadNo,acceptNo2,name,id,gajg_dm,receiptId);
             } else {
                 //查询交接单详单数据
-                Map<String, Object> detailedData = receiptService.selectDetailedData(id);
+                Map<String,Object>  detailedData= receiptService.selectDetailedData(id);
+                System.out.println(String.valueOf("0000000000000000"+detailedData));
                 String uploadNo = (String) detailedData.get("UPLOAD_NO");
-                String fileName = (String) detailedData.get("FILE_NAME");
-                String gajg_dm = (String) detailedData.get("GAJG_DM");
-                String cardId = (String) detailedData.get("CARD_ID");
-                String receiptId = (String) detailedData.get("RECIPT_ID");
+                String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
                 String name = (String) detailedData.get("NAME");
-                //生成详单
-                receiptService.createDetailedList(uploadNo, fileName, gajg_dm, cardId, receiptId, name);
+                String gajg_dm = (String) detailedData.get("GAJG_DM");
+                int receiptId =Integer.parseInt((BigDecimal)detailedData.get("ID")+"");
+                //生成特证详单
+                receiptService.createDetailedList(uploadNo,acceptNo2,name,id,gajg_dm,receiptId);
+                System.out.println(receiptId);
             }
             //查询有几个
             int specialCardCount =receiptService.selectSpecialCard(groupNo);

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

@@ -28,18 +28,21 @@ public interface ReceiptMapper {
 
 
     //根据身份证号查询交接单详单信息
-    @Select("select prod_card_t.upload_no,prepro_person.file_id,subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM,\n" +
-            "prod_card_t.id_no,receipt_list.ID,prod_card_t.name\n" +
+    @Select("select prod_card_t.upload_no," +
+            "PROD_CARD_T.ACCEPT_NO," +
+            "prod_card_t.name," +
+            "prod_card_t.id_no," +
+            "subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
+            "receipt_list.ID\n" +
             "from prod_card_t@PROD_LINK\n" +
-            "left join  prepro_person on prod_card_t.upload_no= prepro_person.jmsfzslh\n" +
             "left join  receipt_list on receipt_list.QR_CODE = subStr(prod_card_t.accept_no,0,8)\n" +
             "where prod_card_t.id_no=#{id}")
     public Map<String,Object>selectDetailedData(String id);
 
     //生成交接单详单
-    @Insert("INSERT INTO CARD_DETAILED_LIST (UPLOAD_NO,FILE_NAME,POLICE_CODE,CARD_ID,RECIPT_ID,NAME)" +
-            "VALUES(#{UPLOAD_NO},#{FILE_NAME},#{GAJG_DM},#{CARD_ID},#{RECIPT_ID},#{NAME})")
-    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("FILE_NAME")String FILE_NAME,@Param("GAJG_DM")String GAJG_DM,@Param("CARD_ID")String CARD_ID,@Param("RECIPT_ID")String RECIPT_ID,@Param("NAME")String NAME);
+    @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,SIGN_GOVT,RECEIPT_ID)" +
+            "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID})")
+    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID);
 
 
 

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

@@ -14,7 +14,7 @@ public interface ReceiptService {
 
     public Map<String,Object>selectDetailedData(String id);
 
-    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("FILE_NAME")String FILE_NAME,@Param("GAJG_DM")String GAJG_DM,@Param("CARD_ID")String CARD_ID,@Param("RECEIPT_ID")String RECIPT_ID,@Param("NAME")String NAME);
+    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID);
 
     public int selectSpecialCard(String GROUP_NO);
 

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

@@ -33,8 +33,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public boolean createDetailedList(String UPLOAD_NO, String FILE_NAME, String GAJG_DM, String CARD_ID, String RECIPT_ID, String NAME) {
-        receiptMapper.createDetailedList(UPLOAD_NO,FILE_NAME,GAJG_DM,CARD_ID,RECIPT_ID,NAME);
+    public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, int RECEIPT_ID) {
+        receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID);
         return true;
     }