提交 b3959b27 authored 作者: 000516's avatar 000516 提交者: Coding

创建/修改稽查任务成功后,返回最新的对象

Merge Request: 创建/修改稽查任务成功后,返回最新的对象 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/258?initial=true
...@@ -29,22 +29,23 @@ public class ExaPlanCoreController { ...@@ -29,22 +29,23 @@ public class ExaPlanCoreController {
public R saveOne(@RequestBody ExaPlanVo exaPlanVo) { public R saveOne(@RequestBody ExaPlanVo exaPlanVo) {
ActivityExamineDto examineDto = new ActivityExamineDto(); ActivityExamineDto examineDto = new ActivityExamineDto();
BeanUtils.copyProperties(exaPlanVo, examineDto); BeanUtils.copyProperties(exaPlanVo, examineDto);
ActivityExamineDto examineN = null;
if (Objects.isNull(exaPlanVo.getId())) { if (Objects.isNull(exaPlanVo.getId())) {
examineDto.setCreateBy(exaPlanVo.getOperName()); examineDto.setCreateBy(exaPlanVo.getOperName());
saveOne(examineDto); examineN = saveOne(examineDto);
} else { } else {
examineDto.setModifyBy(exaPlanVo.getOperName()); examineDto.setModifyBy(exaPlanVo.getOperName());
updateById(examineDto); examineN = updateById(examineDto);
} }
return R.success(); return R.success(examineN);
} }
private void saveOne(ActivityExamineDto examineDto) { private ActivityExamineDto saveOne(ActivityExamineDto examineDto) {
exaPlanCoreService.save(examineDto); return exaPlanCoreService.save(examineDto);
} }
private void updateById(ActivityExamineDto examineDto) { private ActivityExamineDto updateById(ActivityExamineDto examineDto) {
exaPlanCoreService.updateById(examineDto); return exaPlanCoreService.updateById(examineDto);
} }
} }
......
...@@ -14,9 +14,9 @@ public interface ActivityExamineDao { ...@@ -14,9 +14,9 @@ public interface ActivityExamineDao {
ActivityExamineDto selectByPlanId(Long planId); ActivityExamineDto selectByPlanId(Long planId);
void save(ActivityExamineDto examineDto); ActivityExamineDto save(ActivityExamineDto examineDto);
void updateById(ActivityExamineDto examineDto); ActivityExamineDto updateById(ActivityExamineDto examineDto);
void page(PageInfo pageInfo, ExamineWrapper wq); void page(PageInfo pageInfo, ExamineWrapper wq);
} }
...@@ -41,12 +41,14 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -41,12 +41,14 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
} }
@Override @Override
public void save(ActivityExamineDto examineDto) { public ActivityExamineDto save(ActivityExamineDto examineDto) {
try { try {
ActivityExamineDO examineDO = new ActivityExamineDO(); ActivityExamineDO examineDO = new ActivityExamineDO();
BeanUtils.copyProperties(examineDto, examineDO); BeanUtils.copyProperties(examineDto, examineDO);
arrayToStringByDo(examineDO, examineDto); arrayToStringByDo(examineDO, examineDto);
activityExamineMapper.insert(examineDO); activityExamineMapper.insert(examineDO);
ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId());
return BeanUtils.transitionDto(examineDO1, ActivityExamineDto.class);
} catch (Exception e) { } catch (Exception e) {
String eMsg = e.getCause().getMessage(); String eMsg = e.getCause().getMessage();
if (eMsg.contains("for key 'plan_id_unique'")) { if (eMsg.contains("for key 'plan_id_unique'")) {
...@@ -56,11 +58,13 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao { ...@@ -56,11 +58,13 @@ public class ActivityExamineDaoImpl implements ActivityExamineDao {
} }
@Override @Override
public void updateById(ActivityExamineDto examineDto) { public ActivityExamineDto updateById(ActivityExamineDto examineDto) {
ActivityExamineDO examineDO = new ActivityExamineDO(); ActivityExamineDO examineDO = new ActivityExamineDO();
BeanUtils.copyProperties(examineDto,examineDO); BeanUtils.copyProperties(examineDto,examineDO);
arrayToStringByDo(examineDO,examineDto); arrayToStringByDo(examineDO,examineDto);
activityExamineMapper.updateById(examineDO); activityExamineMapper.updateById(examineDO);
ActivityExamineDO examineDO1 = activityExamineMapper.selectById(examineDO.getId());
return BeanUtils.transitionDto(examineDO1, ActivityExamineDto.class);
} }
@Override @Override
......
...@@ -8,7 +8,7 @@ import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto; ...@@ -8,7 +8,7 @@ import com.wangxiaolu.promotion.pojo.activity.examine.dto.ActivityExamineDto;
* @describe : * @describe :
*/ */
public interface ExaPlanCoreService { public interface ExaPlanCoreService {
void save(ActivityExamineDto examineDto); ActivityExamineDto save(ActivityExamineDto examineDto);
void updateById(ActivityExamineDto examineDto); ActivityExamineDto updateById(ActivityExamineDto examineDto);
} }
...@@ -18,13 +18,12 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService { ...@@ -18,13 +18,12 @@ public class ExaPlanCoreServiceImpl implements ExaPlanCoreService {
private ActivityExamineDao activityExamineDao; private ActivityExamineDao activityExamineDao;
@Override @Override
public void save(ActivityExamineDto examineDto) { public ActivityExamineDto save(ActivityExamineDto examineDto) {
activityExamineDao.save(examineDto); return activityExamineDao.save(examineDto);
} }
@Override @Override
public void updateById(ActivityExamineDto examineDto) { public ActivityExamineDto updateById(ActivityExamineDto examineDto) {
activityExamineDao.updateById(examineDto); return activityExamineDao.updateById(examineDto);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论