2016 数据集测试成功OK

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

@@ -1,11 +1,14 @@
 package com.alihealth.d2d.provtest.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Builder;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.math.BigDecimal;
 import java.util.Date;
+
 /**
  * 收货单信息数据子集(DrugDeliveryNoteApplyInfo)表实体类
  *
@@ -91,7 +94,7 @@ public class DrugDeliveryNoteApplyInfo {
     private String zjgg;
     //包装转换比
     @Column(name = "bzzhb")
-    private Double bzzhb;
+    private BigDecimal bzzhb;
     //包装转换比单位
     @Column(name = "bzzhbdw")
     private String bzzhbdw;
@@ -150,8 +153,8 @@ public class DrugDeliveryNoteApplyInfo {
     @Column(name = "djyzwtgyy")
     private String djyzwtgyy;
     //收货人
-    @Column(name = "shr")
+    @TableField("shr")
-    private String shr;
+    private String shrmc;
     //发货机构类型
     @Column(name = "fhjglx")
     private String fhjglx;

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

@@ -14,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
@@ -44,7 +42,7 @@ public class SubType2011Handler extends AbstractEventDataHandler<DomesticDrugPro
         //时间格式
         SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         //日期格式
-        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
 
         try {
             return DomesticDrugProductionApplyInfo.builder()

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

@@ -0,0 +1,120 @@
+package com.alihealth.d2d.provtest.service.handle.business;
+
+import com.alihealth.d2d.provtest.domain.DrugDeliveryNoteApplyInfo;
+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.IDrugDeliveryNoteApplyInfoService;
+import com.alihealth.d2d.provtest.service.handle.AbstractEventDataHandler;
+import com.alihealth.d2d.provtest.service.handle.EventSubType;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+@Service
+@EventSubType("2016")
+public class SubType2016Handler extends AbstractEventDataHandler<DrugDeliveryNoteApplyInfo> {
+
+    @Autowired
+    private IDrugDeliveryNoteApplyInfoService service;
+
+    @Override
+    protected Class<DrugDeliveryNoteApplyInfo> getEntityClass() {
+        return DrugDeliveryNoteApplyInfo.class;
+    }
+
+    @Override
+    protected IService<DrugDeliveryNoteApplyInfo> getService() {
+        return service;
+    }
+
+    @Override
+    protected DrugDeliveryNoteApplyInfo convertToEntity(EventBody eventBody, ItemDetail item, InstanceDetail instance) {
+        EventBasic evtBasic = eventBody.getEvtBasic();
+        //时间格式
+        SimpleDateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //日期格式
+        SimpleDateFormat formatterDate = new SimpleDateFormat("yyyyMMdd");
+
+        try {
+            return DrugDeliveryNoteApplyInfo.builder()
+                    .eventId(eventBody.getEventID())
+                    .recTime(formatterDatetime.parse(eventBody.getRecTime()))
+
+                    .ypzsm(instance.getString("YPZSM"))
+                    .bzcj(instance.getString("BZCJ"))
+                    .syjbzypzsm(instance.getString("SYJBZYPZSM"))
+                    .zsmyzzt(instance.getString("ZSMYZZT"))
+                    .ymzt(instance.getString(("YMZT")))
+
+                    .tyshxydmscqy(item.getString("TYSHXYDMSCQY"))
+                    .scqymc(item.getString("SCQYMC"))
+                    .yptymc(item.getString("YPTYMC"))
+                    .gjypbsm(item.getString("GJYPBSM"))
+                    .ymscph(item.getString("YMSCPH"))
+                    .scrq(formatterDate.parse(item.getString("SCRQ")))
+                    .tyshxydmjkymdlqy(item.getString("TYSHXYDMJKYMDLQY"))
+                    .jkymdlqymc(item.getString("JKYMDLQYMC"))
+                    .ymyxqjzrq(formatterDate.parse(item.getString("YMYXQJZRQ")))
+                    .yshsl(item.getInt("YSHSL"))
+                    .shsl(item.getInt("SHSL"))
+                    .ymssxkcyrmc(item.getString("YMSSXKCYRMC"))
+                    .tyshxydmymssxkcyr(item.getString("TYSHXYDMMYMSSXKCYR"))
+                    .jx(item.getString("JX"))
+                    .bzgg(item.getString("BZGG"))
+                    .zjgg(item.getString("ZJGG"))
+                    .bzzhb(new BigDecimal(item.getString("BZZHB")))
+                    .bzzhbdw(item.getString("BZZHBDW"))
+                    .ypzcfl(item.getString("YPZCFL"))
+                    .tsypglfl(item.getString("TSYPGLFL"))
+
+                    .dhdbh(evtBasic.getString("DHDBH"))
+                    .fhdbh(evtBasic.getString("FHDBH"))
+                    .shdbh(evtBasic.getString("SHDBH"))
+                    .tyshxydmfhjg(evtBasic.getString("TYSHXYDMFHJG"))
+                    .jzdwbmfhjg(evtBasic.getString("JZDWBMMFHJG"))
+                    .fhjgmc(evtBasic.getString("FHJGMC"))
+                    .fhdz(evtBasic.getString("FHDZ"))
+                    .tyshxydmshjg(evtBasic.getString("TYSHXYDMSHJG"))
+                    .jzdwbmshjg(evtBasic.getString("JZDWBMSHJG"))
+                    .shdz(evtBasic.getString("SHDZ"))
+                    .shjgmc(evtBasic.getString("SHJGMC"))
+                    .shlx(evtBasic.getString("SHLX"))
+                    .shsj(formatterDatetime.parse(evtBasic.getString("SHSJ")))
+                    .djyzzt(evtBasic.getString("DJYZZT"))
+                    .djyzrq(formatterDate.parse(evtBasic.getString("DJYZRQ")))
+                    .djyzwtgyy(evtBasic.getString("DJYZWTGYY"))
+
+                    .shrmc(evtBasic.getString("SHR"))
+
+                    .fhjglx(evtBasic.getString("FHJGLX"))
+                    .shjglx(evtBasic.getString("SHJGLX"))
+                    .fhjgxl(evtBasic.getString("FHJGXL"))
+                    .shjgxl(evtBasic.getString("SHJGXL"))
+                    .wsjgdmshjg(evtBasic.getString("WSJGDMSHJG"))
+                    .wsjgdmfhjg(evtBasic.getString("WSJGDMFHJG"))
+                    .zyxkzdjhfhjg(evtBasic.getString("ZYXKZDJHFHJG"))
+                    .zyxkzdjhshjg(evtBasic.getString("ZYXKZDJHSHJG"))
+                    .wtdwmc(evtBasic.getString("WTDWMC"))
+                    .wtdwtyshxydm(evtBasic.getString("WTDWTYSHXYDM"))
+                    .build();
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getSubType() {
+        return "2016";
+    }
+
+    @Override
+    public void handleBase(String xml, String eventId) {
+
+    }
+}