完善工时统计

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

@@ -51,4 +51,6 @@ public interface WorkProjectMapper extends BaseMapper<WorkProject> {
     int updateProject(ModifyProjectVo modifyProjectVo);
 
     List<WorkProject> getListByDeptAndIsConclusion(@Param("deptId") Integer deptId,@Param("isConclusion") Integer isConclusion);
+
+    List<Integer> getProjectIdByManager(Integer userId);
 }

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

@@ -168,5 +168,11 @@ ORDER BY p.is_conclusion DESC
          <if test="isConclusion !=null ">AND is_conclusion=#{isConclusion}</if>
     </select>
 
+    <select id="getProjectIdByManager" resultType="java.lang.Integer">
+    select id
+    from <include refid="table"/>
+    where manager_id = #{userId}
+    </select>
+
 
 </mapper>

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

@@ -210,15 +210,16 @@
             <if test="startDay != null">
                 AND work_day>=#{startDay}
             </if>
-            <if test="projectIds != null">
+            <if test="projectIdList != null">
                 AND project_id IN
-                <foreach collection="projectIds" item="projectId" open="(" close=")" separator=",">
+                <foreach collection="projectIdList" item="projectId" open="(" close=")" separator=",">
                     #{projectId}
                 </foreach>
             </if>
             <if test="statusArray != null">
                 AND `status` IN
-                <foreach collection="statusArray" item="workStatus" open="(" close=")" separator=",">#{workStatus}
+                <foreach collection="statusArray" item="workStatus" open="(" close=")" separator=",">
+                  #{workStatus}
                 </foreach>
             </if>
             <if test="typeList != null">

wisenergy-model/src/main/java/cn/wisenergy/model/enums/LevelEnum.java

@@ -6,7 +6,8 @@ package cn.wisenergy.model.enums;
  */
 public enum LevelEnum {
     EXAMINE("工时审批"),
-    STATISTICS("统计"),
+    USER_STATISTICS("人员统计报表"),
+    PROJECT_STATITSTICS("项目统计报表"),
     PROJECT_MANAGER( "项目/商机管理"),
     TIMEEXPORT("工时导出"),
     SYSTEMSETTINGS("系统设置"),