feat：完善单位车辆的发起人与发起时间
parent
faab3a5c5d
commit
129a192a91
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html><html lang="zh"><head data-built-info="@cqsjjb/scripts@2.0.0 Env/production (2026/3/25 10:20:20) 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: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 () {
|
||||
const APP_ENV = {
|
||||
antd: {
|
||||
'ant-prefix': 'micro-temp',
|
||||
|
|
@ -20,4 +20,4 @@
|
|||
redirect: '',
|
||||
FRAMEWORK: APP_ENV.antd
|
||||
};
|
||||
})();</script><script defer="defer" src="/primeport/static/js/601.8c1c8bd3b08f849f169a.js"></script><script defer="defer" src="/primeport/static/js/745.1a4c36b2a5f096849a4e.js"></script><script defer="defer" src="/primeport/static/js/main.cea8ef14b31922fda1e3.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/25 10:20:20) 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.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>
|
||||
|
|
@ -113,6 +113,7 @@ public class PersonApplyAddExe {
|
|||
BeanUtils.copyProperties(item, personApplyAddCmdExt);
|
||||
personApplyAddCmdExts.add(personApplyAddCmdExt);
|
||||
});
|
||||
xgfPersonApplyCO.setPersonApplyCount(personApplyAddCmdExts.size());
|
||||
xgfPersonApplyCO.setPersonApplyList(personApplyAddCmdExts);
|
||||
return xgfPersonApplyCO;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,9 @@ public class VehicleApplyUpdateExe {
|
|||
// VehicleApplyE nweV = vehicleApplyGateway.getById(vehicleApplyUpdateCmd.getId());
|
||||
// nweV.setAuditCorpId();
|
||||
// VehicleApplyE newV = vehicleApplyGateway.getById(vehicleApplyUpdateCmd.getId());
|
||||
|
||||
vehicleApplyE.setVehicleType(oldV.getVehicleType());
|
||||
vehicleApplyE.setLicenceNo(oldV.getLicenceNo());
|
||||
vehicleApplyE.setVehicleBelongType(oldV.getVehicleBelongType());
|
||||
VehicleAuditE build = VehicleAuditE.builder()
|
||||
.vehicleApplyId(vehicleApplyE.getId())
|
||||
.batchState(2).batchType(2)
|
||||
|
|
@ -54,8 +56,8 @@ public class VehicleApplyUpdateExe {
|
|||
.auditCorpId(vehicleApplyE.getAuditCorpId())
|
||||
.auditCorpName(vehicleApplyE.getAuditCorpName())
|
||||
.auditStatus(AuditEnum.WAITING.getCode())
|
||||
.changeAfter(JSON.toJSONString(oldV))
|
||||
.changeBefore(JSON.toJSONString(vehicleApplyE)).build();
|
||||
.changeAfter(JSON.toJSONString(vehicleApplyE))
|
||||
.changeBefore(JSON.toJSONString(oldV)).build();
|
||||
// 添加审批信息
|
||||
vehicleAuditGateway.add(build);
|
||||
// 发送待审核待办
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ public class PersonApplyQueryExe {
|
|||
|
||||
public PageResponse<XgfPersonApplyCO> xgfPersonApplyList(XgfApplyPersonPageQry qry) {
|
||||
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
|
||||
parmas.put("applyCorpId", AuthContext.getTenantId());
|
||||
// parmas.put("applyCorpId", AuthContext.getTenantId());
|
||||
PageResponse<XgfApplyPersonDO> pageResponse = xgfPersonApplyRepository.xgfPersonAuditList(parmas);
|
||||
List<XgfPersonApplyCO> examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
|
|
|
|||
|
|
@ -46,6 +46,8 @@ public class VehicleAuditPageQry extends PageQuery {
|
|||
private String vehicleBelongType;
|
||||
@ApiModelProperty(name = "processOrRecord", value = "1审批中数据，2审批记录")
|
||||
private Integer processOrRecord;
|
||||
@ApiModelProperty(name = "auditStatus", value = "审核状态")
|
||||
private Integer auditStatus;
|
||||
|
||||
|
||||
@ApiModelProperty(name = "vehicleApplyId", value = "车辆申请ID（车辆审批记录用）")
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ public class XgfPersonApplyCO extends ClientObject {
|
|||
private Long applyCorpId;
|
||||
@ApiModelProperty(name = "申请单位名称", value = "applyCorpName")
|
||||
private String applyCorpName;
|
||||
@ApiModelProperty(name = "申请时间", value = "applyTime")
|
||||
private String applyTime;
|
||||
|
||||
@ApiModelProperty(value = "当前用户是否能审核。1，能审核2不能审核", name = "currentUserCanAudit")
|
||||
private Integer currentUserCanAudit;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ public class VehicleApplyDO extends BaseDO {
|
|||
|
||||
private Long mkmjId;
|
||||
@TableField(exist = false)
|
||||
private Long mkmjName;
|
||||
private String mkmjName;
|
||||
|
||||
private String lsUserPhone;
|
||||
private String lsUserIdcard;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,10 @@ public class VehicleAuditDO extends BaseDO {
|
|||
private String reasonVisit;
|
||||
@TableField(exist = false)
|
||||
private String applyUserName;
|
||||
@TableField(exist = false)
|
||||
private String projectName;
|
||||
@TableField(exist = false)
|
||||
private String projectId;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,5 +57,7 @@ public class XgfApplyPersonDO extends BaseDO {
|
|||
private String reasonVisit;
|
||||
@TableField(exist = false)
|
||||
private Integer personApplyCount;
|
||||
@TableField(exist = false)
|
||||
private String applyTime;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,6 +62,9 @@
|
|||
AND a.audit_status != 1
|
||||
</if>
|
||||
</if>
|
||||
<if test="params.auditStatus != null">
|
||||
AND a.audit_status = #{params.auditStatus}
|
||||
</if>
|
||||
<if test="params.licenceNo != null and params.licenceNo != ''">
|
||||
AND va.licence_no like CONCAT('%', #{params.licenceNo}, '%')
|
||||
</if>
|
||||
|
|
@ -131,8 +134,8 @@
|
|||
vap.vehicle_department_name,
|
||||
vap.employee_vehicle_user_id,
|
||||
vap.employee_vehicle_user_name,
|
||||
vap.create_name apply_user_name,
|
||||
vap.create_time apply_time
|
||||
va.create_name apply_user_name,
|
||||
va.create_time apply_time
|
||||
FROM
|
||||
vehicle_audit AS va
|
||||
LEFT JOIN vehicle_apply vap on va.vehicle_apply_id = vap.id
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@
|
|||
<select id="xgfPersonAuditList" resultType="com.zcloud.primeport.persistence.dataobject.XgfApplyPersonDO">
|
||||
SELECT
|
||||
p.*,
|
||||
p.create_time apply_time,
|
||||
tmp.person_apply_count
|
||||
FROM
|
||||
xgf_apply_person p
|
||||
|
|
|
|||
Loading…
Reference in New Issue