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

feat：违规与拉黑移除多余信息

koumen
dearLin 2026-03-26 16:34:46 +08:00
parent 129a192a91
commit 2103679364
12 changed files with 26 additions and 56 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 Env/production (2026/3/26 15:35:40) App/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"><title>--</title><script>(function () { <!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/3/26 15:53:39) App/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"><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/75.01fcf9a90d6e6463589b.js"></script><script defer="defer" src="/primeport/static/js/745.1a4c36b2a5f096849a4e.js"></script><script defer="defer" src="/primeport/static/js/main.e8b4316da5ee18c3cfce.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.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 Env/production (2026/3/26 15:35:40) App/primeport Version/master Java/<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/75.01fcf9a90d6e6463589b.js"></script><script defer="defer" src="/primeport/static/js/745.1a4c36b2a5f096849a4e.js"></script><script defer="defer" src="/primeport/static/js/main.6c8d6c224683e29cde27.js"></script><link href="/primeport/static/css/main.ef1f3389c7ea99a7bdd0.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 Env/production (2026/3/26 15:53:39) App/primeport Version/master Java/<branch-name>", "color: #1890ff; border-radius: 2px; padding: 0 4px; border: 1px solid #1890ff; background: #f9fcff")</script></body></html>

4
web-app/src/main/java/com/zcloud/primeport/command/PersonApplyAddExe.java
View File

@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse; import com.alibaba.cola.dto.SingleResponse;
import com.alibaba.cola.exception.BizException; import com.alibaba.cola.exception.BizException;
import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.gbscommon.utils.DateUtil;
import com.zcloud.primeport.domain.gateway.PersonApplyGateway; import com.zcloud.primeport.domain.gateway.PersonApplyGateway;
import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway; import com.zcloud.primeport.domain.gateway.XgfApplyPersonGateway;
import com.zcloud.primeport.domain.model.PersonApplyE; import com.zcloud.primeport.domain.model.PersonApplyE;
@ -20,7 +21,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.ZoneOffset;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
@ -105,6 +108,7 @@ public class PersonApplyAddExe {
public XgfPersonApplyCO xgfPersonApplyInfoById(Long id) { public XgfPersonApplyCO xgfPersonApplyInfoById(Long id) {
XgfPersonApplyCO xgfPersonApplyCO = new XgfPersonApplyCO(); XgfPersonApplyCO xgfPersonApplyCO = new XgfPersonApplyCO();
XgfApplyPersonE xgfApplyPersonE = xgfApplyPersonGateway.getInfoById(id); XgfApplyPersonE xgfApplyPersonE = xgfApplyPersonGateway.getInfoById(id);
xgfApplyPersonE.setApplyTime(DateUtil.date2Str(Date.from(xgfApplyPersonE.getCreateTime().toInstant(ZoneOffset.ofHours(8)))));
BeanUtils.copyProperties(xgfApplyPersonE, xgfPersonApplyCO); BeanUtils.copyProperties(xgfApplyPersonE, xgfPersonApplyCO);
List<PersonApplyE> userApplyList = personApplyGateway.personListByxgfApplyPersonId(id); List<PersonApplyE> userApplyList = personApplyGateway.personListByxgfApplyPersonId(id);
ArrayList<XgfPersonApplyAddCmd.PersonApplyAddCmdExt> personApplyAddCmdExts = new ArrayList<>(); ArrayList<XgfPersonApplyAddCmd.PersonApplyAddCmdExt> personApplyAddCmdExts = new ArrayList<>();

1
web-app/src/main/java/com/zcloud/primeport/command/VehicleApplyUpdateExe.java
View File

@ -75,6 +75,7 @@ public class VehicleApplyUpdateExe {
vehicleApplyE.setLicenceNo(cmd.getLicenceNo()); vehicleApplyE.setLicenceNo(cmd.getLicenceNo());
vehicleApplyE.setLicenceTypeName(cmd.getLicenceTypeName()); vehicleApplyE.setLicenceTypeName(cmd.getLicenceTypeName());
vehicleApplyE.setLicenceType(cmd.getLicenceType()); vehicleApplyE.setLicenceType(cmd.getLicenceType());
vehicleApplyE.setRemarks(cmd.getRemarks());
vehicleApplyGateway.update(vehicleApplyE); vehicleApplyGateway.update(vehicleApplyE);
} }
} }

