【员工列表】查询

mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/dal/mysql/user/AdminUserMapper.java

@@ -87,8 +87,8 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
             span = monthsBetween+"";
         }
 
-        query.selectAll(AdminUserDO.class)
-                .select("a.year_mont as yearMonth,b.projectCode,b.external_code,sd.name as deptName")
+        query.distinct().selectAll(AdminUserDO.class)
+                .select("a.year_mont as yearMonth,sd.name as deptName")
                 .select("ifnull(sum(" +
                         "case when exists(select id from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage') " +
                         "then (select price from base_process_setting where user_id=b.owner and procedure_id=b.procedure_id and salary_type='HourWage' limit 1)*b.workTime " +
@@ -119,14 +119,14 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
                 .leftJoin("(select * from system_users as a,(SELECT DATE_FORMAT(DATE_SUB(CURRENT_DATE(),INTERVAL "+span+" MONTH) , '%Y%m')  year_mont) as b " +
                         ") as a on t.id=a.id")
                 .leftJoin("(" +
-                        "select ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m') as year_mont,pso.code as projectCode,pso.business_dept_id,ptr.procedure_id,pso.external_code,sum(ptr.amount) amount,sum(ptr.work_time) workTime from pro_task_report as ptr " +
+                        "select ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m') as year_mont,ptr.procedure_id,sum(ptr.amount) amount,sum(ptr.work_time) workTime from pro_task_report as ptr " +
                         "left join pro_task_dispatch as ptd on ptd.id=ptr.dispatch_id " +
                         "left join project_sale_order as pso on pso.id= ptd.project_id " +
-                        "group by ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m'),pso.code,pso.business_dept_id,ptr.procedure_id,pso.external_code " +
+                        "group by ptr.owner,DATE_FORMAT(ptr.report_time, '%Y%m'),ptr.procedure_id" +
                         ") b on t.id=b.owner and a.id=b.owner and a.year_mont=b.year_mont ")
-                .leftJoin("system_dept as sd on b.business_dept_id= sd.id ")
+                .leftJoin("system_dept as sd on sd.id= t.dept_id ")
                 .leftJoin("base_salary_month as sm on sm.user_id=t.id and sm.month=a.year_mont")
-                .groupBy("t.id,t.username,t.nickname,a.year_mont,b.projectCode,b.external_code,sd.name ")
+                .groupBy("t.id,t.username,t.nickname,a.year_mont,sd.name ")
         ;
         query.like(!StringUtils.isEmpty(reqVO.getProjectCode()),"b.projectCode",reqVO.getProjectCode())
                 .like(!StringUtils.isEmpty(reqVO.getExternalCode()),"b.external_code",reqVO.getExternalCode())