From 01d1b9b60e3b4ef9920b3b95c1e29e8ee8e5d0ac Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 10:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/domain/vo/TmTaskRequestVo.java | 22 ++++++++++++++++++- .../mapper/material/task/TmTaskMapper.xml | 16 +++++++------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java index 18c9c619..81db9780 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java @@ -60,8 +60,19 @@ public class TmTaskRequestVo extends BaseEntity { @ApiModelProperty(value = "往来单位id") private Long unitId; + @ApiModelProperty(value = "往来单位") + //@Excel(name = "领料单位", sort = 2) + private String unitName; + @ApiModelProperty(value = "工程id") - private Long projectId; + private Long proId; + + /** + * 工程名称 + */ + @ApiModelProperty(value = "工程名称") + @Excel(name = "领料工程", sort = 3) + private String proName; /** * 预领料合计数 @@ -69,6 +80,15 @@ public class TmTaskRequestVo extends BaseEntity { @ApiModelProperty(value = "预领料合计数") private Integer preCountNum; + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; + /** * 领料任务实体集合 */ diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml index 3dadc1ed..86c37a8a 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml @@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT DISTINCT tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, - bpl.lot_id as proId,bpl.lot_name as proName, + bpl.pro_id as proId,bpl.pro_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime, case when d.id = '31' then lai.company_audit_remark @@ -203,8 +203,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id - LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id - LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id + LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id + LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id LEFT JOIN sys_dic d ON d.id = tt.task_status WHERE @@ -222,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - AND bpl.lot_id = #{record.projectId} + AND bpl.pro_id = #{record.projectId}