lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除

localizer
ljw 2025-09-20 20:49:30 +08:00
parent 4f0bd0c151
commit 5e8511014f
8 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizDriverController.java
View File

@ -64,7 +64,7 @@ public class BizDriverController {
* @return BizDriverEntity 结果
*/
@GetMapping("/detail")
public R<BizDriverEntity> detail(@RequestParam Long id) {
public R<BizDriverEntity> detail(@RequestParam("id") Long id) {
return R.success(bizDriverService.detail(id));
}

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
View File

@ -183,8 +183,9 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
Integer station = searchCompanyParam.getStation();
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
// .eq("a.station", Boolean.FALSE)
.eq("a.deleted", 0)
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
.eq("a.station", station != null && station == 1)
.eq(station != null, "a.station", station == 1)
// .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
.in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
.like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizDriverService.java
View File

@ -109,6 +109,7 @@ public class BizDriverService extends ServiceImpl<BizDriverMapper, BizDriverEnti
aStatus = auditStatus.getVal();
}
QueryWrapper<BizDriverEntity> ew = Wrappers.<BizDriverEntity>query()
.eq("d.deleted", 0)
.like(StrUtil.isNotBlank(driverName), "d.driver_name", driverName)
.like(StrUtil.isNotBlank(phone), "d.phone", phone)
.eq(StrUtil.isNotBlank(aStatus), "d.audit_status", aStatus);

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizProjectService.java
View File

@ -72,7 +72,7 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values());
QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query()
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus);
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus).eq("a.deleted", 0);
if (bizObj != null && bizObj.isTrans()) {
ew.eq("a.user_id", userDetail.getUserId());
@ -111,6 +111,7 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
Long userId = userDetail.getUserId();
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query()
.eq("a.deleted", 0)
.eq("b.user_id", userId)
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
));

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizTruckService.java
View File

@ -91,6 +91,7 @@ public class BizTruckService extends ServiceImpl<BizTruckMapper, BizTruckEntity>
aStatus = auditStatus.getVal();
}
QueryWrapper<SearchTruckResult> ew = Wrappers.<SearchTruckResult>query()
.eq("a.deleted", 0)
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
.like(StrUtil.isNotBlank(companyName), "b.company_name", companyName)
.like(StrUtil.isNotBlank(licensePlate), "a.license_plate", licensePlate);

4
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizWarnService.java
View File

@ -1,5 +1,6 @@
package com.njzscloud.supervisory.biz.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -57,6 +58,9 @@ public class BizWarnService extends ServiceImpl<BizWarnMapper, BizWarnEntity> im
*/
public PageResult<BizWarnDetailVO> paging(PageParam pageParam, BizWarnEntity bizWarnEntity) {
QueryWrapper<Object> queryWrapper = Wrappers.query(bizWarnEntity);
queryWrapper.eq("bw.deleted", 0);
queryWrapper.eq(StrUtil.isNotBlank(bizWarnEntity.getWarnCategory()), "bw.warn_category", bizWarnEntity.getWarnCategory());
queryWrapper.eq(StrUtil.isNotBlank(bizWarnEntity.getProcessStatus()), "bw.process_status", bizWarnEntity.getProcessStatus());
Page<Object> page = pageParam.toPage();
return PageResult.of(baseMapper.selectWarnDetailPage(page, queryWrapper));
}

8
njzscloud-svr/src/main/resources/mapper/biz/BizDriverMapper.xml
View File

@ -24,12 +24,10 @@
c.company_name
FROM biz_driver d
LEFT JOIN biz_company c ON d.company_id = c.id AND c.deleted = 0
WHERE d.deleted = 0
<if test="ew != null">
<if test="ew.sqlSegment != null and ew.sqlSegment != ''">
AND ${ew.sqlSegment}
</if>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
ORDER BY d.modify_time DESC
</select>
</mapper>

5
njzscloud-svr/src/main/resources/mapper/biz/BizWarnMapper.xml
View File

@ -69,8 +69,9 @@
LEFT JOIN biz_company bc2 ON oi.user_id = bc2.user_id AND bc2.deleted = 0
LEFT JOIN biz_truck bt ON oi.truck_id = bt.id AND bt.deleted = 0
LEFT JOIN biz_driver bd ON oi.driver_id = bd.id AND bd.deleted = 0
WHERE bw.deleted = 0
${ew.customSqlSegment}
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
ORDER BY bw.modify_time DESC
</select>