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 1/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=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} From a1b0cb45f959dc2a24ac76a269c9eb6353af95e9 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 10:45:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/material/task/TmTaskMapper.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 ba44bc2a..e16c994d 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 @@ -134,7 +134,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, 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, + 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 @@ -186,7 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, 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, + 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 From bf6fadcdd671d92423dd295fda534f5ff1e82c4b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 10:48:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/material/task/TmTaskMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 e16c994d..2401e197 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 @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 - tt.task_type = '29' and tt.status = '1' + tt.task_type = 2 and tt.status = '1' AND tt.task_id = #{record.taskId} @@ -212,7 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 - tt.task_type = '29' and tt.status = '1' and tt.create_by = #{record.createBy} + tt.task_type = 2 and tt.status = '1' and tt.create_by = #{record.createBy} AND tt.task_id = #{record.taskId} From 786ee8d784fae4db753baecae89605d9a0d30a41 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 12:23:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/task/TmTaskAgreementMapper.xml | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAgreementMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAgreementMapper.xml index af4f974d..4a5c8c90 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAgreementMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskAgreementMapper.xml @@ -32,25 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into tm_task_agreement - - agreement_id, - create_by, - create_time, - update_by, - update_time, - remark, - company_id, - - - #{agreementId}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{companyId}, - + INSERT INTO tm_task_agreement (task_id, agreement_id, create_by, create_time, company_id) + VALUES(#{taskId},#{agreementId},#{createBy},NOW(),#{companyId}) From 8c5b409fbd780455bdb0d777e1762d5e273b0437 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 13:36:06 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/lease/service/impl/LeaseApplyInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index e0bd3477..fb892c2a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -114,6 +114,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { tmTaskAgreement.setCreateBy(SecurityUtils.getUsername()); tmTaskAgreementMapper.insertTmTaskAgreement(tmTaskAgreement); tmTaskRequestVo.getLeaseApplyInfo().setTaskId(tmTask.getTaskId()); + tmTaskRequestVo.getLeaseApplyInfo().setCode(taskCode); int count = leaseApplyInfoMapper.insertLeaseApplyInfo(tmTaskRequestVo.getLeaseApplyInfo()); if (count > 0) { return insertPurchaseCheckDetails(tmTaskRequestVo.getLeaseApplyDetailsList(), tmTask.getTaskId()); From 8372096fb9bc6aafc500e764866f42a1095123a8 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 13 Nov 2024 13:43:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/basic/domain/BmAgreementInfo.java | 6 ++++++ .../mapper/material/basic/BmAgreementInfoMapper.xml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java index ff75c0af..4cfe2321 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAgreementInfo.java @@ -122,6 +122,12 @@ public class BmAgreementInfo extends BaseEntity @ApiModelProperty(value = "关键词") private String keyWord; + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + @ApiModelProperty(value = "附件列表") private List bmFileInfos; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml index ac7afa70..0c8b8087 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAgreementInfoMapper.xml @@ -37,9 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where bai.status = '1' and (bai.contract_code like concat('%', #{keyWord}, '%') or + bai.agreement_code like concat('%', #{keyWord}, '%') or auth_person like concat('%', #{keyWord}, '%') or phone like concat('%', #{keyWord}, '%')) + + + + + AND bai.`status` = #{status} + and bai.agreement_code like concat('%', #{agreementCode}, '%')