3
web-client/src/main/java/com/zcloud/primeport/dto/clientobject/VehicleApplyCO.java
View File

@ -150,7 +150,8 @@ public class VehicleApplyCO extends ClientObject {
private Long auditUserId; private Long auditUserId;
@ApiModelProperty(value = "currentUserId", name = "当前用户") @ApiModelProperty(value = "currentUserId", name = "当前用户")
private Long currentUserId; private Long currentUserId;
@ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName")
private String checkDepartmentName;
@ApiModelProperty(value = "车辆申请的审批记录", name = "VehicleAuditLogList") @ApiModelProperty(value = "车辆申请的审批记录", name = "VehicleAuditLogList")
private List<VehicleAuditLog> vehicleAuditLogList; private List<VehicleAuditLog> vehicleAuditLogList;

1
web-domain/src/main/java/com/zcloud/primeport/domain/model/XgfApplyPersonE.java
View File

@ -47,5 +47,6 @@ public class XgfApplyPersonE extends BaseE {
private String auditUserName; private String auditUserName;
private String reasonsRefusal; private String reasonsRefusal;
private String reasonVisit; private String reasonVisit;
private String applyTime;
} }

4
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/dataobject/VehicleApplyDO.java
View File

@ -133,6 +133,8 @@ public class VehicleApplyDO extends BaseDO {
@ApiModelProperty(value = "审核用户名称") @ApiModelProperty(value = "审核用户名称")
@TableField(exist = false) @TableField(exist = false)
private String auditUserName; private String auditUserName;
@ApiModelProperty(value = "检查部门名称", name = "checkDepartmentName")
@TableField(exist = false)
private String checkDepartmentName;
} }

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

@ -8,6 +8,7 @@ import com.jjb.saas.framework.repository.common.PageHelper;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.Query; import com.zcloud.gbscommon.utils.Query;
import com.zcloud.gbscommon.utils.Tools;
import com.zcloud.primeport.domain.enums.MenuEnum; import com.zcloud.primeport.domain.enums.MenuEnum;
import com.zcloud.primeport.persistence.dataobject.MkmjDO; import com.zcloud.primeport.persistence.dataobject.MkmjDO;
import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO; import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO;
@ -36,6 +37,8 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl<VehicleV
IPage<VehicleViolationsDO> iPage = new Query<VehicleViolationsDO>().getPage(params); IPage<VehicleViolationsDO> iPage = new Query<VehicleViolationsDO>().getPage(params);
QueryWrapper<VehicleViolationsDO> queryWrapper = new QueryWrapper<>(); QueryWrapper<VehicleViolationsDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.eq(Tools.isEmpty(params.get("violationType")),"violation_type",params.get("violationType"));
queryWrapper.eq("licence_no",params.get("licenceNo"));
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time");
IPage<VehicleViolationsDO> result = vehicleViolationsMapper.selectPage(iPage, queryWrapper); IPage<VehicleViolationsDO> result = vehicleViolationsMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords()); return PageHelper.pageToResponse(result, result.getRecords());

1
web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
View File

@ -83,6 +83,7 @@
va.vehicle_corp_id va.vehicle_corp_id
) tmp ) tmp
LEFT JOIN corp_info c on tmp.apply_corp_id = c.id LEFT JOIN corp_info c on tmp.apply_corp_id = c.id
where 1 = 1
GROUP BY GROUP BY
tmp.apply_corp_id; tmp.apply_corp_id;
</select> </select>

3
web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
View File

