From 7fef7dab415b141ca9fcac443a84a4976a0f2ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Mon, 26 May 2025 15:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutMydoJobController.java | 20 ++- .../com/ruoyi/job/mydojob/domain/MydoJob.java | 14 +- .../job/mydojob/service/IMydoJobService.java | 4 +- .../service/impl/MydoJobServiceImpl.java | 75 +++++++--- .../controller/MydoJobDetailController.java | 12 +- .../mydojobdetail/domain/MydoJobDetail.java | 12 +- .../mapper/MydoJobDetailFinishMapper.java | 4 + .../service/IMydoJobDetailFinishService.java | 3 + .../impl/MydoJobDetailFinishServiceImpl.java | 9 ++ .../mapper/MydoJobFinishMapper.java | 5 + .../service/IMydoJobFinishService.java | 5 + .../impl/MydoJobFinishServiceImpl.java | 7 + .../mapper/job/MydoJobDetailFinishMapper.xml | 5 + .../mapper/job/MydoJobFinishMapper.xml | 30 ++++ ruoyi-ui/src/api/job/OutmydoJob.js | 18 +++ ruoyi-ui/src/api/out/outStockout.js | 8 +- ruoyi-ui/src/views/job/outJobManagement.vue | 133 +++++++----------- ruoyi-ui/src/views/out/addOutStockout.vue | 21 +-- 18 files changed, 249 insertions(+), 136 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java index ae48a46..66b139f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java @@ -8,12 +8,15 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; +import com.ruoyi.job.mydojobfinish.service.IMydoJobFinishService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; import static com.ruoyi.common.utils.PageUtils.startPage; @@ -24,6 +27,8 @@ public class OutMydoJobController extends BaseController { @Autowired private IMydoJobService mydoJobService; + @Autowired + private IMydoJobFinishService mydoJobFinishService; /** * 查询任务表列表 @@ -34,7 +39,12 @@ public class OutMydoJobController extends BaseController { { startPage(); mydoJob.setInOut("2"); - List list = mydoJobService.selectMydoJobList(mydoJob); + List list = new ArrayList<>(); + if(Integer.parseInt(mydoJob.getStatus())<4) { + list = mydoJobService.selectMydoJobList(mydoJob); + }else{ + list=mydoJobFinishService.selectMydoJobFinishListByMydoJob(mydoJob); + } return getDataTable(list); } @@ -44,9 +54,9 @@ public class OutMydoJobController extends BaseController { @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandFinish')") @Log(title = "出库手动完成", businessType = BusinessType.OTHER) @RequestMapping("/OuthandFinish") - public AjaxResult manualCompleted(MydoJob mydoJob) + public AjaxResult manualCompleted(@RequestParam("jobIds")String[] jobIds) { - return mydoJobService.OuthandFinish(mydoJob); + return mydoJobService.OuthandFinish(jobIds); } /** @@ -55,9 +65,9 @@ public class OutMydoJobController extends BaseController { @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandInvalidation')") @Log(title = "出库手动作废", businessType = BusinessType.OTHER) @RequestMapping("/OuthandInvalidation") - public AjaxResult OuthandInvalidation(MydoJob mydoJob) + public AjaxResult OuthandInvalidation(@RequestParam("jobIds")String[] jobIds) { - return mydoJobService.OuthandInvalidation(mydoJob); + return mydoJobService.OuthandInvalidation(jobIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java index 90b21dd..06e4e2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java @@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author ruoyi * @date 2025-05-23 */ -public class MydoJob extends BaseEntity +public class MydoJob { private static final long serialVersionUID = 1L; @@ -83,6 +83,10 @@ public class MydoJob extends BaseEntity @Excel(name = "任务类型",dictType = "in_or_out_type") private String inOrOut; + /** 开始时间 */ + @Excel(name = "创建时间") + private String createTime; + /** 开始时间 */ @Excel(name = "开始时间") private String startTime; @@ -113,6 +117,14 @@ public class MydoJob extends BaseEntity private String inOut; + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + public String getInOut() { return inOut; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java index ce52e37..6744ca0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/IMydoJobService.java @@ -78,9 +78,9 @@ public interface IMydoJobService /** * 出库手动完成 */ - AjaxResult OuthandFinish(MydoJob mydoJob); + AjaxResult OuthandFinish(String [] jobIds); /** * 出库手动作废 */ - AjaxResult OuthandInvalidation(MydoJob mydoJob); + AjaxResult OuthandInvalidation(String [] jobIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index d188f43..8b9881f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.job.mydojob.service.impl; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import cn.hutool.core.collection.CollUtil; @@ -14,6 +16,8 @@ import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; +import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail; +import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService; import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.service.IBasStockService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,7 @@ import com.ruoyi.job.mydojob.mapper.MydoJobMapper; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; /** * 任务表Service业务层处理 @@ -30,8 +35,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2025-05-23 */ @Service -public class MydoJobServiceImpl implements IMydoJobService -{ +public class MydoJobServiceImpl implements IMydoJobService { @Autowired private MydoJobMapper mydoJobMapper; @Autowired @@ -44,6 +48,8 @@ public class MydoJobServiceImpl implements IMydoJobService private IInStockinDetailService inStockinDetailService; @Autowired private IBasStockService basStockService; + @Autowired + private IOutStockoutDetailService outStockoutDetailService; /** @@ -53,8 +59,7 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 任务表 */ @Override - public MydoJob selectMydoJobByJobId(String jobId) - { + public MydoJob selectMydoJobByJobId(String jobId) { return mydoJobMapper.selectMydoJobByJobId(jobId); } @@ -65,8 +70,7 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 任务表 */ @Override - public List selectMydoJobList(MydoJob mydoJob) - { + public List selectMydoJobList(MydoJob mydoJob) { return mydoJobMapper.selectMydoJobList(mydoJob); } @@ -77,9 +81,8 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 结果 */ @Override - public int insertMydoJob(MydoJob mydoJob) - { - mydoJob.setCreateTime(DateUtils.getNowDate()); + public int insertMydoJob(MydoJob mydoJob) { + mydoJob.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); mydoJob.setJobId(basJobIdService.getJobId("RK")); mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1"))); return mydoJobMapper.insertMydoJob(mydoJob); @@ -92,8 +95,7 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 结果 */ @Override - public int updateMydoJob(MydoJob mydoJob) - { + public int updateMydoJob(MydoJob mydoJob) { return mydoJobMapper.updateMydoJob(mydoJob); } @@ -104,8 +106,7 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 结果 */ @Override - public int deleteMydoJobByJobIds(String[] jobIds) - { + public int deleteMydoJobByJobIds(String[] jobIds) { return mydoJobMapper.deleteMydoJobByJobIds(jobIds); } @@ -116,10 +117,10 @@ public class MydoJobServiceImpl implements IMydoJobService * @return 结果 */ @Override - public int deleteMydoJobByJobId(String jobId) - { + public int deleteMydoJobByJobId(String jobId) { return mydoJobMapper.deleteMydoJobByJobId(jobId); } + /** * 手动作废任务表 */ @@ -128,7 +129,7 @@ public class MydoJobServiceImpl implements IMydoJobService public AjaxResult manualInvalidation(MydoJob mydoJob) { String jobId = mydoJob.getJobId(); MydoJob job = selectMydoJobByJobId(jobId); - if (job == null){ + if (job == null) { return AjaxResult.warn("任务不存在"); } MydoJobDetail param = new MydoJobDetail(); @@ -153,6 +154,7 @@ public class MydoJobServiceImpl implements IMydoJobService /** * 插入历史表 + * * @param jobId */ private void insertHistory(String jobId) { @@ -172,16 +174,16 @@ public class MydoJobServiceImpl implements IMydoJobService String jobId = mydoJob.getJobId(); MydoJob job = selectMydoJobByJobId(jobId); - if (job == null){ + if (job == null) { return AjaxResult.warn("任务不存在"); } MydoJobDetail param = new MydoJobDetail(); param.setJobId(jobId); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - if (CollUtil.isNotEmpty(mydoJobDetails)){ + if (CollUtil.isNotEmpty(mydoJobDetails)) { List list = new ArrayList<>(); for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - list.add(getStockByInStockinDetail(mydoJobDetail,job)); + list.add(getStockByInStockinDetail(mydoJobDetail, job)); } basStockService.insertBasStockList(list); mydoJob.setStatus("4"); @@ -193,7 +195,7 @@ public class MydoJobServiceImpl implements IMydoJobService return AjaxResult.success(); } - private BasStock getStockByInStockinDetail(MydoJobDetail mydoJobDetail,MydoJob mydoJob) { + private BasStock getStockByInStockinDetail(MydoJobDetail mydoJobDetail, MydoJob mydoJob) { BasStock stock = new BasStock(); stock.setStockId(basJobIdService.getJobId("KC")); stock.setCargoSpaceId(mydoJob.getCargoSpaceId()); @@ -212,12 +214,39 @@ public class MydoJobServiceImpl implements IMydoJobService } @Override - public AjaxResult OuthandFinish(MydoJob mydoJob) { + public AjaxResult OuthandFinish(String[] jobIds) { return null; } @Override - public AjaxResult OuthandInvalidation(MydoJob mydoJob) { - return null; + @Transactional(rollbackFor = Exception.class) + public AjaxResult OuthandInvalidation(String[] jobIds) { + try { + for (String jobId : jobIds) { + MydoJob job = selectMydoJobByJobId(jobId); + if (job == null) { + return AjaxResult.error("任务不存在"); + } + MydoJobDetail mydoJobDetail = new MydoJobDetail(); + mydoJobDetail.setJobId(jobId); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail); + for (MydoJobDetail detail : mydoJobDetails) { + OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(detail.getInOrOutDId()); + if (outStockoutDetail != null) { + BigDecimal allotQuantity = outStockoutDetail.getAllotQuantity(); + BigDecimal substract = allotQuantity.subtract(Convert.toBigDecimal(detail.getOutQuantity())); + outStockoutDetail.setAllotQuantity(substract); + outStockoutDetailService.updateOutStockoutDetail(outStockoutDetail); + } + } + job.setStatus("5"); + insertHistory(jobId); + } + return AjaxResult.success(); + + } catch (Exception e) { + TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); + return AjaxResult.error("任务处理异常"); + } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java index 942bfa7..8be25c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/controller/MydoJobDetailController.java @@ -1,7 +1,10 @@ package com.ruoyi.job.mydojobdetail.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +36,8 @@ public class MydoJobDetailController extends BaseController { @Autowired private IMydoJobDetailService mydoJobDetailService; + @Autowired + private IMydoJobDetailFinishService mydoJobDetailFinishService; /** * 查询子任务列表 @@ -42,7 +47,12 @@ public class MydoJobDetailController extends BaseController public TableDataInfo list(MydoJobDetail mydoJobDetail) { startPage(); - List list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail); + List list = new ArrayList<>(); + if(Integer.parseInt(mydoJobDetail.getStatus())<4) { + list = mydoJobDetailService.selectMydoJobDetailList(mydoJobDetail); + }else{ + list = mydoJobDetailFinishService.selectMydoJobDetailFinishListByJobDetail(mydoJobDetail); + } return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java index 90ee2d9..1e69b95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java @@ -119,7 +119,17 @@ public class MydoJobDetail extends BaseEntity @Excel(name = "备用字段4") private String spare4; - public void setJobDetailId(String jobDetailId) + private String status; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public void setJobDetailId(String jobDetailId) { this.jobDetailId = jobDetailId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/mapper/MydoJobDetailFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/mapper/MydoJobDetailFinishMapper.java index d9ce7c7..08e7dfd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/mapper/MydoJobDetailFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/mapper/MydoJobDetailFinishMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mydojobdetailfinish.mapper; import java.util.List; + +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish; /** @@ -27,6 +29,8 @@ public interface MydoJobDetailFinishMapper */ public List selectMydoJobDetailFinishList(MydoJobDetailFinish mydoJobDetailFinish); + + public List selectMydoJobDetailFinishListByJobId(String jobId); /** * 新增历史子作业 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/IMydoJobDetailFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/IMydoJobDetailFinishService.java index b89d3bd..6bbf360 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/IMydoJobDetailFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/IMydoJobDetailFinishService.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mydojobdetailfinish.service; import java.util.List; + +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetailfinish.domain.MydoJobDetailFinish; /** @@ -26,6 +28,7 @@ public interface IMydoJobDetailFinishService * @return 历史子作业集合 */ public List selectMydoJobDetailFinishList(MydoJobDetailFinish mydoJobDetailFinish); + public List selectMydoJobDetailFinishListByJobDetail(MydoJobDetail mydoJobDetail); /** * 新增历史子作业 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java index dfb9f25..c5807a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.job.mydojobdetailfinish.service.impl; +import java.util.Collections; import java.util.List; + +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper; @@ -43,6 +46,12 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi return mydoJobDetailFinishMapper.selectMydoJobDetailFinishList(mydoJobDetailFinish); } + @Override + public List selectMydoJobDetailFinishListByJobDetail(MydoJobDetail mydoJobDetail) { + String jobId = mydoJobDetail.getJobId(); + return mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId); + } + /** * 新增历史子作业 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/mapper/MydoJobFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/mapper/MydoJobFinishMapper.java index 4458600..397e548 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/mapper/MydoJobFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/mapper/MydoJobFinishMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mydojobfinish.mapper; import java.util.List; + +import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish; /** @@ -27,6 +29,9 @@ public interface MydoJobFinishMapper */ public List selectMydoJobFinishList(MydoJobFinish mydoJobFinish); + + public List selectMydoJobFinishListByMydoJob(MydoJob mydoJob); + /** * 新增历史主作业 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/IMydoJobFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/IMydoJobFinishService.java index eda4085..2f306d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/IMydoJobFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/IMydoJobFinishService.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mydojobfinish.service; import java.util.List; + +import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish; /** @@ -27,6 +29,9 @@ public interface IMydoJobFinishService */ public List selectMydoJobFinishList(MydoJobFinish mydoJobFinish); + + public List selectMydoJobFinishListByMydoJob(MydoJob mydoJob); + /** * 新增历史主作业 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java index 9738db6..4f01f69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobfinish/service/impl/MydoJobFinishServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.job.mydojobfinish.service.impl; +import java.util.Collections; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.job.mydojob.domain.MydoJob; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper; @@ -44,6 +46,11 @@ public class MydoJobFinishServiceImpl implements IMydoJobFinishService return mydoJobFinishMapper.selectMydoJobFinishList(mydoJobFinish); } + @Override + public List selectMydoJobFinishListByMydoJob(MydoJob mydoJob) { + return mydoJobFinishMapper.selectMydoJobFinishListByMydoJob(mydoJob); + } + /** * 新增历史主作业 * diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index 808afe9..a1c2c71 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -68,6 +68,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare4 = #{spare4} + + + +