push

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

@@ -34,7 +34,7 @@ public class ReceiptApi {
      */
     @RequestMapping("createReceiptList")
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,Object> createReceiptList(@RequestParam("id") String id) {
+    public Map<String,Object> createReceiptList(@RequestParam("id") String id,@RequestParam("name") String name) {
         //判断是否是特证
         if (receiptService.selectSpecialCardByAcceptNo(id) == 1) {
             //查询这个受理号是否生成了交接单
@@ -53,6 +53,7 @@ public class ReceiptApi {
                 receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
                 receiptListEntity.setQrCode(resultDate.get("ACCEPT_NO").toString());
                 receiptListEntity.setState((long) 0);
+                receiptListEntity.setCheckName(name);
                 //生成特证交接单
                 long S = receiptService.createReceiptList(receiptListEntity);
 
@@ -60,13 +61,13 @@ public class ReceiptApi {
                 Map<String, Object> detailedData = receiptService.selectDetailedData2(id);
                 String uploadNo = (String) detailedData.get("UPLOAD_NO");
                 String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
-                String name = (String) detailedData.get("NAME");
+                String name2 = (String) detailedData.get("NAME");
                 String sex = (String) detailedData.get("SEX_NO");
                 String signGovt = (String) detailedData.get("SIGN_GOVT");
                 String gajg_dm = (String) detailedData.get("GAJG_DM");
                 Long receiptId = receiptListEntity.getId();
                 //生成特证详单
-                receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId, sex, signGovt);
+                receiptService.createDetailedList(uploadNo, acceptNo2, name2, id, gajg_dm, receiptId, sex, signGovt);
                 Map<String,Object> map = new HashMap<>();
                 map.put("show",true);
                 map.put("msg","生成交接单");
@@ -100,6 +101,7 @@ public class ReceiptApi {
                 receiptListEntity.setQrCode(receiptListDate.get(i).get("GROUP_NO").toString());
                 // 状态0未复核
                 receiptListEntity.setState((long) 0);
+                receiptListEntity.setCheckName(name);
                 //查询这个组号是否生成了交接单
                 List<Map<String, Object>> mapList = receiptService.selectByGroupNo(receiptListDate.get(i).get("GROUP_NO").toString());
                 //没有生成交接单
@@ -114,13 +116,13 @@ public class ReceiptApi {
                             Map<String, Object> detailedData = receiptService.selectDetailedData(receiptListDate.get(n).get("ID_NO").toString());
                             String uploadNo = (String) detailedData.get("UPLOAD_NO");
                             String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
-                            String name = (String) detailedData.get("NAME");
+                            String name2 = (String) detailedData.get("NAME");
                             String sex = (String) detailedData.get("SEX_NO");
                             String signGovt = (String) detailedData.get("SIGN_GOVT");
                             String gajg_dm = (String) detailedData.get("GAJG_DM");
                             int receiptId = Integer.parseInt((BigDecimal) detailedData.get("ID") + "");
                             //生成详单
-                            receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt);
+                            receiptService.createDetailedList(uploadNo, acceptNo2, name2, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex, signGovt);
                         } else {
                             //不做操作
                         }

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

@@ -47,11 +47,11 @@ public interface ReceiptMapper {
 
     //生成交接单
     @Insert("<script>" +
-            " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID" +
+            " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,CHECK_NAME,CHECK_date" +
             "<if test ='oldCardTypeId !=null'> " +
             ",OLD_CARD_TYPE_ID" +
             "</if> " +
-            ")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId}" +
+            ")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId},#{checkName},sysdate" +
             "<if test ='oldCardTypeId !=null'> " +
             ",#{oldCardTypeId}" +
             "</if> " +

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

@@ -22,8 +22,8 @@ public class ReceiptServiceImpl implements ReceiptService {
 
     @Override
     public long createReceiptList(ReceiptListEntity receiptListEntity) {
-
-        return receiptMapper.createReceiptList(receiptListEntity);
+        receiptMapper.createReceiptList(receiptListEntity);
+        return receiptListEntity.getId();
     }
 
     @Override