|
|
|
@ -17,6 +17,7 @@ import com.biutag.supervision.service.DataCaseVerifService; |
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
import io.swagger.v3.oas.annotations.Operation; |
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag; |
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.cache.annotation.Cacheable; |
|
|
|
import org.springframework.cache.annotation.Cacheable; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
|
import org.springframework.format.annotation.DateTimeFormat; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
import org.springframework.web.bind.annotation.GetMapping; |
|
|
|
@ -33,6 +34,7 @@ import static com.biutag.supervision.constants.enums.ProblemSourcesEnum.*; |
|
|
|
* @author wxc |
|
|
|
* @author wxc |
|
|
|
* @date 2024/10/24 |
|
|
|
* @date 2024/10/24 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
@Slf4j |
|
|
|
@RequestMapping("datav/caseVerif") |
|
|
|
@RequestMapping("datav/caseVerif") |
|
|
|
@RequiredArgsConstructor |
|
|
|
@RequiredArgsConstructor |
|
|
|
@RestController |
|
|
|
@RestController |
|
|
|
@ -155,14 +157,8 @@ public class DataVCaseVerifController { |
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { |
|
|
|
Date finalEndTime = DateUtil.endOfDay(endTime); |
|
|
|
Date finalEndTime = DateUtil.endOfDay(endTime); |
|
|
|
List<CaseVerificationMapVo> caseVerificationMapList = negativeMapper.getCaseVerificationMap(beginTime, finalEndTime); |
|
|
|
List<CaseVerificationMapVo> caseVerificationMapList = negativeMapper.getCaseVerificationMap(beginTime, finalEndTime); |
|
|
|
caseVerificationMapList =caseVerificationMapList.stream().map(s->{ |
|
|
|
log.info("-------caseVerificationMapList-------"); |
|
|
|
// long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper<DataCaseVerif>().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime)
|
|
|
|
log.info(caseVerificationMapList.toString()); |
|
|
|
// .eq(DataCaseVerif::getSecondDepartId,s.));
|
|
|
|
|
|
|
|
// s.setTotal((int) total);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue());
|
|
|
|
|
|
|
|
return s; |
|
|
|
|
|
|
|
}).toList(); |
|
|
|
|
|
|
|
JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList); |
|
|
|
JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList); |
|
|
|
return Result.success(res); |
|
|
|
return Result.success(res); |
|
|
|
} |
|
|
|
} |
|
|
|
|