From 6c64d293fb2f4bfa96157b94bfff5cd9f68f7796 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 30 Nov 2024 19:58:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85=E6=98=AF=E5=90=A6=E8=A2=AB?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/WorkorderTemplate.java | 4 +++ .../workorderController/TemplateController.java | 5 ++-- .../jeecg/modules/apiService/TemplateService.java | 2 +- .../apiService/impl/TemplateServiceImpl.java | 35 ++++++++++++---------- 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.java index fdb69bc..a70d77c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderTemplate/entity/WorkorderTemplate.java @@ -86,6 +86,10 @@ public class WorkorderTemplate implements Serializable { @ApiModelProperty(value = "关联状态id") private java.lang.String statusId; + //工单是否被收藏标识 + @TableField(exist = false) + private boolean collectonFlag; + //工单状态描述 @TableField(exist = false) private java.lang.String statusDescribe; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java index 77e344e..543e1c3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java @@ -22,6 +22,7 @@ import org.jeecg.modules.workorderStepone.entity.WorkorderStepone; import org.jeecg.modules.workorderStepthree.entity.WorkorderStepthree; import org.jeecg.modules.workorderSteptwo.entity.WorkorderSteptwo; import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -49,8 +50,8 @@ public class TemplateController { @ApiOperation(value="工单信息-根据id查询工单详情", notes="工单信息-根据id查询工单详情") @RequestMapping(value = "/queryTemplateById", method = {RequestMethod.GET}) - public Result queryTemplateById(String templateId){ - return templateService.queryTemplateById(templateId); + public Result queryTemplateById(@RequestHeader("X-Access-Token") String userId, String templateId){ + return templateService.queryTemplateById(userId, templateId); } @ApiOperation(value="工单信息-修改工单", notes="工单信息-修改工单") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java index ed95cea..a278ce2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java @@ -31,7 +31,7 @@ public interface TemplateService { * @param templateId * @return */ - public Result queryTemplateById(String templateId); + public Result queryTemplateById(String userId, String templateId); /** * 工单信息-修改工单 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java index 8dd690f..8140239 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.*; import org.jeecg.modules.apiService.TemplateService; +import org.jeecg.modules.workorderCollection.entity.WorkorderCollection; +import org.jeecg.modules.workorderCollection.service.IWorkorderCollectionService; import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour; import org.jeecg.modules.workorderGeneralStepfour.service.IWorkorderGeneralStepfourService; import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone; @@ -48,6 +50,10 @@ import java.util.List; @Service public class TemplateServiceImpl implements TemplateService { + //收藏信息 + @Resource + private IWorkorderCollectionService workorderCollectionService; + //工单状态 @Resource private IWorkorderStatusService workorderStatusService; @@ -88,21 +94,6 @@ public class TemplateServiceImpl implements TemplateService { @Resource private IWorkorderParamStepfourService workorderParamStepfourService; - //工序卡1 - @Resource - private IWorkorderSteponeService workorderSteponeService; - - //工序卡2 - @Resource - private IWorkorderSteptwoService workorderSteptwoService; - - //工序卡3 - @Resource - private IWorkorderStepthreeService workorderStepthreeService; - - //工序卡4 - @Resource - private IWorkorderStepfourService workorderStepfourService; /*************************************************************************************/ //工单信息-查询工单列表 @@ -356,7 +347,7 @@ public class TemplateServiceImpl implements TemplateService { /*********************************************************************************************************/ //工单信息-查询工单详情 @Override - public Result queryTemplateById(String templateId){ + public Result queryTemplateById(String userId, String templateId){ //查询工单信息 WorkorderTemplate workorderTemplate = workorderTemplateService @@ -364,6 +355,18 @@ public class TemplateServiceImpl implements TemplateService { .eq(WorkorderTemplate::getId, templateId) .one(); + //查看工单是否被收藏 + WorkorderCollection collection = workorderCollectionService + .lambdaQuery() + .eq(WorkorderCollection::getUserId, userId) + .eq(WorkorderCollection::getTemplateId, templateId) + .one(); + if(null != collection){ + workorderTemplate.setCollectonFlag(true); + }else { + workorderTemplate.setCollectonFlag(false); + } + //查询工序卡信息 List stepList = workorderStepService .lambdaQuery()