From 795c7d28f7b37ef8d0a6a3904f2ba6be192b2c87 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Mon, 15 Jul 2024 18:02:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=89=BF=E6=8B=85=E6=96=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/app/controller/TmTaskController.java | 1 + .../main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java | 5 +++++ .../src/main/java/com/bonus/sgzb/app/domain/TmTask.java | 5 +++++ .../com/bonus/sgzb/base/controller/SysDicController.java | 4 ++-- .../main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java | 2 +- .../java/com/bonus/sgzb/base/service/ISysDicService.java | 2 +- .../com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java | 4 ++-- .../src/main/resources/mapper/app/LeaseApplyInfoMapper.xml | 6 ++++++ .../src/main/resources/mapper/app/TmTaskMapper.xml | 2 +- 9 files changed, 24 insertions(+), 7 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 3cfaf9d5..16ffb318 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -218,6 +218,7 @@ public class TmTaskController extends BaseController { leaseApplyInfo.setType("2"); // 设置审批层级，先固定2层，后期根据接口传入Type区分来源设定 leaseApplyInfo.setLeaseType(task.getLeaseType()); leaseApplyInfo.setEstimateLeaseTime(task.getEstimateLeaseTime()); + leaseApplyInfo.setCostBearingParty(task.getCostBearingParty()); // 创建领料任务，返回领料任务编号 boolean addLeaseTaskResult = leaseApplyInfoService.genderLeaseCode(leaseApplyInfo) > 0; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java index 48d887f4..7468eab3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyInfo.java @@ -53,6 +53,11 @@ public class LeaseApplyInfo implements Serializable { */ @ApiModelProperty(value = "联系方式") private String phone; + /** + * 费用承担方 + */ + @ApiModelProperty(value = "费用承担方") + private String costBearingParty; /** * 1：1级审批，2：2级审批 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java index 5f03dddc..bead4480 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java @@ -67,6 +67,11 @@ public class TmTask implements Serializable { @ApiModelProperty(value = "库存") private Double num; + /** + * 费用承担方 + */ + @ApiModelProperty(value = "费用承担方") + private String costBearingParty; /** * 编号 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java index 5f8a2498..4734f746 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/SysDicController.java @@ -107,9 +107,9 @@ public class SysDicController extends BaseController */ @ApiOperation(value = "获取费用承担方列表") @GetMapping(value = "/pid") - public AjaxResult getBear(Long pid) + public AjaxResult getBear() { - List bear = sysDicService.getBear(pid); + List bear = sysDicService.getBear(); return success(bear); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java index 909969ae..6e848da3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/SysDicMapper.java @@ -84,5 +84,5 @@ public interface SysDicMapper */ SysDic selectByName(String name); - List getBear(Long pid); + List getBear(); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java index b083164d..5bac02ae 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ISysDicService.java @@ -81,5 +81,5 @@ public interface ISysDicService */ public int deleteSysDicById(Long id); - List getBear(Long pid); + List getBear(); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java index 93d99546..b9e644b1 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/SysDicServiceImpl.java @@ -138,8 +138,8 @@ public class SysDicServiceImpl implements ISysDicService } @Override - public List getBear(Long pid) { - return sysDicMapper.getBear(pid); + public List getBear() { + return sysDicMapper.getBear(); } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml index 238b663c..40624e96 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyInfoMapper.xml @@ -137,6 +137,9 @@ estimate_lease_time, + + cost_bearing_party, + @@ -196,6 +199,9 @@ #{estimateLeaseTime,jdbcType=TIMESTAMP}, + + #{costBearingParty,jdbcType=VARCHAR}, + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index a87c9d41..7c8c11ff 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -642,7 +642,7 @@ tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName, bpi.lot_id as proId, bpi.pro_id as projectId,bpi.lot_name as proName, bui.unit_id as unitId,bui.unit_name as unitName, - tt.create_by as applyFor,d.`name` as taskName, + tt.create_by as applyFor,d.`name` as taskName,lai.cost_bearing_party as costBearingParty,lai.cost_bearing_party as costBearingParty, su2.user_name as companyAuditBy, lai.company_audit_time as companyAuditTime,