zcloud_gbs
/
zcloud-gbs-primeport
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0709 - bug修复

koumen
tianxinlei 2026-07-09 16:35:23 +08:00
parent 897c0e43cf
commit 608c51aa0a
12 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
start/src/main/resources/templates/primeport.html
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/3 17:57:46] App_Identifier[primeport]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>临时访客申请</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/9 15:41:33] App_Identifier[primeport]"><meta charset="UTF-8"/><meta name="renderer" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1"/><meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover"><meta charset="UTF-8" name="referrer" content="strict-origin-when-cross-origin"/><title>临时访客申请</title><script>(function () {
const APP_ENV = { const APP_ENV = {
antd: { antd: {
'ant-prefix': 'micro-temp', 'ant-prefix': 'micro-temp',
@ -20,4 +20,4 @@
redirect: '', redirect: '',
FRAMEWORK: APP_ENV.antd FRAMEWORK: APP_ENV.antd
}; };
})();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.4228da465de98de9.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/3 17:57:46] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html> })();</script><script defer="defer" src="/primeport/static/js/942.000313a5011c30f5.js"></script><script defer="defer" src="/primeport/static/js/98.90d75146a9ca149f.js"></script><script defer="defer" src="/primeport/static/js/main.b94bc8525bf7a9d7.js"></script><link href="/primeport/static/css/main.de5125c7f5780dd6.css" rel="stylesheet"></head><body><noscript>此网页需要开启JavaScript功能。</noscript><div id="root" style="width: 100%; height: 100%; position: relative;overflow-y: auto;"></div><script type="text/javascript">/* @cqsjjb/script 输出当前应用基本信息 */console.log("%c@cqsjjb/scripts@2.0.0-rspack.1 Frontend_Env[production] Build_Date[2026/7/9 15:41:33] App_Identifier[primeport] Frontend_Branch[master] Backend_Branch[<branch-name>]", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

1
start/src/main/resources/templates/primeport/static/js/main.b94bc8525bf7a9d7.js Normal file
View File

File diff suppressed because one or more lines are too long

4
web-adapter/src/main/java/com/zcloud/primeport/web/VehicleApplyController.java
View File

@ -107,8 +107,8 @@ public class VehicleApplyController {
} }
@ApiOperation("分公司统计") @ApiOperation("分公司统计")
@PostMapping("/fgsCount") @GetMapping("/fgsCount")
public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,String> qry) { public PageResponse<FgsVehicleCountCo> fgsCount(@RequestParam HashMap<String,Object> qry) {
return vehicleApplyService.fgsCount(qry); return vehicleApplyService.fgsCount(qry);
} }

2
web-app/src/main/java/com/zcloud/primeport/command/query/VehicleApplyQueryExe.java
View File

@ -82,7 +82,7 @@ public class VehicleApplyQueryExe {
return vehicleApplyCO; return vehicleApplyCO;
} }
public PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, String> qry) { public PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, Object> qry) {
PageResponse<FgsVehicleCountDto> pageResponse = vehicleApplyRepository.fgsCount(qry); PageResponse<FgsVehicleCountDto> pageResponse = vehicleApplyRepository.fgsCount(qry);
List<FgsVehicleCountCo> examCenterCOS = vehicleApplyCoConvertor.converCOsToDtos(pageResponse.getData()); List<FgsVehicleCountCo> examCenterCOS = vehicleApplyCoConvertor.converCOsToDtos(pageResponse.getData());
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

2
web-app/src/main/java/com/zcloud/primeport/service/VehicleApplyServiceImpl.java
View File

@ -129,7 +129,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
} }
@Override @Override
public PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, String> qry) { public PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, Object> qry) {
return vehicleApplyQueryExe.fgsCount(qry); return vehicleApplyQueryExe.fgsCount(qry);
} }

2
web-client/src/main/java/com/zcloud/primeport/api/VehicleApplyServiceI.java
View File

@ -38,7 +38,7 @@ public interface VehicleApplyServiceI {
void inspectCarEdit(VehicleApplyInspectUpdateCmd cmd); void inspectCarEdit(VehicleApplyInspectUpdateCmd cmd);
PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, String> qry); PageResponse<FgsVehicleCountCo> fgsCount(HashMap<String, Object> qry);
PageResponse<VehicleAuditCO> xgfCarApplyList(XgfApplyCarPageQry qry); PageResponse<VehicleAuditCO> xgfCarApplyList(XgfApplyCarPageQry qry);

