From ab9bb0ac792794c5985df0c0ca58be015f9d210b Mon Sep 17 00:00:00 2001 From: siontion Date: Sat, 13 Jul 2024 21:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=91=98=E5=B7=A5=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/dal/dataobject/taskreport/TaskReportDO.java | 1 + .../mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskreport/TaskReportDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskreport/TaskReportDO.java index 0286ead9..082b59b9 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/taskreport/TaskReportDO.java +++ b/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; + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java index 56b475c0..6ed2b335 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java +++ b/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 { default List selectUserReportDetail(String userId,String yearMonth) { MPJLambdaWrapperX 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 { .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);