0320.1

health/src/main/java/com/ccsens/health/api/AbnormalController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @Slf4j
-@Api(tags = "打卡签到相关" , description = "")
+@Api(tags = "异常人员相关" , description = "")
 @RestController
 @RequestMapping("/abnormal")
 public class AbnormalController {

health/src/main/java/com/ccsens/health/bean/dto/AbnormalDto.java

@@ -2,7 +2,6 @@ package com.ccsens.health.bean.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

health/src/main/java/com/ccsens/health/bean/dto/UserDto.java

@@ -34,5 +34,7 @@ public class UserDto {
         private String startTime;
         @ApiModelProperty("结束时间")
         private String endTime;
+        @ApiModelProperty("是否是搜索界面 0搜索界面 1全局概览")
+        private int search;
     }
 }

health/src/main/java/com/ccsens/health/service/AbnormalService.java

@@ -40,11 +40,11 @@ public class AbnormalService implements IAbnormalService{
     @Override
     public List<AbnormalVo.AbnormalOverview> abnormalOverview(QueryDto<AbnormalDto.SelectAbnormal> params) throws Exception {
         AbnormalDto.SelectAbnormal selectAbnormal = params.getParam();
-        Long startTime = selectAbnormal.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectAbnormal.getStartTime();
-        Long endTime = selectAbnormal.getEndTime() == null ? System.currentTimeMillis() : selectAbnormal.getEndTime();
+//        Long startTime = selectAbnormal.getStartTime() == null ? DateUtil.getZeroTime(new Date()) : selectAbnormal.getStartTime();
+//        Long endTime = selectAbnormal.getEndTime() == null ? System.currentTimeMillis() : selectAbnormal.getEndTime();
 
         List<AbnormalVo.AbnormalOverview> abnormalOverviewList =
-                healthAbnormalDao.abnormalOverview(selectAbnormal.getDepartment(),startTime,endTime);
+                healthAbnormalDao.abnormalOverview(selectAbnormal.getDepartment(),selectAbnormal.getStartTime(),selectAbnormal.getEndTime());
 
         return abnormalOverviewList;
     }

health/src/main/resources/mapper_dao/HealthAbnormalDao.xml

@@ -68,10 +68,14 @@
                     and
                     m.department = #{department}
                 </if>
+                <if test="endTime != null">
                 and
                     ha.start_time &lt;= #{endTime}
+                </if>
+                <if test="startTime != null">
                 and
                     ha.end_time &gt;= #{startTime}
+                </if>
             ) h on a.health_status = h.h_status
         GROUP BY a.health_status