bzzhb 字段类型调整，数据库中字段类型已同步调整

src/main/java/com/alihealth/d2d/provtest/controller/DrugRetraceController.java

@@ -1,5 +1,11 @@
 package com.alihealth.d2d.provtest.controller;
 
+import com.alihealth.d2d.provtest.common.AjaxResult;
+import com.alihealth.d2d.provtest.searcher.DrugRetraceSearcher;
+import com.alihealth.d2d.provtest.service.DrugRetraceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,6 +16,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/drugRetrace")
 public class DrugRetraceController {
 
-    //TODO 实现药品的流程追溯逻辑
+    @Autowired
+    private DrugRetraceService drugRetraceService;
 
+    @PostMapping(value = "/retrace")
+    public AjaxResult retrace(@RequestBody(required = true) DrugRetraceSearcher searcher) {
+        drugRetraceService.retrace(searcher);
+        return AjaxResult.success(null);
+    }
 }

src/main/java/com/alihealth/d2d/provtest/domain/DomesticDrugBaseInfo.java

@@ -6,13 +6,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -20,7 +13,10 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import lombok.Data;
 
-import javax.persistence.Transient;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -99,7 +95,7 @@ public class DomesticDrugBaseInfo implements Serializable {
      * 包装转换比
      */
     @JacksonXmlProperty(localName = "BZZHB")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
 
     /**
      * 包装规格标识

src/main/java/com/alihealth/d2d/provtest/domain/DrugDeliveryNoteApplyInfo.java

@@ -8,7 +8,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -96,7 +95,7 @@ public class DrugDeliveryNoteApplyInfo {
     private String zjgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;

src/main/java/com/alihealth/d2d/provtest/domain/DrugInvoiceApplyInfo.java

@@ -7,7 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -89,7 +88,7 @@ public class DrugInvoiceApplyInfo {
     private String zjgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;

src/main/java/com/alihealth/d2d/provtest/domain/DrugRetailAndUseApplyInfo.java

@@ -110,7 +110,7 @@ public class DrugRetailAndUseApplyInfo {
     private String zjgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;

src/main/java/com/alihealth/d2d/provtest/domain/DrugSelfInspectionApplyInfo.java

@@ -7,7 +7,6 @@ import lombok.Builder;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -59,7 +58,7 @@ public class DrugSelfInspectionApplyInfo {
     private String bzgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //药品有效期
     @Column(name = "ypyxq")
     private Integer ypyxq;

src/main/java/com/alihealth/d2d/provtest/domain/ImportedDrugBaseInfo.java

@@ -53,7 +53,7 @@ public class ImportedDrugBaseInfo {
     private String bzgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;

src/main/java/com/alihealth/d2d/provtest/domain/WarehouseStockApplyInfo.java

@@ -77,7 +77,7 @@ public class WarehouseStockApplyInfo {
     private String zjgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private BigDecimal bzzhb;
+    private Integer bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2013Handler.java

@@ -1,12 +1,10 @@
 package com.alihealth.d2d.provtest.service.handle.business;
 
-import com.alihealth.d2d.provtest.domain.DrugImportApplyInfo;
 import com.alihealth.d2d.provtest.domain.DrugSelfInspectionApplyInfo;
 import com.alihealth.d2d.provtest.entity.EventBasic;
 import com.alihealth.d2d.provtest.entity.EventBody;
 import com.alihealth.d2d.provtest.entity.InstanceDetail;
 import com.alihealth.d2d.provtest.entity.ItemDetail;
-import com.alihealth.d2d.provtest.service.IDrugImportApplyInfoService;
 import com.alihealth.d2d.provtest.service.IDrugSelfInspectionApplyInfoService;
 import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler;
 import com.alihealth.d2d.provtest.service.handle.EventSubType;
@@ -16,8 +14,6 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 
 /**
  * @author Jason
@@ -68,7 +64,7 @@ public class SubType2013Handler extends AbstractEventDataHandler<DrugSelfInspect
                     .jx(item.getString("JX"))
                     .zjgg(item.getString("ZJGG"))
                     .bzgg(item.getString("BZGG"))
-                    .bzzhb(item.getBigDecimal("BZZHB"))
+                    .bzzhb(Integer.parseInt(item.getString("BZZHB")))
                     .ypyxq(item.getInt("YPYXQ"))
                     .ypyxqdw(item.getString("YPYXQDW"))
                     .yppzwh(item.getString("YPPZWH"))

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2015Handler.java

@@ -1,13 +1,11 @@
 package com.alihealth.d2d.provtest.service.handle.business;
 
 import com.alihealth.d2d.provtest.domain.DrugInvoiceApplyInfo;
-import com.alihealth.d2d.provtest.domain.DrugSelfInspectionApplyInfo;
 import com.alihealth.d2d.provtest.entity.EventBasic;
 import com.alihealth.d2d.provtest.entity.EventBody;
 import com.alihealth.d2d.provtest.entity.InstanceDetail;
 import com.alihealth.d2d.provtest.entity.ItemDetail;
 import com.alihealth.d2d.provtest.service.IDrugInvoiceApplyInfoService;
-import com.alihealth.d2d.provtest.service.IDrugSelfInspectionApplyInfoService;
 import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler;
 import com.alihealth.d2d.provtest.service.handle.EventSubType;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,8 +14,6 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 
 /**
  * @author Jason
@@ -73,7 +69,7 @@ public class SubType2015Handler extends AbstractEventDataHandler<DrugInvoiceAppl
                             .jx(item.getString("JX"))
                             .bzgg(item.getString("BZGG"))
                             .zjgg(item.getString("ZJGG"))
-                            .bzzhb(item.getBigDecimal("BZZHB"))
+                            .bzzhb(Integer.parseInt(item.getString("BZZHB")))
                             .bzzhbdw(item.getString("BZZHBDW"))
                             .ypzcfl(item.getString("YPZCFL"))
                             .tsypglfl(item.getString("TSYPGLFL"))

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2016Handler.java

@@ -68,7 +68,7 @@ public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNot
                     .jx(item.getString("JX"))
                     .bzgg(item.getString("BZGG"))
                     .zjgg(item.getString("ZJGG"))
-                    .bzzhb(new BigDecimal(item.getString("BZZHB")))
+                    .bzzhb(Integer.parseInt(item.getString("BZZHB")))
                     .bzzhbdw(item.getString("BZZHBDW"))
                     .ypzcfl(item.getString("YPZCFL"))
                     .tsypglfl(item.getString("TSYPGLFL"))

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2017Handler.java

@@ -73,7 +73,7 @@ public class SubType2017Handler extends AbstractEventDataHandler<DrugRetailAndUs
                     .jx(item.getString("JX"))
                     .bzgg(item.getString("BZGG"))
                     .zjgg(item.getString("ZJGG"))
-                    .bzzhb(new BigDecimal(item.getString("BZZHB")))
+                    .bzzhb(Integer.parseInt(item.getString("BZZHB")))
                     .bzzhbdw(item.getString("BZZHBDW"))
                     .ypzcfl(item.getString("YPZCFL"))
                     .tsypglfl(item.getString("TSYPGLFL"))

src/main/java/com/alihealth/d2d/provtest/service/handle/business/SubType2019Handler.java

@@ -61,7 +61,7 @@ public class SubType2019Handler extends AbstractEventDataHandler<WarehouseStockA
                     .jx(item.getString("JX"))
                     .bzgg(item.getString("BZGG"))
                     .zjgg(item.getString("ZJGG"))
-                    .bzzhb(new BigDecimal(item.getString("BZZHB")))
+                    .bzzhb(Integer.parseInt(item.getString("BZZHB")))
                     .bzzhbdw(item.getString("BZZHBDW"))
                     .ypzcfl(item.getString("YPZCFL"))
                     .tsypglfl(item.getString("TSYPGLFL"))