bug修复
This commit is contained in:
parent
77c3923827
commit
235582756c
|
|
@ -3,6 +3,7 @@ package com.bonus.bmw.controller;
|
||||||
import com.bonus.bmw.domain.dto.*;
|
import com.bonus.bmw.domain.dto.*;
|
||||||
import com.bonus.bmw.domain.po.PmProject;
|
import com.bonus.bmw.domain.po.PmProject;
|
||||||
import com.bonus.bmw.service.RepairCardApplyService;
|
import com.bonus.bmw.service.RepairCardApplyService;
|
||||||
|
import com.bonus.common.core.utils.StringUtils;
|
||||||
import com.bonus.common.core.utils.encryption.Sm4Utils;
|
import com.bonus.common.core.utils.encryption.Sm4Utils;
|
||||||
import com.bonus.common.core.utils.json.FastJsonHelper;
|
import com.bonus.common.core.utils.json.FastJsonHelper;
|
||||||
import com.bonus.common.core.utils.poi.ExcelUtil;
|
import com.bonus.common.core.utils.poi.ExcelUtil;
|
||||||
|
|
@ -150,11 +151,21 @@ public class RepairCardApplyController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/saveRepairCardApply")
|
@PostMapping("/saveRepairCardApply")
|
||||||
public AjaxResult saverepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) {
|
public AjaxResult saverepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) {
|
||||||
|
|
||||||
|
try{
|
||||||
params= Sm4Utils.decrypt(params);
|
params= Sm4Utils.decrypt(params);
|
||||||
fileMsg= Sm4Utils.decrypt(fileMsg);
|
fileMsg= Sm4Utils.decrypt(fileMsg);
|
||||||
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
|
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
|
||||||
RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class);
|
RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class);
|
||||||
|
if (StringUtils.isNull(cardApplyDto)){
|
||||||
|
return AjaxResult.error("补卡人员信息为空");
|
||||||
|
}
|
||||||
return repairCardApplyMapper.saverepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files));
|
return repairCardApplyMapper.saverepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files));
|
||||||
|
}catch (Exception e){
|
||||||
|
logger.error(e.toString(), e);
|
||||||
|
return AjaxResult.error("新增失败");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -176,11 +187,18 @@ public class RepairCardApplyController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/updateRepairCardApply")
|
@PostMapping("/updateRepairCardApply")
|
||||||
public AjaxResult updateRepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) {
|
public AjaxResult updateRepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) {
|
||||||
|
|
||||||
|
try {
|
||||||
params= Sm4Utils.decrypt(params);
|
params= Sm4Utils.decrypt(params);
|
||||||
fileMsg= Sm4Utils.decrypt(fileMsg);
|
fileMsg= Sm4Utils.decrypt(fileMsg);
|
||||||
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
|
List<WebFileDto> listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class);
|
||||||
RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class);
|
RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class);
|
||||||
return repairCardApplyMapper.updateRepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files));
|
return repairCardApplyMapper.updateRepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files));
|
||||||
|
}catch (Exception e){
|
||||||
|
logger.error(e.toString(), e);
|
||||||
|
return AjaxResult.error("修改失败");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -203,7 +221,12 @@ public class RepairCardApplyController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/audit")
|
@PostMapping("/audit")
|
||||||
public AjaxResult audit(@RequestBody RepairCardApplyDto cardApplyDto) {
|
public AjaxResult audit(@RequestBody RepairCardApplyDto cardApplyDto) {
|
||||||
|
try {
|
||||||
return repairCardApplyMapper.audit(cardApplyDto);
|
return repairCardApplyMapper.audit(cardApplyDto);
|
||||||
|
}catch (Exception e){
|
||||||
|
logger.error(e.toString(), e);
|
||||||
|
return AjaxResult.error("审核失败");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue