فهرست منبع

问题明细数据数量查询接口修改增添时间条件

zhanghang 3 سال پیش
والد
کامیت
1cf6d4720c

+ 11 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnResultNumberVO.java

@@ -4,8 +4,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 获取字段校验问题明细数量-接口入参
@@ -21,4 +23,13 @@ public class GetColumnResultNumberVO implements Serializable {
 
     @ApiModelProperty(value = "组织ID", required = true,hidden = true)
     private Long hospitalId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间", required = true)
+    private Date solveTimeStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "结束时间", required = true)
+    private Date solveTimeEnd;
+
 }

+ 11 - 5
daqe-center/src/main/resources/mapper/ColumnResultMapper.xml

@@ -12,11 +12,17 @@
 		sum(CASE dcr.is_solved WHEN 0 THEN (CASE dcr.type WHEN 1 THEN 1 ELSE 0 END) ELSE 0 END) notSolvedNonnull,
 		sum(CASE dcr.is_solved WHEN 0 THEN (CASE dcr.type WHEN 2 THEN 1 ELSE 0 END) ELSE 0 END) notSolvedStandardvalue,
 		sum(CASE dcr.is_solved WHEN 0 THEN (CASE dcr.type WHEN 3 THEN 1 ELSE 0 END) ELSE 0 END) notSolvedRegular
-	FROM
-		dc_column_result dcr
-	WHERE
-		dcr.is_deleted = 'N'
-	and hospital_id=#{getColumnResultNumberVO.hospitalId}
+		FROM
+			dc_column_result dcr
+		WHERE
+			dcr.is_deleted = 'N'
+		and hospital_id=#{getColumnResultNumberVO.hospitalId}
+		<if test="getColumnResultNumberVO.solveTimeStart != null ">
+			<![CDATA[ AND solve_time >= #{getColumnResultNumberVO.solveTimeStart}]]>
+		</if>
+		<if test="getColumnResultNumberVO.solveTimeEnd != null ">
+			<![CDATA[ AND solve_time <= #{getColumnResultNumberVO.solveTimeEnd}]]>
+		</if>
 
     </select>