excel添加更改备注

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

@@ -65,12 +65,12 @@ public class ReceiptApi {
                 String uploadNo = (String) detailedData.get("UPLOAD_NO");
                 String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
                 String name = (String) detailedData.get("NAME");
-                String sex = (String) detailedData.get("SEX");
-                String cardId = (String) detailedData.get("CARD_ID");
+                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);
+                receiptService.createDetailedList(uploadNo, acceptNo2, name, id, gajg_dm, receiptId, sex,signGovt);
             } else {
                 //已经生成特证交接单，不做操作。
             }
@@ -113,10 +113,11 @@ public class ReceiptApi {
                             String acceptNo2 = (String) detailedData.get("ACCEPT_NO");
                             String name = (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);
+                            receiptService.createDetailedList(uploadNo, acceptNo2, name, receiptListDate.get(n).get("ID_NO").toString(), gajg_dm, receiptId, sex,signGovt);
                         } else {
                             //不做操作
                         }

src/main/java/com/yxproject/start/entity/DetailReceiptListEntity.java

@@ -20,6 +20,16 @@ public class DetailReceiptListEntity {
     private String signGovt;
     private Long receiptId;
     private Long sex;
+    private String gajg_mc;
+
+
+    public String getGajg_mc() {
+        return gajg_mc;
+    }
+
+    public void setGajg_mc(String gajg_mc) {
+        this.gajg_mc = gajg_mc;
+    }
 
     @Id
     @Column(name = "ID")

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

@@ -29,7 +29,6 @@ public interface PersonPostMapper {
     public List<PersonPostEntity> findAllByIdCardAndStartDateAndEndDate(@Param("idCard") String idCard, @Param("startDate")String startDate, @Param("endDate")String endDate);
 
 
-    //TODO   getToCounty是List
 
     @Select("<script> " +
             "SELECT * FROM " +

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

@@ -66,10 +66,13 @@ public interface ReceiptMapper {
             "prod_card_t.name," +
             "prod_card_t.SEX_NO,"+
             "prod_card_t.id_no," +
+            "GAJG_DM.GAJG_MC,"+
+            "PROD_CARD_T.SIGN_GOVT,"+
             "subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
             "receipt_list.ID\n" +
             "from prod_card_t@PROD_LINK\n" +
-            "left join  receipt_list on receipt_list.QR_CODE = subStr(prod_card_t.accept_no,0,8)\n" +
+            "left join GAJG_DM on GAJG_DM.GAJG_DM = subStr(prod_card_t.UPLOAD_NO,0,9) "+
+            "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);
 
@@ -79,19 +82,22 @@ public interface ReceiptMapper {
             "prod_card_t.name," +
             "prod_card_t.SEX_NO,"+
             "prod_card_t.id_no," +
+            "GAJG_DM.GAJG_MC,"+
+            "PROD_CARD_T.SIGN_GOVT,"+
             "subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
             "receipt_list.ID\n" +
-            "from prod_card_t@PROD_LINK\n" +
-            "left join  receipt_list on receipt_list.QR_CODE =prod_card_t.accept_no\n" +
+            "from prod_card_t@PROD_LINK \n" +
+            "left join GAJG_DM on GAJG_DM.GAJG_DM = subStr(prod_card_t.UPLOAD_NO,0,9) "+
+            "left join  receipt_list on receipt_list.QR_CODE =prod_card_t.accept_no \n" +
             "where prod_card_t.id_no=#{id}")
     public Map<String,Object>selectDetailedData2(String id);
 
 
 
     //生成交接单详单
-    @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,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")long RECEIPT_ID,@Param("SEX")String SEX);
+    @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID,SEX,SIGN_GOVT)" +
+            "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID},#{SEX},#{signGovt})")
+    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")long RECEIPT_ID,@Param("SEX")String SEX,@Param("signGovt")String signGovt);
 
 
 
@@ -201,7 +207,8 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectReceiptDate(@Param("date") String date,@Param("string") String string,@Param("type") long type);
 
 
-    @Select("select * from DETAIL_RECEIPT_LIST where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
+    @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST  LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE  where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
+    @Options(useGeneratedKeys=true, keyProperty="gajg_mc", keyColumn="GAJG_MC")
     public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
 
 

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

@@ -16,7 +16,7 @@ public interface ReceiptService {
 
     public Map<String,Object>selectDetailedData(String id);
 
-    public boolean createDetailedList(String UPLOAD_NO,String ACCEPT_NO,String NAME,String CARD_ID,String GAJG_DM,long RECEIPT_ID,String SEX);
+    public boolean createDetailedList(String UPLOAD_NO,String ACCEPT_NO,String NAME,String CARD_ID,String GAJG_DM,long RECEIPT_ID,String SEX,String signGovt);
 
     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 ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, long RECEIPT_ID,String SEX) {
-        receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID,SEX);
+    public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, long RECEIPT_ID,String SEX,String signGovt) {
+        receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID,SEX,signGovt);
         return true;
     }