feat:applyType
This commit is contained in:
@@ -22,7 +22,7 @@ public interface PreFryQualificationApplyService {
|
|||||||
* @param user
|
* @param user
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean submitApply(ApplyDTO request, PartnerUserInfoVO user);
|
Long submitApply(ApplyDTO request, PartnerUserInfoVO user);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重新提交预炸资质申请
|
* 重新提交预炸资质申请
|
||||||
@@ -30,7 +30,7 @@ public interface PreFryQualificationApplyService {
|
|||||||
* @param user
|
* @param user
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean reSubmitApply(ApplyDTO request, PartnerUserInfoVO user);
|
Long reSubmitApply(ApplyDTO request, PartnerUserInfoVO user);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据门店编码和申请类型查询
|
* 根据门店编码和申请类型查询
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean submitApply(ApplyDTO request, PartnerUserInfoVO user) {
|
public Long submitApply(ApplyDTO request, PartnerUserInfoVO user) {
|
||||||
// 1. 参数校验
|
// 1. 参数校验
|
||||||
validateRequest(request);
|
validateRequest(request);
|
||||||
|
|
||||||
@@ -60,11 +60,11 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA
|
|||||||
// 4. 创建审批操作记录
|
// 4. 创建审批操作记录
|
||||||
createApprovalRecord(apply.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),"");
|
createApprovalRecord(apply.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),"");
|
||||||
|
|
||||||
return Boolean.TRUE;
|
return apply.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean reSubmitApply(ApplyDTO request, PartnerUserInfoVO user) {
|
public Long reSubmitApply(ApplyDTO request, PartnerUserInfoVO user) {
|
||||||
// 1. 参数校验
|
// 1. 参数校验
|
||||||
validateRequest(request);
|
validateRequest(request);
|
||||||
// 2. 检查是否已有同类型申请
|
// 2. 检查是否已有同类型申请
|
||||||
@@ -86,7 +86,7 @@ public class PreFryQualificationApplyServiceImpl implements PreFryQualificationA
|
|||||||
// 4. 创建审批操作记录
|
// 4. 创建审批操作记录
|
||||||
createApprovalRecord(old.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),"");
|
createApprovalRecord(old.getId(), AuditOperationTypeEnum.APPLY.getCode(),1, user.getUsername(),"");
|
||||||
|
|
||||||
return Boolean.TRUE;
|
return old.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -32,14 +32,14 @@ public class MiniPreFryQualificationApplyController {
|
|||||||
|
|
||||||
@ApiOperation("预炸资质申请提交")
|
@ApiOperation("预炸资质申请提交")
|
||||||
@PostMapping("/submitApply")
|
@PostMapping("/submitApply")
|
||||||
public ResponseResult<Boolean> submitApply(@RequestBody @Validated ApplyDTO dto) {
|
public ResponseResult<Long> submitApply(@RequestBody @Validated ApplyDTO dto) {
|
||||||
log.info("预炸资质申请提交:{}", JSONObject.toJSONString(dto));
|
log.info("预炸资质申请提交:{}", JSONObject.toJSONString(dto));
|
||||||
return ResponseResult.success(preFryQualificationApplyService.submitApply( dto, PartnerUserHolder.getUser()));
|
return ResponseResult.success(preFryQualificationApplyService.submitApply( dto, PartnerUserHolder.getUser()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("预炸资质申请重新提交")
|
@ApiOperation("预炸资质申请重新提交")
|
||||||
@PostMapping("/reSubmitApply")
|
@PostMapping("/reSubmitApply")
|
||||||
public ResponseResult<Boolean> reSubmitApply(@RequestBody @Validated ApplyDTO dto) {
|
public ResponseResult<Long> reSubmitApply(@RequestBody @Validated ApplyDTO dto) {
|
||||||
log.info("预炸资质申请重新提交:{}", JSONObject.toJSONString(dto));
|
log.info("预炸资质申请重新提交:{}", JSONObject.toJSONString(dto));
|
||||||
return ResponseResult.success(preFryQualificationApplyService.reSubmitApply( dto, PartnerUserHolder.getUser()));
|
return ResponseResult.success(preFryQualificationApplyService.reSubmitApply( dto, PartnerUserHolder.getUser()));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user