【员工工资明细】

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskreport/TaskReportDO.java

@@ -144,4 +144,5 @@ public class TaskReportDO extends BaseDO {
     @TableField(exist = false)
     private String deptName;
 
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java

@@ -150,7 +150,7 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
     default List<TaskReportDO> selectUserReportDetail(String userId,String yearMonth) {
         MPJLambdaWrapperX<TaskReportDO> query = new MPJLambdaWrapperX<>();
         query.distinct()
-                .select("d.code project_code,h.name dept_name,e.code material_code,e.name material_name,e.spec,f.nickname as ownerName,DATE_FORMAT(t.report_time,'%Y-%m-%d') report_time")
+                .select("d.code project_code,h.name dept_name,e.code material_code,e.name material_name,e.spec,f.nickname as ownerName,DATE_FORMAT(t.report_time,'%Y-%m-%d') as report_time")
                 .select("g.name procedure_name,sum(t.work_time) work_time,sum(t.amount) amount")
                 .leftJoin("pro_task_dispatch_detail as a on a.id=t.dispatch_detail_id")
                 .leftJoin("pro_task_dispatch as b on b.id=a.dispatch_id")
@@ -162,7 +162,7 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
                 .leftJoin("system_dept as h on h.id=f.dept_id")
                 .groupBy("d.code,h.name,e.code,e.name,e.spec,t.owner,DATE_FORMAT(t.report_time,'%Y-%m-%d'),t.procedure_id")
                 .eq(TaskReportDO::getOwner,userId)
-                .eq("DATE_FORMAT(t.report_time,'%Y-%m-%d')",yearMonth)
+                .eq("DATE_FORMAT(t.report_time,'%Y%m')",yearMonth)
                 .disableSubLogicDel();
 
         return selectList(query);