Просмотр исходного кода

新增获取项目打卡月份数据表

anderx 1 год назад
Родитель
Сommit
525f21bf25

+ 0 - 1
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -865,7 +865,6 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
             companyId = user.getDept().getCompanyId();
             if (companyId==null)user.getDept().getDeptId();
         }
-
         return projectTaskMapper.getAllProjectMonth(companyId);
     }
 

+ 2 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectTaskMapper.xml

@@ -311,8 +311,9 @@
         from (select a.id,a.name ,date_format(b.record_time,'%Y-%m')recordTime
               from project_task a left join project_staff_record b on a.id =b.pid
               left join sys_user c on b.aid=c.user_id left join sys_dept d on c.dept_id=d.dept_id
+              where b.process_status=2
               <if test="companyId !=null">
-                  where d.company_id= #{companyId}
+                  and  d.company_id= #{companyId}
               </if>
               )x where x.recordTime is not null group by x.id,x.name,x.recordTime
     </select>

+ 1 - 1
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 		<result property="companyId" column="company_id" />
-		<result property="companyName" column="companyName" />
+		<result property="companyName" column="company_name" />
 		<result property="maxDuration" column="max_duration" />
 		<result property="companyLogo" column="company_logo" />
 		<result property="companyFullName" column="company_full_name" />