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

fixed： 17182 没有显示驳回状态数据 所有申请页面都需要有驳回状态的数据 监管端和企业端都有

koumen
dearLin 2026-05-27 08:45:03 +08:00
parent d4c2779336
commit b697d8990d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web-client/src/main/java/com/zcloud/primeport/dto/MkmjApprovalUserAddCmd.java
View File

@ -34,11 +34,11 @@ public class MkmjApprovalUserAddCmd extends Command {
@NotEmpty(message = "审批人部门名称不能为空") @NotEmpty(message = "审批人部门名称不能为空")
private String deptName; private String deptName;
@ApiModelProperty(value = "审批人岗位Id") @ApiModelProperty(value = "审批人岗位Id")
@NotNull(message = "审批人岗位Id不能为空") // @NotNull(message = "审批人岗位Id不能为空")
private Long postId; private Long postId;
//审批人岗位名称 //审批人岗位名称
@ApiModelProperty(value = "审批人岗位名称") @ApiModelProperty(value = "审批人岗位名称")
@NotEmpty(message = "审批人岗位名称不能为空") // @NotEmpty(message = "审批人岗位名称不能为空")
private String postName; private String postName;
@ApiModelProperty(value = "审批人id", name = "userId", required = true) @ApiModelProperty(value = "审批人id", name = "userId", required = true)
@NotNull(message = "审批人id不能为空") @NotNull(message = "审批人id不能为空")

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

@ -48,7 +48,6 @@
LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id AND a.delete_enum = 'FALSE' AND a.audit_status = 1 LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id AND a.delete_enum = 'FALSE' AND a.audit_status = 1
WHERE WHERE
f.delete_enum = 'FALSE' f.delete_enum = 'FALSE'
AND f.audit_flag != 3
<if test="params.remarks != null and params.remarks != ''"> <if test="params.remarks != null and params.remarks != ''">
AND f.remarks like CONCAT('%', #{params.remarks}, '%') AND f.remarks like CONCAT('%', #{params.remarks}, '%')
</if> </if>