diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml
index ff7f96a8..5c507eba 100644
--- a/yxt_supervise/pom.xml
+++ b/yxt_supervise/pom.xml
@@ -19,6 +19,7 @@
supervise-crm
supervise-flowable
supervise-customer
+ supervise-dispatchcenter
pom
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 1bf9c3be..8acd266e 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
@@ -70,9 +70,14 @@ public interface DispatchModleTemplateFeign {
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
-
+ @ApiOperation("根据模板sid删除记录")
+ @DeleteMapping("/delByTemplateSid")
+ @ResponseBody
+ public ResultBean delByTemplateSid(@RequestBody String templateSid);
+
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean fetchDetailsBySid(@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 b70e94b0..9e481338 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
@@ -64,6 +64,11 @@ public class DispatchModleTemplateFeignFallback implements DispatchModleTemplate
return ResultBean.fireFail().setMsg("接口supervise-dispatchcenter/dispatchmodletemplate/delBySids无法访问");
}
+ @Override
+ public ResultBean delByTemplateSid(String templateSid) {
+ return null;
+ }
+
@Override
public ResultBean fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDto.java
index 06c35e48..98a4b971 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDto.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDto.java
@@ -28,10 +28,13 @@ package com.yxt.supervise.dispatchcenter.api.dispatchorderinfo;
import com.yxt.common.core.dto.Dto;
+import com.yxt.supervise.dispatchcenter.api.dispatchworker.DispatchWorkerDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* Project: supervise-dispatchcenter(工单系统)
* File: DispatchOrderinfoDto.java
@@ -77,5 +80,8 @@ public class DispatchOrderinfoDto implements Dto {
private String receiveperson; // 现场联系人
@ApiModelProperty("现场联系人电话")
private String receivetel; // 现场联系人电话
-
+ @ApiModelProperty("模板sid")
+ private String templatesid; // templatesid
+ @ApiModelProperty("运维人员信息")
+ private List workers;
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
index 4961143a..e1f6ebde 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoQuery.java
@@ -62,13 +62,21 @@ public class DispatchOrderinfoQuery implements Query {
@ApiModelProperty("描述：1-一般；2-重要； 3-紧急；4-督办。")
private String orderdegree; // 描述：1-一般；2-重要； 3-紧急；4-督办。
@ApiModelProperty("描述：1-计划巡视；")
- private Integer ordertype; // 描述：1-计划巡视；
+ private String ordertype; // 描述：1-计划巡视；
@ApiModelProperty("工单内容")
private String ordercontent; // 工单内容
- @ApiModelProperty("到达现场时间")
+ @ApiModelProperty("到达现场时间")
private String arrivetime; // 到达现场时间
- @ApiModelProperty("完成时间")
+ @ApiModelProperty("到达现场时间结束")
+ private String arrivetimeEnd; // 到达现场时间
+ @ApiModelProperty("到达现场时间开始")
+ private String arrivetimeStart; // 到达现场时间
+ @ApiModelProperty("完成时间")
private String planfinishtime; // 完成时间
+ @ApiModelProperty("完成时间开始")
+ private String planfinishtimeStart; // 完成时间
+ @ApiModelProperty("完成时间结束")
+ private String planfinishtimeEnd; // 完成时间
@ApiModelProperty("处理情况")
private String operationcontent; // 处理情况
@ApiModelProperty("现场联系人")
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandards.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java
similarity index 60%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandards.java
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java
index ef53ef59..738ac1e4 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandards.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java
@@ -23,18 +23,19 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchstandards;
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * Project: yxt_dispatchcenter(工单系统)
+ * Project: supervise-dispatchcenter(工单系统)
* File: DispatchStandards.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchstandards.DispatchStandards
- * Description: (运维任务标准库).
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandards
+ * Description: 订单关联的标准的任务项.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2023-05-28 10:30:03
@@ -43,90 +44,28 @@ import io.swagger.annotations.ApiModelProperty;
* @version 1.0
* @since 1.0
*/
-@ApiModel(value = "(运维任务标准库)", description = "(运维任务标准库)")
-@TableName("dispatch_standards")
-public class DispatchStandards extends BaseEntity {
+@Data
+@ApiModel(value = "订单关联的标准的任务项", description = "订单关联的标准的任务项")
+@TableName("dispatch_order_standards")
+public class DispatchOrderStandards extends BaseEntity {
private static final long serialVersionUID = 1L;
-
@ApiModelProperty("任务项名称")
private String taskname; // 任务项名称
-
@ApiModelProperty("任务项分类")
private String tasktype; // 任务项分类
-
@ApiModelProperty("任务描述")
private String taskdesc; // 任务描述
-
@ApiModelProperty("反馈形式（1选项 2图片 3文字）")
private String taskreturn; // 反馈形式（1选项 2图片 3文字）
-
@ApiModelProperty("任务项父级分类+")
private String tasktypeparent; // 任务项父级分类+
-
- /**
- * @return 任务项名称
- */
- public String getTaskname(){
- return taskname;
- }
-
- /**
- * @param taskname 任务项名称 to set
- */
- public void setTaskname(String taskname){
- this.taskname = taskname;
- }
- /**
- * @return 任务项分类
- */
- public String getTasktype(){
- return tasktype;
- }
-
- /**
- * @param tasktype 任务项分类 to set
- */
- public void setTasktype(String tasktype){
- this.tasktype = tasktype;
- }
- /**
- * @return 任务描述
- */
- public String getTaskdesc(){
- return taskdesc;
- }
-
- /**
- * @param taskdesc 任务描述 to set
- */
- public void setTaskdesc(String taskdesc){
- this.taskdesc = taskdesc;
- }
- /**
- * @return 反馈形式（1选项 2图片 3文字）
- */
- public String getTaskreturn(){
- return taskreturn;
- }
-
- /**
- * @param taskreturn 反馈形式（1选项 2图片 3文字） to set
- */
- public void setTaskreturn(String taskreturn){
- this.taskreturn = taskreturn;
- }
- /**
- * @return 任务项父级分类+
- */
- public String getTasktypeparent(){
- return tasktypeparent;
- }
-
- /**
- * @param tasktypeparent 任务项父级分类+ to set
- */
- public void setTasktypeparent(String tasktypeparent){
- this.tasktypeparent = tasktypeparent;
- }
+ @ApiModelProperty("订单id")
+ private String ordersid;
+ @ApiModelProperty("反馈内容")
+ private String taskvalue;
+ @ApiModelProperty("模板sid")
+ private String templatesid;
+ @ApiModelProperty("标准任务id")
+ private String tasksid;
}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDetailsVo.java
new file mode 100644
index 00000000..1b406f73
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDetailsVo.java
@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: supervise-dispatchcenter(工单系统)
+ * File: DispatchStandardsVo.java
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo
+ * Description: 订单关联的标准的任务项 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-05-28 10:30:03
+ *
+ * @author djz
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "订单关联的标准的任务项 视图数据详情", description = "订单关联的标准的任务项 视图数据详情")
+public class DispatchOrderStandardsDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("任务项名称")
+ private String taskname; // 任务项名称
+ @ApiModelProperty("任务项分类")
+ private String tasktype; // 任务项分类
+ @ApiModelProperty("任务描述")
+ private String taskdesc; // 任务描述
+ @ApiModelProperty("反馈形式（1选项 2图片 3文字）")
+ private String taskreturn; // 反馈形式（1选项 2图片 3文字）
+ @ApiModelProperty("任务项父级分类+")
+ private String tasktypeparent; // 任务项父级分类+
+ @ApiModelProperty("订单id")
+ private String ordersid;
+ @ApiModelProperty("反馈内容")
+ private String taskvalue;
+ @ApiModelProperty("模板sid")
+ private String templatesid;
+ @ApiModelProperty("标准任务id")
+ private String tasksid;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java
similarity index 54%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateQuery.java
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java
index 0f60e7c3..32a0f364 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java
@@ -23,62 +23,49 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate;
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
-
-import com.yxt.common.core.query.Query;
+import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchModleTemplateQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate.DispatchModleTemplateQuery
- * Description: 模型模板对照 查询条件.
+ * Project: supervise-dispatchcenter(工单系统)
+ * File: DispatchStandardsDto.java
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsDto
+ * Description: 订单关联的标准的任务项 数据传输对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:02
+ * Makedate: 2023-05-28 10:30:03
*
* @author djz
* @version 1.0
* @since 1.0
*/
-public class DispatchModleTemplateQuery implements Query {
+@Data
+@ApiModel(value = "订单关联的标准的任务项 数据传输对象", description = "订单关联的标准的任务项 数据传输对象")
+public class DispatchOrderStandardsDto implements Dto {
-
- @ApiModelProperty("模板id")
- private String templateid; // 模板id
-
- @ApiModelProperty("任务项标准库id")
- private String taskid; // 任务项标准库id
+ private String sid; // sid
-
- /**
- * @return 模板id
- */
- public String getTemplateid(){
- return templateid;
- }
-
- /**
- * @param templateid 模板id to set
- */
- public void setTemplateid(String templateid){
- this.templateid = templateid;
- }
-
- /**
- * @return 任务项标准库id
- */
- public String getTaskid(){
- return taskid;
- }
-
- /**
- * @param taskid 任务项标准库id to set
- */
- public void setTaskid(String taskid){
- this.taskid = taskid;
- }
-}
+ @ApiModelProperty("任务项名称")
+ private String taskname; // 任务项名称
+ @ApiModelProperty("任务项分类")
+ private String tasktype; // 任务项分类
+ @ApiModelProperty("任务描述")
+ private String taskdesc; // 任务描述
+ @ApiModelProperty("反馈形式（1选项 2图片 3文字）")
+ private String taskreturn; // 反馈形式（1选项 2图片 3文字）
+ @ApiModelProperty("任务项父级分类+")
+ private String tasktypeparent; // 任务项父级分类+
+ @ApiModelProperty("订单id")
+ private String ordersid;
+ @ApiModelProperty("反馈内容")
+ private String taskvalue;
+ @ApiModelProperty("模板sid")
+ private String templatesid;
+ @ApiModelProperty("标准任务id")
+ private String tasksid;
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeign.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeign.java
new file mode 100644
index 00000000..3b180b7b
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeign.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: supervise-dispatchcenter(工单系统)
+ * File: DispatchStandardsFeign.java
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsFeign
+ * Description: 订单关联的标准的任务项.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-05-28 10:30:03
+ *
+ * @author djz
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "订单关联的标准的任务项")
+@FeignClient(
+ contextId = "supervise-dispatchcenter-DispatchOrderStandards",
+ name = "supervise-dispatchcenter",
+ path = "v1/dispatchorderstandards",
+ fallback = DispatchOrderStandardsFeignFallback.class)
+public interface DispatchOrderStandardsFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody DispatchOrderStandardsDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplate.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeignFallback.java
similarity index 52%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplate.java
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeignFallback.java
index 45e162f7..a90a5002 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplate.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsFeignFallback.java
@@ -23,62 +23,48 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate;
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchModleTemplate.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate.DispatchModleTemplate
- * Description: 模型模板对照.
+ * Project: supervise-dispatchcenter(工单系统)
+ * File: DispatchStandardsFeignFallback.java
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsFeignFallback
+ * Description: 订单关联的标准的任务项.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:02
+ * Makedate: 2023-05-28 10:30:03
*
* @author djz
* @version 1.0
* @since 1.0
*/
-@ApiModel(value = "模型模板对照", description = "模型模板对照")
-@TableName("dispatch_modle_template")
-public class DispatchModleTemplate extends BaseEntity {
- private static final long serialVersionUID = 1L;
+@Component
+public class DispatchOrderStandardsFeignFallback implements DispatchOrderStandardsFeign {
-
- @ApiModelProperty("模板id")
- private String templateid; // 模板id
-
- @ApiModelProperty("任务项标准库id")
- private String taskid; // 任务项标准库id
-
- /**
- * @return 模板id
- */
- public String getTemplateid(){
- return templateid;
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise-dispatchcenter/dispatchstandards/listPage无法访问");
}
-
- /**
- * @param templateid 模板id to set
- */
- public void setTemplateid(String templateid){
- this.templateid = templateid;
+
+ @Override
+ public ResultBean save(DispatchOrderStandardsDto dto){
+ return ResultBean.fireFail().setMsg("接口supervise-dispatchcenter/dispatchstandards/save无法访问");
}
- /**
- * @return 任务项标准库id
- */
- public String getTaskid(){
- return taskid;
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口supervise-dispatchcenter/dispatchstandards/delBySids无法访问");
}
-
- /**
- * @param taskid 任务项标准库id to set
- */
- public void setTaskid(String taskid){
- this.taskid = taskid;
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口supervise-dispatchcenter/dispatchstandards/fetchDetailsBySid无法访问");
}
-}
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java
similarity index 60%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsQuery.java
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java
index 312f7ee6..52e97c3b 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java
@@ -23,19 +23,19 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchstandards;
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
import com.yxt.common.core.query.Query;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * Project: yxt_dispatchcenter(工单系统)
+ * Project: supervise-dispatchcenter(工单系统)
* File: DispatchStandardsQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchstandards.DispatchStandardsQuery
- * Description: (运维任务标准库) 查询条件.
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsQuery
+ * Description: 订单关联的标准的任务项 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2023-05-28 10:30:03
@@ -44,92 +44,26 @@ import io.swagger.annotations.ApiModelProperty;
* @version 1.0
* @since 1.0
*/
-public class DispatchStandardsQuery implements Query {
+@Data
+@ApiModel(value = "订单关联的标准的任务项 查询条件", description = "订单关联的标准的任务项 查询条件")
+public class DispatchOrderStandardsQuery implements Query {
-
@ApiModelProperty("任务项名称")
private String taskname; // 任务项名称
-
@ApiModelProperty("任务项分类")
private String tasktype; // 任务项分类
-
@ApiModelProperty("任务描述")
private String taskdesc; // 任务描述
-
@ApiModelProperty("反馈形式（1选项 2图片 3文字）")
private String taskreturn; // 反馈形式（1选项 2图片 3文字）
-
@ApiModelProperty("任务项父级分类+")
private String tasktypeparent; // 任务项父级分类+
-
-
- /**
- * @return 任务项名称
- */
- public String getTaskname(){
- return taskname;
- }
-
- /**
- * @param taskname 任务项名称 to set
- */
- public void setTaskname(String taskname){
- this.taskname = taskname;
- }
-
- /**
- * @return 任务项分类
- */
- public String getTasktype(){
- return tasktype;
- }
-
- /**
- * @param tasktype 任务项分类 to set
- */
- public void setTasktype(String tasktype){
- this.tasktype = tasktype;
- }
-
- /**
- * @return 任务描述
- */
- public String getTaskdesc(){
- return taskdesc;
- }
-
- /**
- * @param taskdesc 任务描述 to set
- */
- public void setTaskdesc(String taskdesc){
- this.taskdesc = taskdesc;
- }
-
- /**
- * @return 反馈形式（1选项 2图片 3文字）
- */
- public String getTaskreturn(){
- return taskreturn;
- }
-
- /**
- * @param taskreturn 反馈形式（1选项 2图片 3文字） to set
- */
- public void setTaskreturn(String taskreturn){
- this.taskreturn = taskreturn;
- }
-
- /**
- * @return 任务项父级分类+
- */
- public String getTasktypeparent(){
- return tasktypeparent;
- }
-
- /**
- * @param tasktypeparent 任务项父级分类+ to set
- */
- public void setTasktypeparent(String tasktypeparent){
- this.tasktypeparent = tasktypeparent;
- }
+ @ApiModelProperty("订单id")
+ private String ordersid;
+ @ApiModelProperty("反馈内容")
+ private String taskvalue;
+ @ApiModelProperty("模板sid")
+ private String templatesid;
+ @ApiModelProperty("标准任务id")
+ private String tasksid;
}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java
similarity index 55%
rename from yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleQuery.java
rename to yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java
index 60b118ed..70a2c862 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModleQuery.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java
@@ -23,19 +23,19 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchpatrolmodle;
+package com.yxt.supervise.dispatchcenter.api.dispatchorderstandards;
-import com.yxt.common.core.query.Query;
-
+import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchPatrolModleQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchpatrolmodle.DispatchPatrolModleQuery
- * Description: 巡视任务模型,工单和模型之间的关联关系 查询条件.
+ * Project: supervise-dispatchcenter(工单系统)
+ * File: DispatchStandardsVo.java
+ * Class: com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo
+ * Description: 订单关联的标准的任务项 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2023-05-28 10:30:03
@@ -44,58 +44,28 @@ import io.swagger.annotations.ApiModelProperty;
* @version 1.0
* @since 1.0
*/
-public class DispatchPatrolModleQuery implements Query {
+@Data
+@ApiModel(value = "订单关联的标准的任务项 视图数据对象", description = "订单关联的标准的任务项 视图数据对象")
+public class DispatchOrderStandardsVo implements Vo {
-
- @ApiModelProperty("模型id")
- private String modleid; // 模型id
-
- @ApiModelProperty("工单id（与工单表一致）")
- private String orderid; // 工单id（与工单表一致）
-
- @ApiModelProperty("模型名称")
- private String modlename; // 模型名称
+ private String sid; // sid
-
- /**
- * @return 模型id
- */
- public String getModleid(){
- return modleid;
- }
-
- /**
- * @param modleid 模型id to set
- */
- public void setModleid(String modleid){
- this.modleid = modleid;
- }
-
- /**
- * @return 工单id（与工单表一致）
- */
- public String getOrderid(){
- return orderid;
- }
-
- /**
- * @param orderid 工单id（与工单表一致） to set
- */
- public void setOrderid(String orderid){
- this.orderid = orderid;
- }
-
- /**
- * @return 模型名称
- */
- public String getModlename(){
- return modlename;
- }
-
- /**
- * @param modlename 模型名称 to set
- */
- public void setModlename(String modlename){
- this.modlename = modlename;
- }
+ @ApiModelProperty("任务项名称")
+ private String taskname; // 任务项名称
+ @ApiModelProperty("任务项分类")
+ private String tasktype; // 任务项分类
+ @ApiModelProperty("任务描述")
+ private String taskdesc; // 任务描述
+ @ApiModelProperty("反馈形式（1选项 2图片 3文字）")
+ private String taskreturn; // 反馈形式（1选项 2图片 3文字）
+ @ApiModelProperty("任务项父级分类+")
+ private String tasktypeparent; // 任务项父级分类+
+ @ApiModelProperty("订单id")
+ private String ordersid;
+ @ApiModelProperty("反馈内容")
+ private String taskvalue;
+ @ApiModelProperty("模板sid")
+ private String templatesid;
+ @ApiModelProperty("标准任务id")
+ private String tasksid;
}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
index b378ef6b..625475e3 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,13 @@ public interface DispatchModleTemplateMapper extends BaseMapper selectListVo();
+
+ /**
+ * 根据templatesid 获取标准任务项
+ * @param templatesid
+ * @return
+ */
+ @Select("select * from dispatch_standards " +
+ "where sid in(select taskid from dispatch_modle_template where templateid=#{templatesid} )")
+ List getStandardsByTemplateSid(@Param("templatesid")String 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/dispatchmodletemplate/DispatchModleTemplateRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchmodletemplate/DispatchModleTemplateRest.java
index f1799415..bbf1d00b 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
@@ -89,6 +89,13 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign {
return rb.success();
}
+ @Override
+ public ResultBean delByTemplateSid(String templateSid) {
+ ResultBean rb = ResultBean.fireFail();
+ dispatchModleTemplateService.delByTemplateSid(templateSid);
+ return rb.success();
+ }
+
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@@ -97,4 +104,5 @@ public class DispatchModleTemplateRest implements DispatchModleTemplateFeign {
DispatchModleTemplateDetailsVo vo = dispatchModleTemplateService.fetchDetailsVoBySid(sid);
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 189ea80c..d58e89aa 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
@@ -28,6 +28,7 @@ package com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.supervise.dispatchcenter.api.dispatchstandards.DispatchStandardsVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -64,6 +65,9 @@ public class DispatchModleTemplateService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getTemplateid())) {
+ qw.like("templateid", query.getTemplateid());
+ }
return qw;
}
@@ -107,4 +111,22 @@ public class DispatchModleTemplateService extends MybatisBaseService qw = new QueryWrapper<>();
+ qw.eq("templateid",templateSid);
+ baseMapper.delete(qw);
+ }
+
+ /**
+ * 根据sid获取标准任务项
+ * @param templatesid
+ * @return
+ */
+ public List 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/dispatchorderinfo/DispatchOrderinfo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfo.java
deleted file mode 100644
index 4b8be0de..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfo.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchOrderinfo.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo.DispatchOrderinfo
- * Description: 汇总工单数据.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "汇总工单数据", description = "汇总工单数据")
-@TableName("dispatch_orderinfo")
-public class DispatchOrderinfo extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty("客户ID")
- private String custid; // 客户ID
-
- @ApiModelProperty("客户名称")
- private String custname; // 客户名称
-
- @ApiModelProperty("监管公司id")
- private String supervisesid; // 监管公司id
-
- @ApiModelProperty("用法说明：工单编号规则。")
- private String orderno; // 用法说明：工单编号规则。
-
- @ApiModelProperty("工单名称")
- private String ordername; // 工单名称
-
- @ApiModelProperty("描述：1-一般；2-重要； 3-紧急；4-督办。")
- private String orderdegree; // 描述：1-一般；2-重要； 3-紧急；4-督办。
-
- @ApiModelProperty("描述：1-计划巡视；")
- private Integer ordertype; // 描述：1-计划巡视；
-
- @ApiModelProperty("工单内容")
- private String ordercontent; // 工单内容
-
- @ApiModelProperty("到达现场时间")
- private String arrivetime; // 到达现场时间
-
- @ApiModelProperty("完成时间")
- private String planfinishtime; // 完成时间
-
- @ApiModelProperty("处理情况")
- private String operationcontent; // 处理情况
-
- @ApiModelProperty("现场联系人")
- private String receiveperson; // 现场联系人
-
- @ApiModelProperty("现场联系人电话")
- private String receivetel; // 现场联系人电话
-
- /**
- * @return 客户ID
- */
- public String getCustid(){
- return custid;
- }
-
- /**
- * @param custid 客户ID to set
- */
- public void setCustid(String custid){
- this.custid = custid;
- }
- /**
- * @return 客户名称
- */
- public String getCustname(){
- return custname;
- }
-
- /**
- * @param custname 客户名称 to set
- */
- public void setCustname(String custname){
- this.custname = custname;
- }
- /**
- * @return 监管公司id
- */
- public String getSupervisesid(){
- return supervisesid;
- }
-
- /**
- * @param supervisesid 监管公司id to set
- */
- public void setSupervisesid(String supervisesid){
- this.supervisesid = supervisesid;
- }
- /**
- * @return 用法说明：工单编号规则。
- */
- public String getOrderno(){
- return orderno;
- }
-
- /**
- * @param orderno 用法说明：工单编号规则。 to set
- */
- public void setOrderno(String orderno){
- this.orderno = orderno;
- }
- /**
- * @return 工单名称
- */
- public String getOrdername(){
- return ordername;
- }
-
- /**
- * @param ordername 工单名称 to set
- */
- public void setOrdername(String ordername){
- this.ordername = ordername;
- }
- /**
- * @return 描述：1-一般；2-重要； 3-紧急；4-督办。
- */
- public String getOrderdegree(){
- return orderdegree;
- }
-
- /**
- * @param orderdegree 描述：1-一般；2-重要； 3-紧急；4-督办。 to set
- */
- public void setOrderdegree(String orderdegree){
- this.orderdegree = orderdegree;
- }
- /**
- * @return 描述：1-计划巡视；
- */
- public Integer getOrdertype(){
- return ordertype;
- }
-
- /**
- * @param ordertype 描述：1-计划巡视； to set
- */
- public void setOrdertype(Integer ordertype){
- this.ordertype = ordertype;
- }
- /**
- * @return 工单内容
- */
- public String getOrdercontent(){
- return ordercontent;
- }
-
- /**
- * @param ordercontent 工单内容 to set
- */
- public void setOrdercontent(String ordercontent){
- this.ordercontent = ordercontent;
- }
- /**
- * @return 到达现场时间
- */
- public String getArrivetime(){
- return arrivetime;
- }
-
- /**
- * @param arrivetime 到达现场时间 to set
- */
- public void setArrivetime(String arrivetime){
- this.arrivetime = arrivetime;
- }
- /**
- * @return 完成时间
- */
- public String getPlanfinishtime(){
- return planfinishtime;
- }
-
- /**
- * @param planfinishtime 完成时间 to set
- */
- public void setPlanfinishtime(String planfinishtime){
- this.planfinishtime = planfinishtime;
- }
- /**
- * @return 处理情况
- */
- public String getOperationcontent(){
- return operationcontent;
- }
-
- /**
- * @param operationcontent 处理情况 to set
- */
- public void setOperationcontent(String operationcontent){
- this.operationcontent = operationcontent;
- }
- /**
- * @return 现场联系人
- */
- public String getReceiveperson(){
- return receiveperson;
- }
-
- /**
- * @param receiveperson 现场联系人 to set
- */
- public void setReceiveperson(String receiveperson){
- this.receiveperson = receiveperson;
- }
- /**
- * @return 现场联系人电话
- */
- public String getReceivetel(){
- return receivetel;
- }
-
- /**
- * @param receivetel 现场联系人电话 to set
- */
- public void setReceivetel(String receivetel){
- this.receivetel = receivetel;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoQuery.java
deleted file mode 100644
index 1ca2a49d..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoQuery.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo;
-
-
-import com.yxt.common.core.query.Query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchOrderinfoQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo.DispatchOrderinfoQuery
- * Description: 汇总工单数据 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-public class DispatchOrderinfoQuery implements Query {
-
-
- @ApiModelProperty("客户ID")
- private String custid; // 客户ID
-
- @ApiModelProperty("客户名称")
- private String custname; // 客户名称
-
- @ApiModelProperty("监管公司id")
- private String supervisesid; // 监管公司id
-
- @ApiModelProperty("用法说明：工单编号规则。")
- private String orderno; // 用法说明：工单编号规则。
-
- @ApiModelProperty("工单名称")
- private String ordername; // 工单名称
-
- @ApiModelProperty("描述：1-一般；2-重要； 3-紧急；4-督办。")
- private String orderdegree; // 描述：1-一般；2-重要； 3-紧急；4-督办。
-
- @ApiModelProperty("描述：1-计划巡视；")
- private Integer ordertype; // 描述：1-计划巡视；
-
- @ApiModelProperty("工单内容")
- private String ordercontent; // 工单内容
-
- @ApiModelProperty("到达现场时间")
- private String arrivetime; // 到达现场时间
-
- @ApiModelProperty("完成时间")
- private String planfinishtime; // 完成时间
-
- @ApiModelProperty("处理情况")
- private String operationcontent; // 处理情况
-
- @ApiModelProperty("现场联系人")
- private String receiveperson; // 现场联系人
-
- @ApiModelProperty("现场联系人电话")
- private String receivetel; // 现场联系人电话
-
-
- /**
- * @return 客户ID
- */
- public String getCustid(){
- return custid;
- }
-
- /**
- * @param custid 客户ID to set
- */
- public void setCustid(String custid){
- this.custid = custid;
- }
-
- /**
- * @return 客户名称
- */
- public String getCustname(){
- return custname;
- }
-
- /**
- * @param custname 客户名称 to set
- */
- public void setCustname(String custname){
- this.custname = custname;
- }
-
- /**
- * @return 监管公司id
- */
- public String getSupervisesid(){
- return supervisesid;
- }
-
- /**
- * @param supervisesid 监管公司id to set
- */
- public void setSupervisesid(String supervisesid){
- this.supervisesid = supervisesid;
- }
-
- /**
- * @return 用法说明：工单编号规则。
- */
- public String getOrderno(){
- return orderno;
- }
-
- /**
- * @param orderno 用法说明：工单编号规则。 to set
- */
- public void setOrderno(String orderno){
- this.orderno = orderno;
- }
-
- /**
- * @return 工单名称
- */
- public String getOrdername(){
- return ordername;
- }
-
- /**
- * @param ordername 工单名称 to set
- */
- public void setOrdername(String ordername){
- this.ordername = ordername;
- }
-
- /**
- * @return 描述：1-一般；2-重要； 3-紧急；4-督办。
- */
- public String getOrderdegree(){
- return orderdegree;
- }
-
- /**
- * @param orderdegree 描述：1-一般；2-重要； 3-紧急；4-督办。 to set
- */
- public void setOrderdegree(String orderdegree){
- this.orderdegree = orderdegree;
- }
-
- /**
- * @return 描述：1-计划巡视；
- */
- public Integer getOrdertype(){
- return ordertype;
- }
-
- /**
- * @param ordertype 描述：1-计划巡视； to set
- */
- public void setOrdertype(Integer ordertype){
- this.ordertype = ordertype;
- }
-
- /**
- * @return 工单内容
- */
- public String getOrdercontent(){
- return ordercontent;
- }
-
- /**
- * @param ordercontent 工单内容 to set
- */
- public void setOrdercontent(String ordercontent){
- this.ordercontent = ordercontent;
- }
-
- /**
- * @return 到达现场时间
- */
- public String getArrivetime(){
- return arrivetime;
- }
-
- /**
- * @param arrivetime 到达现场时间 to set
- */
- public void setArrivetime(String arrivetime){
- this.arrivetime = arrivetime;
- }
-
- /**
- * @return 完成时间
- */
- public String getPlanfinishtime(){
- return planfinishtime;
- }
-
- /**
- * @param planfinishtime 完成时间 to set
- */
- public void setPlanfinishtime(String planfinishtime){
- this.planfinishtime = planfinishtime;
- }
-
- /**
- * @return 处理情况
- */
- public String getOperationcontent(){
- return operationcontent;
- }
-
- /**
- * @param operationcontent 处理情况 to set
- */
- public void setOperationcontent(String operationcontent){
- this.operationcontent = operationcontent;
- }
-
- /**
- * @return 现场联系人
- */
- public String getReceiveperson(){
- return receiveperson;
- }
-
- /**
- * @param receiveperson 现场联系人 to set
- */
- public void setReceiveperson(String receiveperson){
- this.receiveperson = receiveperson;
- }
-
- /**
- * @return 现场联系人电话
- */
- public String getReceivetel(){
- return receivetel;
- }
-
- /**
- * @param receivetel 现场联系人电话 to set
- */
- public void setReceivetel(String receivetel){
- this.receivetel = receivetel;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
index 1d8a6728..08288e3a 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderinfo/DispatchOrderinfoService.java
@@ -28,6 +28,9 @@ package com.yxt.supervise.dispatchcenter.biz.dispatchorderinfo;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.supervise.dispatchcenter.api.dispatchorderstandards.DispatchOrderStandardsDto;
+import com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards.DispatchOrderStandardsService;
+import com.yxt.supervise.dispatchcenter.biz.dispatchworker.DispatchWorkerService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@@ -41,7 +44,9 @@ import com.yxt.supervise.dispatchcenter.api.dispatchorderinfo.DispatchOrderinfoD
import com.yxt.supervise.dispatchcenter.api.dispatchorderinfo.DispatchOrderinfoDto;
import com.yxt.supervise.dispatchcenter.api.dispatchorderinfo.DispatchOrderinfoFeign;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -60,10 +65,44 @@ import java.util.List;
*/
@Service
public class DispatchOrderinfoService extends MybatisBaseService {
+ @Autowired
+ private DispatchOrderStandardsService dispatchOrderStandardsService;
+ @Autowired
+ private DispatchWorkerService dispatchWorkerService;
private QueryWrapper createQueryWrapper(DispatchOrderinfoQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getCustid())) {
+ qw.eq("custid", query.getCustid());
+ }
+ if (StringUtils.isNotBlank(query.getCustname())) {
+ qw.like("custname", query.getCustname());
+ }
+ if (StringUtils.isNotBlank(query.getOrderno())) {
+ qw.like("orderno", query.getOrderno());
+ }
+ if (StringUtils.isNotBlank(query.getOrdername())) {
+ qw.like("ordername", query.getOrdername());
+ }
+ if (StringUtils.isNotBlank(query.getOrderdegree())) {
+ qw.eq("orderdegree", query.getOrderdegree());
+ }
+ if (StringUtils.isNotBlank(query.getOrdertype())) {
+ qw.eq("ordertype", query.getOrdertype());
+ }
+ if (StringUtils.isNotBlank(query.getArrivetimeStart())) {
+ qw.gt("arrivetime", query.getArrivetimeStart());
+ }
+ if (StringUtils.isNotBlank(query.getArrivetimeEnd())) {
+ qw.lt("arrivetime", query.getArrivetimeEnd());
+ }
+ if (StringUtils.isNotBlank(query.getPlanfinishtimeStart())) {
+ qw.gt("planfinishtime", query.getPlanfinishtimeStart());
+ }
+ if (StringUtils.isNotBlank(query.getPlanfinishtimeEnd())) {
+ qw.lt("planfinishtime", query.getPlanfinishtimeEnd());
+ }
return qw;
}
@@ -75,22 +114,29 @@ public class DispatchOrderinfoService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null);
return p;
}
-
+ @Transactional
public void saveOrUpdateDto(DispatchOrderinfoDto dto){
+ dispatchOrderStandardsService.deleteByOrderSid(dto.getSid());
+ dispatchWorkerService.deleteByOrderSid(dto.getSid());
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
+ return;
}
this.updateByDto(dto);
}
-
+ @Transactional
public void insertByDto(DispatchOrderinfoDto dto){
DispatchOrderinfo entity = new DispatchOrderinfo();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
+ DispatchOrderStandardsDto d=new DispatchOrderStandardsDto();
+ d.setOrdersid(entity.getSid());
+ d.setTemplatesid(dto.getTemplatesid());
+ dispatchOrderStandardsService.insertByDto(d);
+ dispatchWorkerService.insertByDto(dto.getWorkers(),entity.getSid());
}
-
+ @Transactional
public void updateByDto(DispatchOrderinfoDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
@@ -99,6 +145,11 @@ public class DispatchOrderinfoService extends MybatisBaseService
- * File: DispatchTemplateQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchtemplate.DispatchTemplateQuery
- * Description: 运维任务模板 查询条件.
+ * File: DispatchStandardsMapper.java
+ * Class: com.yxt.supervise.dispatchcenter.biz.dispatchstandards.DispatchStandardsMapper
+ * Description: (运维任务标准库).
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2023-05-28 10:30:03
@@ -44,58 +53,16 @@ import io.swagger.annotations.ApiModelProperty;
* @version 1.0
* @since 1.0
*/
-public class DispatchTemplateQuery implements Query {
+@Mapper
+public interface DispatchOrderStandardsMapper extends BaseMapper {
-
- @ApiModelProperty("模板名称")
- private String templatename; // 模板名称
-
- @ApiModelProperty("描述：2-计划检修；3-巡检任务；")
- private String ordertype; // 描述：2-计划检修；3-巡检任务；
-
- @ApiModelProperty("仓库类型（仓库、门店）")
- private String devtype; // 仓库类型（仓库、门店）
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
- /**
- * @return 模板名称
- */
- public String getTemplatename(){
- return templatename;
- }
-
- /**
- * @param templatename 模板名称 to set
- */
- public void setTemplatename(String templatename){
- this.templatename = templatename;
- }
-
- /**
- * @return 描述：2-计划检修；3-巡检任务；
- */
- public String getOrdertype(){
- return ordertype;
- }
-
- /**
- * @param ordertype 描述：2-计划检修；3-巡检任务； to set
- */
- public void setOrdertype(String ordertype){
- this.ordertype = ordertype;
- }
-
- /**
- * @return 仓库类型（仓库、门店）
- */
- public String getDevtype(){
- return devtype;
- }
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
- /**
- * @param devtype 仓库类型（仓库、门店） to set
- */
- public void setDevtype(String devtype){
- this.devtype = devtype;
- }
-}
+ @Select("select * from dispatch_order_standards")
+ List selectListVo();
+ @Delete("delete from dispatch_order_standards where ordersid=#{orderSid}")
+ void deleteByOrderSid(@Param("orderSid")String orderSid);
+}
\ 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/DispatchOrderStandardsMapper.xml b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsMapper.xml
new file mode 100644
index 00000000..85cfeb78
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ 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/DispatchOrderStandardsRest.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsRest.java
new file mode 100644
index 00000000..9c46fc7c
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsRest.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.dispatchcenter.api.dispatchorderstandards.*;
+import com.yxt.supervise.dispatchcenter.api.dispatchstandards.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: yxt_dispatchcenter(工单系统)
+ * File: DispatchStandardsFeignFallback.java
+ * Class: com.yxt.supervise.dispatchcenter.biz.dispatchstandards.DispatchStandardsRest
+ * Description: (运维任务标准库).
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-05-28 10:30:03
+ *
+ * @author djz
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "(运维任务标准库)")
+@RestController("com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards.DispatchOrderStandardsRest")
+@RequestMapping("v1/dispatchorderstandards")
+public class DispatchOrderStandardsRest implements DispatchOrderStandardsFeign {
+
+ @Autowired
+ private DispatchOrderStandardsService dispatchOrderStandardsService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = dispatchOrderStandardsService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody DispatchOrderStandardsDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ dispatchOrderStandardsService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ dispatchOrderStandardsService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ DispatchOrderStandardsDetailsVo vo = dispatchOrderStandardsService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
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
new file mode 100644
index 00000000..6f37ba12
--- /dev/null
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java
@@ -0,0 +1,137 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.dispatchcenter.api.dispatchorderstandards.*;
+import com.yxt.supervise.dispatchcenter.api.dispatchstandards.*;
+import com.yxt.supervise.dispatchcenter.biz.dispatchmodletemplate.DispatchModleTemplateService;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt_dispatchcenter(工单系统)
+ * File: DispatchOrderStandardsService.java
+ * Class: com.yxt.supervise.dispatchcenter.biz.dispatchorderstandards.DispatchOrderStandardsService
+ * Description: (运维任务标准库) 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-05-28 10:30:03
+ *
+ * @author djz
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class DispatchOrderStandardsService extends MybatisBaseService {
+ @Autowired
+ private DispatchModleTemplateService dispatchModleTemplateService;
+ private QueryWrapper createQueryWrapper(DispatchOrderStandardsQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getTaskdesc())) {
+ qw.like("taskdesc", query.getTaskdesc());
+ }
+
+ if (StringUtils.isNotBlank(query.getTaskname())) {
+ qw.like("taskname", query.getTaskname());
+ }
+ if (StringUtils.isNotBlank(query.getTaskreturn())) {
+ qw.eq("taskreturn", query.getTaskreturn());
+ }
+ if (StringUtils.isNotBlank(query.getTasktype())) {
+ qw.eq("tasktype", query.getTasktype());
+ }
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ DispatchOrderStandardsQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(DispatchOrderStandardsDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(DispatchOrderStandardsDto dto){
+ String templatesid = dto.getTemplatesid();
+ String ordersid = dto.getOrdersid();
+ List list=dispatchModleTemplateService.getStandardsByTemplateSid(templatesid);
+ list.forEach(l->{
+ DispatchOrderStandards entity = new DispatchOrderStandards();
+ entity.setOrdersid(ordersid);
+ entity.setTemplatesid(templatesid);
+ entity.setTaskdesc(l.getTaskdesc());
+ entity.setTaskname(l.getTaskname());
+ entity.setTasktype(l.getTasktype());
+ entity.setTaskreturn(l.getTaskreturn());
+ entity.setTasktypeparent(l.getTasktypeparent());
+ entity.setTasksid(l.getSid());
+ baseMapper.insert(entity);
+ });
+
+ }
+ public void deleteByOrderSid(String orderSid){
+ baseMapper.deleteByOrderSid(orderSid);
+ }
+ public void updateByDto(DispatchOrderStandardsDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ DispatchOrderStandards entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public DispatchOrderStandardsDetailsVo fetchDetailsVoBySid(String sid){
+ DispatchOrderStandards entity = fetchBySid(sid);
+ DispatchOrderStandardsDetailsVo vo = new DispatchOrderStandardsDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModle.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModle.java
deleted file mode 100644
index a6eb0b15..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolmodle/DispatchPatrolModle.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchpatrolmodle;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchPatrolModle.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchpatrolmodle.DispatchPatrolModle
- * Description: 巡视任务模型,工单和模型之间的关联关系.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "巡视任务模型,工单和模型之间的关联关系", description = "巡视任务模型,工单和模型之间的关联关系")
-@TableName("dispatch_patrol_modle")
-public class DispatchPatrolModle extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty("模型id")
- private String modleid; // 模型id
-
- @ApiModelProperty("工单id（与工单表一致）")
- private String orderid; // 工单id（与工单表一致）
-
- @ApiModelProperty("模型名称")
- private String modlename; // 模型名称
-
- /**
- * @return 模型id
- */
- public String getModleid(){
- return modleid;
- }
-
- /**
- * @param modleid 模型id to set
- */
- public void setModleid(String modleid){
- this.modleid = modleid;
- }
- /**
- * @return 工单id（与工单表一致）
- */
- public String getOrderid(){
- return orderid;
- }
-
- /**
- * @param orderid 工单id（与工单表一致） to set
- */
- public void setOrderid(String orderid){
- this.orderid = orderid;
- }
- /**
- * @return 模型名称
- */
- public String getModlename(){
- return modlename;
- }
-
- /**
- * @param modlename 模型名称 to set
- */
- public void setModlename(String modlename){
- this.modlename = modlename;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlan.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlan.java
deleted file mode 100644
index b47f4620..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlan.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchpatrolplan;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchPatrolPlan.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchpatrolplan.DispatchPatrolPlan
- * Description: (巡视计划包含客户信息、仓库等).
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "(巡视计划包含客户信息、仓库等)", description = "(巡视计划包含客户信息、仓库等)")
-@TableName("dispatch_patrol_plan")
-public class DispatchPatrolPlan extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty("计划名称")
- private String planname; // 计划名称
-
- @ApiModelProperty("客户标识")
- private String custid; // 客户标识
-
- @ApiModelProperty("监管公司id")
- private String supervisesid; // 监管公司id
-
- @ApiModelProperty("1计划巡视、2专项巡视")
- private String patroltype; // 1计划巡视、2专项巡视
-
- @ApiModelProperty("计划开始日期")
- private String startdate; // 计划开始日期
-
- @ApiModelProperty("计划结束日期")
- private String enddate; // 计划结束日期
-
- @ApiModelProperty("用户联系人")
- private String contactperson; // 用户联系人
-
- @ApiModelProperty("用户联系人电话")
- private String contactphone; // 用户联系人电话
-
- @ApiModelProperty("计划编号")
- private String planno; // 计划编号
-
- @ApiModelProperty("模板id")
- private String templateid; // 模板id
-
- @ApiModelProperty("周期类型(固定间隔周期)")
- private String cycletype; // 周期类型(固定间隔周期)
-
- @ApiModelProperty("巡检周期")
- private String cycle; // 巡检周期
-
- @ApiModelProperty("周期值")
- private String cyclevalue; // 周期值
-
- /**
- * @return 计划名称
- */
- public String getPlanname(){
- return planname;
- }
-
- /**
- * @param planname 计划名称 to set
- */
- public void setPlanname(String planname){
- this.planname = planname;
- }
- /**
- * @return 客户标识
- */
- public String getCustid(){
- return custid;
- }
-
- /**
- * @param custid 客户标识 to set
- */
- public void setCustid(String custid){
- this.custid = custid;
- }
- /**
- * @return 监管公司id
- */
- public String getSupervisesid(){
- return supervisesid;
- }
-
- /**
- * @param supervisesid 监管公司id to set
- */
- public void setSupervisesid(String supervisesid){
- this.supervisesid = supervisesid;
- }
- /**
- * @return 1计划巡视、2专项巡视
- */
- public String getPatroltype(){
- return patroltype;
- }
-
- /**
- * @param patroltype 1计划巡视、2专项巡视 to set
- */
- public void setPatroltype(String patroltype){
- this.patroltype = patroltype;
- }
- /**
- * @return 计划开始日期
- */
- public String getStartdate(){
- return startdate;
- }
-
- /**
- * @param startdate 计划开始日期 to set
- */
- public void setStartdate(String startdate){
- this.startdate = startdate;
- }
- /**
- * @return 计划结束日期
- */
- public String getEnddate(){
- return enddate;
- }
-
- /**
- * @param enddate 计划结束日期 to set
- */
- public void setEnddate(String enddate){
- this.enddate = enddate;
- }
- /**
- * @return 用户联系人
- */
- public String getContactperson(){
- return contactperson;
- }
-
- /**
- * @param contactperson 用户联系人 to set
- */
- public void setContactperson(String contactperson){
- this.contactperson = contactperson;
- }
- /**
- * @return 用户联系人电话
- */
- public String getContactphone(){
- return contactphone;
- }
-
- /**
- * @param contactphone 用户联系人电话 to set
- */
- public void setContactphone(String contactphone){
- this.contactphone = contactphone;
- }
- /**
- * @return 计划编号
- */
- public String getPlanno(){
- return planno;
- }
-
- /**
- * @param planno 计划编号 to set
- */
- public void setPlanno(String planno){
- this.planno = planno;
- }
- /**
- * @return 模板id
- */
- public String getTemplateid(){
- return templateid;
- }
-
- /**
- * @param templateid 模板id to set
- */
- public void setTemplateid(String templateid){
- this.templateid = templateid;
- }
- /**
- * @return 周期类型(固定间隔周期)
- */
- public String getCycletype(){
- return cycletype;
- }
-
- /**
- * @param cycletype 周期类型(固定间隔周期) to set
- */
- public void setCycletype(String cycletype){
- this.cycletype = cycletype;
- }
- /**
- * @return 巡检周期
- */
- public String getCycle(){
- return cycle;
- }
-
- /**
- * @param cycle 巡检周期 to set
- */
- public void setCycle(String cycle){
- this.cycle = cycle;
- }
- /**
- * @return 周期值
- */
- public String getCyclevalue(){
- return cyclevalue;
- }
-
- /**
- * @param cyclevalue 周期值 to set
- */
- public void setCyclevalue(String cyclevalue){
- this.cyclevalue = cyclevalue;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanQuery.java
deleted file mode 100644
index cad6e7f2..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanQuery.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchpatrolplan;
-
-
-import com.yxt.common.core.query.Query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchPatrolPlanQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchpatrolplan.DispatchPatrolPlanQuery
- * Description: (巡视计划包含客户信息、仓库等) 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-public class DispatchPatrolPlanQuery implements Query {
-
-
- @ApiModelProperty("计划名称")
- private String planname; // 计划名称
-
- @ApiModelProperty("客户标识")
- private String custid; // 客户标识
-
- @ApiModelProperty("监管公司id")
- private String supervisesid; // 监管公司id
-
- @ApiModelProperty("1计划巡视、2专项巡视")
- private String patroltype; // 1计划巡视、2专项巡视
-
- @ApiModelProperty("计划开始日期")
- private String startdate; // 计划开始日期
-
- @ApiModelProperty("计划结束日期")
- private String enddate; // 计划结束日期
-
- @ApiModelProperty("用户联系人")
- private String contactperson; // 用户联系人
-
- @ApiModelProperty("用户联系人电话")
- private String contactphone; // 用户联系人电话
-
- @ApiModelProperty("计划编号")
- private String planno; // 计划编号
-
- @ApiModelProperty("模板id")
- private String templateid; // 模板id
-
- @ApiModelProperty("周期类型(固定间隔周期)")
- private String cycletype; // 周期类型(固定间隔周期)
-
- @ApiModelProperty("巡检周期")
- private String cycle; // 巡检周期
-
- @ApiModelProperty("周期值")
- private String cyclevalue; // 周期值
-
-
- /**
- * @return 计划名称
- */
- public String getPlanname(){
- return planname;
- }
-
- /**
- * @param planname 计划名称 to set
- */
- public void setPlanname(String planname){
- this.planname = planname;
- }
-
- /**
- * @return 客户标识
- */
- public String getCustid(){
- return custid;
- }
-
- /**
- * @param custid 客户标识 to set
- */
- public void setCustid(String custid){
- this.custid = custid;
- }
-
- /**
- * @return 监管公司id
- */
- public String getSupervisesid(){
- return supervisesid;
- }
-
- /**
- * @param supervisesid 监管公司id to set
- */
- public void setSupervisesid(String supervisesid){
- this.supervisesid = supervisesid;
- }
-
- /**
- * @return 1计划巡视、2专项巡视
- */
- public String getPatroltype(){
- return patroltype;
- }
-
- /**
- * @param patroltype 1计划巡视、2专项巡视 to set
- */
- public void setPatroltype(String patroltype){
- this.patroltype = patroltype;
- }
-
- /**
- * @return 计划开始日期
- */
- public String getStartdate(){
- return startdate;
- }
-
- /**
- * @param startdate 计划开始日期 to set
- */
- public void setStartdate(String startdate){
- this.startdate = startdate;
- }
-
- /**
- * @return 计划结束日期
- */
- public String getEnddate(){
- return enddate;
- }
-
- /**
- * @param enddate 计划结束日期 to set
- */
- public void setEnddate(String enddate){
- this.enddate = enddate;
- }
-
- /**
- * @return 用户联系人
- */
- public String getContactperson(){
- return contactperson;
- }
-
- /**
- * @param contactperson 用户联系人 to set
- */
- public void setContactperson(String contactperson){
- this.contactperson = contactperson;
- }
-
- /**
- * @return 用户联系人电话
- */
- public String getContactphone(){
- return contactphone;
- }
-
- /**
- * @param contactphone 用户联系人电话 to set
- */
- public void setContactphone(String contactphone){
- this.contactphone = contactphone;
- }
-
- /**
- * @return 计划编号
- */
- public String getPlanno(){
- return planno;
- }
-
- /**
- * @param planno 计划编号 to set
- */
- public void setPlanno(String planno){
- this.planno = planno;
- }
-
- /**
- * @return 模板id
- */
- public String getTemplateid(){
- return templateid;
- }
-
- /**
- * @param templateid 模板id to set
- */
- public void setTemplateid(String templateid){
- this.templateid = templateid;
- }
-
- /**
- * @return 周期类型(固定间隔周期)
- */
- public String getCycletype(){
- return cycletype;
- }
-
- /**
- * @param cycletype 周期类型(固定间隔周期) to set
- */
- public void setCycletype(String cycletype){
- this.cycletype = cycletype;
- }
-
- /**
- * @return 巡检周期
- */
- public String getCycle(){
- return cycle;
- }
-
- /**
- * @param cycle 巡检周期 to set
- */
- public void setCycle(String cycle){
- this.cycle = cycle;
- }
-
- /**
- * @return 周期值
- */
- public String getCyclevalue(){
- return cyclevalue;
- }
-
- /**
- * @param cyclevalue 周期值 to set
- */
- public void setCyclevalue(String cyclevalue){
- this.cyclevalue = cyclevalue;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java
index 3f160077..99a81f65 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchpatrolplan/DispatchPatrolPlanService.java
@@ -64,6 +64,16 @@ public class DispatchPatrolPlanService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getPlanname())) {
+ qw.like("planname", query.getPlanname());
+ }
+ if (StringUtils.isNotBlank(query.getCustid())) {
+ qw.like("custid", query.getCustid());
+ }
+ if (StringUtils.isNotBlank(query.getPlanno())) {
+ qw.like("planno", query.getPlanno());
+ }
+
return qw;
}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
index cdc21f83..1853b0e9 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchstandards/DispatchStandardsService.java
@@ -64,6 +64,19 @@ public class DispatchStandardsService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper qw = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(query.getTaskdesc())) {
+ qw.like("taskdesc", query.getTaskdesc());
+ }
+
+ if (StringUtils.isNotBlank(query.getTaskname())) {
+ qw.like("taskname", query.getTaskname());
+ }
+ if (StringUtils.isNotBlank(query.getTaskreturn())) {
+ qw.eq("taskreturn", query.getTaskreturn());
+ }
+ if (StringUtils.isNotBlank(query.getTasktype())) {
+ qw.eq("tasktype", query.getTasktype());
+ }
return qw;
}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplate.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplate.java
deleted file mode 100644
index 2c6e6b13..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchtemplate/DispatchTemplate.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchtemplate;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchTemplate.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchtemplate.DispatchTemplate
- * Description: 运维任务模板.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "运维任务模板", description = "运维任务模板")
-@TableName("dispatch_template")
-public class DispatchTemplate extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty("模板名称")
- private String templatename; // 模板名称
-
- @ApiModelProperty("描述：2-计划检修；3-巡检任务；")
- private String ordertype; // 描述：2-计划检修；3-巡检任务；
-
- @ApiModelProperty("仓库类型（仓库、门店）")
- private String devtype; // 仓库类型（仓库、门店）
-
- /**
- * @return 模板名称
- */
- public String getTemplatename(){
- return templatename;
- }
-
- /**
- * @param templatename 模板名称 to set
- */
- public void setTemplatename(String templatename){
- this.templatename = templatename;
- }
- /**
- * @return 描述：2-计划检修；3-巡检任务；
- */
- public String getOrdertype(){
- return ordertype;
- }
-
- /**
- * @param ordertype 描述：2-计划检修；3-巡检任务； to set
- */
- public void setOrdertype(String ordertype){
- this.ordertype = ordertype;
- }
- /**
- * @return 仓库类型（仓库、门店）
- */
- public String getDevtype(){
- return devtype;
- }
-
- /**
- * @param devtype 仓库类型（仓库、门店） to set
- */
- public void setDevtype(String devtype){
- this.devtype = devtype;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorker.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorker.java
deleted file mode 100644
index c0bb2694..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorker.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchworker;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchWorker.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchworker.DispatchWorker
- * Description: 工单运维人员情况.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-@ApiModel(value = "工单运维人员情况", description = "工单运维人员情况")
-@TableName("dispatch_worker")
-public class DispatchWorker extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
-
- @ApiModelProperty("工单id")
- private String orderid; // 工单id
-
- @ApiModelProperty("巡视人名称")
- private String principalname; // 巡视人名称
-
- @ApiModelProperty("巡视人sid")
- private String principalsid; // 巡视人sid
-
- @ApiModelProperty("联系方式")
- private String principalcontact; // 联系方式
-
- @ApiModelProperty("是否负责人")
- private String executorname; // 是否负责人
-
- @ApiModelProperty("班组组织。")
- private String workteam; // 班组组织。
-
- @ApiModelProperty("响应状态（接受、拒绝）")
- private Integer assignstate; // 响应状态（接受、拒绝）
-
- @ApiModelProperty("响应时间（接受、拒绝）")
- private String assigntime; // 响应时间（接受、拒绝）
-
- /**
- * @return 工单id
- */
- public String getOrderid(){
- return orderid;
- }
-
- /**
- * @param orderid 工单id to set
- */
- public void setOrderid(String orderid){
- this.orderid = orderid;
- }
- /**
- * @return 巡视人名称
- */
- public String getPrincipalname(){
- return principalname;
- }
-
- /**
- * @param principalname 巡视人名称 to set
- */
- public void setPrincipalname(String principalname){
- this.principalname = principalname;
- }
- /**
- * @return 巡视人sid
- */
- public String getPrincipalsid(){
- return principalsid;
- }
-
- /**
- * @param principalsid 巡视人sid to set
- */
- public void setPrincipalsid(String principalsid){
- this.principalsid = principalsid;
- }
- /**
- * @return 联系方式
- */
- public String getPrincipalcontact(){
- return principalcontact;
- }
-
- /**
- * @param principalcontact 联系方式 to set
- */
- public void setPrincipalcontact(String principalcontact){
- this.principalcontact = principalcontact;
- }
- /**
- * @return 是否负责人
- */
- public String getExecutorname(){
- return executorname;
- }
-
- /**
- * @param executorname 是否负责人 to set
- */
- public void setExecutorname(String executorname){
- this.executorname = executorname;
- }
- /**
- * @return 班组组织。
- */
- public String getWorkteam(){
- return workteam;
- }
-
- /**
- * @param workteam 班组组织。 to set
- */
- public void setWorkteam(String workteam){
- this.workteam = workteam;
- }
- /**
- * @return 响应状态（接受、拒绝）
- */
- public Integer getAssignstate(){
- return assignstate;
- }
-
- /**
- * @param assignstate 响应状态（接受、拒绝） to set
- */
- public void setAssignstate(Integer assignstate){
- this.assignstate = assignstate;
- }
- /**
- * @return 响应时间（接受、拒绝）
- */
- public String getAssigntime(){
- return assigntime;
- }
-
- /**
- * @param assigntime 响应时间（接受、拒绝） to set
- */
- public void setAssigntime(String assigntime){
- this.assigntime = assigntime;
- }
-}
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerMapper.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerMapper.java
index 7ee512b1..bbec5836 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerMapper.java
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerMapper.java
@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -62,4 +63,6 @@ public interface DispatchWorkerMapper extends BaseMapper {
@Select("select * from dispatch_worker")
List selectListVo();
+ @Delete("delete from dispatch_worker where orderid=#{orderSid}")
+ void deleteByOrderSid(@Param("orderSid") String orderSid);
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerQuery.java
deleted file mode 100644
index 59a05ff9..00000000
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchworker/DispatchWorkerQuery.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*********************************************************
- *********************************************************
- ******************** *******************
- ************* ************
- ******* _oo0oo_ *******
- *** o8888888o ***
- * 88" . "88 *
- * (| -_- |) *
- * 0\ = /0 *
- * ___/`---'\___ *
- * .' \\| |// '. *
- * / \\||| : |||// \ *
- * / _||||| -:- |||||- \ *
- * | | \\\ - /// | | *
- * | \_| ''\---/'' |_/ | *
- * \ .-\__ '-' ___/-. / *
- * ___'. .' /--.--\ `. .'___ *
- * ."" '< `.___\_<|>_/___.' >' "". *
- * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
- * \ \ `_. \_ __\ /__ _/ .-` / / *
- * =====`-.____`.___ \_____/___.-`___.-'===== *
- * `=---=' *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
- *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
- *********************************************************/
-package com.yxt.supervise.dispatchcenter.biz.dispatchworker;
-
-
-import com.yxt.common.core.query.Query;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * Project: yxt_dispatchcenter(工单系统)
- * File: DispatchWorkerQuery.java
- * Class: com.yxt.supervise.dispatchcenter.biz.dispatchworker.DispatchWorkerQuery
- * Description: 工单运维人员情况 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2023-05-28 10:30:03
- *
- * @author djz
- * @version 1.0
- * @since 1.0
- */
-public class DispatchWorkerQuery implements Query {
-
-
- @ApiModelProperty("工单id")
- private String orderid; // 工单id
-
- @ApiModelProperty("巡视人名称")
- private String principalname; // 巡视人名称
-
- @ApiModelProperty("巡视人sid")
- private String principalsid; // 巡视人sid
-
- @ApiModelProperty("联系方式")
- private String principalcontact; // 联系方式
-
- @ApiModelProperty("是否负责人")
- private String executorname; // 是否负责人
-
- @ApiModelProperty("班组组织。")
- private String workteam; // 班组组织。
-
- @ApiModelProperty("响应状态（接受、拒绝）")
- private Integer assignstate; // 响应状态（接受、拒绝）
-
- @ApiModelProperty("响应时间（接受、拒绝）")
- private String assigntime; // 响应时间（接受、拒绝）
-
-
- /**
- * @return 工单id
- */
- public String getOrderid(){
- return orderid;
- }
-
- /**
- * @param orderid 工单id to set
- */
- public void setOrderid(String orderid){
- this.orderid = orderid;
- }
-
- /**
- * @return 巡视人名称
- */
- public String getPrincipalname(){
- return principalname;
- }
-
- /**
- * @param principalname 巡视人名称 to set
- */
- public void setPrincipalname(String principalname){
- this.principalname = principalname;
- }
-
- /**
- * @return 巡视人sid
- */
- public String getPrincipalsid(){
- return principalsid;
- }
-
- /**
- * @param principalsid 巡视人sid to set
- */
- public void setPrincipalsid(String principalsid){
- this.principalsid = principalsid;
- }
-
- /**
- * @return 联系方式
- */
- public String getPrincipalcontact(){
- return principalcontact;
- }
-
- /**
- * @param principalcontact 联系方式 to set
- */
- public void setPrincipalcontact(String principalcontact){
- this.principalcontact = principalcontact;
- }
-
- /**
- * @return 是否负责人
- */
- public String getExecutorname(){
- return executorname;
- }
-
- /**
- * @param executorname 是否负责人 to set
- */
- public void setExecutorname(String executorname){
- this.executorname = executorname;
- }
-
- /**
- * @return 班组组织。
- */
- public String getWorkteam(){
- return workteam;
- }
-
- /**
- * @param workteam 班组组织。 to set
- */
- public void setWorkteam(String workteam){
- this.workteam = workteam;
- }
-
- /**
- * @return 响应状态（接受、拒绝）
- */
- public Integer getAssignstate(){
- return assignstate;
- }
-
- /**
- * @param assignstate 响应状态（接受、拒绝） to set
- */
- public void setAssignstate(Integer assignstate){
- this.assignstate = assignstate;
- }
-
- /**
- * @return 响应时间（接受、拒绝）
- */
- public String getAssigntime(){
- return assigntime;
- }
-
- /**
- * @param assigntime 响应时间（接受、拒绝） to set
- */
- public void setAssigntime(String assigntime){
- this.assigntime = assigntime;
- }
-}
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 9a09aba9..9d8596bd 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
@@ -84,22 +84,35 @@ public class DispatchWorkerService extends MybatisBaseService workers,String orderSid){
+ workers.forEach(w->{
+ DispatchWorker entity = new DispatchWorker();
+ BeanUtil.copyProperties(w, entity, "id", "sid");
+ entity.setOrderid(orderSid);
+ baseMapper.insert(entity);
+ });
+
+ }
+
public void updateByDto(DispatchWorkerDto dto){
- String dtoSid = dto.getSid();
- if (StringUtils.isBlank(dtoSid)) {
- return;
- }
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
DispatchWorker entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
+
+ public void deleteByOrderSid(String orderSid){
+ baseMapper.deleteByOrderSid(orderSid);
+ }
public DispatchWorkerDetailsVo fetchDetailsVoBySid(String sid){
DispatchWorker entity = fetchBySid(sid);