430/mdc_430.git

			@@ -1,9 +1,7 @@
			package org.jeecg.modules.mdc.service.impl;

			import com.alipay.api.domain.NewsfeedMediaGiftInfo;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import org.apache.commons.lang3.StringUtils;
			import org.checkerframework.checker.units.qual.A;
			import org.jeecg.common.constant.CommonConstant;
			import org.jeecg.common.exception.JeecgBootException;
			import org.jeecg.modules.mdc.dto.*;
			@@ -11,8 +9,8 @@
			import org.jeecg.modules.mdc.mapper.MdcEfficiencyReportMapper;
			import org.jeecg.modules.mdc.service.*;
			import org.jeecg.modules.mdc.util.DateUtils;
			import org.jeecg.modules.mdc.vo.*;
			import org.jeecg.modules.mdc.vo.MdcUtilizationRateDto;
			import org.jeecg.modules.mdc.vo.*;
			import org.jeecg.modules.system.entity.MdcProduction;
			import org.jeecg.modules.system.entity.SysDepart;
			import org.jeecg.modules.system.service.IMdcProductionService;
			@@ -21,8 +19,7 @@

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			import java.text.Collator;
			import java.time.LocalDate;
			import java.time.format.DateTimeFormatter;
			import java.time.temporal.ChronoUnit;
			@@ -230,7 +227,7 @@
			listDtos.add(mdcEfficiencyListDto);
			}
			}

			listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
			result.setMdcEfficiencyList(listDtos);
			}

			@@ -410,7 +407,7 @@
			listDtos.add(mdcEfficiencyListDto);
			}
			}

			listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
			result.setMdcEfficiencyList(listDtos);
			}

			@@ -633,6 +630,7 @@
			listDtos.add(mdcEfficiencyShiftListDto);
			}
			}
			listDtos.sort(((o1, o2) -> Collator.getInstance(Locale.TRADITIONAL_CHINESE).compare(o1.getLevel3(), o2.getLevel3())));
			result.setMdcEfficiencyList(listDtos);
			}
			return result;