更新
This commit is contained in:
parent
cd806c9ac0
commit
d81fa731c5
@ -1,6 +1,7 @@
|
||||
package cn.iocoder.yudao.module.inspection.controller;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.security.core.LoginUser;
|
||||
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
||||
@ -69,6 +70,9 @@ public class InspectionFileController extends BaseController {
|
||||
*/
|
||||
@GetMapping("/listByPermission")
|
||||
public CommonResult listByPermission(InspectionFile inspectionFile) throws Exception {
|
||||
if (ObjectUtil.isEmpty(inspectionFile.getServicePackageId())){
|
||||
inspectionFile.setServicePackageId("jiance");
|
||||
}
|
||||
//判断当前登陆人的角色是否是可以查看文件
|
||||
boolean ifFile = permissionApi.hasDictTypeRole(inspectionFile.getDictType());
|
||||
if (ifFile) {
|
||||
|
@ -151,6 +151,7 @@ public class InspectionInfo extends TenantBaseDO
|
||||
//2024-03-27新增字段
|
||||
//其他联系人手机号
|
||||
private String otherPhone;
|
||||
// private String otherName;
|
||||
private String driverLicenesImg;
|
||||
//是否线上支付0否1是
|
||||
private String isPayOnline;
|
||||
|
@ -207,11 +207,6 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
|
||||
InspectionAppointment appointment1 = inspectionAppointmentService.getById(inspectionInfo.getAppointmentId());
|
||||
if (ObjectUtil.isNotEmpty(appointment1.getOrderId())) {
|
||||
// 需要核销订单表
|
||||
//修改订单的核销时间
|
||||
// orderInfoService.update(Wrappers.<OrderInfo>lambdaUpdate()
|
||||
// .eq(OrderInfo::getId, appointment1.getOrderId())
|
||||
// .set(OrderInfo::getValidationTime, new Date()));
|
||||
|
||||
// 查询订单
|
||||
orderInfo = orderInfoService.getById(appointment1.getOrderId());
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user