Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/yxproject/start/mapper/PersonPostMapper.java

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

@@ -96,7 +96,6 @@ public class PersonPostApi {
         return true;
     }
 
-
     /**
      * 按条件查询个人邮寄信息
      *
@@ -289,6 +288,37 @@ public class PersonPostApi {
         return flag;
     }
 
+    /**
+     * 按受理号检查个人邮寄信息
+     *
+     * @param jsonStr
+     * @return
+     */
+    @RequestMapping("checkPersonalPost")
+    @Transactional
+    public List<PersonPostEntity> checkPersonalPost(@RequestBody String jsonStr, HttpServletRequest requ) {
+        String remoteAddr = requ.getRemoteAddr();
+        MDC.put("ip", remoteAddr);
+        JSONArray jsonArray = JSONArray.fromObject(jsonStr);
+        List<PersonPostEntity> list = new ArrayList<>();
+        try {
+            String uploadNo = "";
+            for (int i = 0; i < jsonArray.size(); i++){
+                String no = jsonArray.get(i).toString();
+                if(i!=jsonArray.size()-1){
+                    uploadNo+="'"+no+"',";
+                }else{
+                    uploadNo+="'"+no+"'";
+                }
+            }
+            list = personPostService.checkPersonalPost(uploadNo);
+        } catch (Exception e) {
+            logger.error("上传受理号：" + jsonArray);
+            logger.error("Exception 按受理号检查个人邮寄信息", e);
+        }
+        return list;
+    }
+
 
     /**
      * 去除字符串中中线

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

@@ -45,6 +45,7 @@ public class PersonPostEntity {
     private Time formStartTime;
     private Time formDeadline;
     private long  id;
+    private Long state1;
 
     @Basic
     @Column(name = "WAYBILL_NUMBER")
@@ -359,6 +360,16 @@ public class PersonPostEntity {
         this.state = state;
     }
 
+    @Basic
+    @Column(name = "STATE1")
+    public Long getState1() {
+        return state1;
+    }
+
+    public void setState1(Long state1) {
+        this.state1 = state1;
+    }
+
     @Basic
     @Column(name = "UPLOAD_DATE")
     public Time getUploadDate() {
@@ -455,6 +466,7 @@ public class PersonPostEntity {
                 Objects.equals(validPeriodEnd, that.validPeriodEnd) &&
                 Objects.equals(note, that.note) &&
                 Objects.equals(state, that.state) &&
+                Objects.equals(state1, that.state1) &&
                 Objects.equals(uploadDate, that.uploadDate) &&
                 Objects.equals(fileId, that.fileId) &&
                 Objects.equals(analysisDate, that.analysisDate) &&
@@ -467,6 +479,6 @@ public class PersonPostEntity {
 
     @Override
     public int hashCode() {
-        return Objects.hash(waybillNumber, backWaybillNumber,id, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline);
+        return Objects.hash(waybillNumber, backWaybillNumber,id,state1, orderNumber, createDate, openid, wcPlayOrderNumber, playState, orderState, applicantName, senderName, senderPhone, senderAddress, recipientName, recipientPhone, recipientAddress, orderBlankNumber, getToProvince, getToCity, getToCounty, businessType, latticeMouthInformation, natureOfTheInternal, natureOfTheInformation, firstWhite, idCard, acceptTheMatter, beginUsefulLife, validPeriodEnd, note, state, uploadDate, fileId, analysisDate, printDate, formStartTime, formDeadline);
     }
 }

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

@@ -43,10 +43,10 @@ public interface LogMapper {
     @Update("UPDATE PREPRO_PERSON SET CARD_TYPE_ID =9 \n" +
             "WHERE JMSFZSLH in (\n" +
             "SELECT PREPRO_PERSON.JMSFZSLH \n" +
-            "FROM PREPRO_PERSON \n" +
-            "LEFT JOIN PERSON_POST ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
+            "FROM PERSON_POST \n" +
+            "LEFT JOIN PREPRO_PERSON ON PERSON_POST.FIRST_WHITE = PREPRO_PERSON.JMSFZSLH\n" +
             "LEFT JOIN FILES ON FILES.ID=PREPRO_PERSON.FILE_ID "+
-            " WHERE TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )")
+            "WHERE TO_CHAR(FILES.UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss')=#{printDate} )")
     public boolean changeCardTypeByPrintDate(@Param("printDate")String printDate);
 
     @Update(" update FILE_NAME_DIC set  FILE_NAME_DIC.ANALYSIS_DATE = #{printDate} where  file_id=#{fileId} ")

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

@@ -141,4 +141,9 @@ public interface PersonPostMapper {
             "</script>")
     public List <PersonPostEntity> findAllPersonalDataNoPage( @Param("sqrxm") String sqrxm, @Param("ddh") String ddh, @Param("hasPrinted") String hasPrinted,
                                                               @Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo,@Param("printDate") String printDate,@Param("notNull") String notNull );
+                                                              @Param("gkxx") String gkxx, @Param("str") String str, @Param("startDate") String startDate,@Param("endDate") String endDate, @Param("emailNo") String emailNo );
+
+
+    @Select("SELECT * FROM PERSON_POST WHERE STATE1 = 3 AND FIRST_WHITE IN (${uploadNo}) ")
+    public List <PersonPostEntity> checkPersonalPost(@Param("uploadNo") String uploadNo);
 }

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

@@ -48,4 +48,6 @@ public interface PersonPostService {
 
     public boolean addNote(@Param("id")String id,@Param("note")String note);
 
+    public List<PersonPostEntity> checkPersonalPost(String uploadNo);
+
 }

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

@@ -145,6 +145,11 @@ public class PersonPostServiceImpl implements PersonPostService {
         return true;
     }
 
+    @Override
+    public List<PersonPostEntity> checkPersonalPost(String uploadNo) {
+        return personPostMapper.checkPersonalPost(uploadNo);
+    }
+
 //    /**
 //     * 查询个人邮寄信息
 //     * @param fileName 文件名