From a8956fa0f830d3b74b8debad566bbb0d70bebbeb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 18 Nov 2024 15:14:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97=E4=BC=98?=
=?UTF-8?q?=E5=8C=96tm=5Ftask=E5=8E=BB=E9=99=A4status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/LeaseApplyInfoServiceImpl.java | 2 +-
.../impl/PurchaseCheckInfoServiceImpl.java | 2 +-
.../bonus/material/task/domain/TmTask.java | 8 +-
.../material/back/BackApplyInfoMapper.xml | 2 +-
.../mapper/material/task/TmTaskMapper.xml | 123 +-----------------
5 files changed, 5 insertions(+), 132 deletions(-)
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 36368d6e..e05866a5 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
@@ -116,7 +116,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService {
String taskCode = genderTaskCode(thisMonthMaxOrder);
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_LEASE.getTaskTypeId(),
LeaseTaskStatusEnum.LEASE_TASK_TO_PUBLISHED.getStatus(),
- leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode);
+ leaseApplyRequestVo.getLeaseApplyInfo().getCompanyId(),thisMonthMaxOrder + 1, taskCode);
tmTask.setCreateTime(DateUtils.getNowDate());
tmTask.setCreateBy(SecurityUtils.getUsername());
tmTaskMapper.insertTmTask(tmTask);
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index a71a8bc8..2ef4b115 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -206,7 +206,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
String taskCode = genderTaskCode(thisMonthMaxOrder);
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId(),
PurchaseTaskStatusEnum.TASK_TO_START.getStatus(),
- purchaseCheckInfo.getPurchaseCheckInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode);
+ purchaseCheckInfo.getPurchaseCheckInfo().getCompanyId(), thisMonthMaxOrder + 1, taskCode);
tmTask.setCreateTime(DateUtils.getNowDate());
tmTaskMapper.insertTmTask(tmTask);
Long taskId = tmTask.getTaskId();
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java
index a6eaf172..c3f67041 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java
@@ -46,20 +46,14 @@ public class TmTask extends BaseEntity {
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
- /** 0不启用 1启用 */
- @Excel(name = "0不启用 1启用")
- @ApiModelProperty(value = "0不启用 1启用")
- private String status;
-
@ApiModelProperty(value = "任务当月序号 例如:1 插入及查询时请携带任务类型")
private Integer monthOrder;
- public TmTask(Long taskId, Integer taskType, Integer taskStatus, Long companyId, String status, Integer monthOrder, String code) {
+ public TmTask(Long taskId, Integer taskType, Integer taskStatus, Long companyId, Integer monthOrder, String code) {
this.taskId = taskId;
this.taskType = taskType;
this.taskStatus = taskStatus;
this.companyId = companyId;
- this.status = status;
this.monthOrder = monthOrder;
this.code = code;
}
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
index 8f35ce34..3210a194 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
back_apply_info bai
LEFT JOIN back_apply_details bad on bad.parent_id = bai.id
- LEFT JOIN tm_task tt on tt.task_id = bai.task_id and tt.status = '1'
+ LEFT JOIN tm_task tt on tt.task_id = bai.task_id
LEFT JOIN tm_task_agreement tta on tta.task_id = tt.task_id
LEFT JOIN bm_agreement_info bagi on bagi.agreement_id = tta.agreement_id
AND bagi.`status` = '1'
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 bea4a162..85b57af1 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
@@ -14,13 +14,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
select task_id, task_type, task_status, code, create_by, create_time,
- update_by, update_time, remark, company_id, status, month_order
+ update_by, update_time, remark, company_id, month_order
from tm_task
@@ -33,7 +32,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and code = #{code}
and month_order = #{monthOrder}
and company_id = #{companyId}
- and status = #{status}
@@ -55,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time,
remark,
company_id,
- `status`,
#{taskType},
@@ -68,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{updateTime},
#{remark},
#{companyId},
- #{status},
@@ -85,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = #{updateTime},
remark = #{remark},
company_id = #{companyId},
- `status` = #{status},
where task_id = #{taskId}
@@ -137,120 +132,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY create_time DESC LIMIT 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file