From 0fba5ce68ebd2609ac6ab09c56cd187e465f71d6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 10:42:01 +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 --- .../mapper/material/task/TmTaskMapper.xml | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 ffabf089..ba44bc2a 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 @@ -135,14 +135,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bpl.pro_id as proId,bpl.pro_name as projectName, 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 - when d.id = '32' then lai.dept_audit_remark - when d.id = '33' then lai.direct_audit_remark - when d.id = '98' then lai.company_audit_remark - when d.id = '99' then lai.dept_audit_remark - when d.id = '100' then lai.direct_audit_remark - end examineStatus, - d.id as examineStatusId, +-- case when d.id = '31' then lai.company_audit_remark +-- when d.id = '32' then lai.dept_audit_remark +-- when d.id = '33' then lai.direct_audit_remark +-- when d.id = '98' then lai.company_audit_remark +-- when d.id = '99' then lai.dept_audit_remark +-- when d.id = '100' then lai.direct_audit_remark +-- end examineStatus, +-- d.id as examineStatusId, bai.agreement_code as agreementCode, tt.create_time as createTimes, tt.update_time as updateTimes FROM @@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 + -- LEFT JOIN sys_dic d ON d.id = tt.task_status WHERE tt.task_type = '29' and tt.status = '1' @@ -187,14 +187,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bpl.pro_id as proId,bpl.pro_name as projectName, 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 - when d.id = '32' then lai.dept_audit_remark - when d.id = '33' then lai.direct_audit_remark - when d.id = '98' then lai.company_audit_remark - when d.id = '99' then lai.dept_audit_remark - when d.id = '100' then lai.direct_audit_remark - end examineStatus , - d.id as examineStatusId, +-- case when d.id = '31' then lai.company_audit_remark +-- when d.id = '32' then lai.dept_audit_remark +-- when d.id = '33' then lai.direct_audit_remark +-- when d.id = '98' then lai.company_audit_remark +-- when d.id = '99' then lai.dept_audit_remark +-- when d.id = '100' then lai.direct_audit_remark +-- end examineStatus , +-- d.id as examineStatusId, bai.agreement_code as agreementCode, tt.create_time as createTimes, tt.update_time as updateTimes FROM @@ -206,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 + -- LEFT JOIN sys_dic d ON d.id = tt.task_status WHERE tt.task_type = '29' and tt.status = '1' and tt.create_by = #{record.createBy}