From 54cef0f8244c35e41844845f1d1b667d96f82e38 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Sat, 20 Apr 2024 11:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=8F=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackApplyController.java | 20 +++++++++++-------- .../sgzb/app/mapper/BackReceiveMapper.java | 4 ++-- .../bonus/sgzb/app/mapper/TmTaskMapper.java | 11 ++++++++-- .../bonus/sgzb/app/service/TmTaskService.java | 11 ++++++++-- .../service/impl/BackReceiveServiceImpl.java | 20 +++++++++++-------- .../app/service/impl/TmTaskServiceImpl.java | 10 +++++----- .../mapper/app/BackReceiveMapper.xml | 8 ++++++-- .../resources/mapper/app/TmTaskMapper.xml | 11 ++++++---- .../sgzb/material/mapper/BackApplyMapper.java | 2 +- .../sgzb/material/mapper/TaskMapper.java | 9 +++++++++ .../service/impl/BackApplyServiceImpl.java | 20 +++++++++++-------- .../impl/PurchaseAccessoryServiceImpl.java | 18 ++++++++++------- .../impl/PurchaseCheckInfoServiceImpl.java | 20 +++++++++++-------- ...PurchaseCheckServiceCenterServiceImpl.java | 20 +++++++++++-------- .../mapper/material/BackApplyMapper.xml | 8 ++++++-- .../material/PurchaseMacodeInfoMapper.xml | 3 ++- .../resources/mapper/material/TaskMapper.xml | 7 +++++++ 17 files changed, 134 insertions(+), 68 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 2a3bcae2..6b226e62 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -10,6 +10,7 @@ import com.bonus.sgzb.app.service.LeaseApplyInfoService; import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.GlobalConstants; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -237,15 +238,18 @@ public class BackApplyController extends BaseController { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = tmTaskService.selectTaskNumByMonth(nowDate, 36) + 1; - String code = ""; - if (taskNum > GlobalConstants.INT_9 && taskNum < GlobalConstants.INT_100) { - code = "T" + format + "-00" + taskNum; - } else if (taskNum > GlobalConstants.INT_99 && taskNum < GlobalConstants.INT_1000) { - code = "T" + format + "-0" + taskNum; - } else { - code = "T" + format + "-000" + taskNum; + String taskNum = tmTaskService.selectTaskNumByMonths(nowDate, 36); + if (StringHelper.isNotEmpty(taskNum)){ + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + }else { + taskNum = "0001"; } + String code = "T" + format + "-" + taskNum; return code; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index b9fa925a..35b375c9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -43,9 +43,9 @@ public interface BackReceiveMapper { * 查询编号 * @param date * @param taskType - * @return int + * @return String */ - int selectTaskNumByMonthWx(@Param("date") Date date, @Param("taskType") Integer taskType); + String selectTaskNumByMonthWx(@Param("date") Date date, @Param("taskType") Integer taskType); /** * 添加维修任务 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 b5a59a74..3a6556e8 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 @@ -85,8 +85,6 @@ public interface TmTaskMapper { int batchInsert(@Param("list") List list); - int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); - int insertAgreement(TmTask record); int updateAgreementByTask(TmTask record); @@ -124,4 +122,13 @@ public interface TmTaskMapper { int getCountMachine(BackApplyInfo record); int getCountMachineByPidAndTid(MachinePart machinePart); + + /** + * 获取任务编号 + * + * @param nowDate + * @param taskType + * @return + */ + String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); } \ 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 6033bb90..5bf836c4 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 @@ -83,8 +83,6 @@ public interface TmTaskService{ int batchInsert(List list); - int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); - int insertAgreement(TmTask record); List getLeaseListAll(TmTask task); @@ -104,4 +102,13 @@ public interface TmTaskService{ List getLeaseListAllCq(TmTask task); List getLeaseOutListByUser(TmTask task); + + /** + * 获取任务编号 + * + * @param nowDate + * @param taskType + * @return + */ + String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index 0bc58d15..4678e1fc 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -454,7 +454,17 @@ public class BackReceiveServiceImpl implements BackReceiveService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = backReceiveMapper.selectTaskNumByMonthWx(nowDate, taskType) + 1; + String taskNum = backReceiveMapper.selectTaskNumByMonthWx(nowDate, taskType); + if (StringHelper.isNotEmpty(taskNum)) { + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + } else { + taskNum = "0001"; + } String code = ""; if (GlobalConstants.INT_41 == taskType) { code = "WX"; @@ -462,13 +472,7 @@ public class BackReceiveServiceImpl implements BackReceiveService { if (GlobalConstants.INT_57 == taskType) { code = "BF"; } - if (taskNum > GlobalConstants.INT_9 && taskNum < GlobalConstants.INT_100) { - code = code + format + "-00" + taskNum; - } else if (taskNum > GlobalConstants.INT_99 && taskNum < GlobalConstants.INT_1000) { - code = code + format + "-0" + taskNum; - } else { - code = code + format + "-000" + taskNum; - } + code = code + format + "-" + taskNum; return code; } } 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 a499f44c..d142a9b5 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 @@ -582,6 +582,11 @@ public class TmTaskServiceImpl implements TmTaskService { return tmTaskMapper.getLeaseOutListByUser(task); } + @Override + public String selectTaskNumByMonths(Date nowDate, Integer taskType) { + return tmTaskMapper.selectTaskNumByMonths(nowDate,taskType); + } + /** * 获取领料申请列表 @@ -1166,11 +1171,6 @@ public class TmTaskServiceImpl implements TmTaskService { return tmTaskMapper.batchInsert(list); } - @Override - public int selectTaskNumByMonth(Date date, Integer taskType) { - 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/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index e5238188..c68c22b4 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -696,8 +696,12 @@ - + SELECT SUBSTRING(`code`, - 4) as code + FROM tm_task + WHERE DATE_FORMAT(create_time, '%y%m') = DATE_FORMAT(#{date}, '%y%m') + AND task_type = #{taskType} + ORDER BY create_time DESC LIMIT 1 - - update tm_task set `status` = '0' where task_id = #{taskId} @@ -1033,4 +1029,11 @@ WHERE parent_id = #{parentId} and type_id = #{modelId} + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 97bd6221..ccf17dbc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -37,7 +37,7 @@ public interface BackApplyMapper { * @param taskType * @return */ - int selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); + String selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); /** * 增加 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java index 6bc7ba27..73b6b7f5 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/TaskMapper.java @@ -85,4 +85,13 @@ public interface TaskMapper { List getMaTypeDetails(BackApplyInfo backApplyInfo); MachinePart getMachineParts(TmTask typeId); + + /** + * 获取任务编号 + * + * @param nowDate + * @param taskType + * @return + */ + String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 18af4901..24939f6d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.service.impl; import cn.hutool.core.collection.CollUtil; 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 com.bonus.sgzb.common.security.utils.SecurityUtils; @@ -93,15 +94,18 @@ public class BackApplyServiceImpl implements BackApplyService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = backApplyMapper.selectTaskNumByMonth(nowDate, 36) + 1; - String code = ""; - if (taskNum > GlobalContants.NUM1 && taskNum < GlobalContants.NUM2) { - code = "T" + format + "-00" + taskNum; - } else if (taskNum > GlobalContants.NUM3 && taskNum < GlobalContants.NUM4) { - code = "T" + format + "-0" + taskNum; - } else { - code = "T" + format + "-000" + taskNum; + String taskNum = backApplyMapper.selectTaskNumByMonth(nowDate, 36); + if (StringHelper.isNotEmpty(taskNum)){ + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + }else { + taskNum = "0001"; } + String code = "T" + format + "-" + taskNum; return code; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java index d569ab25..4324f74c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseAccessoryServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; @@ -341,15 +342,18 @@ public class PurchaseAccessoryServiceImpl implements IPurchaseAccessoryService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = taskMapper.selectTaskNumByMonth(nowDate, 67) + 1; - String code = ""; - if (taskNum > GlobalContants.NUM1 && taskNum < GlobalContants.NUM2) { - code = "XG" + format + "-00" + taskNum; - } else if (taskNum > GlobalContants.NUM3 && taskNum < GlobalContants.NUM4) { - code = "XG" + format + "-0" + taskNum; + String taskNum = taskMapper.selectTaskNumByMonths(nowDate, 67); + if (StringHelper.isNotEmpty(taskNum)) { + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); } else { - code = "XG" + format + "-000" + taskNum; + taskNum = "0001"; } + String code = "XG" + format + "-" + taskNum; return code; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index f2c4c202..b5563ae0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; @@ -172,15 +173,18 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = taskMapper.selectTaskNumByMonth(nowDate, 23) + 1; - String code = ""; - if (taskNum > GlobalContants.NUM1 && taskNum < GlobalContants.NUM2) { - code = "XG" + format + "-00" + taskNum; - } else if (taskNum > GlobalContants.NUM3 && taskNum < GlobalContants.NUM4) { - code = "XG" + format + "-0" + taskNum; - } else { - code = "XG" + format + "-000" + taskNum; + String taskNum = taskMapper.selectTaskNumByMonths(nowDate, 23); + if (StringHelper.isNotEmpty(taskNum)){ + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + }else { + taskNum = "0001"; } + String code = "XG" + format + "-" + taskNum; return code; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java index 068e367c..227482cd 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckServiceCenterServiceImpl.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.base.api.domain.MaMachine; import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.common.core.utils.DateUtils; +import com.bonus.sgzb.common.core.utils.StringHelper; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; @@ -246,15 +247,18 @@ public class PurchaseCheckServiceCenterServiceImpl implements PurchaseCheckServi SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); Date nowDate = DateUtils.getNowDate(); String format = dateFormat.format(nowDate); - int taskNum = taskMapper.selectTaskNumByMonth(nowDate, 23) + 1; - String code = ""; - if (taskNum > GlobalContants.NUM1 && taskNum < GlobalContants.NUM2) { - code = "XG" + format + "-00" + taskNum; - } else if (taskNum > GlobalContants.NUM3 && taskNum < GlobalContants.NUM4) { - code = "XG" + format + "-0" + taskNum; - } else { - code = "XG" + format + "-000" + taskNum; + String taskNum = taskMapper.selectTaskNumByMonths(nowDate, 23); + if (StringHelper.isNotEmpty(taskNum)){ + // 将字符串转换为整数 + int num = Integer.parseInt(taskNum); + // 执行加一操作 + num++; + // 将结果转换回字符串格式，并确保结果是四位数，不足四位则在前面补0 + taskNum = String.format("%04d", num); + }else { + taskNum = "0001"; } + String code = "XG" + format + "-" + taskNum; return code; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 2f9ed815..ea3df5d3 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -502,8 +502,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE subquery1.out_num - COALESCE(subquery2.audit_num, 0)>0 - + SELECT SUBSTRING(`code`, - 4) as code + FROM tm_task + WHERE DATE_FORMAT(create_time, '%y%m') = DATE_FORMAT(#{date}, '%y%m') + AND task_type = #{taskType} + ORDER BY create_time DESC LIMIT 1 + \ No newline at end of file