:sparkles: 内河危货数据同步接口

ghjg-item-datashare-server/src/main/java/com/shanghaichengdi/ghjgitem/vo/HyDangerPreDeclareNhVo.java

@@ -6,90 +6,159 @@ import lombok.Data;
 
 @Data
 public class HyDangerPreDeclareNhVo {
-
-  private String id;
-
+  // 表1主键
+  private String id1;
+  // 申请人,申报企业名称
+  private String maker;
+  // 申请时间
+  private String makeDate;
+  // 项目名称
+  private String makeProject;
+  // 联系人：企业紧急联系人
   private String connects;
-
+  // 联系人电话：企业紧急联系人电话
+  private String connectNo;
+  // 事项说明
   private String explanations;
-
+  // 申报单号
   private String declareCode;
-
+  // 港口作业单位：散装时为申报单位，包装时页面下拉选择
   private String unitCode;
-
+  // 作业委托人：申报企业名称
   private String consigner;
-
+  // 船名
   private String shipName;
-
+  // 航次
   private String voyageNumberCode;
-
+  // 作业地点
   private String address;
-
+  // 起运港
   private String fromPortCode;
-
+  // 目的港
   private String toPortCode;
-
+  // 开工时间
   private Date preStartDate;
-
+  // 完工时间
   private Date preEndDate;
-
+  // 包装件
   private String packCode;
-
+  // 港口作业方式
   private String handleMode;
-
-  private String addInfo;
-
-  private String emergencyCode;
-
+  // 申报单位
   private String declareUnit;
-
+  // 申报日期
   private Date declareDate;
-
+  // 紧急联系电话
+  private String emergencyLinkTelNo;
+  // 核准部门
   private String checkUnitCode;
-
+  // 核准人
   private String checker;
-
+  // 核准意见:0未审批 1核准同意 2核准不同意
   private String checkerFlag;
-
+  // 核准时间
   private Date checkDate;
-
+  // 撤单人
+  private String revoker;
+  // 撤单时间
+  private Date revokerDate;
+  // 申报员:申报企业信息表中的申报员字段
   private String declarer;
-
+  // 货物运输形式类型：0：集装箱 1：包装件2：散装 3：中散 4：罐柜
   private String transportType;
-
+  // 具体运输
   private String transportDesc;
-
+  // 状态：0撤单  2正常
   private String state;
-
-  private Date addtime;
-
-  private Date updatetime;
-
-  private String isremove;
-
+  // 表1是否删除
+  private String isRemove1;
+  // (只有内河)
+  private String declareType;
+  // 事项编号
+  private String itemId;
+  // 审核说明
   private String checkOption;
-
+  // 审核说明
   private Long isSpotCheck;
-
+  // 作业总量吨
   private String declareTotalTon;
-
+  // 作业总量TEU
   private String declareTotalTeu;
-
+  // 作业总量件
   private String declareTotalPiece;
-
+  // 是否必检单0否1是
   private Long isMustCheck;
-
+  // 实际作业量（吨）
   private Integer declareTonActual;
-
+  // 实际作业量（TEU）
   private BigDecimal declareTeuActual;
-
+  // 实际作业量（件）
   private Integer declarePieceActual;
-
+  // 取消理由
   private String cancelReason;
-
-  private Date implementTime;
-
+  // 申报单位CODE
+  private String declareUnitCode;
+  // 执行时间
+  private String implementTime;
+  // 完工时间
+  private String finishedTime;
+  // 船舶吨位
   private String shipTon;
-
+  // 提交港口管理机构
+  private String areaCode;
+  // 起运码头/到达码头
   private String departurearrivalport;
+
+  // 表2主键
+  private String id2;
+  // 危险物申请ID
+  private String declareId;
+  // 货物名称编号
+  private String cargoCode;
+  // 货物名称
+  private String cargoName;
+  // 作业吨
+  private String declareTon;
+  // 作业TEU
+  private String declareTeu;
+  // 作业件
+  private String declarePiece;
+  // 包装类别
+  private String packageType;
+  // 危险类别
+  private String dangerType;
+  // 表2是否删除
+  private String isRemove2;
+  // 运输名称
+  private String transportName;
+  // 措施编号
+  private String measuresNumber;
+  // 序号（出口包装使用）货物序号
+  private String orderNumber;
+  // 是否是剧毒品(0否 1是)
+  private String isRefPoisonGoods;
+  // 箱号
+  private String containerNo;
+  // 提单号
+  private String billNo;
+  // 整拼
+  private String fullBox;
+  // 箱型
+  private String cntType;
+  // 尺寸
+  private String cntSize;
+
+  // 证照编号
+  private String licensenumber;
+  private String operatorWay;
+  private String unitMeasure;
+  private String dangerGroupName;
+  private String dangerName;
+  private String yearLimitAmount;
+  private String transWay;
+  private String transShape;
+  private String operatorLocationName;
+  private String dangerCode;
+  private String bowei;
+
 }

ghjg-item-datashare-server/src/main/resources/mapper/HyDangerPreDeclareNhMapper.xml

@@ -98,50 +98,91 @@
 
   <select id="selectDeclareGoodsList"
     resultType="com.shanghaichengdi.ghjgitem.vo.HyDangerPreDeclareNhVo">