2
web-client/src/main/java/com/zcloud/primeport/dto/VehicleBlackPageQry.java
View File

@ -32,6 +32,8 @@ public class VehicleBlackPageQry extends PageQuery {
private Long vehicleDepartmentId; private Long vehicleDepartmentId;
@ApiModelProperty(name = "vehicleType", value = "车辆类型") @ApiModelProperty(name = "vehicleType", value = "车辆类型")
private String vehicleType; private String vehicleType;
@ApiModelProperty(name = " licenceType", value = "车牌类型")
private String licenceType;
private String menuPath; private String menuPath;

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java
View File

@ -31,7 +31,7 @@ public interface VehicleApplyMapper extends BaseMapper<VehicleApplyDO> {
IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms); IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
IPage<FgsVehicleCountDto> fgsCount(Page<Map<String, Object>> page, @Param("params") HashMap<String, String> qry); IPage<FgsVehicleCountDto> fgsCount(Page<Map<String, Object>> page, @Param("params") HashMap<String, Object> qry);
VehicleApplyDO getInfoById(Long id); VehicleApplyDO getInfoById(Long id);
@InterceptorIgnore(tenantLine = "true") @InterceptorIgnore(tenantLine = "true")

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java
View File

@ -20,7 +20,7 @@ import java.util.Map;
public interface VehicleApplyRepository extends BaseRepository<VehicleApplyDO> { public interface VehicleApplyRepository extends BaseRepository<VehicleApplyDO> {
PageResponse<VehicleApplyDO> listPage(Map<String, Object> params); PageResponse<VehicleApplyDO> listPage(Map<String, Object> params);
PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, String> qry); PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, Object> qry);
PageResponse<VehicleApplyDO> getCarByVehicleBelongType(Map<String, Object> params); PageResponse<VehicleApplyDO> getCarByVehicleBelongType(Map<String, Object> params);

2
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java
View File

@ -50,7 +50,7 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
} }
@Override @Override
public PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, String> qry) { public PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, Object> qry) {
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(qry.get("pageIndex").toString()), Page<Map<String, Object>> page = new Page<>(Integer.parseInt(qry.get("pageIndex").toString()),
Integer.parseInt(qry.get("pageSize").toString())); Integer.parseInt(qry.get("pageSize").toString()));
IPage<FgsVehicleCountDto> result = vehicleApplyMapper.fgsCount(page, qry); IPage<FgsVehicleCountDto> result = vehicleApplyMapper.fgsCount(page, qry);

9
web-infrastructure/src/main/resources/mapper/VehicleBlackDO.xml
View File

@ -30,6 +30,15 @@
<if test="params.licenceNo != null and params.licenceNo != ''"> <if test="params.licenceNo != null and params.licenceNo != ''">
AND b.licence_no LIKE CONCAT('%', #{params.licenceNo}, '%') AND b.licence_no LIKE CONCAT('%', #{params.licenceNo}, '%')
</if> </if>
<if test="params.employeeVehicleUserName != null and params.employeeVehicleUserName != ''">
AND b.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%')
</if>
<if test="params.vehicleType != null and params.vehicleType != ''">
AND b.vehicle_type = #{params.vehicleType}
</if>
<if test="params.licenceType != null and params.licenceType != ''">
AND b.licence_type = #{params.licenceType}
</if>
</select> </select>
</mapper> </mapper>

6
web-infrastructure/src/main/resources/mapper/VehicleViolationsDO.xml
View File

@ -13,6 +13,12 @@
vehicle_violations AS f vehicle_violations AS f
WHERE WHERE
f.delete_enum = 'FALSE' f.delete_enum = 'FALSE'
<if test="params.licenceNo != null and params.licenceNo">
AND f.licence_no LIKE CONCAT( '%', #{params.licenceNo}, '%' )
</if>
<if test="params.violationType != null and params.violationType">
AND f.violation_type = #{params.violationType}
</if>
GROUP BY GROUP BY
f.licence_no f.licence_no
</select> </select>