dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
xyc 2025-05-20 14:19:26 +08:00
parent cd806c9ac0
commit d81fa731c5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.inspection.controller; package cn.iocoder.yudao.module.inspection.controller;
import cn.hutool.core.collection.CollUtil; 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.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.LoginUser; import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
@ -69,6 +70,9 @@ public class InspectionFileController extends BaseController {
*/ */
@GetMapping("/listByPermission") @GetMapping("/listByPermission")
public CommonResult listByPermission(InspectionFile inspectionFile) throws Exception { public CommonResult listByPermission(InspectionFile inspectionFile) throws Exception {
if (ObjectUtil.isEmpty(inspectionFile.getServicePackageId())){
inspectionFile.setServicePackageId("jiance");
}
//判断当前登陆人的角色是否是可以查看文件 //判断当前登陆人的角色是否是可以查看文件
boolean ifFile = permissionApi.hasDictTypeRole(inspectionFile.getDictType()); boolean ifFile = permissionApi.hasDictTypeRole(inspectionFile.getDictType());
if (ifFile) { if (ifFile) {

1
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/entity/InspectionInfo.java
View File

@ -151,6 +151,7 @@ public class InspectionInfo extends TenantBaseDO
//2024-03-27新增字段 //2024-03-27新增字段
//其他联系人手机号 //其他联系人手机号
private String otherPhone; private String otherPhone;
// private String otherName;
private String driverLicenesImg; private String driverLicenesImg;
//是否线上支付0否1是 //是否线上支付0否1是
private String isPayOnline; private String isPayOnline;

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionInfoServiceImpl.java
View File

@ -207,11 +207,6 @@ public class InspectionInfoServiceImpl extends ServiceImpl<InspectionInfoMapper,
InspectionAppointment appointment1 = inspectionAppointmentService.getById(inspectionInfo.getAppointmentId()); InspectionAppointment appointment1 = inspectionAppointmentService.getById(inspectionInfo.getAppointmentId());
if (ObjectUtil.isNotEmpty(appointment1.getOrderId())) { 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()); orderInfo = orderInfoService.getById(appointment1.getOrderId());
} else { } else {