Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java

@@ -144,11 +144,10 @@ public class GuideCategoryController {
      * @date 2021/9/8 5:11 下午
      */
     @PostMapping("save")
-    public Result save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+    public Result<GuideCategoryDTO> save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.SaveInfoGroup.class);
-        guideCategoryService.save(formDTO);
+        return new Result<GuideCategoryDTO>().ok(guideCategoryService.save(formDTO));
-        return new Result();
     }
 
 
@@ -162,11 +161,10 @@ public class GuideCategoryController {
      * @date 2021/9/8 5:37 下午
      */
     @PostMapping("update")
-    public Result update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
+    public Result<GuideCategoryDTO> update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,EditGuideCategoryFormDTO.AddUserInternalGroup.class,EditGuideCategoryFormDTO.UpdateInfoGroup.class);
-        guideCategoryService.update(formDTO);
+        return new Result<GuideCategoryDTO>().ok(guideCategoryService.update(formDTO));
-        return new Result();
     }
 
 

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/GuideCategoryService.java

@@ -86,7 +86,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void save(EditGuideCategoryFormDTO dto);
+    GuideCategoryDTO save(EditGuideCategoryFormDTO dto);
 
     /**
      * 默认更新
@@ -96,7 +96,7 @@ public interface GuideCategoryService extends BaseService<GuideCategoryEntity> {
      * @author generator
      * @date 2021-09-06
      */
-    void update(EditGuideCategoryFormDTO dto);
+    GuideCategoryDTO update(EditGuideCategoryFormDTO dto);
 
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideCategoryServiceImpl.java

@@ -169,7 +169,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(EditGuideCategoryFormDTO dto) {
+    public GuideCategoryDTO save(EditGuideCategoryFormDTO dto) {
         if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), null) > 0) {
             throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
         }
@@ -185,11 +185,12 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         entity.setSort(currentMax == 0 ? currentMax : currentMax + 1);
         entity.setStatus(Constant.ENABLE);
         insert(entity);
+        return ConvertUtils.sourceToTarget(entity,GuideCategoryDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(EditGuideCategoryFormDTO dto) {
+    public GuideCategoryDTO update(EditGuideCategoryFormDTO dto) {
         if (baseDao.selectCategoryName(dto.getCategoryName().trim(), dto.getCustomerId(), dto.getId()) > 0) {
             throw new RenException(EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getCode(), EpmetErrorCode.GUIDE_CATEGORY_NAME_EXITS.getMsg());
         }
@@ -201,6 +202,7 @@ public class GuideCategoryServiceImpl extends BaseServiceImpl<GuideCategoryDao,
         origin.setCategoryCode(categoryCode);
         origin.setCategoryName(dto.getCategoryName());
         updateById(origin);
+        return ConvertUtils.sourceToTarget(origin,GuideCategoryDTO.class);
     }
     /**
      * 删除分类，存在办事指南的不允许删除，给予提示