Skip to content

C
clx-performance
提交 85b3b3a7 authored 作者: liuhaiquan's avatar liuhaiquan
浏览文件
操作

Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into v5.7_break_contract_reverse_20231020 # Conflicts: # performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java # performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
上级 f6cdc616 84d21e72
隐藏空白字符变更
内嵌 并排
正在显示 包含 564 行增加 和 57 行删除
performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementDriverEnum.java
浏览文件 @ 85b3b3a7
......@@ -29,4 +29,41 @@ public enum BreakContractSettlementDriverEnum {
}
}
@Getter
@AllArgsConstructor
public enum SettleStatus {
NO(0, "待结算"),
YES(1, "已结算"),
;
private final Integer code;
private final String msg;
public static Optional<SettleStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(SettleStatus::getMsg).orElse(null);
}
}
@Getter
@AllArgsConstructor
public enum SettlePlatform {
MSL(0, "马上来"),
;
private final Integer code;
private final String msg;
public static Optional<SettlePlatform> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(SettlePlatform::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/enums/BreakContractSettlementOwnerEnum.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;
public enum BreakContractSettlementOwnerEnum {
;
@Getter
@AllArgsConstructor
public enum Status {
TO_BE_LOCKED(10, "待锁定"),
OWNER_TO_BE_CONFIRMED(20, "待货主确认"),
SHIPPER_TO_PAYMENT (30, "待货主付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(40, "待平台确认付款"),
PLATFORM_TO_PAYMENT(50, "待平台付款"),
OWNER_CONFIRMED_PLATFORM_PAYMENT(60, "待货主确认付款"),
COMPLETED(70, "已完结"),
;
private final Integer code;
private final String msg;
public static Optional<Status> getByCode(int code) {
return Arrays.stream(values()).filter(e -> Objects.equals(e.getCode(), code)).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(Status::getMsg).orElse(null);
}
}
}
performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailParam.java
浏览文件 @ 85b3b3a7
......@@ -21,6 +21,6 @@ public class PageCarrierBreakContractSettlementDriverDetailParam extends PagePar
private Long truckOwnUserNo;
@ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
}
performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverParam.java
浏览文件 @ 85b3b3a7
......@@ -21,7 +21,7 @@ public class PageCarrierBreakContractSettlementDriverParam extends PageParam {
private Long truckOwnUserNo;
@ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
private String beginTime;
......
performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerDetailParam.java
浏览文件 @ 85b3b3a7
......@@ -21,6 +21,6 @@ public class PageCarrierBreakContractSettlementOwnerDetailParam extends PagePara
private Long ownerUserNo;
@ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
}
performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerParam.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.param.pc.breakcontract.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
@Setter
@Getter
@ToString
@NoArgsConstructor
public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
@ApiModelProperty(value="订单编号",example = "201457878")
private String orderNo;
@ApiModelProperty(value="结算单号",example = "201457878")
private String settlementNo;
@ApiModelProperty(value = "违约方类型：1平台 2货主 3车主", example = "1")
private Integer breakContractPartyType;
@ApiModelProperty(value="开始时间",example = "2012-01-01 00:00:00")
private String beginTime;
@ApiModelProperty(value="结束时间",example = "2012-01-01 00:00:00")
private String endTime;
}
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverDetailVO.java
浏览文件 @ 85b3b3a7
......@@ -17,10 +17,10 @@ import java.math.BigDecimal;
public class PageCarrierBreakContractSettlementDriverDetailVO {
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
private String breachContractPartyTypeMsg;
private String breakContractPartyTypeMsg;
@ApiModelProperty("违约单号")
private String breakNo;
......@@ -42,7 +42,7 @@ public class PageCarrierBreakContractSettlementDriverDetailVO {
private BigDecimal figure;
@ApiModelProperty("违约说明")
private String breachContractRemark;
private String breakContractRemark;
@ApiModelProperty("操作人名称")
private String createName;
......
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementDriverVO.java
浏览文件 @ 85b3b3a7
......@@ -16,10 +16,10 @@ import java.math.BigDecimal;
public class PageCarrierBreakContractSettlementDriverVO {
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
private String breachContractPartyTypeMsg;
private String breakContractPartyTypeMsg;
@ApiModelProperty("结算单编号")
private String settlementNo;
......@@ -43,13 +43,13 @@ public class PageCarrierBreakContractSettlementDriverVO {
private String settleStatusMsg;
@ApiModelProperty("结算状态 0待结算;1已结算")
private Integer settleStatusCode;
private Integer settleStatus;
@ApiModelProperty("结算平台 0马上来")
private String settlePlatformMsg;
@ApiModelProperty("结算平台 0马上来")
private Integer settlePlatformCode;
private Integer settlePlatform;
@ApiModelProperty("结算时间")
private String settleTime;
......
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerDetailVO.java
浏览文件 @ 85b3b3a7
......@@ -16,10 +16,10 @@ import java.math.BigDecimal;
public class PageCarrierBreakContractSettlementOwnerDetailVO {
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
private String breachContractPartyTypeMsg;
private String breakContractPartyTypeMsg;
@ApiModelProperty("违约单号")
private String breakNo;
......@@ -40,7 +40,7 @@ public class PageCarrierBreakContractSettlementOwnerDetailVO {
private BigDecimal figure;
@ApiModelProperty("违约说明")
private String breachContractRemark;
private String breakContractRemark;
@ApiModelProperty("操作人名称")
private String createName;
......
performance-api/src/main/java/com/clx/performance/vo/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerVO.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.vo.pc.breakcontract.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import java.math.BigDecimal;
@Getter
@Setter
@ToString
@NoArgsConstructor
public class PageCarrierBreakContractSettlementOwnerVO {
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breakContractPartyType;
@ApiModelProperty("违约方类型Msg：1平台 2货主 3车主")
private String breakContractPartyTypeMsg;
@ApiModelProperty("结算单号")
private String settlementNo;
@ApiModelProperty("货主用户编号")
private Long ownerUserNo;
@ApiModelProperty("货主名称")
private String ownerName;
@ApiModelProperty("订单编号")
private String orderNo;
@ApiModelProperty("状态msg")
private String statusMsg;
@ApiModelProperty("状态")
private Integer status;
@ApiModelProperty("违约金")
private BigDecimal figure;
@ApiModelProperty("操作人名称")
private String createName;
@ApiModelProperty("创建时间")
private String createTime;
}
\ No newline at end of file
performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
浏览文件 @ 85b3b3a7
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.order.feign.OrderFeign;
import com.clx.order.params.OrderGoodsParams;
import com.clx.order.params.PageOrderGoodsListParam;
import com.clx.order.params.UpdateEditOrderGoodsParam;
import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.performance.component.GoodsOrderStrategyContext;
import com.clx.performance.constant.RedisConstants;
......@@ -133,4 +132,10 @@ public class GoodsOrderController {
return Result.ok();
}
@ApiOperation(value = "取消订单获取弹窗样式", notes = "<br>By:胡宇帆")
@GetMapping("/orderCancel")
public Result<String> orderCancel(@RequestParam(value = "orderNo") String orderNo) {
return Result.ok(orderGoodsService.orderCancel(orderNo));
}
}
performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementDriverController.java
浏览文件 @ 85b3b3a7
package com.clx.performance.controller.pc.breakcontract.carrier;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementDriverDetailService;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailVO;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementDriverService;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
......@@ -31,22 +31,22 @@ import javax.servlet.http.HttpServletResponse;
@AllArgsConstructor
public class CarrierBreakContractSettlementDriverController {
private final BreakContractSettlementDriverDetailService breakContractSettlementDriverDetailService;
private final BreakContractSettlementDriverService breakContractSettlementDriverService;
@ApiOperation(value = "列表",notes = "<br>By:李瑞新")
@PostMapping("/pageCarrierBreakContractSettlementDriverDetailList")
@PostMapping("/pageCarrierBreakContractSettlementDriverList")
@UnitCovert(param = false)
public Result<PageData<PageCarrierBreakContractSettlementDriverDetailVO>> pageCarrierBreakContractSettlementDriverDetailList(@RequestBody PageCarrierBreakContractSettlementDriverDetailParam param) {
IPage<PageCarrierBreakContractSettlementDriverDetailVO> page = breakContractSettlementDriverDetailService.pageCarrierBreakContractSettlementDriverDetailList(param);
public Result<PageData<PageCarrierBreakContractSettlementDriverVO>> pageCarrierBreakContractSettlementDriverList(@RequestBody PageCarrierBreakContractSettlementDriverParam param) {
IPage<PageCarrierBreakContractSettlementDriverVO> page = breakContractSettlementDriverService.pageCarrierBreakContractSettlementDriverList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "导出")
@PostMapping("/exportCarrierBreakContractSettlementDriverDetailList")
public Result exportCarrierBreakContractSettlementDriverDetailList(@RequestBody PageCarrierBreakContractSettlementDriverDetailParam param, HttpServletResponse response) throws Exception {
@PostMapping("/exportCarrierBreakContractSettlementDriverList")
public Result exportCarrierBreakContractSettlementDriverList(@RequestBody PageCarrierBreakContractSettlementDriverParam param, HttpServletResponse response) throws Exception {
SXSSFWorkbook workbook = breakContractSettlementDriverDetailService.exportCarrierBreakContractSettlementDriverDetailList(param);
SXSSFWorkbook workbook = breakContractSettlementDriverService.exportCarrierBreakContractSettlementDriverList(param);
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
workbook.write(response.getOutputStream());
return null;
......
performance-web/src/main/java/com/clx/performance/controller/pc/breakcontract/carrier/CarrierBreakContractSettlementOwnerController.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.controller.pc.breakcontract.carrier;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
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;
import javax.servlet.http.HttpServletResponse;
@Slf4j
@RestController
@RequestMapping(value="/pc/carrier/breakContract")
@Validated
@Api(tags = "承运端-违约结算单（货主）")
@AllArgsConstructor
public class CarrierBreakContractSettlementOwnerController {
private final BreakContractSettlementOwnerService breakContractSettlementOwnerService;
@ApiOperation(value = "列表",notes = "<br>By:李瑞新")
@PostMapping("/pageCarrierBreakContractSettlementOwnerList")
@UnitCovert(param = false)
public Result<PageData<PageCarrierBreakContractSettlementOwnerVO>> pageCarrierBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param) {
IPage<PageCarrierBreakContractSettlementOwnerVO> page = breakContractSettlementOwnerService.pageCarrierBreakContractSettlementOwnerList(param);
return Result.page(page.getRecords(), page.getTotal(), page.getPages());
}
@ApiOperation(value = "导出")
@PostMapping("/exportCarrierBreakContractSettlementOwnerList")
public Result exportCarrierBreakContractSettlementOwnerList(@RequestBody PageCarrierBreakContractSettlementOwnerParam param, HttpServletResponse response) throws Exception {
SXSSFWorkbook workbook = breakContractSettlementOwnerService.exportCarrierBreakContractSettlementOwnerList(param);
response.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_OCTET_STREAM_VALUE);
workbook.write(response.getOutputStream());
return null;
}
}
performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractSettlementDriverDao.java
浏览文件 @ 85b3b3a7
package com.clx.performance.dao.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.breakcontract.BreakContractSettlementDriverMapper;
import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
import com.msl.common.dao.BaseDao;
/**
......@@ -11,4 +13,6 @@ import com.msl.common.dao.BaseDao;
* Time 16:02
*/
public interface BreakContractSettlementDriverDao extends BaseDao<BreakContractSettlementDriverMapper, BreakContractSettlementDriver, Integer> {
IPage<BreakContractSettlementDriver> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param);
}
performance-web/src/main/java/com/clx/performance/dao/breakcontract/BreakContractSettlementOwnerDao.java
浏览文件 @ 85b3b3a7
package com.clx.performance.dao.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.breakcontract.BreakContractSettlementOwnerMapper;
import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
import com.msl.common.dao.BaseDao;
/**
......@@ -11,4 +13,5 @@ import com.msl.common.dao.BaseDao;
* Time 16:02
*/
public interface BreakContractSettlementOwnerDao extends BaseDao<BreakContractSettlementOwnerMapper, BreakContractSettlementOwner, Integer> {
IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
}
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDaoImpl.java
浏览文件 @ 85b3b3a7
package com.clx.performance.dao.impl.breakcontract;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
import com.clx.performance.mapper.breakcontract.BreakContractSettlementDriverMapper;
import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import java.util.Objects;
/**
* @author liruixin
* Date 2023-10-24
......@@ -14,4 +21,15 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContractSettlementDriverMapper, BreakContractSettlementDriver, Integer> implements BreakContractSettlementDriverDao {
@Override
public IPage<BreakContractSettlementDriver> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param) {
LambdaQueryWrapper<BreakContractSettlementDriver> query = new LambdaQueryWrapper<>();
query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriver :: getChildNo,param.getChildNo());
query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriver :: getTruckOwnUserNo,param.getTruckOwnUserNo());
query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriver :: getBreakContractPartyType,param.getBreakContractPartyType());
query.ge(StringUtils.isNotBlank(param.getBeginTime()),BreakContractSettlementDriver :: getCreateTime,param.getBeginTime());
query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractSettlementDriver :: getCreateTime,param.getEndTime());
query.orderByDesc(BreakContractSettlementDriver::getId);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDetailDaoImpl.java
浏览文件 @ 85b3b3a7
......@@ -28,7 +28,7 @@ public class BreakContractSettlementDriverDetailDaoImpl extends BaseDaoImpl<Brea
LambdaQueryWrapper<BreakContractSettlementDriverDetail> query = new LambdaQueryWrapper<>();
query.eq(StringUtils.isNotBlank(param.getChildNo()),BreakContractSettlementDriverDetail :: getChildNo,param.getChildNo());
query.eq(Objects.nonNull(param.getTruckOwnUserNo()),BreakContractSettlementDriverDetail :: getTruckOwnUserNo,param.getTruckOwnUserNo());
query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementDriverDetail :: getBreachContractPartyType,param.getBreachContractPartyType());
query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementDriverDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
query.orderByDesc(BreakContractSettlementDriverDetail::getId);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
}
......
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java
浏览文件 @ 85b3b3a7
package com.clx.performance.dao.impl.breakcontract;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
import com.clx.performance.mapper.breakcontract.BreakContractSettlementOwnerMapper;
import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Repository;
import java.util.Objects;
/**
* @author liruixin
* Date 2023-10-24
......@@ -14,4 +21,15 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContractSettlementOwnerMapper, BreakContractSettlementOwner, Integer> implements BreakContractSettlementOwnerDao {
@Override
public IPage<BreakContractSettlementOwner> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param) {
LambdaQueryWrapper<BreakContractSettlementOwner> query = new LambdaQueryWrapper<>();
query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwner :: getOrderNo,param.getOrderNo());
query.eq(StringUtils.isNotBlank(param.getSettlementNo()),BreakContractSettlementOwner ::getSettlementNo ,param.getSettlementNo());
query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());
query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractSettlementOwner:: getCreateTime,param.getBeginTime());
query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractSettlementOwner :: getCreateTime,param.getEndTime());
query.orderByDesc(BreakContractSettlementOwner::getId);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
}
}
performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDetailDaoImpl.java
浏览文件 @ 85b3b3a7
......@@ -26,7 +26,7 @@ public class BreakContractSettlementOwnerDetailDaoImpl extends BaseDaoImpl<Break
LambdaQueryWrapper<BreakContractSettlementOwnerDetail> query = new LambdaQueryWrapper<>();
query.eq(StringUtils.isNotBlank(param.getOrderNo()),BreakContractSettlementOwnerDetail :: getOrderNo,param.getOrderNo());
query.eq(Objects.nonNull(param.getOwnerUserNo()),BreakContractSettlementOwnerDetail ::getOwnerUserNo ,param.getOwnerUserNo());
query.eq(Objects.nonNull(param.getBreachContractPartyType()),BreakContractSettlementOwnerDetail :: getBreachContractPartyType,param.getBreachContractPartyType());
query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwnerDetail :: getBreakContractPartyType,param.getBreakContractPartyType());
query.orderByDesc(BreakContractSettlementOwnerDetail::getId);
return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
}
......
performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriver.java
浏览文件 @ 85b3b3a7
......@@ -27,9 +27,9 @@ public class BreakContractSettlementDriver implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("breach_contract_party_type")
@TableField("break_contract_party_type")
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@TableField("settlement_no")
@ApiModelProperty("结算单编号")
......
performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementDriverDetail.java
浏览文件 @ 85b3b3a7
......@@ -27,9 +27,9 @@ public class BreakContractSettlementDriverDetail implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("breach_contract_party_type")
@TableField("break_contract_party_type")
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@TableField("break_no")
@ApiModelProperty("违约单号")
......@@ -63,9 +63,9 @@ public class BreakContractSettlementDriverDetail implements HasKey<Integer> {
@ApiModelProperty("违约金（分）")
private BigDecimal figure;
@TableField("breach_contract_remark")
@TableField("break_contract_remark")
@ApiModelProperty("违约说明")
private String breachContractRemark;
private String breakContractRemark;
@TableField("create_by")
......
performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementOwner.java
浏览文件 @ 85b3b3a7
......@@ -28,9 +28,9 @@ public class BreakContractSettlementOwner implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("breach_contract_party_type")
@TableField("break_contract_party_type")
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@TableField("settlement_no")
@ApiModelProperty("结算单编号")
......@@ -84,9 +84,9 @@ public class BreakContractSettlementOwner implements HasKey<Integer> {
@ApiModelProperty("状态")
private Integer status;
@TableField("breach_contract_remark")
@TableField("break_contract_remark")
@ApiModelProperty("违约说明")
private String breachContractRemark;
private String breakContractRemark;
@TableField("create_by")
@ApiModelProperty("操作人编号")
......
performance-web/src/main/java/com/clx/performance/model/breakcontract/BreakContractSettlementOwnerDetail.java
浏览文件 @ 85b3b3a7
......@@ -27,9 +27,9 @@ public class BreakContractSettlementOwnerDetail implements HasKey<Integer> {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@TableField("breach_contract_party_type")
@TableField("break_contract_party_type")
@ApiModelProperty("违约方类型：1平台 2货主 3车主")
private Integer breachContractPartyType;
private Integer breakContractPartyType;
@TableField("break_no")
@ApiModelProperty("违约单号")
......@@ -55,9 +55,9 @@ public class BreakContractSettlementOwnerDetail implements HasKey<Integer> {
@ApiModelProperty("违约金（分）")
private BigDecimal figure;
@TableField("breach_contract_remark")
@TableField("break_contract_remark")
@ApiModelProperty("违约说明")
private String breachContractRemark;
private String breakContractRemark;
@TableField("create_by")
@ApiModelProperty("操作人编号")
......
performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
浏览文件 @ 85b3b3a7
......@@ -35,6 +35,7 @@ public interface OrderGoodsService {
List<OrderGoods> getOrderGoodsList(String orderNo, LocalDateTime lastArriveSendTime);
String orderCancel(String orderNo);
String orderCancel();
void updateEditOrderGoods(UpdateEditOrderGoodsParam param);
......
performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractSettlementDriverService.java
浏览文件 @ 85b3b3a7
package com.clx.performance.service.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
/**
* @author liruixin
* Date 2023-10-24
* Time 16:02
*/
public interface BreakContractSettlementDriverService {
IPage<PageCarrierBreakContractSettlementDriverVO> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param);
SXSSFWorkbook exportCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param);
}
performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractSettlementOwnerService.java
浏览文件 @ 85b3b3a7
package com.clx.performance.service.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
/**
* @author liruixin
* Date 2023-10-24
* Time 16:02
*/
public interface BreakContractSettlementOwnerService {
IPage<PageCarrierBreakContractSettlementOwnerVO> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
SXSSFWorkbook exportCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param);
}
performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
浏览文件 @ 85b3b3a7
......@@ -154,8 +154,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
}
@Override
public String orderCancel() {
String orderNo = "";
public String orderCancel(String orderNo) {
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
Integer orderStatus = orderInfoFeign.getOrderStatus();
......@@ -166,13 +165,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
case 1:
//不算违约 弹窗1
return "writeRemark";
case 2:
//算违约，但是不会有吨数，弹窗2
return "reamrkHasAmount";
return "remarkHasAmount";
case 3:
//算违约，但是不会有吨数，弹窗2
return "remarkHasAmount";
case 4:
//已取消状态，不会涉及弹窗
case 5:
......@@ -182,16 +180,22 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
case 7:
//挂单中 ，算违约，需要判断弹窗2还是3
//约可取消吨数
String residueWeight = orderInfoFeign.getResidueWeight();
return "selectType";
case 8: //运输中 ，算违约， 弹窗3
return "selectType";
case 9: //已完成，不能取消
case 10: //已失效,不会出现在订单列表
case 11: //已挂单 算违约 弹窗 2
return "remarkHasAmount";
case 12: //已完结
default:
throw new RuntimeException();
}
}
public String getOrderRe(String orderNo) {
return "";
}
}
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverDetailServiceImpl.java
浏览文件 @ 85b3b3a7
......@@ -77,7 +77,7 @@ public class BreakContractSettlementDriverDetailServiceImpl implements BreakCon
rowData.add(new ExcelData(dto.getChildNo()));
rowData.add(new ExcelData(dto.getDriverName()));
rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
rowData.add(new ExcelData(dto.getCreateName()));
rowData.add(new ExcelData(dto.getCreateTime()));
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java
浏览文件 @ 85b3b3a7
package com.clx.performance.service.impl.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementDriverService;
import com.clx.performance.struct.breakcontract.BreakContractSettlementDriverStruct;
import com.clx.performance.utils.excel.ExcelData;
import com.clx.performance.utils.excel.ExcelField;
import com.clx.performance.utils.excel.ExcelSheet;
import com.clx.performance.utils.excel.ExcelUtil;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author liruixin
* Date 2023-10-24
* Time 16:02
*/
@Service
@Slf4j
@AllArgsConstructor
public class BreakContractSettlementDriverServiceImpl implements BreakContractSettlementDriverService {
private final BreakContractSettlementDriverDao breakContractSettlementDriverDao;
private final BreakContractSettlementDriverStruct breakContractSettlementStruct;
@Override
public IPage<PageCarrierBreakContractSettlementDriverVO> pageCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param) {
IPage<BreakContractSettlementDriver> breakContractSettlementDriverDetail = breakContractSettlementDriverDao.pageCarrierBreakContractSettlementDriverList(param);
List<PageCarrierBreakContractSettlementDriverVO> list = breakContractSettlementStruct.covertToCarrierList(breakContractSettlementDriverDetail.getRecords());
return new Page<PageCarrierBreakContractSettlementDriverVO>().setRecords(list).setTotal(breakContractSettlementDriverDetail.getTotal()).setPages(breakContractSettlementDriverDetail.getPages());
}
@Override
public SXSSFWorkbook exportCarrierBreakContractSettlementDriverList(PageCarrierBreakContractSettlementDriverParam param) {
param.setPage(1);
param.setPageSize(1000000);
IPage<PageCarrierBreakContractSettlementDriverVO> settlementOwnerDetail = pageCarrierBreakContractSettlementDriverList(param);
List<PageCarrierBreakContractSettlementDriverVO> list = settlementOwnerDetail.getRecords();
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "结算单号", "settlementNo", 5000));
fieldList.add(new ExcelField(2, "运单编号", "childNo", 5000));
fieldList.add(new ExcelField(3, "车主编号", "truckOwnerNo", 5000));
fieldList.add(new ExcelField(4, "司机名称", "driverName", 5000));
fieldList.add(new ExcelField(5, "违约方", "breachContractPartyType", 5000));
fieldList.add(new ExcelField(6, "违约金额", "figure", 5000));
fieldList.add(new ExcelField(7, "创建人", "createName", 5000));
fieldList.add(new ExcelField(8, "创建时间", "createTime", 5000));
fieldList.add(new ExcelField(9, "结算平台", "settlePlatform", 5000));
fieldList.add(new ExcelField(9, "结算状态", "settleStatus", 5000));
fieldList.add(new ExcelField(9, "结算时间", "settleTime", 5000));
// 组装数据
List<List<ExcelData>> dataList = new ArrayList<>();
for (int i=0; i<list.size(); i++){
PageCarrierBreakContractSettlementDriverVO dto = list.get(i);
List<ExcelData> rowData = new ArrayList<>();
rowData.add(new ExcelData(i+1));
rowData.add(new ExcelData(dto.getSettlementNo()));
rowData.add(new ExcelData(dto.getChildNo()));
rowData.add(new ExcelData(dto.getTruckOwnUserNo()+""));
rowData.add(new ExcelData(dto.getDriverName()));
rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
rowData.add(new ExcelData(dto.getCreateName()));
rowData.add(new ExcelData(dto.getCreateTime()));
rowData.add(new ExcelData(dto.getSettlePlatformMsg()));
rowData.add(new ExcelData(dto.getSettleStatusMsg()));
rowData.add(new ExcelData(dto.getSettleTime()));
dataList.add(rowData);
}
ExcelSheet excelSheet = new ExcelSheet("车主违约结算单", "车主违约结算单", fieldList, dataList);
//创建excel
return ExcelUtil.create(excelSheet);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerDetailServiceImpl.java
浏览文件 @ 85b3b3a7
......@@ -2,19 +2,15 @@ package com.clx.performance.service.impl.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDetailDao;
import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDetailDao;
import com.clx.performance.model.breakcontract.BreakContractSettlementDriverDetail;
import com.clx.performance.model.breakcontract.BreakContractSettlementOwnerDetail;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerDetailParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerDetailService;
import com.clx.performance.struct.breakcontract.BreakContractSettlementDriverDetailStruct;
import com.clx.performance.struct.breakcontract.BreakContractSettlementOwnerDetailStruct;
import com.clx.performance.utils.excel.ExcelData;
import com.clx.performance.utils.excel.ExcelField;
import com.clx.performance.utils.excel.ExcelSheet;
import com.clx.performance.utils.excel.ExcelUtil;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverDetailVO;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerDetailVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
......@@ -56,9 +52,9 @@ public class BreakContractSettlementOwnerDetailServiceImpl implements BreakCont
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "订单编号", "breakNo", 5000));
fieldList.add(new ExcelField(2, "货主编号", "truckOwnUserNo", 5000));
fieldList.add(new ExcelField(3, "货主名称", "childNo", 5000));
fieldList.add(new ExcelField(1, "订单编号", "orderNo", 5000));
fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
......@@ -79,7 +75,7 @@ public class BreakContractSettlementOwnerDetailServiceImpl implements BreakCont
rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
rowData.add(new ExcelData(dto.getOwnerName()));
rowData.add(new ExcelData(dto.getBreachContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
rowData.add(new ExcelData(dto.getCreateName()));
rowData.add(new ExcelData(dto.getCreateTime()));
......
performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java
浏览文件 @ 85b3b3a7
package com.clx.performance.service.impl.breakcontract;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.breakcontract.BreakContractSettlementOwnerDao;
import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
import com.clx.performance.param.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerParam;
import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
import com.clx.performance.struct.breakcontract.BreakContractSettlementOwnerStruct;
import com.clx.performance.utils.excel.ExcelData;
import com.clx.performance.utils.excel.ExcelField;
import com.clx.performance.utils.excel.ExcelSheet;
import com.clx.performance.utils.excel.ExcelUtil;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* @author liruixin
* Date 2023-10-24
* Time 16:02
*/
@Service
@Slf4j
@AllArgsConstructor
public class BreakContractSettlementOwnerServiceImpl implements BreakContractSettlementOwnerService {
private final BreakContractSettlementOwnerDao breakContractSettlementOwnerDao;
private final BreakContractSettlementOwnerStruct breakContractSettlementOwnerStruct;
@Override
public IPage<PageCarrierBreakContractSettlementOwnerVO> pageCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param) {
IPage<BreakContractSettlementOwner> breakContractSettlementDriverDetail = breakContractSettlementOwnerDao.pageCarrierBreakContractSettlementOwnerList(param);
List<PageCarrierBreakContractSettlementOwnerVO> list = breakContractSettlementOwnerStruct.covertToCarrierList(breakContractSettlementDriverDetail.getRecords());
return new Page<PageCarrierBreakContractSettlementOwnerVO>().setRecords(list).setTotal(breakContractSettlementDriverDetail.getTotal()).setPages(breakContractSettlementDriverDetail.getPages());
}
@Override
public SXSSFWorkbook exportCarrierBreakContractSettlementOwnerList(PageCarrierBreakContractSettlementOwnerParam param) {
param.setPage(1);
param.setPageSize(1000000);
IPage<PageCarrierBreakContractSettlementOwnerVO> settlementOwnerDetail = pageCarrierBreakContractSettlementOwnerList(param);
List<PageCarrierBreakContractSettlementOwnerVO> list = settlementOwnerDetail.getRecords();
// 组装表头
List<ExcelField> fieldList = new ArrayList<>();
fieldList.add(new ExcelField(0, "序号", "index", 2000));
fieldList.add(new ExcelField(1, "订单编号", "orderNo", 5000));
fieldList.add(new ExcelField(2, "货主编号", "ownUserNo", 5000));
fieldList.add(new ExcelField(3, "货主名称", "ownerName", 5000));
fieldList.add(new ExcelField(4, "违约方", "breachContractPartyType", 5000));
fieldList.add(new ExcelField(5, "违约金额", "figure", 5000));
fieldList.add(new ExcelField(6, "状态", "statusMsg", 5000));
fieldList.add(new ExcelField(7, "结算单号", "settlementNo", 5000));
fieldList.add(new ExcelField(8, "创建人", "createName", 5000));
fieldList.add(new ExcelField(9, "创建时间", "createTime", 5000));
// 组装数据
List<List<ExcelData>> dataList = new ArrayList<>();
for (int i=0; i<list.size(); i++){
PageCarrierBreakContractSettlementOwnerVO dto = list.get(i);
List<ExcelData> rowData = new ArrayList<>();
rowData.add(new ExcelData(i+1));
rowData.add(new ExcelData(dto.getOrderNo()));
rowData.add(new ExcelData(dto.getOwnerUserNo()+""));
rowData.add(new ExcelData(dto.getOwnerName()));
rowData.add(new ExcelData(dto.getBreakContractPartyTypeMsg()));
rowData.add(new ExcelData(dto.getFigure().movePointLeft(2)));
rowData.add(new ExcelData(dto.getStatusMsg()));
rowData.add(new ExcelData(dto.getSettlementNo()));
rowData.add(new ExcelData(dto.getCreateName()));
rowData.add(new ExcelData(dto.getCreateTime()));
dataList.add(rowData);
}
ExcelSheet excelSheet = new ExcelSheet("货主违约结算单", "货主违约结算单", fieldList, dataList);
//创建excel
return ExcelUtil.create(excelSheet);
}
}
performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverDetailStruct.java
浏览文件 @ 85b3b3a7
......@@ -17,7 +17,7 @@ public interface BreakContractSettlementDriverDetailStruct {
@Named("toBaseVo")
@Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
@Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
PageCarrierBreakContractSettlementDriverDetailVO convert(BreakContractSettlementDriverDetail detail);
@IterableMapping(qualifiedByName = "toBaseVo")
......
performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementDriverStruct.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.struct.breakcontract;
import com.clx.performance.enums.BreakContractSettlementDriverEnum;
import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementDriverVO;
import com.msl.common.utils.DateStructUtil;
import com.msl.common.utils.DateUtils;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import java.util.List;
@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {BreakContractSettlementDriverEnum.class, DateUtils.class})
public interface BreakContractSettlementDriverStruct {
@Named("toBaseVo")
@Mapping(target = "settleStatusMsg", expression = "java(BreakContractSettlementDriverEnum.SettleStatus.getMsgByCode(detail.getSettleStatus()))")
@Mapping(target = "settlePlatformMsg", expression = "java(BreakContractSettlementDriverEnum.SettlePlatform.getMsgByCode(detail.getSettlePlatform()))")
@Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
PageCarrierBreakContractSettlementDriverVO convert(BreakContractSettlementDriver detail);
@IterableMapping(qualifiedByName = "toBaseVo")
List<PageCarrierBreakContractSettlementDriverVO> covertToCarrierList(List<BreakContractSettlementDriver> list);
}
performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerDetailStruct.java
浏览文件 @ 85b3b3a7
......@@ -19,7 +19,7 @@ public interface BreakContractSettlementOwnerDetailStruct {
@Named("toBaseVo")
@Mapping(target = "breachContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreachContractPartyType()))")
@Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
PageCarrierBreakContractSettlementOwnerDetailVO convert(BreakContractSettlementOwnerDetail detail);
@IterableMapping(qualifiedByName = "toBaseVo")
......
performance-web/src/main/java/com/clx/performance/struct/breakcontract/BreakContractSettlementOwnerStruct.java 0 → 100644
浏览文件 @ 85b3b3a7
package com.clx.performance.struct.breakcontract;
import com.clx.performance.enums.BreakContractSettlementDriverEnum;
import com.clx.performance.enums.BreakContractSettlementOwnerEnum;
import com.clx.performance.model.breakcontract.BreakContractSettlementOwner;
import com.clx.performance.vo.pc.breakcontract.carrier.PageCarrierBreakContractSettlementOwnerVO;
import com.msl.common.utils.DateStructUtil;
import com.msl.common.utils.DateUtils;
import org.mapstruct.IterableMapping;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.Named;
import java.util.List;
@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {BreakContractSettlementDriverEnum.class, BreakContractSettlementOwnerEnum.class, DateUtils.class})
public interface BreakContractSettlementOwnerStruct {
@Named("toBaseVo")
@Mapping(target = "breakContractPartyTypeMsg", expression = "java(BreakContractSettlementDriverEnum.BreachContractPartyType.getMsgByCode(detail.getBreakContractPartyType()))")
@Mapping(target = "statusMsg", expression = "java(BreakContractSettlementOwnerEnum.Status.getMsgByCode(detail.getStatus()))")
PageCarrierBreakContractSettlementOwnerVO convert(BreakContractSettlementOwner detail);
@IterableMapping(qualifiedByName = "toBaseVo")
List<PageCarrierBreakContractSettlementOwnerVO> covertToCarrierList(List<BreakContractSettlementOwner> list);
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论