fengjin
2022-12-05 4b92c6f30a86ad0f804614b2659c1dda368b8fdd
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -27,6 +27,7 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -86,7 +87,8 @@
    @GetMapping("/orderdata")
    @Authorization
    public ResultData selectConfigData(@RequestParam(value = "Id",required = false) String Id,
                                       @RequestParam(value = "orderNum",required = false)  String orderNum)
                                       @RequestParam(value = "orderNum",required = false)  String orderNum,
                                       @CurrentUser SysUser sysUser)
    {
        if(StringUtils.isEmpty(Id) && StringUtils.isEmpty(orderNum))
        {
@@ -94,7 +96,7 @@
        }
        GuideRepairOrder order=iGuideRepairOrderService.selectConfigData(Id,orderNum);
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id));
        order.setGuideEvolveEntities(iGuideEvolveService.selectConfigList(Id,sysUser));
        return ResultData.success(order);
    }
@@ -189,7 +191,7 @@
            WxUtil wxUtil=new WxUtil();
            String accessToken="0";
            try {
                accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get().toString();
                accessToken= stringRedisTemplate.boundValueOps("access_token:access_token:" + ConstantPropertiesUtil.WX_OPEN_APP_ID).get();
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
@@ -197,7 +199,7 @@
            wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
            }
            else if (order.getSubmitType().equals(2)){
                smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            //待评价
            order.setState("4");
@@ -327,19 +329,39 @@
    {
        List<String> ids=null;
        String userId=null;
        if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
        if( StringUtils.equals("2",sysUser.getRoleIds()))
        {
            userId=null;
            ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
            if(StringUtils.equals("1",sysUser.getIsDivisionHead()))
            {
                ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
            }
            else
            {
                userId=sysUser.getUserId()+"";
                ids=new ArrayList<>();
                ids.add(sysUser.getDepartmentId());
            }
        }
        else
        {
            userId=sysUser.getUserId()+"";
            ids=PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        }
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId);
        List<GuideRepairOrder> list = iGuideRepairOrderService.selectConfigList(null,ids,status,userId,null,null,null);
        int num=iGuideRepairOrderService.countConfigList(null,ids,status,userId);
        return getDataTable(list,num);
    }
    /**
     * 删除评论
     * @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);
    }
}