@@ -82,7 +82,13 @@ public class FssPaccountPay extends StringUUIDEntity { | |||
/*** 向微信请款使用的订单号*/ | |||
private String wxOrderId; | |||
@Column(name = "version") | |||
//新增字段 | |||
/*** 入站时间*/ | |||
private LocalDateTime enTime; | |||
/*** 出站时间*/ | |||
private LocalDateTime exTime; | |||
@Column(name = "version") | |||
public String getVersion() { | |||
return version; | |||
} | |||
@@ -360,4 +366,20 @@ public class FssPaccountPay extends StringUUIDEntity { | |||
public void setWxOrderId(String wxOrderId) { | |||
this.wxOrderId = wxOrderId; | |||
} | |||
@Column(name = "en_time") | |||
public LocalDateTime getEnTime() { | |||
return enTime; | |||
} | |||
public void setEnTime(LocalDateTime enTime) { | |||
this.enTime = enTime; | |||
} | |||
@Column(name = "ex_time") | |||
public LocalDateTime getExTime() { | |||
return exTime; | |||
} | |||
public void setExTime(LocalDateTime exTime) { | |||
this.exTime = exTime; | |||
} | |||
} |
@@ -11,7 +11,7 @@ public interface AflAccessChannelAuthorityInfoRepo extends AbstractJpaRepo<AflA | |||
JpaSpecificationExecutor<AflAccessChannelAuthorityInfo>{ | |||
@Query(" from AflAccessChannelAuthorityInfo where functionCode = ?1 and isDelete=0 ") | |||
AflAccessChannelAuthorityInfo findByFunctionCode(String functionName); | |||
AflAccessChannelAuthorityInfo findByFunctionCode(String functionCode); | |||
@Query("from AflAccessChannelAuthorityInfo where id = ?1 and isDelete = 0") | |||
AflAccessChannelAuthorityInfo findByIdAndIsDelete(String id); |
@@ -91,10 +91,10 @@ public class FssPaccountPayByVehicleIdHandler extends AbstractAfterSalesManager< | |||
List<Predicate> list = Lists.newArrayList(); | |||
list.add(cb.equal(root.<String>get("vehicleId"), request.getPlateNumber() + "_" + request.getPlateColor())); | |||
if (null != request.getStartTime()) { | |||
list.add(cb.greaterThanOrEqualTo(root.<LocalDateTime>get("chargeTime"), request.getStartTime())); | |||
list.add(cb.greaterThanOrEqualTo(root.<LocalDateTime>get("exTime"), request.getStartTime())); | |||
} | |||
if (null != request.getEndTime()) { | |||
list.add(cb.lessThanOrEqualTo(root.<LocalDateTime>get("chargeTime"), request.getEndTime())); | |||
list.add(cb.lessThanOrEqualTo(root.<LocalDateTime>get("exTime"), request.getEndTime())); | |||
} | |||
Predicate[] p = new Predicate[list.size()]; |
@@ -41,7 +41,7 @@ public class AflAccessChannelAuthorityInfoServiceImpl implements AflAccessChanne | |||
@Override | |||
public void save(AflAccessChannelAuthorityInfoAddRequest request) throws ServiceHandleException { | |||
verify(request); | |||
AflAccessChannelAuthorityInfo aflAccessChannelAuthorityInfo = aflAccessChannelAuthorityInfoRepo.findByFunctionCode(request.getFunctionName()); | |||
AflAccessChannelAuthorityInfo aflAccessChannelAuthorityInfo = aflAccessChannelAuthorityInfoRepo.findByFunctionCode(request.getFunctionCode()); | |||
if (null != aflAccessChannelAuthorityInfo) { | |||
throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该功能的配置,不允许重复,请核实"); | |||
} | |||
@@ -101,7 +101,12 @@ public class AflAccessChannelAuthorityInfoServiceImpl implements AflAccessChanne | |||
logger.error("选装-接入渠道功能权限管理导出失败:{}", e.getMessage()); | |||
throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("接入渠道功能权限管理导出失败"); | |||
}finally { | |||
File file = new File(pathFile); | |||
File file = null; | |||
try { | |||
file = new File(pathFile); | |||
} catch (Exception e) { | |||
} | |||
if (file!=null){ | |||
file.delete(); | |||
} |
@@ -51,6 +51,14 @@ public class FssPaccountPayVo extends BaseModel { | |||
/*** 向微信请款使用的订单号*/ | |||
private String wxOrderId; | |||
//新增字段 | |||
/*** 入站时间*/ | |||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
private LocalDateTime enTime; | |||
/*** 出站时间*/ | |||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
private LocalDateTime exTime; | |||
public Integer getSceneTp() { | |||
return sceneTp; | |||
} | |||
@@ -178,4 +186,20 @@ public class FssPaccountPayVo extends BaseModel { | |||
public void setWxOrderId(String wxOrderId) { | |||
this.wxOrderId = wxOrderId; | |||
} | |||
public LocalDateTime getEnTime() { | |||
return enTime; | |||
} | |||
public void setEnTime(LocalDateTime enTime) { | |||
this.enTime = enTime; | |||
} | |||
public LocalDateTime getExTime() { | |||
return exTime; | |||
} | |||
public void setExTime(LocalDateTime exTime) { | |||
this.exTime = exTime; | |||
} | |||
} |