优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java

@@ -38,7 +38,7 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
 
     int updateStatusById(@Param("reviewerId") Integer reviewerId,@Param("id") Integer id,@Param("reason") String reason);
 
-    List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectIds")List<Integer> projectIds, @Param("types") List<Integer> types);
+    List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectId")Integer projectId, @Param("type")Integer type,@Param("deptId") Integer deptId);
 
     /**
      * 根据填报项目类型获取次数和工时汇总

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

@@ -112,20 +112,17 @@
         FROM
         <include refid="table"/>
         <where>
-            <if test="null != projectIds">
-            AND   project_id IN
-                <foreach collection="projectIds" item="projectId" open="(" close=")" separator=",">
-                    #{projectId}
-                </foreach>
+            <if test="null != projectId">
+            AND   project_id = #{projectId}
             </if>
             <if test="null != status">
             AND status = #{status}
             </if>
-            <if test="null != types">
-            AND type IN
-            <foreach collection="types" item="type" open="(" close=")" separator=",">
-                #{type}
-            </foreach>
+            <if test="null != type">
+            AND type = #{type}
+            </if>
+            <if test="null != type">
+                AND dept_id = #{deptId}
             </if>
         </where>
         ORDER BY work_day DESC

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

@@ -888,22 +888,10 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         PageHelper.startPage(page, size);
         List<WorkTimeOrder> workTimeOrders = null;
         Integer level = user.getLevel();
-        List<Integer> types;
-        List<Integer> projectIds = new ArrayList<>();
+
         if (0 != level) {
-            if (null == projectId) {
-                List<ProjectDto> byManagerId = workProjectService.getByManagerId(user.getId());
-                if (!CollectionUtils.isEmpty(byManagerId)) {
-                    for (ProjectDto projectDto : byManagerId) {
-                        projectIds.add(projectDto.getId());
-                    }
-                }
-            }
-            if (null != projectId) {
-                projectIds.add(projectId);
-            }
-            types = type == null ? Arrays.asList(1, 2, 5, 6, 7) : new ArrayList<>(Collections.singletonList(type));
-            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectIds, types);
+            Integer deptId = user.getDeptId();
+            workTimeOrders = workTimeOrderMapper.queryByPage(status, projectId, type,deptId);
         }