完善工时统计

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

@@ -94,14 +94,9 @@
         </foreach>
         </if>
         <if test="deptId != null">
-            AND dept_id = #{deptId}
-        </if>
-        <if test="types != null">
-            AND type in
-            <foreach collection="types" open="(" close=")" separator="," item="type">
-                #{type}
-            </foreach>
+            AND ptc.dept_id = #{deptId}
         </if>
+
         <if test="centreId != null">
            AND centre_id = #{centreId}
         </if>

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

@@ -306,8 +306,8 @@ public class StatisticsServiceImpl implements StatisticsService {
             WorkDept userDept = workDeptMapper.getById(user.getDeptId());
             // 获取中心下的所有项目和商机工单统计
             Map<String, Object> map = new HashMap<>();
-            map.put("centreId", userDept.getCentreId());
             map.put("firstDayOfMonth", startTime);
+            map.put("centreId", userDept.getCentreId());
             workTimeAndCostCollects = workProjectTimeCostMapper.selectList(map);
 
             // 除项目和项目的类型