From 9cca2cb7d9cd6acc6d9798da237c5a8ce7174fb3 Mon Sep 17 00:00:00 2001 From: djz8236 Date: Wed, 14 Jun 2023 23:15:14 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=B7=A5=E5=8D=95=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E5=90=8E=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A0=B9=E6=8D=AEsid=E8=B0=83=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=88v1/dispatchorderinfo/fetchDetailsBySid/{sid}?= =?UTF-8?q?=EF=BC=89=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=8D=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E6=A0=B9=E6=8D=AE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E9=94=AE=EF=BC=88orderid=EF=BC=89=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=88v1/dispatchworker/listPage=EF=BC=89?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=BF=90=E7=BB=B4=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E3=80=82=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E4=B8=BB=E9=94=AE=EF=BC=88orderid=EF=BC=89?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=EF=BC=88v1/dispatchorderst?= =?UTF-8?q?andards/listPage=EF=BC=89=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B9=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82=202=E3=80=81=E5=85=B3=E8=81=94=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B9=E6=8E=A5=E5=8F=A3=EF=BC=88v1/dispatchmodletemplate/sa?= =?UTF-8?q?ve=EF=BC=89=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=EF=BC=9A{'templ?= =?UTF-8?q?ateid':'12345690','taskid':[1,2,3,4,5,6,7,8]}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DispatchModleTemplateDetailsVo.java | 8 ++-- .../DispatchModleTemplateDto.java | 4 +- .../DispatchModleTemplateFeign.java | 4 +- .../DispatchModleTemplateFeignFallback.java | 5 +++ .../DispatchModleTemplateVo.java | 8 ++-- .../DispatchModleTemplateRest.java | 16 +++++++- .../DispatchModleTemplateService.java | 40 +++++++++++++++---- .../DispatchOrderStandardsService.java | 3 ++ .../DispatchPlanWorkerService.java | 1 + .../dispatchworker/DispatchWorkerService.java | 1 + 10 files changed, 73 insertions(+), 17 deletions(-) diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java index 6e7690d0..995fefd6 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDetailsVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: supervise-dispatchcenter(工单系统)
* File: DispatchModleTemplateVo.java
@@ -51,9 +53,9 @@ public class DispatchModleTemplateDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("模板id") + @ApiModelProperty("模板id") private String templateid; // 模板id - @ApiModelProperty("任务项标准库id") - private String taskid; // 任务项标准库id + @ApiModelProperty("任务项标准库id") + private List taskid; // 任务项标准库id } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java index 2bc328ad..32ae898f 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: supervise-dispatchcenter(工单系统)
* File: DispatchModleTemplateDto.java
@@ -54,6 +56,6 @@ public class DispatchModleTemplateDto implements Dto { @ApiModelProperty("模板id") private String templateid; // 模板id @ApiModelProperty("任务项标准库id") - private String taskid; // 任务项标准库id + private List taskid; // 任务项标准库id } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java index 8acd266e..753a5fe3 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeign.java @@ -79,5 +79,7 @@ public interface DispatchModleTemplateFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - + @ApiOperation("根据模板SID获取一条记录") + @GetMapping("/fetchDetailsByTemplateSid/{sid}") + public ResultBean fetchDetailsByTemplateSid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java index 9e481338..7266aa42 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateFeignFallback.java @@ -74,4 +74,9 @@ public class DispatchModleTemplateFeignFallback implements DispatchModleTemplate ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口supervise-dispatchcenter/dispatchmodletemplate/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean fetchDetailsByTemplateSid(String sid) { + return null; + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java index 3043c045..fa0f9305 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchmodletemplate/DispatchModleTemplateVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: supervise-dispatchcenter(工单系统)
* File: DispatchModleTemplateVo.java
@@ -51,9 +53,9 @@ public class DispatchModleTemplateVo implements Vo { private String sid; // sid - @ApiModelProperty("模板id") + @ApiModelProperty("模板id") private String templateid; // 模板id - @ApiModelProperty("任务项标准库id") - private String taskid; // 任务项标准库id + @ApiModelProperty("任务项标准库id") + private List taskid; // 任务项标准库id } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java index ffdaa754..fcd38a02 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java @@ -98,8 +98,8 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign { @Override @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsVoBySid(sid); if (vo==null) @@ -107,4 +107,16 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign { return rb.success().setData(vo); } + + @Override + @ApiOperation("根据模板SID获取一条记录") + @GetMapping("/fetchDetailsByTemplateSid/{sid}") + public ResultBean fetchDetailsByTemplateSid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsByTemplateSid(sid); +// if (vo==null) +// return rb.setMsg("查询不到数据"); + return rb.success().setData(vo); + } + } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java index a1a2e4e7..41e0656f 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateService.java @@ -44,6 +44,7 @@ import com.yxt.supervise.dispatchcenter.api.dispatchmodletemplate.DispatchModleT import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -85,14 +86,22 @@ public class DispatchModleTemplateService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("templateid",dto.getTemplateid()); + baseMapper.delete(qw); + this.insertByDto(dto); } public void insertByDto(DispatchModleTemplateDto dto){ - DispatchModleTemplate entity = new DispatchModleTemplate(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); + List taskid = dto.getTaskid(); + for (String s : taskid) { + DispatchModleTemplate entity = new DispatchModleTemplate(); + //BeanUtil.copyProperties(dto, entity, "id", "sid"); + entity.setTemplateid(dto.getTemplateid()); + entity.setTaskid(s); + baseMapper.insert(entity); + } } public void updateByDto(DispatchModleTemplateDto dto){ @@ -104,7 +113,7 @@ public class DispatchModleTemplateService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("templateid",templateSid); + List dispatchModleTemplateVos = baseMapper.selectListAllVo(qw); + if(dispatchModleTemplateVos==null||dispatchModleTemplateVos.size()==0){ + return null; + } + DispatchModleTemplateDetailsVo vo = new DispatchModleTemplateDetailsVo(); + vo.setTemplateid(dispatchModleTemplateVos.get(0).getTemplateid()); + List ss=new ArrayList<>(); + dispatchModleTemplateVos.forEach(d->{ + ss.add(d.getTaskid()+""); + }); + vo.setTaskid(ss); + return vo; + } public void delByTemplateSid(String templateSid) { if(StringUtils.isBlank(templateSid)){ return; @@ -131,4 +155,6 @@ public class DispatchModleTemplateService extends MybatisBaseService getStandardsByTemplateSid(String templatesid) { return baseMapper.getStandardsByTemplateSid(templatesid); } + + } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java index 051eade2..b636d55b 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java @@ -76,6 +76,9 @@ public class DispatchOrderStandardsService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("planid",query.getPlanid()); return qw; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java index 0ff16adf..42d62ed9 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerService.java @@ -64,6 +64,7 @@ public class DispatchWorkerService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + qw.eq("orderid",query.getOrderid()); return qw; }