diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java index 376c060a..56a7380e 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfo.java @@ -49,7 +49,6 @@ import lombok.Data; @TableName("dispatch_orderinfo") public class DispatchOrderinfo extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("客户ID") private String custid; // 客户ID @ApiModelProperty("客户名称") @@ -76,5 +75,10 @@ public class DispatchOrderinfo extends BaseEntity { private String receiveperson; // 现场联系人 @ApiModelProperty("现场联系人电话") private String receivetel; // 现场联系人电话 - + @ApiModelProperty("描述(数据字典):1-一般;2-重要; 3-紧急;4-督办。key") + private String orderdegreekey; + @ApiModelProperty("描述(数据字典):1-计划巡视,专项巡视、告警巡视;key") + private String ordertypekey; + @ApiModelProperty("告警信息的id") + private String alarmid; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java index 07dca52c..14a8d270 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDetailsVo.java @@ -77,5 +77,8 @@ public class DispatchOrderinfoDetailsVo implements Vo { private String receiveperson; // 现场联系人 @ApiModelProperty("现场联系人电话") private String receivetel; // 现场联系人电话 - + @ApiModelProperty("描述(数据字典):1-一般;2-重要; 3-紧急;4-督办。key") + private String orderdegreekey; + @ApiModelProperty("描述(数据字典):1-计划巡视,专项巡视、告警巡视;key") + private String ordertypekey; } \ 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/DispatchOrderinfoDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoDto.java index 98a4b971..a43ccbd9 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 @@ -82,6 +82,12 @@ public class DispatchOrderinfoDto implements Dto { private String receivetel; // 现场联系人电话 @ApiModelProperty("模板sid") private String templatesid; // templatesid + @ApiModelProperty("描述(数据字典):1-一般;2-重要; 3-紧急;4-督办。key") + private String orderdegreekey; + @ApiModelProperty("描述(数据字典):1-计划巡视,专项巡视、告警巡视;key") + private String ordertypekey; + @ApiModelProperty("告警信息的id") + private String alarmid; @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 e1f6ebde..7f4f9d38 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 @@ -83,5 +83,8 @@ public class DispatchOrderinfoQuery implements Query { private String receiveperson; // 现场联系人 @ApiModelProperty("现场联系人电话") private String receivetel; // 现场联系人电话 - + @ApiModelProperty("描述(数据字典):1-一般;2-重要; 3-紧急;4-督办。key") + private String orderdegreekey; + @ApiModelProperty("描述(数据字典):1-计划巡视,专项巡视、告警巡视;key") + private String ordertypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java index b3ada416..ce2b841a 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderinfo/DispatchOrderinfoVo.java @@ -77,5 +77,8 @@ public class DispatchOrderinfoVo implements Vo { private String receiveperson; // 现场联系人 @ApiModelProperty("现场联系人电话") private String receivetel; // 现场联系人电话 - + @ApiModelProperty("描述(数据字典):1-一般;2-重要; 3-紧急;4-督办。key") + private String orderdegreekey; + @ApiModelProperty("描述(数据字典):1-计划巡视,专项巡视、告警巡视;key") + private String ordertypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java index 738ac1e4..0c2df525 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandards.java @@ -52,12 +52,16 @@ public class DispatchOrderStandards extends BaseEntity { @ApiModelProperty("任务项名称") private String taskname; // 任务项名称 - @ApiModelProperty("任务项分类") + @ApiModelProperty("任务项分类(数据字典)value") private String tasktype; // 任务项分类 + @ApiModelProperty("任务项分类(数据字典)key") + private String tasktypekey; @ApiModelProperty("任务描述") private String taskdesc; // 任务描述 - @ApiModelProperty("反馈形式(1选项 2图片 3文字)") + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)value") private String taskreturn; // 反馈形式(1选项 2图片 3文字) + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)key") + private String taskreturnkey; @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ @ApiModelProperty("订单id") 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 index 1b406f73..9b49445b 100644 --- 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 @@ -68,4 +68,8 @@ public class DispatchOrderStandardsDetailsVo implements Vo { private String templatesid; @ApiModelProperty("标准任务id") private String tasksid; + @ApiModelProperty("任务项分类(数据字典)key") + private String tasktypekey; + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)key") + private String taskreturnkey; } \ 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/DispatchOrderStandardsDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java index 32a0f364..bec7144c 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsDto.java @@ -68,4 +68,8 @@ public class DispatchOrderStandardsDto implements Dto { private String templatesid; @ApiModelProperty("标准任务id") private String tasksid; + @ApiModelProperty("任务项分类(数据字典)key") + private String tasktypekey; + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)key") + private String taskreturnkey; } \ 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/DispatchOrderStandardsQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java index 52e97c3b..bd447349 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsQuery.java @@ -66,4 +66,8 @@ public class DispatchOrderStandardsQuery implements Query { private String templatesid; @ApiModelProperty("标准任务id") private String tasksid; + @ApiModelProperty("任务项分类(数据字典)key") + private String tasktypekey; + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)key") + private String taskreturnkey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java index 70a2c862..643fb65f 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchorderstandards/DispatchOrderStandardsVo.java @@ -68,4 +68,8 @@ public class DispatchOrderStandardsVo implements Vo { private String templatesid; @ApiModelProperty("标准任务id") private String tasksid; + @ApiModelProperty("任务项分类(数据字典)key") + private String tasktypekey; + @ApiModelProperty("反馈形式(数据字典1选项 2图片 3文字)key") + private String taskreturnkey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlan.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlan.java index a9dda18c..9e5d3e66 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlan.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlan.java @@ -76,5 +76,8 @@ public class DispatchPatrolPlan extends BaseEntity { private String cycle; // 巡检周期 @ApiModelProperty("周期值") private String cyclevalue; // 周期值 - + @ApiModelProperty("1计划巡视、2专项巡视 key") + private String patroltypekey; + @ApiModelProperty("周期类型(固定间隔周期)日、月 key") + private String cycletypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDetailsVo.java index a404f593..4dfae839 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDetailsVo.java @@ -77,5 +77,9 @@ public class DispatchPatrolPlanDetailsVo implements Vo { private String cycle; // 巡检周期 @ApiModelProperty("周期值") private String cyclevalue; // 周期值 + @ApiModelProperty("1计划巡视、2专项巡视 key") + private String patroltypekey; + @ApiModelProperty("周期类型(固定间隔周期)日、月 key") + private String cycletypekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDto.java index 021177a1..7934747a 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanDto.java @@ -77,5 +77,8 @@ public class DispatchPatrolPlanDto implements Dto { private String cycle; // 巡检周期 @ApiModelProperty("周期值") private String cyclevalue; // 周期值 - + @ApiModelProperty("1计划巡视、2专项巡视 key") + private String patroltypekey; + @ApiModelProperty("周期类型(固定间隔周期)日、月 key") + private String cycletypekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanQuery.java index 6610acf0..456c8dae 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanQuery.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanQuery.java @@ -75,5 +75,8 @@ public class DispatchPatrolPlanQuery implements Query { private String cycle; // 巡检周期 @ApiModelProperty("周期值") private String cyclevalue; // 周期值 - + @ApiModelProperty("1计划巡视、2专项巡视 key") + private String patroltypekey; + @ApiModelProperty("周期类型(固定间隔周期)日、月 key") + private String cycletypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanVo.java index d0ac596f..7f81868d 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchpatrolplan/DispatchPatrolPlanVo.java @@ -77,5 +77,8 @@ public class DispatchPatrolPlanVo implements Vo { private String cycle; // 巡检周期 @ApiModelProperty("周期值") private String cyclevalue; // 周期值 - + @ApiModelProperty("1计划巡视、2专项巡视 key") + private String patroltypekey; + @ApiModelProperty("周期类型(固定间隔周期)日、月 key") + private String cycletypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandards.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandards.java index b6469f22..eafedc09 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandards.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandards.java @@ -60,5 +60,8 @@ public class DispatchStandards extends BaseEntity { private String taskreturn; // 反馈形式(1选项 2图片 3文字) @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ - + @ApiModelProperty("任务项分类key") + private String tasktypekey; + @ApiModelProperty("反馈形式(1选项 2图片 3文字)key") + private String taskreturnkey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDetailsVo.java index 281f2721..735dc7d4 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDetailsVo.java @@ -61,5 +61,8 @@ public class DispatchStandardsDetailsVo implements Vo { private String taskreturn; // 反馈形式(1选项 2图片 3文字) @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ - + @ApiModelProperty("任务项分类key") + private String tasktypekey; + @ApiModelProperty("反馈形式(1选项 2图片 3文字)key") + private String taskreturnkey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDto.java index 85674a3d..5b32236a 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsDto.java @@ -61,5 +61,8 @@ public class DispatchStandardsDto implements Dto { private String taskreturn; // 反馈形式(1选项 2图片 3文字) @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ - + @ApiModelProperty("任务项分类key") + private String tasktypekey; + @ApiModelProperty("反馈形式(1选项 2图片 3文字)key") + private String taskreturnkey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java index be4a77e3..8b009b9a 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsQuery.java @@ -59,5 +59,8 @@ public class DispatchStandardsQuery implements Query { private String taskreturn; // 反馈形式(1选项 2图片 3文字) @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ - + @ApiModelProperty("任务项分类key") + private String tasktypekey; + @ApiModelProperty("反馈形式(1选项 2图片 3文字)key") + private String taskreturnkey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java index ce00cc5d..325b5bf0 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchstandards/DispatchStandardsVo.java @@ -61,5 +61,8 @@ public class DispatchStandardsVo implements Vo { private String taskreturn; // 反馈形式(1选项 2图片 3文字) @ApiModelProperty("任务项父级分类+") private String tasktypeparent; // 任务项父级分类+ - + @ApiModelProperty("任务项分类key") + private String tasktypekey; + @ApiModelProperty("反馈形式(1选项 2图片 3文字)key") + private String taskreturnkey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplate.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplate.java index 1e583483..48d325b8 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplate.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplate.java @@ -56,5 +56,8 @@ public class DispatchTemplate extends BaseEntity { private String ordertype; // 描述:2-计划检修;3-巡检任务; @ApiModelProperty("仓库类型(仓库、门店)") private String devtype; // 仓库类型(仓库、门店) - + @ApiModelProperty("描述:2-计划检修;3-巡检任务;key") + private String ordertypekey; + @ApiModelProperty("巡视对象类型(仓库、门店)key") + private String devtypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDetailsVo.java index c5d30ed3..f2b1b788 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDetailsVo.java @@ -57,5 +57,8 @@ public class DispatchTemplateDetailsVo implements Vo { private String ordertype; // 描述:2-计划检修;3-巡检任务; @ApiModelProperty("仓库类型(仓库、门店)") private String devtype; // 仓库类型(仓库、门店) - + @ApiModelProperty("描述:2-计划检修;3-巡检任务;key") + private String ordertypekey; + @ApiModelProperty("巡视对象类型(仓库、门店)key") + private String devtypekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDto.java index daec1990..5a097961 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateDto.java @@ -57,5 +57,8 @@ public class DispatchTemplateDto implements Dto { private String ordertype; // 描述:2-计划检修;3-巡检任务; @ApiModelProperty("仓库类型(仓库、门店)") private String devtype; // 仓库类型(仓库、门店) - + @ApiModelProperty("描述:2-计划检修;3-巡检任务;key") + private String ordertypekey; + @ApiModelProperty("巡视对象类型(仓库、门店)key") + private String devtypekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateQuery.java index 7391f99f..19199227 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateQuery.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateQuery.java @@ -55,5 +55,8 @@ public class DispatchTemplateQuery implements Query { private String ordertype; // 描述:2-计划检修;3-巡检任务; @ApiModelProperty("仓库类型(仓库、门店)") private String devtype; // 仓库类型(仓库、门店) - + @ApiModelProperty("描述:2-计划检修;3-巡检任务;key") + private String ordertypekey; + @ApiModelProperty("巡视对象类型(仓库、门店)key") + private String devtypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateVo.java index e607d65c..ad8d9046 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchtemplate/DispatchTemplateVo.java @@ -57,5 +57,8 @@ public class DispatchTemplateVo implements Vo { private String ordertype; // 描述:2-计划检修;3-巡检任务; @ApiModelProperty("仓库类型(仓库、门店)") private String devtype; // 仓库类型(仓库、门店) - + @ApiModelProperty("描述:2-计划检修;3-巡检任务;key") + private String ordertypekey; + @ApiModelProperty("巡视对象类型(仓库、门店)key") + private String devtypekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorker.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorker.java index 8df3364f..12fe7aa8 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorker.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorker.java @@ -62,9 +62,14 @@ public class DispatchWorker extends BaseEntity { private String executorname; // 是否负责人 @ApiModelProperty("班组组织。") private String workteam; // 班组组织。 + @ApiModelProperty("班组组织。id") + private String workteamid; @ApiModelProperty("响应状态(接受、拒绝)") private Integer assignstate; // 响应状态(接受、拒绝) @ApiModelProperty("响应时间(接受、拒绝)") private String assigntime; // 响应时间(接受、拒绝) - + @ApiModelProperty("是否负责人key") + private String executornamekey; + @ApiModelProperty("响应状态(接受、拒绝)key") + private String assignstatekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDetailsVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDetailsVo.java index 47621819..da3dd1e7 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDetailsVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDetailsVo.java @@ -63,9 +63,14 @@ public class DispatchWorkerDetailsVo implements Vo { private String executorname; // 是否负责人 @ApiModelProperty("班组组织。") private String workteam; // 班组组织。 + @ApiModelProperty("班组组织。id") + private String workteamid; @ApiModelProperty("响应状态(接受、拒绝)") private Integer assignstate; // 响应状态(接受、拒绝) @ApiModelProperty("响应时间(接受、拒绝)") private String assigntime; // 响应时间(接受、拒绝) - + @ApiModelProperty("是否负责人key") + private String executornamekey; + @ApiModelProperty("响应状态(接受、拒绝)key") + private String assignstatekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDto.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDto.java index 964306ee..7f932d60 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDto.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerDto.java @@ -63,9 +63,14 @@ public class DispatchWorkerDto implements Dto { private String executorname; // 是否负责人 @ApiModelProperty("班组组织。") private String workteam; // 班组组织。 + @ApiModelProperty("班组组织。id") + private String workteamid; @ApiModelProperty("响应状态(接受、拒绝)") private Integer assignstate; // 响应状态(接受、拒绝) @ApiModelProperty("响应时间(接受、拒绝)") private String assigntime; // 响应时间(接受、拒绝) - + @ApiModelProperty("是否负责人key") + private String executornamekey; + @ApiModelProperty("响应状态(接受、拒绝)key") + private String assignstatekey; } \ No newline at end of file diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerQuery.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerQuery.java index c4e5799a..5751a243 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerQuery.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerQuery.java @@ -61,9 +61,14 @@ public class DispatchWorkerQuery implements Query { private String executorname; // 是否负责人 @ApiModelProperty("班组组织。") private String workteam; // 班组组织。 + @ApiModelProperty("班组组织。id") + private String workteamid; @ApiModelProperty("响应状态(接受、拒绝)") private Integer assignstate; // 响应状态(接受、拒绝) @ApiModelProperty("响应时间(接受、拒绝)") private String assigntime; // 响应时间(接受、拒绝) - + @ApiModelProperty("是否负责人key") + private String executornamekey; + @ApiModelProperty("响应状态(接受、拒绝)key") + private String assignstatekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerVo.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerVo.java index 3b8ffa53..e76e137d 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerVo.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-api/src/main/java/com/yxt/supervise/dispatchcenter/api/dispatchworker/DispatchWorkerVo.java @@ -63,9 +63,14 @@ public class DispatchWorkerVo implements Vo { private String executorname; // 是否负责人 @ApiModelProperty("班组组织。") private String workteam; // 班组组织。 + @ApiModelProperty("班组组织。id") + private String workteamid; @ApiModelProperty("响应状态(接受、拒绝)") private Integer assignstate; // 响应状态(接受、拒绝) @ApiModelProperty("响应时间(接受、拒绝)") private String assigntime; // 响应时间(接受、拒绝) - + @ApiModelProperty("是否负责人key") + private String executornamekey; + @ApiModelProperty("响应状态(接受、拒绝)key") + private String assignstatekey; } diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java index 6f37ba12..951e25d1 100644 --- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java +++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-biz/src/main/java/com/yxt/supervise/dispatchcenter/biz/dispatchorderstandards/DispatchOrderStandardsService.java @@ -109,6 +109,8 @@ public class DispatchOrderStandardsService extends MybatisBaseService