|
@@ -259,8 +259,10 @@ func (this *SealApprovalCommon) List() {
|
|
|
}, "获取成功")
|
|
|
}
|
|
|
|
|
|
+// Detail
|
|
|
// @Title 审批单详情
|
|
|
// @Description 审批单详情接口
|
|
|
+// @Param SealId query int false "用印id"
|
|
|
// @Param ContractApprovalId query int false "审批单id"
|
|
|
// @Param ContractApprovalRecordId query int false "审批流程单id"
|
|
|
// @Success 200 {object} seal.SealDetailResp
|
|
@@ -273,18 +275,26 @@ func (this *SealApprovalCommon) Detail() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- //审批单id
|
|
|
- contractApprovalId, _ := this.GetInt("ContractApprovalId")
|
|
|
-
|
|
|
- //审批单详情
|
|
|
- contractApprovalInfo, err := contract_approval.GetContractApprovalById(contractApprovalId)
|
|
|
- if err != nil {
|
|
|
- this.FailWithMessage("获取审批单失败!", "获取审批单失败,Err:"+err.Error())
|
|
|
- return
|
|
|
+ //用印id
|
|
|
+ sealId, _ := this.GetInt("SealId")
|
|
|
+ if sealId <= 0 {
|
|
|
+ //审批单id
|
|
|
+ contractApprovalId, _ := this.GetInt("ContractApprovalId")
|
|
|
+ if contractApprovalId <= 0 {
|
|
|
+ this.FailWithMessage("获取审批单失败!审批单id未传", "获取审批单失败!审批单id未传")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //审批单详情
|
|
|
+ contractApprovalInfo, err := contract_approval.GetContractApprovalById(contractApprovalId)
|
|
|
+ if err != nil {
|
|
|
+ this.FailWithMessage("获取审批单失败!", "获取审批单失败,Err:"+err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+ sealId = contractApprovalInfo.ContractId
|
|
|
}
|
|
|
|
|
|
//用印详情
|
|
|
- sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(contractApprovalInfo.ContractId, this.AdminWx)
|
|
|
+ sealInfo, flowNodeListResp, opButton, err := sealService.GetSealDetailBySealId(sealId, this.AdminWx)
|
|
|
if err != nil {
|
|
|
this.FailWithMessage("获取详情失败", "获取详情失败,Err:"+err.Error())
|
|
|
return
|
|
@@ -327,6 +337,7 @@ func (this *SealApprovalCommon) detailByApprovalRecordId(approvalRecordId int) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+// Reject
|
|
|
// @Title 驳回审批
|
|
|
// @Description 驳回审批接口
|
|
|
// @Param request body seal.RejectReq true "type json string"
|