From 15cc47f4657d656ad320c9d75a5b4af4ea4478ac Mon Sep 17 00:00:00 2001 From: dengjun Date: Thu, 25 Jan 2024 10:37:03 +0800 Subject: [PATCH] =?UTF-8?q?2023=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rtosc/dto/DepartureCargoVo.java | 2 +- .../haitonggauto/rtosc/dto/DepartureVo.java | 2 +- .../rtosc/query/ExportInCheckQuery.java | 6 +- .../rtosc/api/dto/OldExportInAddReq.java | 102 ++++++++++++++++++ .../rtosc/handler/DepartureHandler.java | 95 ++++++++-------- .../rtosc/handler/ExportInHandler.java | 51 ++++++--- .../rtosc/handler/ExportLoadHandler.java | 3 + .../rtosc/handler/FreeTradeHandler.java | 18 ++++ .../rtosc/handler/mapper/PoMapper.java | 36 +++++++ .../main/resources/templates/template.xlsx | Bin 15008 -> 15028 bytes .../entity/CustomerDeparturePlan.java | 3 + .../mapper/CustomerExportInMapper.xml | 6 ++ .../mapper/CustomerExportLoadMapper.xml | 6 ++ 13 files changed, 267 insertions(+), 63 deletions(-) create mode 100644 nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/api/dto/OldExportInAddReq.java diff --git a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureCargoVo.java b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureCargoVo.java index dc195c8..a7916d1 100644 --- a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureCargoVo.java +++ b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureCargoVo.java @@ -60,7 +60,7 @@ public class DepartureCargoVo implements Serializable { /** * 数量 */ - @NotNull(groups = {ValidationGroup.insert.class, ValidationGroup.update.class}, message = "数量不能为空") +// @NotNull(groups = {ValidationGroup.insert.class, ValidationGroup.update.class}, message = "数量不能为空") @ApiModelProperty(value = "数量", required = true) private Integer quantity; diff --git a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureVo.java b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureVo.java index c50b044..6a5ca8e 100644 --- a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureVo.java +++ b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/dto/DepartureVo.java @@ -151,7 +151,7 @@ public class DepartureVo implements Serializable { */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "返回日期", required = true, example="2023-06-12") - @NotNull(groups = {ValidationGroup.insert.class, ValidationGroup.update.class}, message = "返回日期不能为空") +// @NotNull(groups = {ValidationGroup.insert.class, ValidationGroup.update.class}, message = "返回日期不能为空") private Date returnTime; /** diff --git a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/query/ExportInCheckQuery.java b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/query/ExportInCheckQuery.java index 76c24cf..dd78093 100644 --- a/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/query/ExportInCheckQuery.java +++ b/nuzar-customer-client/src/main/java/com/haitonggauto/rtosc/query/ExportInCheckQuery.java @@ -74,15 +74,15 @@ public class ExportInCheckQuery extends BaseQuery { @DbQuery(field = "checkStatus", symbol = SqlSymbol.IN) private List checkStatusList; - @ApiModelProperty(value = "品牌") + @ApiModelProperty(value = "品牌ID") @DbQuery(field = "brandId") private String brand; - @ApiModelProperty(value = "车型") + @ApiModelProperty(value = "车型ID") @DbQuery(field = "cartTypeId") private String cartType; - @ApiModelProperty(value = "车型明细") + @ApiModelProperty(value = "车型明细ID") @DbQuery(field = "cartTypeDetailId") private String cartTypeDetail; diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/api/dto/OldExportInAddReq.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/api/dto/OldExportInAddReq.java new file mode 100644 index 0000000..fa5d228 --- /dev/null +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/api/dto/OldExportInAddReq.java @@ -0,0 +1,102 @@ +package com.haitonggauto.rtosc.api.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ApiModel("老系统出口进港同步数据") +public class OldExportInAddReq implements Serializable { + @ApiModelProperty("新系统计划主键") + private String nsId; + + @ApiModelProperty("船名") + private String vlsNm; + + @ApiModelProperty("航次") + private String vvyNm; + + @ApiModelProperty("货代") + private String cstNm; + + @ApiModelProperty("品牌") + private String brdNm; + + @ApiModelProperty("型号") + private String mdlNm; + + @ApiModelProperty("长度") + private BigDecimal length; + + @ApiModelProperty("宽度") + private BigDecimal width; + + @ApiModelProperty("高度") + private BigDecimal height; + + @ApiModelProperty("体积") + private BigDecimal volume; + + @ApiModelProperty("重量") + private BigDecimal weight; + + @ApiModelProperty("目的国") + private String ctnNm; + + @ApiModelProperty("目的港") + private String potNm; + + @ApiModelProperty("车辆数") + private String carNum; + + @ApiModelProperty("备件数") + private String partNum; + + @ApiModelProperty("提单号") + private String mnfBl; + + @ApiModelProperty("单票件数") + private BigDecimal mnfNum; + + @ApiModelProperty("单票重量") + private BigDecimal mnfWeight; + + @ApiModelProperty("单票体积") + private BigDecimal mnfVolume; + + @ApiModelProperty("车型") + private String godType; + + @ApiModelProperty("车型明细") + private String godDtlType; + + @ApiModelProperty("备注") + private String remark; + + @ApiModelProperty("运输方式") + private String transType; + + @ApiModelProperty("联系人") + private String person; + + @ApiModelProperty("车辆操作模式") + private String carOpMode; + + @ApiModelProperty("备件操作模式") + private String partOpMode; + + @ApiModelProperty("特殊作业") + private String specWork; + + @ApiModelProperty("进场时间（起始）") + private String inStartTm; + + @ApiModelProperty("进场时间（截止）") + private String inEndTm; + + @ApiModelProperty("联系方式") + private String personTel; +} diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/DepartureHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/DepartureHandler.java index 6692a64..d9605f3 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/DepartureHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/DepartureHandler.java @@ -827,9 +827,9 @@ public class DepartureHandler implements BaseHandler { XSSFWorkbook workbook = new XSSFWorkbook(inputStream); //设置模板的第一个sheet的名称 // 查询出所有提单的数量 - List ids = departures.stream().map(item -> item.getId()).collect(Collectors.toList()); - long count = departureCargoService.count(new LambdaQueryWrapper().in(CustomerDepartureCargo::getDepartureId, ids)); - for (int i = 1; i < count; i++) { +// List ids = departures.stream().map(item -> item.getId()).collect(Collectors.toList()); +// long count = departureCargoService.count(new LambdaQueryWrapper().in(CustomerDepartureCargo::getDepartureId, ids)); + for (int i = 1; i < departures.size(); i++) { workbook.cloneSheet(0, "Sheet"+(i+1)); } @@ -843,56 +843,63 @@ public class DepartureHandler implements BaseHandler { // 计划数据是共用的 List plans = departurePlanService.list(new LambdaQueryWrapper().eq(CustomerDeparturePlan::getDepartureId, departures.get(i).getId())); + // 时间转换 + plans.stream().forEach(item -> { + if (item.getPickTime() != null) { + item.setPickTimeStr(DateUtils.formatDate(item.getPickTime(), "yyyy-MM-dd HH:mm:ss")); + } + }); + int totalCarQuantity = plans.stream().mapToInt(item -> item.getCarQuantity()).sum(); int totalPartQuantity = plans.stream().mapToInt(item -> item.getPartQuantity()).sum(); // 查询出提单 List list = departureCargoService.list(new LambdaQueryWrapper().in(CustomerDepartureCargo::getDepartureId, departures.get(i).getId())); - for (CustomerDepartureCargo cargo : list) { - // 每个提单一个sheet - WriteSheet writeSheet = EasyExcel.writerSheet(i, departures.get(i).getBatchNo()).build(); - // 这里注意 入参用了forceNewRow 代表在写入list的时候不管list下面有没有空行 都会创建一行，然后下面的数据往后移动。默认 是false，会直接使用下一行，如果没有则创建。 - // forceNewRow 如果设置了true,有个缺点 就是他会把所有的数据都放到内存了，所以慎用 - // 简单的说 如果你的模板有list,且list不是最后一行，下面还有数据需要填充 就必须设置 forceNewRow=true 但是这个就会把所有数据放到内存 会很耗内存 - // 如果数据量大 list不是最后一行 参照下一个 + // 每个提单一个sheet + WriteSheet writeSheet = EasyExcel.writerSheet(i, departures.get(i).getBatchNo()).build(); + // 这里注意 入参用了forceNewRow 代表在写入list的时候不管list下面有没有空行 都会创建一行，然后下面的数据往后移动。默认 是false，会直接使用下一行，如果没有则创建。 + // forceNewRow 如果设置了true,有个缺点 就是他会把所有的数据都放到内存了，所以慎用 + // 简单的说 如果你的模板有list,且list不是最后一行，下面还有数据需要填充 就必须设置 forceNewRow=true 但是这个就会把所有数据放到内存 会很耗内存 + // 如果数据量大 list不是最后一行 参照下一个 - FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); - List before = CollectionUtil.sub(plans, 0, 1); - List after = CollectionUtil.sub(plans, 1, plans.size() - 1); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + List before = CollectionUtil.sub(plans, 0, 1); + List after = CollectionUtil.sub(plans, 1, plans.size() - 1); - excelWriter.fill(new FillWrapper("plan", before), writeSheet); - excelWriter.fill(new FillWrapper("plan", after), fillConfig, writeSheet); + excelWriter.fill(new FillWrapper("plan", before), writeSheet); + excelWriter.fill(new FillWrapper("plan", after), fillConfig, writeSheet); - Map map = new HashMap<>(); - map.put("batchNo", departures.get(i).getBatchNo()); // {batchNo} - map.put("receiveCompany", departures.get(i).getReceiveCompany()); // {receiveCompany} - //{applicant} - map.put("applicant", departures.get(i).getApplicant()); - //{applyTime} - map.put("applyTime", departures.get(i).getApplyTime()); - //{shipName} - map.put("shipName", departures.get(i).getShipName()); - //{voyage} - map.put("voyage", departures.get(i).getVoyage()); - // {billNo} - map.put("billNo", cargo.getBillNo()); - // {arrivalTime} - map.put("arrivalTime", departures.get(i).getArrivalTime()); - // {deliveryTime} - map.put("deliveryTime", departures.get(i).getDeliveryTime()); - // {contact} - map.put("contact", departures.get(i).getContact()); - // {contactPhone} - map.put("contactPhone", departures.get(i).getContactPhone()); - // {retainPort} - map.put("retainPort", departures.get(i).getRetainPort()); - // {totalCarQuantity} - map.put("totalCarQuantity", totalCarQuantity); - // {totalPartQuantity} - map.put("totalPartQuantity", totalPartQuantity); - excelWriter.fill(map, writeSheet); - } + Map map = new HashMap<>(); + map.put("batchNo", departures.get(i).getBatchNo()); // {batchNo} + map.put("receiveCompany", departures.get(i).getReceiveCompany()); // {receiveCompany} + //{applicant} + map.put("applicant", departures.get(i).getApplicant()); + //{applyTime} + map.put("applyTime", departures.get(i).getApplyTime()); + //{shipName} + map.put("shipName", departures.get(i).getShipName()); + //{voyage} + map.put("voyage", departures.get(i).getVoyage()); + // {billNo} + map.put("billNo", list.get(0).getBillNo()); + // {arrivalTime} + map.put("arrivalTime", departures.get(i).getArrivalTime()); + // {deliveryTime} + map.put("deliveryTime", departures.get(i).getDeliveryTime()); + // {contact} + map.put("contact", departures.get(i).getContact()); + // {contactPhone} + map.put("contactPhone", departures.get(i).getContactPhone()); + // {retainPort} + map.put("retainPort", departures.get(i).getRetainPort()); + // {totalCarQuantity} + map.put("totalCarQuantity", totalCarQuantity); + // {totalPartQuantity} + map.put("totalPartQuantity", totalPartQuantity); + + + excelWriter.fill(map, writeSheet); } }catch (Exception e){ e.printStackTrace(); diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java index 57f6097..5c27135 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportInHandler.java @@ -1200,6 +1200,9 @@ public class ExportInHandler implements BaseHandler { } boolean row = customerExportInService.updateBatchById(exportIns); + + // 如果是审核通过，还需要将数据同步到旧系统 + if (row) { List list = customerExportInService.lambdaQuery().in(CustomerExportIn::getId, check.getIds()).list(); @@ -3116,12 +3119,7 @@ public class ExportInHandler implements BaseHandler { } } - JSONObject o = JSONObject.from(item); - o.put("status", "导入成功"); - successDataList.add(o); - saveData.add(item); - }); if (CollectionUtils.isNotEmpty(errorDataList)) { @@ -3237,27 +3235,48 @@ public class ExportInHandler implements BaseHandler { return; } - errorDataList.addAll(item.getValue().stream().map(p -> { + successDataList.addAll(item.getValue().stream().map(p -> { JSONObject o = JSONObject.from(p); - o.put("status", "导入成功"); + o.put("status", "数据验证成功"); return o; }).collect(Collectors.toList())); + }); + if (CollectionUtils.isNotEmpty(errorDataList)) { + errorDataList.addAll(successDataList); + return ResultUtil.failure(ErrorType.PARAMS_ERROR.id(), "导入失败", errorDataList); + } + + inMap.entrySet().forEach(item -> { + String[] keys = StringUtils.split(item.getKey(), "#$#"); + String shipId = keys[0]; // 船名 + String voyageId = keys[1]; // 航次 + String billNo = keys[2]; // 提单号 + + // 查询出已存在的数据 + LambdaQueryWrapper cQuery = new LambdaQueryWrapper<>(); + cQuery.eq(CustomerExportIn::getShipId, shipId); + cQuery.eq(CustomerExportIn::getVoyageId, voyageId); + cQuery.eq(CustomerExportIn::getBillNum, billNo); + + List exportInList = customerExportInService.list(cQuery); + + // 单票件件，毛，体 + CustomerExportIn lastE = item.getValue().get(item.getValue().size() - 1); // 以最后一个为标准 // 如果是备件自动生成条码 - // 过滤出是备件的 - item.getValue().stream().filter(ss -> StringUtils.equals(ss.getCartType(), "备件") && StringUtils.equals(ss.getNatureFlagName(), "正常")).forEach(ss -> { + // 过滤出是备件 + item.getValue().stream().filter(ss -> StringUtils.equals(ss.getCartType(), "备件")).forEach(ss -> { // 判断是否是国际中转航次ID String vvyId = ss.getVoyageId(); TransitPartRequest request = new TransitPartRequest(); request.setVvyIds(Arrays.asList(vvyId)); request.setPartAmount(ss.getQuantity()); request.setMnfBl(ss.getBillNum()); - Map> rst = openApi.getTransitPart(request); +// Map> rst = openApi.getTransitPart(request); - List vins = new ArrayList<>(ss.getQuantity()); - if (MapUtils.isNotEmpty(rst) && CollectionUtils.isNotEmpty(rst.get(vvyId))) { // 需要自动生成 - vins.addAll(rst.get(vvyId).stream().map(t -> t.getVinCode()).collect(Collectors.toList())); - } else { + List vins = new ArrayList<>(); + if (StringUtils.equals(ss.getNatureFlagName(), "正常")) { // 需要自动生成 +// vins.addAll(rst.get(vvyId).stream().map(t -> t.getVinCode()).collect(Collectors.toList())); // 出口进场计划备件条码生成的规则要变一下，BJ+年月日时分+5随机数，一共要17位 String prefix = StringUtils.join("BJ", DateUtil.format(new Date(), "yyMMddHHmm")); do { @@ -3474,4 +3493,8 @@ public class ExportInHandler implements BaseHandler { }); } + + private void syncAddExportInToOld(List list) { + + } } diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportLoadHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportLoadHandler.java index cb2f22c..5a72b2b 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportLoadHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/ExportLoadHandler.java @@ -1729,7 +1729,10 @@ public class ExportLoadHandler implements BaseHandler { exportLoad.setPortArea(item.getValue().get(0).getPortArea()); exportLoad.setContact(item.getValue().get(0).getContact()); exportLoad.setContactPhone(item.getValue().get(0).getContactPhone()); + exportLoad.setNatureFlagName(item.getValue().get(0).getNatureFlagName()); exportLoad.setNatureFlag(goodsNature.stream().filter(p -> StringUtils.equalsIgnoreCase(p.getPtrDesc(), item.getValue().get(0).getNatureFlagName())).findFirst().get().getPtrCode()); + exportLoad.setTransferVoyage(item.getValue().get(0).getTransferVoyage()); + exportLoad.setTransferShipName(item.getValue().get(0).getTransferShipName()); if (!StringUtils.equals(item.getValue().get(0).getNatureFlagName(), "正常")) { exportLoad.setTransferShipId(shipList.stream().filter(p -> StringUtils.equalsIgnoreCase(p.getText(), item.getValue().get(0).getTransferShipName())).findFirst().get().getId()); exportLoad.setTransferVoyageId(transferVoyageMap.get(exportLoad.getTransferShipName()).stream().filter(p -> StringUtils.equalsIgnoreCase(p.getVvyName(), item.getValue().get(0).getTransferVoyage())).findFirst().get().getVvyId()); diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/FreeTradeHandler.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/FreeTradeHandler.java index c54b99d..8a401bc 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/FreeTradeHandler.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/FreeTradeHandler.java @@ -8,6 +8,7 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.haitonggauto.rtosc.api.NuzarMiniApi; @@ -107,6 +108,23 @@ public class FreeTradeHandler implements BaseHandler { return ResultUtil.success(page); } + @ApiOperation("总价，总净重查询") + @PostMapping("/query/sum") + public Result> checkQuerySum(@RequestBody FreeTradeQuery query) { + if (query.getEndCreateDate() != null) { + query.setEndCreateDate(DateUtils.getDayEnd(query.getEndCreateDate())); + } + if (query.getCheckStatus() == null) { + query.setCheckStatusList(Arrays.asList(AuditEnum.SUBMIT, AuditEnum.AUDIT, AuditEnum.AUDIT_PASS, AuditEnum.AUDIT_REJECT)); + } + query.setSorts(null); + QueryWrapper queryWrapper = (QueryWrapper)new WrapperKit() { + }.changeBaseQueryToWrapper(CustomerFreeTrade.class, query); + queryWrapper.select("sum(total_price) as total_price, sum(net_weight) as net_weight"); + Map map = customerFreeTradeService.getMap(queryWrapper); + return ResultUtil.success(map); + } + /** * 新增 * diff --git a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/mapper/PoMapper.java b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/mapper/PoMapper.java index e5dd4f0..3dc5470 100644 --- a/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/mapper/PoMapper.java +++ b/nuzar-customer-controller/src/main/java/com/haitonggauto/rtosc/handler/mapper/PoMapper.java @@ -1,13 +1,17 @@ package com.haitonggauto.rtosc.handler.mapper; +import com.haitonggauto.rtosc.api.dto.OldExportInAddReq; import com.haitonggauto.rtosc.api.dto.log.ImportInspectLog; import com.haitonggauto.rtosc.excel.*; import com.haitonggauto.rtosc.repository.entity.*; import com.haitonggauto.rtosc.dto.*; +import io.swagger.annotations.ApiModelProperty; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; +import java.math.BigDecimal; + @Mapper public interface PoMapper { PoMapper instance = Mappers.getMapper(PoMapper.class); @@ -98,4 +102,36 @@ public interface PoMapper { @Mapping(source = "cargo.vin", target = "vin") @Mapping(source = "head.company", target = "company") ExportInspectExportExcel inspectEntity2ExportExcel(CustomerExportInspect head, CustomerExportInspectCargo cargo); + + @Mapping(source = "id", target = "nsId") +// @Mapping(source = "head.company", target = "vlsNm") +// @Mapping(source = "head.company", target = "vvyNm") +// @Mapping(source = "head.company", target = "cstNm") +// @Mapping(source = "head.company", target = "brdNm") +// @Mapping(source = "head.company", target = "mdlNm") +// @Mapping(source = "head.company", target = "length") +// @Mapping(source = "head.company", target = "width") +// @Mapping(source = "head.company", target = "height") +// @Mapping(source = "head.company", target = "volume") +// @Mapping(source = "head.company", target = "weight") +// @Mapping(source = "head.company", target = "ctnNm") +// @Mapping(source = "head.company", target = "potNm") +// @Mapping(source = "head.company", target = "carNum") +// @Mapping(source = "head.company", target = "partNum") +// @Mapping(source = "head.company", target = "mnfBl") +// @Mapping(source = "head.company", target = "mnfNum") +// @Mapping(source = "head.company", target = "mnfWeight") +// @Mapping(source = "head.company", target = "mnfVolume") +// @Mapping(source = "head.company", target = "godType") +// @Mapping(source = "head.company", target = "godDtlType") +// @Mapping(source = "head.company", target = "remark") +// @Mapping(source = "head.company", target = "transType") +// @Mapping(source = "head.company", target = "person") +// @Mapping(source = "head.company", target = "carOpMode") +// @Mapping(source = "head.company", target = "partOpMode") +// @Mapping(source = "head.company", target = "specWork") +// @Mapping(source = "head.company", target = "inStartTm") +// @Mapping(source = "head.company", target = "inEndTm") +// @Mapping(source = "head.company", target = "personTel") + OldExportInAddReq exportIn2OldExportInAddReq(CustomerExportIn exportIn); } diff --git a/nuzar-customer-controller/src/main/resources/templates/template.xlsx b/nuzar-customer-controller/src/main/resources/templates/template.xlsx index 77f5d42582dac8f0dc9f7ff2a570e6d4de0079a5..fd2f59e46c2d0fcc048b66dad9f20421f34cc3d6 100644 GIT binary patch delta 6591 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 E2X@C(_W%F@ diff --git a/nuzar-customer-repository/src/main/java/com/haitonggauto/rtosc/repository/entity/CustomerDeparturePlan.java b/nuzar-customer-repository/src/main/java/com/haitonggauto/rtosc/repository/entity/CustomerDeparturePlan.java index 3cc7a9a..47d1b67 100644 --- a/nuzar-customer-repository/src/main/java/com/haitonggauto/rtosc/repository/entity/CustomerDeparturePlan.java +++ b/nuzar-customer-repository/src/main/java/com/haitonggauto/rtosc/repository/entity/CustomerDeparturePlan.java @@ -32,6 +32,9 @@ public class CustomerDeparturePlan extends BaseEntity implements Serializable { @ApiModelProperty(value = "计划提货时间") private Date pickTime; + @TableField(exist = false) + private String pickTimeStr; + /** * 品牌ID */ diff --git a/nuzar-customer-repository/src/main/resources/mapper/CustomerExportInMapper.xml b/nuzar-customer-repository/src/main/resources/mapper/CustomerExportInMapper.xml index 377be20..1b5cf5e 100644 --- a/nuzar-customer-repository/src/main/resources/mapper/CustomerExportInMapper.xml +++ b/nuzar-customer-repository/src/main/resources/mapper/CustomerExportInMapper.xml @@ -71,6 +71,12 @@ + + + + + + diff --git a/nuzar-customer-repository/src/main/resources/mapper/CustomerExportLoadMapper.xml b/nuzar-customer-repository/src/main/resources/mapper/CustomerExportLoadMapper.xml index 8a2ff5f..6f1d692 100644 --- a/nuzar-customer-repository/src/main/resources/mapper/CustomerExportLoadMapper.xml +++ b/nuzar-customer-repository/src/main/resources/mapper/CustomerExportLoadMapper.xml @@ -37,6 +37,12 @@ + + + + + +