提交 fd28c538 authored 作者: zjm's avatar zjm

修改注入问题

上级 a4a0016e
流水线 #130 已取消 于阶段
...@@ -39,12 +39,12 @@ public interface WorkRepository extends MongoRepository<Work, String> { ...@@ -39,12 +39,12 @@ public interface WorkRepository extends MongoRepository<Work, String> {
* @param eTime 结束时间 * @param eTime 结束时间
* @return 集合 * @return 集合
*/ */
List<Work> findAllByExecutorAndStateTimeBetween(String id,Date sTime,Date eTime); List<Work> findByExecutorAndStateTimeBetween(String id,Date sTime,Date eTime);
/** /**
* 根据人员id以及的任务 * 根据人员id以及的任务
* @param id 人员id * @param id 人员id
* @return 集合 * @return 集合
*/ */
List<Work> findAllByExecutor(String id); List<Work> findByExecutor(String id);
} }
package com.zjty.tynotes.job.status.controller; package com.zjty.tynotes.job.status.controller;
import com.zjty.tynotes.job.status.entity.RedisListSum; import com.zjty.tynotes.job.status.entity.RedisListSum;
import com.zjty.tynotes.job.status.service.InternalService;
import com.zjty.tynotes.job.status.service.TestSeeService; import com.zjty.tynotes.job.status.service.TestSeeService;
import com.zjty.tynotes.job.status.service.TestService; import com.zjty.tynotes.job.status.service.TestService;
import com.zjty.tynotes.misc.config.AutoDocument; import com.zjty.tynotes.misc.config.AutoDocument;
...@@ -29,6 +30,9 @@ public class Read1Controller { ...@@ -29,6 +30,9 @@ public class Read1Controller {
TestService testService; TestService testService;
@Autowired @Autowired
TestSeeService testSeeService; TestSeeService testSeeService;
@Autowired
InternalService internalService;
/** /**
*阅读页面我的代办任务列表 *阅读页面我的代办任务列表
* @param page 页码 默认1 * @param page 页码 默认1
...@@ -204,4 +208,17 @@ public class Read1Controller { ...@@ -204,4 +208,17 @@ public class Read1Controller {
} }
@ApiOperation(value = "测试接口")
@PostMapping("/test")
@ApiImplicitParams({
@ApiImplicitParam(name="id",value="人员id",dataType="String", paramType = "query",required = true)
})
public ResponseEntity loginFirstOneManualPush1(@RequestParam(value = "id") String id
){
// internalService.personnelWorkCount(id);
return ResponseEntity.ok(internalService.personnelWorkCount(id));
}
} }
...@@ -32,7 +32,7 @@ public class InternalServiceImpl implements InternalService { ...@@ -32,7 +32,7 @@ public class InternalServiceImpl implements InternalService {
@Autowired @Autowired
IUserService iUserService; IUserService iUserService;
@ApiModelProperty @Autowired
WorkRepository workRepository; WorkRepository workRepository;
@Autowired @Autowired
ScoreCoefficientRepository scoreCoefficientRepository; ScoreCoefficientRepository scoreCoefficientRepository;
...@@ -81,7 +81,8 @@ public class InternalServiceImpl implements InternalService { ...@@ -81,7 +81,8 @@ public class InternalServiceImpl implements InternalService {
int countOngoing=0; int countOngoing=0;
int countFinished=0; int countFinished=0;
Double countScore=0d; Double countScore=0d;
List<Work> works= workRepository.findAllByExecutorAndStateTimeBetween(userId,startTime,endTime);
List<Work> works= workRepository.findByExecutorAndStateTimeBetween(userId,startTime,endTime);
for (Work work:works){ for (Work work:works){
if (work.getStatus().equals(WorkStatus.ONGOING)){ if (work.getStatus().equals(WorkStatus.ONGOING)){
...@@ -107,7 +108,7 @@ public class InternalServiceImpl implements InternalService { ...@@ -107,7 +108,7 @@ public class InternalServiceImpl implements InternalService {
int countOngoing=0; int countOngoing=0;
int countFinished=0; int countFinished=0;
Double countScore=0d; Double countScore=0d;
List<Work> works= workRepository.findAllByExecutor(userId); List<Work> works= workRepository.findByExecutor(userId);
for (Work work:works){ for (Work work:works){
if (work.getStatus().equals(WorkStatus.ONGOING)){ if (work.getStatus().equals(WorkStatus.ONGOING)){
......
package com.zjty.tynotes.job.status.service.impl; package com.zjty.tynotes.job.status.service.impl;
import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
import com.zjty.tynotes.job.basic.entity.database.Work; import com.zjty.tynotes.job.basic.entity.database.Work;
import com.zjty.tynotes.job.basic.repository.ScoreCoefficientRepository; import com.zjty.tynotes.job.basic.repository.ScoreCoefficientRepository;
import com.zjty.tynotes.job.basic.service.WorkService; import com.zjty.tynotes.job.basic.service.WorkService;
...@@ -12,7 +11,6 @@ import com.zjty.tynotes.job.status.entity.RedisPersonalWork; ...@@ -12,7 +11,6 @@ import com.zjty.tynotes.job.status.entity.RedisPersonalWork;
import com.zjty.tynotes.job.status.entity.RoleSum1; import com.zjty.tynotes.job.status.entity.RoleSum1;
import com.zjty.tynotes.job.status.service.TestService; import com.zjty.tynotes.job.status.service.TestService;
import com.zjty.tynotes.job.status.utils.JacksonUtil; import com.zjty.tynotes.job.status.utils.JacksonUtil;
import com.zjty.tynotes.pas.entity.vo.JobLeads;
import com.zjty.tynotes.pas.service.IUserService; import com.zjty.tynotes.pas.service.IUserService;
import com.zjty.tynotes.search.subject.entity.EsSource; import com.zjty.tynotes.search.subject.entity.EsSource;
import com.zjty.tynotes.search.subject.service.EsUtil; import com.zjty.tynotes.search.subject.service.EsUtil;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论