|
@@ -22,6 +22,7 @@ import com.dragonsoft.dcuc.approve.model.req.v2.ApproveOperateV2ReqVO;
|
|
|
import com.dragonsoft.dcuc.approve.model.resp.*;
|
|
|
import com.dragonsoft.dcuc.approve.model.vo.ApproveTaskRequestVo;
|
|
|
import com.dragonsoft.dcuc.approve.model.vo.dcuc.OauthUserVO;
|
|
|
+import com.dragonsoft.dcuc.approve.properties.ApproveProperties;
|
|
|
import com.dragonsoft.dcuc.approve.service.IApproveRecordService;
|
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
|
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
|
|
@@ -33,7 +34,6 @@ import com.dragonsoft.duceap.core.search.Searchable;
|
|
|
import com.dragonsoft.duceap.core.search.enums.SearchOperator;
|
|
|
import com.dragonsoft.duceap.duwf.api.model.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.hibernate.validator.constraints.Length;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
@@ -55,21 +55,48 @@ import java.util.*;
|
|
|
@RestController
|
|
|
public class ApiV2ApproveFacade implements IApiV2ApproveFacade {
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveCommonBusiness approveService;
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveRecordService approveRecordService;
|
|
|
|
|
|
- @Autowired
|
|
|
private IApproveBusiness approveBusiness;
|
|
|
|
|
|
- @Autowired
|
|
|
private IWorkFlowBusiness workFlowBusiness;
|
|
|
|
|
|
- @Autowired
|
|
|
private IDcucBusiness dcucBusiness;
|
|
|
|
|
|
+ private ApproveProperties approveProperties;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveService(IApproveCommonBusiness approveService) {
|
|
|
+ this.approveService = approveService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveRecordService(IApproveRecordService approveRecordService) {
|
|
|
+ this.approveRecordService = approveRecordService;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveBusiness(IApproveBusiness approveBusiness) {
|
|
|
+ this.approveBusiness = approveBusiness;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setWorkFlowBusiness(IWorkFlowBusiness workFlowBusiness) {
|
|
|
+ this.workFlowBusiness = workFlowBusiness;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setDcucBusiness(IDcucBusiness dcucBusiness) {
|
|
|
+ this.dcucBusiness = dcucBusiness;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ public void setApproveProperties(ApproveProperties approveProperties) {
|
|
|
+ this.approveProperties = approveProperties;
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ResponseDTO<String> approveAuthorities(ApprovalInfoAuthReqVO approvalInfoAuthReqVO) {
|
|
|
|
|
@@ -121,13 +148,14 @@ public class ApiV2ApproveFacade implements IApiV2ApproveFacade {
|
|
|
return ResponseUtil.dtoFail(checkResourceStatus.getMessage());
|
|
|
}
|
|
|
|
|
|
- @NotBlank @Length(max = 18, message = "请输入正确的身份证号") String applicantIdcard = approvalInfoReqVO.getApplicantIdcard();
|
|
|
+ String applicantIdcard = approvalInfoReqVO.getApplicantIdcard();
|
|
|
|
|
|
OauthUserVO oauthUserVO = dcucBusiness.getOauthUserInfoByIdcard(applicantIdcard);
|
|
|
if (oauthUserVO == null) {
|
|
|
return ResponseUtil.dtoFail("申请人不存在");
|
|
|
}
|
|
|
|
|
|
+ approvalInfoReqVO.setApproveTaskClass(approveProperties.getAuthTaskClass());
|
|
|
ApproveRecordInfo approveRecordInfo = approveService.saveBase(approvalInfoReqVO, ManageDisposeTypeEnum.INSERT, new Date());
|
|
|
|
|
|
String approveNo = approveRecordInfo.getApproveNo();
|