1.增加删除评论功能 2.修改根据办事指南id获取所属地区 3.修改接口文档

fengjin

2022-11-16 bbb9e7153ee97aaf2a5fa9819bab028bd5a71472

1.增加删除评论功能 2.修改根据办事指南id获取所属地区 3.修改接口文档

 flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java

@@ -352,4 +352,16 @@
    }


    /**
     * 删除评论
     * @return
     */
    @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
    @GetMapping("/deleteComment")
    @Authorization
    public  ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser  SysUser sysUser){
        return  iGuideRepairOrderService.deleteComment(id,sysUser);
    }


}

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -469,4 +469,16 @@
    }


    /**
     * 删除评论
     * @return
     */
    @ApiOperation(value = "删除评论",response = GuideRepairOrder.class)
    @GetMapping("/deleteComment")
    @Authorization
    public  ResultData deleteComment(@RequestParam(value = "id",required = false) Integer id,@CurrentUser  SysUser sysUser){
        return  iGuideRepairOrderService.deleteComment(id,sysUser);
    }


}

 flower_city/src/main/java/com/dg/core/controller/UserController.java

@@ -396,7 +396,7 @@
     *
     * @return 结果
     */
    @ApiOperation("获取登录人员信息")
    @ApiOperation(value = "获取登录人员信息,userType=1 为超级管理员  isDivisionHead=1 为部门领导",response = SysUser.class)
    @PostMapping("/getLoginInformation")
    @Authorization
    public ResultData getLoginInformation(@CurrentUser SysUser sysUse)

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -138,6 +138,6 @@
     * 删除评论
     * @return
     */
    int deleteComment(Integer id);
    ResultData deleteComment(Integer id, SysUser sysUser);

}

 flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java

@@ -13,6 +13,7 @@

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

@@ -27,12 +28,14 @@

    @Override
    public List<AreaCode2022> getAreaCodeByTransactionId(Integer transactionId){
//        HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
        List<String> areaCodes = new ArrayList<>();
        TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().
                eq(TransactionEvent::getId, transactionId));
        List<String> departmentIds = new ArrayList<>(Arrays.asList(transactionEvent.getDepartmentIds().split(",")));
        departmentIds.add(transactionEvent.getDepartmentId());
        for (String departmentId : departmentIds) {
        OrganizationChartEntity organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getId, transactionEvent.getDepartmentId()));
        List<String> areaCodes=new ArrayList<>();
                    .eq(OrganizationChartEntity::getId, departmentId));
        if (organizationChartEntity!=null){
           if (organizationChartEntity.getCity()!=null)
             areaCodes.add(organizationChartEntity.getCity());
@@ -40,11 +43,9 @@
             areaCodes.add(organizationChartEntity.getDistrict());
           if (organizationChartEntity.getVillage()!=null)
             areaCodes.add(organizationChartEntity.getVillage());
           getAreaCodeIds(areaCodes,organizationChartEntity);
        }
        if (areaCodes.size()==0)
            return null;
        else

        }
           return baseMapper.selectByIdSet(areaCodes);
    }


 flower_city/src/main/java/com/dg/core/service/impl/AutomessagePolicyDocumentsServiceImpl.java

@@ -18,6 +18,7 @@
    @Override
    public List<AutomessagePolicyDocuments> selectConfigList(IPage<AutomessagePolicyDocuments> page, Integer state, String name, String type, SysUser sysUser,Integer departmentId) {
        List<AutomessagePolicyDocuments> automessagePolicyDocumentsList = baseMapper.selectConfigList(page, state, name, type, departmentId);
        if (sysUser!=null){
        for (AutomessagePolicyDocuments automessagePolicyDocuments:automessagePolicyDocumentsList) {
            if(sysUser.getUserType().equals("1")){//超级管理员
                automessagePolicyDocuments.setIsDelete(1);
@@ -36,6 +37,7 @@
                }
            }
        }
        }
        return automessagePolicyDocumentsList;
    }


 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -106,8 +106,7 @@
                        for (String departmentId : departmentIdsParent) {
                            OrganizationChartEntity organizationChart = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, departmentId));
                            OrganizationChartEntity organizationChartParent = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda().eq(OrganizationChartEntity::getId, organizationChart.getParentId()));
                            if (organizationChartParent!=null)
                            {
                            if (organizationChartParent != null) {
                                departmentIds.add(organizationChartParent.getId().toString());
                            }
                        }
@@ -438,8 +437,10 @@
    }

    @Override
    public int deleteComment(Integer id) {
    public ResultData deleteComment(Integer id, SysUser sysUser) {
        if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
        GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
            if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
        guideRepairOrder.setIsHideComments(1);
        baseMapper.updateById(guideRepairOrder);
        //新增删除评论进展
@@ -450,7 +451,15 @@
        entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
        entity.setGuideId(guideRepairOrder.getId().toString());
        guideEvolveMapper.insertConfig(entity);
        return  baseMapper.updateById(guideRepairOrder);
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
        return  ResultData.error();
    }