Browse Source

9.01 在一级市场查询边民所属申报单时,可根据边民身份证号和申报单编号,进行远程调用(getByIdNoAndPreleportNo),将获得数据返还航通

Mechrevo 1 year ago
parent
commit
bf1c18a187

+ 31 - 14
sp-core/sp-api/src/main/java/com/pj/api/dto/ImportDeclarePeopleDto.java

@@ -1,8 +1,10 @@
 package com.pj.api.dto;
 
+import java.util.Date;
+
 /**
  * @Author Mechrevo
- * @Date 2023 08 31 15 30
+ * @Date 2023 09 01 11 53
  **/
 public class ImportDeclarePeopleDto {
     private Integer id;
@@ -42,6 +44,16 @@ public class ImportDeclarePeopleDto {
      */
     private Integer payStatus;
 
+    /**
+     * 完成情况
+     */
+    private Integer finishStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
     public Integer getId() {
         return id;
     }
@@ -106,7 +118,23 @@ public class ImportDeclarePeopleDto {
         this.payStatus = payStatus;
     }
 
-    public ImportDeclarePeopleDto(Integer id, String idno, String borderPutrecNo, String borderName, String settleBillNo, String preIeportNo, String buyConfirmStatus, Integer payStatus, Integer finishStatus) {
+    public Integer getFinishStatus() {
+        return finishStatus;
+    }
+
+    public void setFinishStatus(Integer finishStatus) {
+        this.finishStatus = finishStatus;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public ImportDeclarePeopleDto(Integer id, String idno, String borderPutrecNo, String borderName, String settleBillNo, String preIeportNo, String buyConfirmStatus, Integer payStatus, Integer finishStatus, Date createTime) {
         this.id = id;
         this.idno = idno;
         this.borderPutrecNo = borderPutrecNo;
@@ -116,20 +144,9 @@ public class ImportDeclarePeopleDto {
         this.buyConfirmStatus = buyConfirmStatus;
         this.payStatus = payStatus;
         this.finishStatus = finishStatus;
-    }
-
-    public Integer getFinishStatus() {
-        return finishStatus;
-    }
-
-    public void setFinishStatus(Integer finishStatus) {
-        this.finishStatus = finishStatus;
+        this.createTime = createTime;
     }
 
     public ImportDeclarePeopleDto() {
     }
-    /**
-     * 完成情况
-     */
-    private Integer finishStatus;
 }

+ 3 - 0
sp-service/async-server/src/main/java/com/pj/ht_import_declare_people/HtImportDeclarePeopleService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.dto.ImportDeclarePeopleDto;
+import com.pj.common.core.exception.ServiceException;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +61,8 @@ public class HtImportDeclarePeopleService extends ServiceImpl<HtImportDeclarePeo
 			BeanUtils.copyProperties(htImportDeclarePeople.get(0),importDeclarePeopleDto);
 			return importDeclarePeopleDto;
 		}
+		if(htImportDeclarePeople.size() > 1)
+			throw new ServiceException("当前边民 申报信息有误");
 		return null;
 	}
 }