完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkTimeOrderMapper.xml

@@ -249,12 +249,7 @@
                     #{type}
                 </foreach>
             </if>
-            <if test="deptIdList != null">
-                AND `type` IN
-                <foreach collection="deptIdList" item="dept" open="(" close=")" separator=",">
-                    #{type}
-                </foreach>
-            </if>
+
         </where>
     </select>
 

wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java

@@ -194,7 +194,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                 map.remove("projectIdList");
                 List<WorkType> allType = workTypeMapper.getAll();
                 List<Integer> type = new ArrayList<>();
-                for (int i = 5; i < allType.size(); i++) {
+                for (int i = 4; i < allType.size(); i++) {
                     type.add(allType.get(i).getId());
                 }
                 map.put("typeList", type);