From b19a375a4bc8a5003bc7a66751574be0f23a0c3c Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Thu, 21 Dec 2023 18:35:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE=EF=BC=9B=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/TmTask.java | 28 +++++++++++++ .../sgzb/app/controller/TmTaskController.java | 25 +++++++++++- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 2 + .../bonus/sgzb/app/service/TmTaskService.java | 2 + .../app/service/impl/TmTaskServiceImpl.java | 5 +++ .../resources/mapper/app/TmTaskMapper.xml | 39 ++++++++++++++++--- .../controller/AgreementInfoController.java | 7 +++- .../material/mapper/AgreementInfoMapper.java | 2 + .../impl/AgreementInfoServiceImpl.java | 26 ++++++++++--- .../mapper/material/AgreementInfoMapper.xml | 13 +++++-- 10 files changed, 131 insertions(+), 18 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java index fb49a43c..408c9c59 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/TmTask.java @@ -146,6 +146,9 @@ public class TmTask implements Serializable { @ApiModelProperty(value="往来单位id") private Long unitId; + @ApiModelProperty(value="往来单位") + private String unitName; + @ApiModelProperty(value="工程id") private Long projectId; @ApiModelProperty(value="关键字") @@ -157,4 +160,29 @@ public class TmTask implements Serializable { @ApiModelProperty(value="类型") private Integer types; + + @ApiModelProperty(value="协议编号") + private String agreementCode; + + @ApiModelProperty(value="领料人") + private String leasePerson; + + @ApiModelProperty(value="领料人手机号") + private String leasePhone; + + @ApiModelProperty(value="申请人") + private String applyFor; + + @ApiModelProperty(value="任务状态") + private String taskName; + + @ApiModelProperty(value="审批状态") + private String examineStatus; + + @ApiModelProperty(value="创建时间") + private String createTimes; + + @ApiModelProperty(value="更新时间") + private String updateTimes; + } \ No newline at end of file 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 af8df7f3..fefbf04f 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 @@ -82,6 +82,11 @@ public class TmTaskController extends BaseController { task.setCode(code); // 创建任务 boolean addTaskResult = tmTaskService.insertSelective(task) > 0; + + //任务与协议建立关联关系 + boolean i = tmTaskService.insertAgreement(task) > 0; + + if (addTaskResult && task.getLeaseApplyInfo() != null) { if (CollUtil.isEmpty(task.getLeaseApplyDetails())) { return AjaxResult.error("领料设备明细为空，请重新选择后上传!"); @@ -215,11 +220,27 @@ public class TmTaskController extends BaseController { /** - * 查询机具领料审核列表 + * 查询机具领料审核列表 - 后台 * @param task 筛选条件 * @return 列表 */ - @Log(title = "查询机具领料审核列表", businessType = BusinessType.QUERY) + @Log(title = "查询机具领料审核列表- 后台", businessType = BusinessType.QUERY) + @GetMapping(value = "getLeaseAuditListAll") + public AjaxResult getLeaseAuditListAll(TmTask task) { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误"); + } + startPage(); + List leaseAuditList = tmTaskService.getLeaseAuditList(task); + return AjaxResult.success(getDataTable(leaseAuditList)); + } + + /** + * 查询机具领料审核列表 - app + * @param task 筛选条件 + * @return 列表 + */ + @Log(title = "查询机具领料审核列表- app", businessType = BusinessType.QUERY) @GetMapping(value = "getLeaseAuditList") public AjaxResult getLeaseAuditList(TmTask task) { if (StringUtils.isNull(task)) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index be5ef37d..35e3a8fa 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -69,4 +69,6 @@ public interface TmTaskMapper { int batchInsert(@Param("list") List list); int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); + + int insertAgreement(TmTask record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index 5ba5f76c..90ee438d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -46,4 +46,6 @@ public interface TmTaskService{ int batchInsert(List list); int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); + + int insertAgreement(TmTask record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 064df67e..da3841ee 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -178,4 +178,9 @@ public class TmTaskServiceImpl implements TmTaskService{ return tmTaskMapper.selectTaskNumByMonth(date,taskType); } + @Override + public int insertAgreement(TmTask record) { + return tmTaskMapper.insertAgreement(record); + } + } 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 ce87dd1b..796307b6 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 @@ -67,9 +67,7 @@ update_by, - update_time, - remark, @@ -94,9 +92,7 @@ #{updateBy,jdbcType=VARCHAR}, - - #{updateTime,jdbcType=TIMESTAMP}, - + now(), #{remark,jdbcType=VARCHAR}, @@ -439,9 +435,20 @@ + + INSERT INTO tm_task_agreement ( `task_id`, `agreement_id`, `create_by`, `create_time`, `company_id` ) + VALUES(#{id},#{agreementId},#{createBy},NOW(),#{companyId}) + + + + \ No newline at end of file