From 97d555617b839f49d2e0fe72ffbc54f8b2c86606 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 14 Nov 2024 12:10:46 +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 --- .../bonus/common/biz/enums/LeaseTaskStatusEnum.java | 11 +++++------ .../bonus/material/lease/domain/LeaseApplyInfo.java | 8 ++++---- .../lease/service/impl/LeaseApplyInfoServiceImpl.java | 2 -- .../mapper/material/lease/LeaseApplyInfoMapper.xml | 6 +----- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java index e8353953..daecb125 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/LeaseTaskStatusEnum.java @@ -10,12 +10,11 @@ import lombok.Getter; @Getter public enum LeaseTaskStatusEnum { - LEASE_TASK_TO_PUBLISHED(0, "领料任务--未发布"), - LEASE_TASK_PUBLISHED(1, "领料任务--已发布"), - LEASE_TASK_TO_AUDIT(2, "领料任务--待审核"), - LEASE_TASK_TO_STOCK_OUT(3, "领料任务--待出库"), - LEASE_TASK_IN_STOCK_OUT(4, "领料任务--进行中"), - LEASE_TASK_END_STOCK_OUT(5, "领料任务--已出库完成"); + LEASE_TASK_TO_PUBLISHED(1, "待发布"), + LEASE_TASK_TO_AUDIT(2, "待审核"), + LEASE_TASK_TO_STOCK_OUT(3, "待出库"), + LEASE_TASK_IN_STOCK_OUT(4, "出库进行中"), + LEASE_TASK_END_STOCK_OUT(5, "出库已完成"); private final Integer status; private final String statusName; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java index 66ec0338..ca75a00c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/domain/LeaseApplyInfo.java @@ -107,9 +107,9 @@ public class LeaseApplyInfo extends BaseEntity { private Long companyId; /** 1机具分公司审核通过，2调试分公司审核通过3机具分公司审核驳回4调试分公司审核驳回5出库进行中5出库完成 */ - @Excel(name = "1机具分公司审核通过，2调试分公司审核通过3机具分公司审核驳回4调试分公司审核驳回5出库进行中5出库完成") - @ApiModelProperty(value = "1机具分公司审核通过，2调试分公司审核通过3机具分公司审核驳回4调试分公司审核驳回5出库进行中5出库完成") - private String status; +// @Excel(name = "1机具分公司审核通过，2调试分公司审核通过3机具分公司审核驳回4调试分公司审核驳回5出库进行中5出库完成") +// @ApiModelProperty(value = "1机具分公司审核通过，2调试分公司审核通过3机具分公司审核驳回4调试分公司审核驳回5出库进行中5出库完成") +// private String status; /** $column.columnComment */ @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @@ -158,7 +158,7 @@ public class LeaseApplyInfo extends BaseEntity { private Integer taskType; /** 任务状态(定义数据字典) */ - @Excel(name = "任务状态(定义数据字典)") + @Excel(name = "任务状态") @ApiModelProperty(value = "任务状态(定义数据字典)") private Integer taskStatus; 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 56ec4601..c0e2abf8 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 @@ -153,9 +153,7 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { if (leaseApplyInfo.getTaskId() == null) { return AjaxResult.error("任务ID为空,请完善后重新发布!"); } - leaseApplyInfo.setUpdateTime(DateUtils.getNowDate()); - leaseApplyInfo.setStatus(String.valueOf(LeaseTaskStatusEnum.LEASE_TASK_TO_STOCK_OUT.getStatus())); try { int result = leaseApplyInfoMapper.updateLeaseApplyInfo(leaseApplyInfo); if (result > 0) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml index 4672b880..fc8b1b34 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml @@ -25,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -43,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time, lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark, lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id, - lai.status, lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, + lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party, bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus, IFNULL(sum(lad.pre_num),0) as preCountNum, IFNULL(sum(lad.al_num),0) as alNum @@ -116,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, remark, company_id, - status, direct_id, lease_type, estimate_lease_time, @@ -143,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{remark}, #{companyId}, - #{status}, #{directId}, #{leaseType}, #{estimateLeaseTime}, @@ -174,7 +171,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, remark = #{remark}, company_id = #{companyId}, - status = #{status}, direct_id = #{directId}, lease_type = #{leaseType}, estimate_lease_time = #{estimateLeaseTime},