Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2024-09-05 a4cd4c2d98392cd1036f36b96c262878743a7e63

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/DisposeRecordController.java

@@ -10,12 +10,16 @@
import com.ycl.vo.MyBacklogVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDateTime;


/**
@@ -44,9 +48,24 @@
    @LogSave(operationType = "我的待办", contain = "查询")
    public CommonResult searchMyTask(@RequestParam(required = false) String num,
                                     @RequestParam Integer pageSize,
                                     @RequestParam Integer current) {
                                     @RequestParam Integer current,
                                     @RequestParam(required = false) Short source,
                                     @RequestParam(required = false) Short type,
                                     @RequestParam(required = false) Short time
    ) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        return CommonResult.success(iDisposeRecordService.listMyTask(new Page<>(current,pageSize),num, user.getUserId()));
        return CommonResult.success(iDisposeRecordService.listMyTask(num, user.getUserId(), type, source, time, current, pageSize));
    }

    @ApiOperation(value = "查询", response = MyBacklogVO.class)
    @GetMapping("/query/count")
    @LogSave(operationType = "我的待办-总数", contain = "查询总数")
    public CommonResult searchMyTaskCount(@RequestParam(required = false) String num,
                                          @RequestParam(required = false) Short source,
                                          @RequestParam(required = false) Short type,
                                          @RequestParam(required = false) Short time
    ) {
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        return CommonResult.success(iDisposeRecordService.listMyTaskCount(num, user.getUserId(), type, source, time));
    }
}