@ -40,7 +40,8 @@
a.audit_dept_id, a.audit_dept_id,
a.audit_dept_name, a.audit_dept_name,
a.audit_corp_name, a.audit_corp_name,
a.audit_corp_id a.audit_corp_id,
f.remarks check_department_name,
FROM FROM
vehicle_apply AS f vehicle_apply AS f
LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id

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

@ -43,42 +43,14 @@
b.licence_type_name, b.licence_type_name,
b.licence_no, b.licence_no,
b.vehicle_type, b.vehicle_type,
b.vehicle_type_name, b.vehicle_type_name
a.vehicle_belong_type,
a.gate_level_auth_area,
a.vehicle_corp_id,
a.vehicle_corp_name,
a.vehicle_department_id,
a.vehicle_department_name,
a.employee_vehicle_user_id,
a.employee_vehicle_user_name,
a.emission_standards,
a.emission_standards_name,
a.driving_license_id,
a.attachment_id,
a.inform_sign_id,
a.project_id,
a.project_name,
a.ls_user_idcard,
a.ls_user_phone,
a.mkmj_id
FROM FROM
vehicle_black AS b vehicle_black AS b
LEFT JOIN vehicle_apply AS a ON b.licence_no = a.licence_no
WHERE WHERE
b.delete_enum = 'FALSE' b.delete_enum = 'FALSE'
<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 a.employee_vehicle_user_name LIKE CONCAT('%', #{params.employeeVehicleUserName}, '%')
</if>
<if test="params.vehicleDepartmentId != null">
AND a.vehicle_department_id = #{params.vehicleDepartmentId}
</if>
<if test="params.vehicleType != null and params.vehicleType != ''">
AND a.vehicleType LIKE CONCAT('%', #{params.vehicleType}, '%')
</if>
</select> </select>
</mapper> </mapper>

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

@ -8,27 +8,11 @@
resultType="com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO"> resultType="com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO">
SELECT SELECT
f.licence_no, f.licence_no,
a.id vehicle_id, COUNT( f.id ) violation_count
a.vehicle_belong_type,
a.employee_vehicle_user_name,
a.employee_vehicle_user_id,
a.vehicle_department_name,
a.vehicle_department_id,
a.vehicle_corp_name,
a.vehicle_corp_id,
a.vehicle_type,
a.vehicle_type_name,
a.licence_type_name,
a.licence_type,
COUNT(f.licence_no) violation_count
FROM FROM
vehicle_violations AS f vehicle_violations AS f
LEFT JOIN WHERE
vehicle_apply AS a f.delete_enum = 'FALSE'
ON
f.licence_no = a.licence_no AND
a.delete_enum = 'FALSE'
where f.delete_enum = 'FALSE'
GROUP BY GROUP BY
f.licence_no f.licence_no
</select> </select>

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

@ -47,10 +47,10 @@
</if> </if>
<if test="params.processOrRecord != null"> <if test="params.processOrRecord != null">
<if test="params.processOrRecord == 1"> <if test="params.processOrRecord == 1">
AND xap.audit_status = 1 AND xap.audit_flag = 1
</if> </if>
<if test="params.processOrRecord == 2"> <if test="params.processOrRecord == 2">
AND xap.audit_status != 1 AND xap.audit_flag != 1
</if> </if>
</if> </if>
<if test="params.mkmjId != null"> <if test="params.mkmjId != null">
@ -120,7 +120,7 @@
pa.id apply_person_id, pa.id apply_person_id,
pa.xgf_apply_person_id, pa.xgf_apply_person_id,
IFNULL( tmp.vehicle_count, 0 ) vehicle_count, IFNULL( tmp.vehicle_count, 0 ) vehicle_count,
IFNULL( xap.mkmj_permission, 2 ) mkmj_permission, IFNULL( pa.mkmj_permission, 2 ) mkmj_permission,
u.user_avatar_url user_face_url u.user_avatar_url user_face_url
FROM FROM
USER u USER u