fengjin
2022-09-30 610065c78311dbf5085998943612f153456e4672
修改Bug
3个文件已修改
32 ■■■■ 已修改文件
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -53,7 +53,7 @@
     * @param orderNum
     * @return
     */
    @ApiOperation("获取订单详情")
    @ApiOperation(value = "获取订单详情",response = GuideRepairOrder.class)
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
@@ -79,7 +79,7 @@
     * @param order
     * @return
     */
    @ApiOperation("转派人员")
    @ApiOperation(value = "转派人员",response = GuideRepairOrder.class)
    @PostMapping("/redeploy")
    @Authorization
    public ResultData redeploy(@RequestBody GuideRepairOrder order, @CurrentUser SysUser sysUser)
@@ -129,7 +129,7 @@
     * @param entity
     * @return
     */
    @ApiOperation("去处理")
    @ApiOperation(value = "去处理",response = GuideRepairOrder.class)
    @PostMapping("/dispose")
    @Authorization
    public ResultData dispose(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
@@ -177,7 +177,7 @@
     * @param entity
     * @return
     */
    @ApiOperation("取消导办工单")
    @ApiOperation(value = "取消导办工单",response = GuideRepairOrder.class)
    @PostMapping("/cancel")
    @Authorization
    public ResultData cancel(@RequestBody GuideEvolveEntity entity, @CurrentUser SysUser sysUser)
@@ -222,7 +222,7 @@
     * @param entity
     * @return
     */
    @ApiOperation("工单评价")
    @ApiOperation(value = "工单评价",response = GuideRepairOrder.class)
    @PostMapping("/evaluate")
    @Authorization
    public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
@@ -265,7 +265,7 @@
     * @param sysUser 当前登录人员信息
     * @return
     */
    @ApiOperation("获取个人中心工单数据")
    @ApiOperation(value = "获取个人中心工单数据",response = GuideRepairOrder.class)
    @GetMapping("/personalCenter")
    @Authorization
    public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
flower_city/src/main/java/com/dg/core/service/impl/AreaCodeServiceImpl.java
@@ -47,16 +47,16 @@
    }
    public  List<String> getAreaCodeIds(List<String> areaCodes, OrganizationChartEntity organizationChartEntity){
         organizationChartEntity = organizationChartMapper.selectOne(new QueryWrapper<OrganizationChartEntity>().lambda()
       List<OrganizationChartEntity>  organizationChartEntitys= organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
                .eq(OrganizationChartEntity::getParentId, organizationChartEntity.getId()));
        if (organizationChartEntity!=null){
            if (organizationChartEntity.getCity()!=null)
                areaCodes.add(organizationChartEntity.getCity());
            if (organizationChartEntity.getDistrict()!=null)
                areaCodes.add(organizationChartEntity.getDistrict());
            if (organizationChartEntity.getVillage()!=null)
                areaCodes.add(organizationChartEntity.getVillage());
            getAreaCodeIds(areaCodes,organizationChartEntity);
        for (OrganizationChartEntity organizationChart:organizationChartEntitys) {
            if (organizationChart.getCity()!=null)
                areaCodes.add(organizationChart.getCity());
            if (organizationChart.getDistrict()!=null)
                areaCodes.add(organizationChart.getDistrict());
            if (organizationChart.getVillage()!=null)
                areaCodes.add(organizationChart.getVillage());
            getAreaCodeIds(areaCodes,organizationChart);
        }
        return  areaCodes;
    }
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -38,6 +38,8 @@
        guideRepairOrder.setDepartmentId(transactionEvent.getDepartmentId());
        guideRepairOrder.setClassifyId(transactionEvent.getClassifyId());
        guideRepairOrder.setState("1");
        guideRepairOrder.setCreateTime(LocalDateTime.now());
        guideRepairOrder.setUpdateTime(LocalDateTime.now());
        transactionEvent.setTransactionNum(transactionEvent.getTransactionNum()+1);
         String[] images = guideRepairOrder.getImages().split(",");
        for (String image: images) {