From 3e1839ce643c015afd5a738a367038e450698742 Mon Sep 17 00:00:00 2001 From: syruan <1555146157@163.com> Date: Fri, 22 Dec 2023 15:21:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/app/controller/TmTaskController.java | 2 +- .../src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java | 2 +- .../main/java/com/bonus/sgzb/app/service/TmTaskService.java | 2 +- .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 4 +--- .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml | 1 - 5 files changed, 4 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 60a2fcc9..5f96bfd7 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 @@ -113,7 +113,7 @@ public class TmTaskController extends BaseController { // 根据设备所属分公司拆分集合 List> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId"); - // 对拆分后的集合进行遍历 + // 对拆分后的集合进行each遍历 for (List leaseApplyDetailsList : deviceByCompanyList) { // 判断拆分后的集合内是否有数据 if (CollUtil.isNotEmpty(leaseApplyDetailsList)) { 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 fbd36c14..999288fa 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 @@ -20,7 +20,7 @@ import java.util.List; public interface TmTaskMapper { /** - * 获取领料审核列表 by TmTask + * 获取领料审核列表 by_TmTask * @param record 筛选条件 * @return TmTask列表 */ 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 6d27aac2..1ce66d49 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 @@ -18,7 +18,7 @@ public interface TmTaskService{ List getLeaseAuditList(TmTask record); - /** 领料任务审核状态 */ + /** 领料任务审核状态修改 */ int updateLeaseTaskAuditInfo(TmTask record); String genderLeaseCode(); 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 f1007e9c..a31bb0c1 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 @@ -7,7 +7,6 @@ import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.TmTask; import com.bonus.sgzb.common.core.utils.DateUtils; -import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import org.springframework.stereotype.Service; @@ -17,7 +16,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Random; /** * Description: @@ -56,7 +54,7 @@ public class TmTaskServiceImpl implements TmTaskService{ count += leaseApplyDetail.getPreNum(); } } - // 塞入领料任务详情集合 + // 塞入领料任务详情的集合中 leaseApplyInfo.setLeaseApplyDetails(leaseApplyDetails); } } 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 8e153e5b..6634fa73 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 @@ -129,7 +129,6 @@ - update tm_task set task_type = #{taskType,jdbcType=INTEGER}, task_status = #{taskStatus,jdbcType=INTEGER},