From 502523ec43c302d6e4e42852152695fdf69a8609 Mon Sep 17 00:00:00 2001 From: ly19960718 <1622779752@qq.com> Date: Fri, 3 Dec 2021 14:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=91=E7=AE=A1=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenlion/pojo/vos/oversee/OverseeVO.java | 54 ++++++ .../cn/com/tenlion/pojo/vos/remote/IdsVO.java | 25 +++ .../vos/rulehandletime/RuleHandletimeVO.java | 51 ++++++ .../pojo/vos/ruleoversee/RuleOverseeVO.java | 50 ++++++ .../pojo/vos/rulewarning/RuleWarningVO.java | 71 ++++++++ .../tenlion/pojo/vos/taskmsg/SmsPhoneVO.java | 66 ++++++++ .../handle/impl/HandleServiceImpl.java | 21 +-- .../route/distribution/show-history.html | 132 +++++++++++++++ .../static/route/handle/show-report.html | 156 ++++++++++++++++++ .../taskbase/allocate/save-allocate.html | 9 + .../route/taskbase/archive/list-archive.html | 14 ++ .../taskbase/check/save-check-approved.html | 6 +- .../taskbase/check/save-check-failed.html | 6 +- 13 files changed, 645 insertions(+), 16 deletions(-) create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/oversee/OverseeVO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/remote/IdsVO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/rulehandletime/RuleHandletimeVO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/ruleoversee/RuleOverseeVO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/rulewarning/RuleWarningVO.java create mode 100644 src/main/java/cn/com/tenlion/pojo/vos/taskmsg/SmsPhoneVO.java create mode 100644 src/main/resources/static/route/distribution/show-history.html create mode 100644 src/main/resources/static/route/handle/show-report.html diff --git a/src/main/java/cn/com/tenlion/pojo/vos/oversee/OverseeVO.java b/src/main/java/cn/com/tenlion/pojo/vos/oversee/OverseeVO.java new file mode 100644 index 0000000..e5db1f1 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/oversee/OverseeVO.java @@ -0,0 +1,54 @@ +package cn.com.tenlion.pojo.vos.oversee; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: OverseeVO + * @Description: 督办信息 + * @Author: CodeFactory + * @Date: 2021-11-08 10:09:51 + * @Version: 3.0 + **/ +@ApiModel +public class OverseeVO { + + @ApiModelProperty(name = "taskId", value = "任务ID") + private String taskId; + @ApiModelProperty(name = "overseeContent", value = "督办内容") + private String overseeContent; + @ApiModelProperty(name = "overseeWay", value = "督办方式 notice 站内通知 nm 站内+短信") + private String overseeWay; + + + public String getTaskId() { + return taskId; + } + + public void setTaskId(String taskId) { + this.taskId = taskId; + } + + public String getOverseeContent() { + return overseeContent == null ? "" : overseeContent.trim(); + } + + public void setOverseeContent(String overseeContent) { + this.overseeContent = overseeContent; + } + + public String getOverseeWay() { + return overseeWay == null ? "" : overseeWay.trim(); + } + + public void setOverseeWay(String overseeWay) { + this.overseeWay = overseeWay; + } + + + + +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/remote/IdsVO.java b/src/main/java/cn/com/tenlion/pojo/vos/remote/IdsVO.java new file mode 100644 index 0000000..5a96095 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/remote/IdsVO.java @@ -0,0 +1,25 @@ +package cn.com.tenlion.pojo.vos.remote; + +import java.util.List; + +public class IdsVO { + + private List ids; + private List ids2; + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + public List getIds2() { + return ids2; + } + + public void setIds2(List ids2) { + this.ids2 = ids2; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/rulehandletime/RuleHandletimeVO.java b/src/main/java/cn/com/tenlion/pojo/vos/rulehandletime/RuleHandletimeVO.java new file mode 100644 index 0000000..6bade88 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/rulehandletime/RuleHandletimeVO.java @@ -0,0 +1,51 @@ +package cn.com.tenlion.pojo.vos.rulehandletime; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: RuleHandletimeVO + * @Description: 时效规则 + * @Author: CodeFactory + * @Date: 2021-11-05 16:15:36 + * @Version: 3.0 + **/ +@ApiModel +public class RuleHandletimeVO { + + @ApiModelProperty(name = "nodeId", value = "节点ID") + private String nodeId; + @ApiModelProperty(name = "ruleTimeType", value = "时限类型") + private String ruleTimeType; + @ApiModelProperty(name = "ruleTime", value = "时限") + @CheckNumberAnnotation(name = "时限") + private int ruleTime; + + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getRuleTimeType() { + return ruleTimeType; + } + + public void setRuleTimeType(String ruleTimeType) { + this.ruleTimeType = ruleTimeType; + } + + public int getRuleTime() { + return ruleTime; + } + + public void setRuleTime(int ruleTime) { + this.ruleTime = ruleTime; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/ruleoversee/RuleOverseeVO.java b/src/main/java/cn/com/tenlion/pojo/vos/ruleoversee/RuleOverseeVO.java new file mode 100644 index 0000000..70b7c27 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/ruleoversee/RuleOverseeVO.java @@ -0,0 +1,50 @@ +package cn.com.tenlion.pojo.vos.ruleoversee; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: RuleOverseeVO + * @Description: 督办规则 + * @Author: CodeFactory + * @Date: 2021-11-04 15:57:14 + * @Version: 3.0 + **/ +@ApiModel +public class RuleOverseeVO { + + @ApiModelProperty(name = "nodeId", value = "节点ID") + private String nodeId; + @ApiModelProperty(name = "ruleTimeType", value = "时限类型") + private String ruleTimeType; + @ApiModelProperty(name = "ruleTime", value = "时限") + @CheckNumberAnnotation(name = "时限") + private int ruleTime; + + public String getNodeId() { + return nodeId == null ? "" : nodeId.trim(); + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getRuleTimeType() { + return ruleTimeType; + } + + public void setRuleTimeType(String ruleTimeType) { + this.ruleTimeType = ruleTimeType; + } + + public int getRuleTime() { + return ruleTime; + } + + public void setRuleTime(int ruleTime) { + this.ruleTime = ruleTime; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/rulewarning/RuleWarningVO.java b/src/main/java/cn/com/tenlion/pojo/vos/rulewarning/RuleWarningVO.java new file mode 100644 index 0000000..d7c1ce4 --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/rulewarning/RuleWarningVO.java @@ -0,0 +1,71 @@ +package cn.com.tenlion.pojo.vos.rulewarning; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * + * @ClassName: RuleWarningVO + * @Description: 预警规则 + * @Author: CodeFactory + * @Date: 2021-11-05 16:49:03 + * @Version: 3.0 + **/ +@ApiModel +public class RuleWarningVO { + + @ApiModelProperty(name = "nodeId", value = "节点ID") + private String nodeId; + @ApiModelProperty(name = "yellowRuleTimeType", value = "黄牌时限类型") + private String yellowRuleTimeType; + @ApiModelProperty(name = "yellowRuleTime", value = "黄牌时限") + @CheckNumberAnnotation(name = "黄牌时限") + private int yellowRuleTime; + @ApiModelProperty(name = "redRuleTimeType", value = "红牌时限类型") + private String redRuleTimeType; + @ApiModelProperty(name = "redRuleTime", value = "红牌时限") + @CheckNumberAnnotation(name = "红牌时限") + private int redRuleTime; + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getYellowRuleTimeType() { + return yellowRuleTimeType; + } + + public void setYellowRuleTimeType(String yellowRuleTimeType) { + this.yellowRuleTimeType = yellowRuleTimeType; + } + + public int getYellowRuleTime() { + return yellowRuleTime; + } + + public void setYellowRuleTime(int yellowRuleTime) { + this.yellowRuleTime = yellowRuleTime; + } + + public String getRedRuleTimeType() { + return redRuleTimeType; + } + + public void setRedRuleTimeType(String redRuleTimeType) { + this.redRuleTimeType = redRuleTimeType; + } + + public int getRedRuleTime() { + return redRuleTime; + } + + public void setRedRuleTime(int redRuleTime) { + this.redRuleTime = redRuleTime; + } +} diff --git a/src/main/java/cn/com/tenlion/pojo/vos/taskmsg/SmsPhoneVO.java b/src/main/java/cn/com/tenlion/pojo/vos/taskmsg/SmsPhoneVO.java new file mode 100644 index 0000000..2d6fd1e --- /dev/null +++ b/src/main/java/cn/com/tenlion/pojo/vos/taskmsg/SmsPhoneVO.java @@ -0,0 +1,66 @@ +package cn.com.tenlion.pojo.vos.taskmsg; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import io.swagger.annotations.ApiModelProperty; + +import java.lang.reflect.Array; + +public class SmsPhoneVO { + + @ApiModelProperty(name = "content", value = "发送内容") + @CheckEmptyAnnotation(name="发送内容") + private String content; + @ApiModelProperty(name = "phones", value = "手机号码列表") + @CheckEmptyAnnotation(name="手机号码") + private Array phones; + @ApiModelProperty(name = "sendUserId", value = "发送人用户ID") + @CheckEmptyAnnotation(name="发送人用户ID") + private String sendUserId; + @ApiModelProperty(name = "sendUserName", value = "发送人昵称") + @CheckEmptyAnnotation(name="发送人昵称") + private String sendUserName; + @ApiModelProperty(name = "sendUserUsername", value = "发送人用户名") + @CheckEmptyAnnotation(name="发送人用户名") + private String sendUserUsername; + + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Array getPhones() { + return phones; + } + + public void setPhones(Array phones) { + this.phones = phones; + } + + public String getSendUserId() { + return sendUserId; + } + + public void setSendUserId(String sendUserId) { + this.sendUserId = sendUserId; + } + + public String getSendUserName() { + return sendUserName; + } + + public void setSendUserName(String sendUserName) { + this.sendUserName = sendUserName; + } + + public String getSendUserUsername() { + return sendUserUsername; + } + + public void setSendUserUsername(String sendUserUsername) { + this.sendUserUsername = sendUserUsername; + } +} diff --git a/src/main/java/cn/com/tenlion/service/handle/impl/HandleServiceImpl.java b/src/main/java/cn/com/tenlion/service/handle/impl/HandleServiceImpl.java index 4f8f8a8..7bfe71d 100644 --- a/src/main/java/cn/com/tenlion/service/handle/impl/HandleServiceImpl.java +++ b/src/main/java/cn/com/tenlion/service/handle/impl/HandleServiceImpl.java @@ -68,6 +68,16 @@ public class HandleServiceImpl extends DefaultBaseService implements IHandleServ + + + + + + + + + + public HandleDTO getByTaskId(String taskId){ Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); if(task == null){ @@ -77,9 +87,7 @@ public class HandleServiceImpl extends DefaultBaseService implements IHandleServ if(handleId == null){ throw new SearchException("系统异常"); } - return this.get(handleId.toString()); - } @@ -125,7 +133,7 @@ public class HandleServiceImpl extends DefaultBaseService implements IHandleServ } /** - * 发送通过信号 + * 发送通过信号（废弃） */ public void sendPassSignal(String reprotId,Map params){ String processInstanceId = activitiBaseService.getProcessInstanceId(reprotId); @@ -271,7 +279,6 @@ public class HandleServiceImpl extends DefaultBaseService implements IHandleServ public void setParams(List list){ - //设置处理人姓名 for (HandleDTO handleDTO : list) { UserDTO userDTO = userBaseService.get(handleDTO.getCreator()); @@ -279,12 +286,6 @@ public class HandleServiceImpl extends DefaultBaseService implements IHandleServ handleDTO.setCreatorName(userDTO.getUserName()); } } - - - - - - } diff --git a/src/main/resources/static/route/distribution/show-history.html b/src/main/resources/static/route/distribution/show-history.html new file mode 100644 index 0000000..887a0e6 --- /dev/null +++ b/src/main/resources/static/route/distribution/show-history.html @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + +
+
    + +
  • + +
    +
    暂无
    +
    +
    • + +
+
+ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/handle/show-report.html b/src/main/resources/static/route/handle/show-report.html new file mode 100644 index 0000000..342786f --- /dev/null +++ b/src/main/resources/static/route/handle/show-report.html @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + +
+
+
+

分拨详情

+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+ + + +
+
+
+
+

责任单位处理详情

+
+

因为不适合。如果希望开发长期的项目或者制作产品类网站，那么就需要实现特定的设计，为了在维护项目中可以方便地按设计师要求快速修改样式，肯定会逐步编写出各种业务组件、工具类，相当于为项目自行开发一套框架。——来自知乎@Kayo

+
+
+
+ +
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/route/taskbase/allocate/save-allocate.html b/src/main/resources/static/route/taskbase/allocate/save-allocate.html index ce4ff3c..8c2e5f8 100644 --- a/src/main/resources/static/route/taskbase/allocate/save-allocate.html +++ b/src/main/resources/static/route/taskbase/allocate/save-allocate.html @@ -159,6 +159,15 @@ }); function selectSpecialUser(){ + var specialDeptId = $('#specialDeptId').val(); + var specialDeptName = $('#specialDeptName').val(); + + if(specialDeptId == ''){ + var selectedNodes = []; + selectedNodes.id = specialDeptId; + selectedNodes.name = specialDeptName; + top.dialog.dialogTreeData.selectedNodes = selectedNodes; + } top.dialog.open({ url: top.restAjax.path('route/taskbase/allocate/select-dept.html', []), title: '选择专办单位', diff --git a/src/main/resources/static/route/taskbase/archive/list-archive.html b/src/main/resources/static/route/taskbase/archive/list-archive.html index f588893..3e7330e 100644 --- a/src/main/resources/static/route/taskbase/archive/list-archive.html +++ b/src/main/resources/static/route/taskbase/archive/list-archive.html @@ -282,6 +282,20 @@ reloadTable(); } }); + }else if(layEvent === 'handleEvent'){ + layer.open({ + type: 2, + title: '评价结果', + closeBtn: 1, + area: ['90%', '90%'], + shadeClose: false, + anim: 2, + maxmin:false, + content: top.restAjax.path('route/handle/show-report.html?reportId={reportId}', [data.reportId]), + end: function() { + reloadTable(); + } + }); } }); diff --git a/src/main/resources/static/route/taskbase/check/save-check-approved.html b/src/main/resources/static/route/taskbase/check/save-check-approved.html index b7aee85..d30c298 100644 --- a/src/main/resources/static/route/taskbase/check/save-check-approved.html +++ b/src/main/resources/static/route/taskbase/check/save-check-approved.html @@ -28,13 +28,13 @@
- +
- +
- +