Commit 2c202e7e authored by chenzhao's avatar chenzhao

*) 我发起代码添加

parent 61d65968
...@@ -4,6 +4,7 @@ import java.util.List; ...@@ -4,6 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -125,7 +126,8 @@ public class FailureDetailsController extends BaseController { ...@@ -125,7 +126,8 @@ public class FailureDetailsController extends BaseController {
Page<FailureDetailsDto> page = new Page<FailureDetailsDto>(); Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus)); final AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus,userInfo));
} }
/** /**
...@@ -165,4 +167,21 @@ public class FailureDetailsController extends BaseController { ...@@ -165,4 +167,21 @@ public class FailureDetailsController extends BaseController {
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(currentStatus)); return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryStatusCount(currentStatus));
} }
/**
* 查询我提交状态任务数量
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "查询我提交状态任务数量", notes = "查询我提交状态任务数量")
@GetMapping(value = "/list/userID")
public ResponseModel<Page<FailureDetailsDto>> selectISubmit(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
page.setCurrent(current);
page.setSize(size);
String userId = getUserInfo().getUserId();
return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForPage(page,userId));
}
} }
...@@ -7,7 +7,9 @@ import java.util.List; ...@@ -7,7 +7,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -64,8 +66,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -64,8 +66,21 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
/** /**
* 分页查询 * 分页查询
*/ */
public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page,Long currentStatus) { public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page, Long currentStatus, AgencyUserModel userInfo ) {
return this.queryForPage(page, null, false,currentStatus); if (currentStatus == null){
return this.queryForPage(page, "submission_time", true);
}
return this.queryForPage(page, "submission_time", true,currentStatus);
}
/**
* 我发起分页查询
*/
public Page<FailureDetailsDto> queryForPage(Page<FailureDetailsDto> page, String userId ) {
if (userId == null){
return null;
}
return this.queryForPage(page, "submission_time", true,userId);
} }
/** /**
...@@ -122,7 +137,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa ...@@ -122,7 +137,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(),
failureDetailsDto.getAttachment()); failureDetailsDto.getAttachment());
} }
/*failureDetailsDto.set*/
model = this.createWithModel(failureDetailsDto); model = this.createWithModel(failureDetailsDto);
FailureAuditDto failureAuditDto = new FailureAuditDto(); FailureAuditDto failureAuditDto = new FailureAuditDto();
failureAuditDto.setAuditor(model.getRecUserName()); failureAuditDto.setAuditor(model.getRecUserName());
failureAuditDto.setFaultId(model.getSequenceNbr()); failureAuditDto.setFaultId(model.getSequenceNbr());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment