|
@@ -80,8 +80,13 @@ public class CaseFrontSheetAnalyzeService {
|
|
|
}
|
|
|
|
|
|
public ResultVo<List<SheetQuality>> analyzeQualityControl(SheetAnalyzeParams params) {
|
|
|
- String[] dateRange = StringUtil.isBlank(params.getMonth()) ? getDatetimeRangeByYear(params.getYear()) :
|
|
|
- getDatetimeRangeByMonth(params.getMonth());
|
|
|
+ String[] dateRange = new String[2];
|
|
|
+ if (StringUtil.isBlank(params.getYear())) {
|
|
|
+ dateRange[0] = params.getBeginMonth() + "-01 00:00:00";
|
|
|
+ dateRange[1] = DateUtil.getMonthEndtime(params.getEndMonth());
|
|
|
+ } else {
|
|
|
+ dateRange = getDatetimeRangeByYear(params.getYear());
|
|
|
+ }
|
|
|
String deptIdentity = params.getType() == 1 ? "admiss_dept" : "dismiss_dept";
|
|
|
List<SheetQualitySources> qualitySources = dao.selectSheetQualitySource(dateRange[0], dateRange[1], deptIdentity);
|
|
|
Map<String, List<SheetQualitySources>> deptQualitySources = new HashMap<>();
|