员工生产统计

jjt-biz/src/main/java/com/jjt/emp/controller/TwinEmpCalcController.java

@@ -104,7 +104,7 @@ public class TwinEmpCalcController extends BaseController {
                             vo.setEfficiency(eff);
                             return vo;
                         }
-                ).sorted(Comparator.comparing(EmpCalcEmpVO::getEmpName)).collect(Collectors.toList());
+                ).sorted(Comparator.comparing(EmpCalcEmpVO::getTotalPrice).reversed()).collect(Collectors.toList());
 
         result.put("trend", trend);
         result.put("emp", emp);

jjt-biz/src/main/java/com/jjt/emp/service/impl/TwinEmpCalcServiceImpl.java

@@ -125,7 +125,7 @@ public class TwinEmpCalcServiceImpl implements ITwinEmpCalcService {
 
         //获取统计数据
         List<TwinCalcHourSpec> specHourList = hourSpecService.selectTwinCalcHourSpecListByDate(date);
-        specHourList.forEach(obj -> obj.setTeam());
+        specHourList.forEach(TwinCalcHourSpec::setTeam);
         // 按照deviceId、density、mick、team，并统计每组的length总和
         Map<String, List<TwinCalcHourSpec>> specHourMap = specHourList.stream().collect(Collectors.groupingBy(o -> o.getDeviceId() + "-" + o.getTeam(), LinkedHashMap::new, Collectors.toList()));
         List<TwinCalcDay> twinCalcDays = twinCalcDayService.selectTwinCalcDayListByTime(date, date);

jjt-biz/src/main/java/com/jjt/emp/service/impl/TwinEmpServiceImpl.java

@@ -144,15 +144,18 @@ public class TwinEmpServiceImpl implements ITwinEmpService {
         TwinEmp twinEmp = new TwinEmp();
         twinEmp.setEmpDate(date);
         List<TwinEmp> list = selectTwinEmpList(twinEmp);
+        Long empId = list.get(0).getEmpId();
+        twinEmp = selectTwinEmpByEmpId(empId);
         if (list.size() == 0) {
             //如果未找到，则取最后一条记录
             list = selectTwinEmpList(new TwinEmp());
+            empId = list.get(0).getEmpId();
+            TwinEmp emp = selectTwinEmpByEmpId(empId);
+            emp.setEmpId(null);
+            emp.setEmpDate(date);
+            insertTwinEmp(emp);
+            twinEmp = emp;
         }
-        Long empId = list.get(0).getEmpId();
-        twinEmp = selectTwinEmpByEmpId(empId);
-        twinEmp.setEmpId(null);
-        twinEmp.setEmpDate(date);
-        insertTwinEmp(twinEmp);
         return twinEmp;
     }
 }

jjt-biz/src/main/resources/mapper/emp/TwinEmpMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTwinEmpList" parameterType="TwinEmp" resultMap="TwinEmpResult">
         <include refid="selectTwinEmpVo"/>
         <where>
-            <if test="empDate != null "> and EMP_DATE = #{empDate}</if>
+            <if test="empDate != null "> and FORMAT(EMP_DATE,'yyyy-MM-dd') = #{empDate}</if>
         </where>
         order by emp_date desc
     </select>