|
@@ -109,22 +109,40 @@ public class BusJcbFdfxjyqController extends BaseController {
|
|
|
|
|
|
|
|
@ApiOperation(value = "提交")
|
|
@ApiOperation(value = "提交")
|
|
|
@PutMapping("/submit")
|
|
@PutMapping("/submit")
|
|
|
- public AjaxResult submit(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
|
|
|
|
|
|
|
+ public AjaxResult submit(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
|
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
|
|
|
+ //将文件转成base64
|
|
|
|
|
+ if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
|
|
|
|
|
+ MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
|
|
|
|
|
+ String path = sysFileService.uploadFile(multipartFile);
|
|
|
|
|
+ busJcbFdfxjyq.setPicUrl(path);
|
|
|
|
|
+ }
|
|
|
return toAjax(busJcbFdfxjyqService.submit(busJcbFdfxjyq));
|
|
return toAjax(busJcbFdfxjyqService.submit(busJcbFdfxjyq));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation(value = "退回")
|
|
@ApiOperation(value = "退回")
|
|
|
@PutMapping("/reject")
|
|
@PutMapping("/reject")
|
|
|
- public AjaxResult reject(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
|
|
|
|
|
|
|
+ public AjaxResult reject(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
|
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
|
|
|
+ //将文件转成base64
|
|
|
|
|
+ if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
|
|
|
|
|
+ MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
|
|
|
|
|
+ String path = sysFileService.uploadFile(multipartFile);
|
|
|
|
|
+ busJcbFdfxjyq.setPicUrl(path);
|
|
|
|
|
+ }
|
|
|
return toAjax(busJcbFdfxjyqService.reject(busJcbFdfxjyq));
|
|
return toAjax(busJcbFdfxjyqService.reject(busJcbFdfxjyq));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@ApiOperation(value = "确认")
|
|
@ApiOperation(value = "确认")
|
|
|
@PutMapping("/confirm")
|
|
@PutMapping("/confirm")
|
|
|
- public AjaxResult confirm(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) {
|
|
|
|
|
|
|
+ public AjaxResult confirm(@RequestBody BusJcbFdfxjyq busJcbFdfxjyq) throws Exception {
|
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
busJcbFdfxjyq.setUpdateBy(getUsername());
|
|
|
|
|
+ //将文件转成base64
|
|
|
|
|
+ if(busJcbFdfxjyq.getPicUrl()!=null&&!"".equals(busJcbFdfxjyq.getPicUrl())){
|
|
|
|
|
+ MultipartFile multipartFile = BASE64DecodedMultipartFile.base64ToMultipart(busJcbFdfxjyq.getPicUrl());
|
|
|
|
|
+ String path = sysFileService.uploadFile(multipartFile);
|
|
|
|
|
+ busJcbFdfxjyq.setPicUrl(path);
|
|
|
|
|
+ }
|
|
|
return toAjax(busJcbFdfxjyqService.confirm(busJcbFdfxjyq));
|
|
return toAjax(busJcbFdfxjyqService.confirm(busJcbFdfxjyq));
|
|
|
}
|
|
}
|
|
|
|
|
|