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

feat：审批时间

koumen
dearLin 2026-03-17 14:39:33 +08:00
parent fc928f1f11
commit b971c628e2
11 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ public class VehicleApplyAddExe {
examTypeE.setStatusFlag(2);
examTypeE.setBlockedFlag(2);
examTypeE.setAuditFlag(AuditEnum.WAITING.getCode());
examTypeE.setApplyTime(DateUtil.date2Str(new Date()));
// examTypeE.setApplyTime(DateUtil.date2Str(new Date()));
// 股份、分公司个人车辆
if (cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.JGD_PRI_VEHICLES.getCode())
|| cmd.getVehicleBelongType().equals(VehicleBelongTypeEnum.FGS_PRI_VEHICLES.getCode())) {

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

@ -38,7 +38,7 @@ public class VehicleApplyUpdateExe {
VehicleApplyE oldV = vehicleApplyGateway.getById(vehicleApplyE.getId());
BeanUtils.copyProperties(vehicleApplyUpdateCmd, vehicleApplyE);
vehicleApplyE.setAuditFlag(AuditEnum.WAITING.getCode());
vehicleApplyE.setApplyTime(DateUtil.date2Str(new Date()));
// vehicleApplyE.setApplyTime(DateUtil.date2Str(new Date()));
boolean res = vehicleApplyGateway.update(vehicleApplyE);
VehicleAuditE build = VehicleAuditE.builder().vehicleApplyId(vehicleApplyE.getId()).batchState(1).batchType(2).auditUserId(vehicleApplyE.getAuditUserId()).auditUserName(vehicleApplyE.getAuditUserName()).auditDeptId(vehicleApplyE.getAuditDeptId()).auditDeptName(vehicleApplyE.getAuditDeptName()).auditCorpId(vehicleApplyE.getAuditCorpId()).auditCorpName(vehicleApplyE.getAuditCorpName()).auditStatus(AuditEnum.WAITING.getCode()).changeAfter(JSON.toJSONString(oldV)).changeBefore(JSON.toJSONString(vehicleApplyE)).build();
// 添加审批信息

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

@ -94,7 +94,7 @@ public class VehicleApplyServiceImpl implements VehicleApplyServiceI {
vehicleApplyDO.setMkmjPermission(1);
vehicleApplyDO.setRemarks(cmd.getRemarks());
vehicleApplyDO.setVehicleBelongType(cmd.getVehicleBelongType());
vehicleApplyDO.setApplyTime(DateUtil.date2Str(new Date()));
// vehicleApplyDO.setApplyTime(DateUtil.date2Str(new Date()));
BeanUtils.copyProperties(item, vehicleApplyDO);
objects.add(vehicleApplyDO);
});

56
web-client/src/main/java/com/zcloud/primeport/dto/VehicleApplyUpdateCmd.java
View File

@ -22,78 +22,78 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
public class VehicleApplyUpdateCmd extends Command {
@ApiModelProperty(value = "id", name = "id", required = true)
@ApiModelProperty(value = "id", name = "id")
@NotNull(message = "id不能为空")
private Long id;
@ApiModelProperty(value = "车牌类型数据字典", name = "licenceType", required = true)
@ApiModelProperty(value = "车牌类型数据字典", name = "licenceType")
@NotEmpty(message = "车牌类型数据字典不能为空")
private String licenceType;
@ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName", required = true)
@ApiModelProperty(value = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌", name = "licenceTypeName")
@NotEmpty(message = "车牌类型名称0-白牌 1- 蓝牌 2-黄牌 3-绿牌 4-黑牌不能为空")
private String licenceTypeName;
@ApiModelProperty(value = "车辆类型", name = "vehicleType", required = true)
@ApiModelProperty(value = "车辆类型", name = "vehicleType")
@NotEmpty(message = "车辆类型不能为空")
private String vehicleType;
@ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName", required = true)
@ApiModelProperty(value = "车辆类型-名字", name = "vehicleTypeName")
@NotEmpty(message = "车辆类型-名字不能为空")
private String vehicleTypeName;
@ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea", required = true)
@ApiModelProperty(value = "授权范围港区与区域", name = "gateLevelAuthArea")
@NotEmpty(message = "授权范围港区与区域不能为空")
private String gateLevelAuthArea;
@ApiModelProperty(value = "访问起始时间", name = "visitStartTime", required = true)
@ApiModelProperty(value = "访问起始时间", name = "visitStartTime")
@NotNull(message = "访问起始时间不能为空")
private String visitStartTime;
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime", required = true)
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime")
@NotNull(message = "访问结束时间不能为空")
private String visitEndTime;
@ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId", required = true)
@ApiModelProperty(value = "车辆所属企业ID", name = "vehicleCorpId")
@NotNull(message = "车辆所属企业ID不能为空")
private Long vehicleCorpId;
@ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName", required = true)
@ApiModelProperty(value = "车辆所属企业名称", name = "vehicleCorpName")
@NotEmpty(message = "车辆所属企业名称不能为空")
private String vehicleCorpName;
@ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId", required = true)
@ApiModelProperty(value = "车辆所属部门id", name = "vehicleDepartmentId")
@NotNull(message = "车辆所属部门id不能为空")
private Long vehicleDepartmentId;
@ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName", required = true)
@ApiModelProperty(value = "车辆所属部门名称", name = "vehicleDepartmentName")
@NotEmpty(message = "车辆所属部门名称不能为空")
private String vehicleDepartmentName;
@ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId", required = true)
@ApiModelProperty(value = "车辆所属人id(员工车辆/驾驶人id)", name = "employeeVehicleUserId")
@NotNull(message = "车辆所属人id(员工车辆/驾驶人id)不能为空")
private Long employeeVehicleUserId;
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName", required = true)
@ApiModelProperty(value = "车辆所属人姓名(员工车辆/驾驶人名称)", name = "employeeVehicleUserName")
@NotEmpty(message = "车辆所属人姓名(员工车辆/驾驶人名称)不能为空")
private String employeeVehicleUserName;
@ApiModelProperty(value = "排放标准名称", name = "emissionStandards", required = true)
@ApiModelProperty(value = "排放标准名称", name = "emissionStandards")
private String emissionStandards;
@ApiModelProperty(value = "排放标准", name = "emissionStandardsName", required = true)
@ApiModelProperty(value = "排放标准", name = "emissionStandardsName")
private String emissionStandardsName;
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId", required = true)
@ApiModelProperty(value = "行驶证照片", name = "drivingLicenseId")
@NotNull(message = "行驶证照片不能为空")
private String drivingLicenseId;
@ApiModelProperty(value = "车辆照片", name = "attachmentId", required = true)
@ApiModelProperty(value = "车辆照片", name = "attachmentId")
@NotNull(message = "车辆照片不能为空")
private String attachmentId;
@ApiModelProperty(value = "告知签字", name = "informSignId", required = true)
@NotNull(message = "告知签字不能为空")
@ApiModelProperty(value = "告知签字", name = "informSignId")
// @NotNull(message = "告知签字不能为空")
private String informSignId;
@ApiModelProperty(value = "项目id", name = "projectId", required = true)
@ApiModelProperty(value = "项目id", name = "projectId")
private Long projectId;
@ApiModelProperty(value = "项目名称", name = "projectName", required = true)
@ApiModelProperty(value = "项目名称", name = "projectName")
private String projectName;
// 审批
@ApiModelProperty(value = "审核企业", name = "auditCorpId", required = true)
@ApiModelProperty(value = "审核企业", name = "auditCorpId")
private Long auditCorpId;
@ApiModelProperty(value = "审核企业名称", name = "auditCorpName", required = true)
@ApiModelProperty(value = "审核企业名称", name = "auditCorpName")
private String auditCorpName;
@ApiModelProperty(value = "审核部门", name = "auditDeptId", required = true)
@ApiModelProperty(value = "审核部门", name = "auditDeptId")
private Long auditDeptId;
@ApiModelProperty(value = "审核部门名称", name = "auditDeptName", required = true)
@ApiModelProperty(value = "审核部门名称", name = "auditDeptName")
private String auditDeptName;
@ApiModelProperty(value = "审核用户", name = "auditUserId", required = true)
@ApiModelProperty(value = "审核用户", name = "auditUserId")
private Long auditUserId;
@ApiModelProperty(value = "审核用户名称", name = "auditUserName", required = true)
@ApiModelProperty(value = "审核用户名称", name = "auditUserName")
private String auditUserName;
}

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

@ -53,10 +53,11 @@ public class VehicleAuditCO extends ClientObject {
//审批意见
@ApiModelProperty(value = "审批意见(驳回原因)", name = "remarks")
private String remarks;
//访问起始时间
@ApiModelProperty(value = "访问起始时间", name = "visitStartTime")
private String visitStartTime;
@ApiModelProperty(value = "申请时间", name = "applyTime")
private String applyTime;
//访问结束时间
@ApiModelProperty(value = "访问结束时间", name = "visitEndTime")
private String visitEndTime;

4
web-domain/src/main/java/com/zcloud/primeport/domain/model/VehicleApplyE.java
View File

@ -71,13 +71,9 @@ public class VehicleApplyE extends BaseE {
private String projectName;
//1被拉黑2未拉黑
private Integer blockedFlag;
private Long mkmjId;
private String lsUserPhone;
private String lsUserIdcard;
private String applyTime;
private Long auditCorpId;
private String auditCorpName;
private Long auditDeptId;

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

@ -60,9 +60,6 @@ public class VehicleApplyDO extends BaseDO {
//车辆所属企业ID
@ApiModelProperty(value = "车辆所属企业ID")
private Long vehicleCorpId;
@ApiModelProperty(value = "申请时间")
private String applyTime;
//车辆所属企业名称
@ApiModelProperty(value = "车辆所属企业名称")
private String vehicleCorpName;

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

@ -60,7 +60,9 @@ public class VehicleAuditDO extends BaseDO {
//变更前信息
@ApiModelProperty(value = "变更前信息")
private String changeBefore;
@ApiModelProperty(value = "申请时间")
@TableField(exist = false)
private String applyTime;
//访问起始时间
@ApiModelProperty(value = "访问起始时间")
@TableField(exist = false)

3
web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleAuditMapper.java
View File

@ -23,5 +23,6 @@ import java.util.Map;
public interface VehicleAuditMapper extends BaseMapper<VehicleAuditDO> {
IPage<VehicleAuditDO> listPage(Page<Map<String, Object>> page, Map<String, Object> parmas, String menuPerms);
}
IPage<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Page<Map<String, Object>> page, Map<String, Object> parmas);
}

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

@ -50,11 +50,9 @@ public class VehicleAuditRepositoryImpl extends BaseRepositoryImpl<VehicleAuditM
@Override
public PageResponse<VehicleAuditDO> carApprovalLogByvehicleApplyIdList(Map<String, Object> parmas) {
IPage<VehicleAuditDO> iPage = new Query<VehicleAuditDO>().getPage(parmas);
QueryWrapper<VehicleAuditDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("vehicle_apply_id", parmas.get("vehicleApplyId"));
queryWrapper.orderByDesc("create_time");
IPage<VehicleAuditDO> result = vehicleAuditMapper.selectPage(iPage, queryWrapper);
Page<Map<String, Object>> page = new Page<>(Integer.parseInt(parmas.get("pageIndex").toString()),
Integer.parseInt(parmas.get("pageSize").toString()));
IPage<VehicleAuditDO> result = vehicleAuditMapper.carApprovalLogByvehicleApplyIdList(page, parmas);
return PageHelper.pageToResponse(result, result.getRecords());
}

34
web-infrastructure/src/main/resources/mapper/VehicleAuditDO.xml
View File

@ -96,5 +96,39 @@
)
</if>
</select>
<select id="carApprovalLogByvehicleApplyIdList"
resultType="com.zcloud.primeport.persistence.dataobject.VehicleAuditDO">
SELECT
va.id,
va.vehicle_apply_id,
va.batch_type,
va.batch_state,
va.audit_user_id,
va.audit_user_name,
va.audit_dept_id,
va.audit_dept_name,
va.audit_corp_id,
va.audit_corp_name,
va.audit_status,
va.audit_time,
va.change_after,
va.change_before,
va.create_time apply_time,
va.remarks,
vap.visit_start_time,
vap.visit_end_time,
vap.vehicle_corp_id,
vap.vehicle_corp_name,
vap.vehicle_department_id,
vap.vehicle_department_name,
vap.employee_vehicle_user_id,
vap.employee_vehicle_user_name
FROM
vehicle_audit AS va
LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id
WHERE
va.delete_enum = 'FALSE' and vap.delete_enum = 'FALSE'
and va.vehicle_apply_id = #{parmas.vehicleApplyId}
</select>
</mapper>