-    select t.id                 id,
-           connects             connects,
-           explanations         explanations,
-           declare_code         declareCode,
-           unit_code            unitCode,
-           consigner            consigner,
-           ship_name            shipName,
-           voyage_number_code   voyageNumberCode,
-           address              address,
-           from_port_code       fromPortCode,
-           to_port_code         toPortCode,
-           pre_start_date       preStartDate,
-           pre_end_date         preEndDate,
-           pack_code            packCode,
-           handle_mode          handleMode,
-           add_info             addInfo,
-           emergency_code       emergencyCode,
-           declare_unit         declareUnit,
-           declare_date         declareDate,
-           check_unit_code      checkUnitCode,
-           checker              checker,
-           checker_flag         checkerFlag,
-           check_date           checkDate,
-           declarer             declarer,
-           transport_type       transportType,
-           transport_desc       transportDesc,
-           state                state,
-           addtime              addtime,
-           updatetime           updatetime,
-           isremove             isremove,
-           check_option         checkOption,
-           is_spot_check        isSpotCheck,
-           declare_total_ton    declareTotalTon,
-           declare_total_teu    declareTotalTeu,
-           declare_total_piece  declareTotalPiece,
-           is_must_check        isMustCheck,
-           declare_ton_actual   declareTonActual,
-           declare_teu_actual   declareTeuActual,
-           declare_piece_actual declarePieceActual,
-           cancel_reason        cancelReason,
-           implement_time       implementTime,
-           ship_ton             shipTon,
-           departurearrivalport departurearrivalport
+    select distinct t.id                      id1,
+                    t.maker                   maker,
+                    t.make_date               makeDate,
+                    t.make_project            makeProject,
+                    t.connects                connects,
+                    t.connect_no              connectNo,
+                    t.explanations            explanations,
+                    t.declare_code            declareCode,
+                    t.unit_code               unitCode,
+                    t.consigner               consigner,
+                    t.ship_name               shipName,
+                    t.voyage_number_code      voyageNumberCode,
+                    t.address                 address,
+                    t.from_port_code          fromPortCode,
+                    t.to_port_code            toPortCode,
+                    t.pre_start_date          preStartDate,
+                    t.pre_end_date            preEndDate,
+                    t.pack_code               packCode,
+                    t.handle_mode             handleMode,
+                    t.declare_unit            declareUnit,
+                    t.declare_date            declareDate,
+                    t.emergency_link_tel_no   emergencyLinkTelNo,
+                    t.check_unit_code         checkUnitCode,
+                    t.checker                 checker,
+                    t.checker_flag            checkerFlag,
+                    t.check_date              checkDate,
+                    t.revoker                 revoker,
+                    t.revoker_date            revokerDate,
+                    t.declarer                declarer,
+                    t.transport_type          transportType,
+                    t.transport_desc          transportDesc,
+                    t.state                   state,
+                    t.isremove                isRemove1,
+                    t.declare_type            declareType,
+                    t.item_id                 itemId,
+                    t.check_option            checkOption,
+                    t.is_spot_check           isSpotCheck,
+                    t.declare_total_ton       declareTotalTon,
+                    t.declare_total_teu       declareTotalTeu,
+                    t.declare_total_piece     declareTotalPiece,
+                    t.is_must_check           isMustCheck,
+                    t.declare_ton_actual      declareTonActual,
+                    t.declare_teu_actual      declareTeuActual,
+                    t.declare_piece_actual    declarePieceActual,
+                    t.cancel_reason           cancelReason,
+                    t.declare_unit_code       declareUnitCode,
+                    t.implement_time          implementTime,
+                    t.finished_time           finishedTime,
+                    t.ship_ton                shipTon,
+                    t.area_code               areaCode,
+                    t.departurearrivalport    departurearrivalport,
+                    t1.id                     id2,
+                    t1.declare_id             declareId,
+                    t1.cargo_code             cargoCode,
+                    t3.kind_name              cargoName,
+                    t1.declare_ton            declareTon,
+                    t1.declare_teu            declareTeu,
+                    t1.declare_piece          declarePiece,
+                    t1.package_type           packageType,
+                    t1.danger_type            dangerType,
+                    t1.isremove               isRemove2,
+                    t1.transport_name         transportName,
+                    t1.measures_number        measuresNumber,
+                    t1.order_number           orderNumber,
+                    t1.is_ref_poison_goods    isRefPoisonGoods,
+                    t1.container_no           containerNo,
+                    t1.bill_no                billNo,
+                    t1.full_box               fullBox,
+                    t1.cnt_type               cntType,
+                    t1.cnt_size               cntSize,
+                    t2.licensenumber          licensenumber,
+                    t2.operator_way           operatorWay,
+                    t2.unit_measure           unitMeasure,
+                    t2.dange_groupname        dangerGroupName,
+                    t2.dange_name             dangerName,
+                    t2.year_limitamount       yearLimitAmount,
+                    t2.trans_way              transWay,
+                    t2.trans_shape            transShape,
+                    t2.operator_location_naem operatorLocationName,
+                    t2.dange_code             dangerCode,
+                    t2.bowei                  bowei
     from ghjg_port_manage.hy_danger_pre_declare_nh t
+           left join ghjg_port_manage.hy_danger_pre_declare_cargo_nh t1 on t.id = t1.declare_id
+           left join ghjg_basics.hy_wharf_ruleconfig_nh t2 on t.unit_code = t2.operator_location
+           left join ghjg_port_manage.hy_danger_goods_nh_dict t3 on t1.cargo_code = t3.kind_code
     where t.AREA_CODE = #{areaCode}
   </select>