ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -20,6 +20,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.quartz.task.RyTask; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserDeptService; import com.smartor.domain.*; @@ -77,6 +78,9 @@ @Autowired private ISysConfigService configService; @Autowired private RyTask ryTask; @Value("${spring.profiles.active}") private String active; @@ -580,6 +584,25 @@ return success(serviceStatistics); } /** * é访å¼å¸¸ç»è®¡å¯¼åº */ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") @Log(title = "é访ç»è®¡å¯¼åº", businessType = BusinessType.EXPORT) @PostMapping("/getSfStatisticsIsAbnormalExport") public void getSfStatisticsIsAbnormalExport(HttpServletResponse response, ServiceSubtaskCountReq serviceSubtaskCountReq) { List<ServiceSubtaskIsAbnormalStatistic> sfStatistics = serviceSubtaskService.getSfStatisticsIsAbnormalExport(serviceSubtaskCountReq); ExcelUtil<ServiceSubtaskIsAbnormalStatistic> util = new ExcelUtil<ServiceSubtaskIsAbnormalStatistic>(ServiceSubtaskIsAbnormalStatistic.class); String sheetName = ""; String fileName = ""; if (active.equals("ls") || active.equals("druid")) { fileName = sheetName = LocalDate.now().getMonthValue() + "æåºé¢é访å¼å¸¸ç»è®¡è¡¨"; util.exportExcelWithFileName(response, sfStatistics, sheetName, fileName); } else { sheetName = "é访å¼å¸¸ç»è®¡å¯¼åº"; util.exportExcel(response, sfStatistics, sheetName); } } /** * è·åé访ç»è®¡æ¯ä¾ @@ -737,4 +760,9 @@ return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO); } @PostMapping("/test") public void test() { ryTask.longTaskSend(); } } smartor/src/main/java/com/smartor/domain/ServiceSubtaskIsAbnormalStatistic.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,71 @@ package com.smartor.domain; import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.util.List; /** * åç åºé访ç»è®¡æ¯ä¾ * * @author ruoyi * @date 2024-12-11 */ @ApiModel(value = "ServiceSubtaskStatistic", description = "åç åºé访ç»è®¡æ¯ä¾") @Data public class ServiceSubtaskIsAbnormalStatistic implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "ç§å®¤ç åº") private Integer statisticaltype; @ApiModelProperty(value = "åºé¢ç åºç¼å·") private String leavehospitaldistrictcode; @ApiModelProperty(value = "åºé¢ç åºåç§°") @Excel(name = " åºé¢ç åºåç§° ") private String leavehospitaldistrictname; @ApiModelProperty(value = "åºé¢ç§å®¤ç¼å·") private String deptcode; @ApiModelProperty(value = "åºé¢ç§å®¤åç§°") @Excel(name = " åºé¢ç åºåç§° ") private String deptname; /** * æ§å« */ @ApiModelProperty(value = "æ§å« 1ç· 2女") private Long sex; @ApiModelProperty(value = "å¼å¸¸äººæ°0-10å²") private Long abnormalCount010 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°10-20å²") private Long abnormalCount1020 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°20-30å²") private Long abnormalCount2030 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°30-40å²") private Long abnormalCount3040 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°40-50å²") private Long abnormalCount4050 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°50-60å²") private Long abnormalCount5060 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°60-70å²") private Long abnormalCount6070 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°70-80å²") private Long abnormalCount7090 = 0L; @ApiModelProperty(value = "å¼å¸¸äººæ°80å²ä»¥ä¸") private Long abnormalCount80More = 0L; } smartor/src/main/java/com/smartor/service/IServiceSubtaskService.java
@@ -137,6 +137,9 @@ //导åºé访 public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq); //导åºé访-å¼å¸¸ public List<ServiceSubtaskIsAbnormalStatistic> getSfStatisticsIsAbnormalExport(ServiceSubtaskCountReq serviceSubtaskCountReq); public List<ServiceSubtaskStatistic> getSfStatisticsJoy(ServiceSubtaskCountReq serviceSubtaskCountReq); public List<ServiceSubtaskCount> getSfStatisticsJoydetails(ServiceSubtaskCountReq serviceSubtaskCountReq); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -457,7 +457,9 @@ //å°å½ååéç¶ææ¹æ9宿 ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform(); serviceSubtaskPreachform.setPreachform(serviceSubtaskList.get(0).getCurrentPreachform()); if (CollectionUtils.isNotEmpty(serviceSubtaskList)) { serviceSubtaskPreachform.setPreachform(serviceSubtaskList.get(0).getCurrentPreachform()); } serviceSubtaskPreachform.setSubid(serviceSubtask.getId()); serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid()); List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform); @@ -900,7 +902,7 @@ } //夿ä¸ä¸å½åçé®é¢æ¯ä¸æ¯æ»¡æåº¦é®é¢ï¼å¹¶ä¸dutyDeptCodeæ¯å¦æå¼ï¼å¹¶ä¸é项æ¯ä¸æ¯å¼å¸¸é项ï¼å¦æå ¨ç¬¦åï¼å徿»¡æåº¦é®é¢å¼å¸¸è¡¨æ°å¢ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal()) { if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && 1 == stt.getIsabnormal()) { isabnormalFlag = 1L; ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace(); subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId()); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -2477,7 +2477,7 @@ return jsRates; } @Override public List<ServiceSubtaskStatistic> getSfStatisticsExport(ServiceSubtaskCountReq serviceSubtaskCountReq) { List<ServiceSubtaskStatistic> sfStatistics = getSfStatistics(serviceSubtaskCountReq); // æ·»å æ»è®¡è¡ @@ -2491,6 +2491,12 @@ return sfStatistics; } @Override public List<ServiceSubtaskIsAbnormalStatistic> getSfStatisticsIsAbnormalExport(ServiceSubtaskCountReq serviceSubtaskCountReq){ return null; } /** * è·åé访ç»è®¡æ¯ä¾ *