Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

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

@@ -31,7 +31,7 @@ public class PreproPersonEntity {
     private String sjrTxdz;
     private String sid;
     private String fileName;
-    private Long isPost;
+    private Long cardTypeId;
     private String newFileName;
     private Long state;
 
@@ -286,13 +286,13 @@ public class PreproPersonEntity {
     }
 
     @Basic
-    @Column(name = "IS_POST")
-    public Long getIsPost() {
-        return isPost;
+    @Column(name = "CARD_TYPE_ID")
+    public Long getCardTypeId() {
+        return cardTypeId;
     }
 
-    public void setIsPost(Long isPost) {
-        this.isPost = isPost;
+    public void setCardTypeId(Long cardTypeId) {
+        this.cardTypeId = cardTypeId;
     }
 
     @Basic
@@ -345,13 +345,13 @@ public class PreproPersonEntity {
                 Objects.equals(sjrTxdz, that.sjrTxdz) &&
                 Objects.equals(sid, that.sid) &&
                 Objects.equals(fileName, that.fileName) &&
-                Objects.equals(isPost, that.isPost) &&
+                Objects.equals(cardTypeId, that.cardTypeId) &&
                 Objects.equals(newFileName, that.newFileName) &&
                 Objects.equals(state, that.state);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileName, isPost, newFileName, state);
+        return Objects.hash(jmsfzslh, gmsfhm, xm, xbdm, mzdm, csrq, ssxqdm, dzmc, sdxp, zwyZwtxsj, zwyZwtzsj, zweZwtxsj, zweZwtzsj, qfjgGajgmc, yxqqsrq, yxqjzrq, jmsfzslyydm, jmsfzzzlxdm, jmsfzlzfsdm, sjrXm, sjrLxdh, sjrYzbm, sjrTxdz, sid, fileName, cardTypeId, newFileName, state);
     }
 }

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

@@ -31,7 +31,7 @@ public interface PreproPersonMapper {
             "left join files on PREPRO_PERSON.FILE_ID = files.ID\n" +
             "left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
             "where PREPRO_PERSON.JMSFZSLH = #{uploadNo} and GMSFHM = #{IDCard}" +
-            //TODO
-            "and files.SOURCE_FILE_NAME =#{oldFile} and ")
+            "and files.SOURCE_FILE_NAME =#{oldFile} and  NEW_FILES.NEW_FILE_NAME = #{newFile}" +
+            "and PREPRO_PERSON.SSXQDM =#{SSXQDM} and PREPRO_PERSON.state =#{}  ")
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo,String IDCard,String oldFile,String newFile,String SSXQDM,String cardType,String state,String uploadDate);
 }