From 1970c8d9445ec31ccbaf8d42d1639eebc31e564e Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 24 Feb 2025 16:24:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor(activiti):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E8=AF=B7=E6=B1=82=E7=9B=B8=E5=85=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=92=8C=E5=8A=9F=E8=83=BD=EF=BC=8CexperimentDesc?= =?UTF-8?q?=E4=B8=BA=E5=AE=9E=E9=AA=8C=E5=86=85=E5=AE=B9=EF=BC=8Cexperimen?= =?UTF-8?q?tContent=E4=B8=BA=E5=AE=9E=E9=AA=8C=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了多个模板文件的布局和字段显示 - 更新了实验请求状态的处理逻辑 - 优化了时间列表的展示方式 - 调整了编辑功能的权限控制 - 修复了一些小的UI问题 --- .../ExperimentRequestController.java | 22 +- .../ExperimentRequestRelationServiceImpl.java | 7 +- .../impl/ExperimentRequestServiceImpl.java | 14 +- .../activiti/experiment_request/add.html | 4 +- .../editCommunicationContent.html | 79 +++++-- .../activiti/experiment_request/editDesc.html | 78 +++++-- .../editExperimentContent.html | 72 ++++-- .../experiment_request/editTools.html | 87 +++++-- .../experiment_request.html | 35 +-- .../activiti/experiment_request/timeList.html | 218 +++++++++--------- 10 files changed, 393 insertions(+), 223 deletions(-) diff --git a/haiwei-activiti/src/main/java/com/haiwei/activiti/controller/ExperimentRequestController.java b/haiwei-activiti/src/main/java/com/haiwei/activiti/controller/ExperimentRequestController.java index 6898e03..9538b4f 100644 --- a/haiwei-activiti/src/main/java/com/haiwei/activiti/controller/ExperimentRequestController.java +++ b/haiwei-activiti/src/main/java/com/haiwei/activiti/controller/ExperimentRequestController.java @@ -160,16 +160,16 @@ public class ExperimentRequestController extends BaseController return toAjax(experimentRequestService.updateExperimentRequest(experimentRequest)); } - /** * 修改实验申请信息 */ - @GetMapping("/edit/{objid}") - public String edit(@PathVariable("objid") Long objid, ModelMap mmap) + @GetMapping("/editExperimentContent/{objid}") + public String editExperimentContent(@PathVariable("objid") Long objid, ModelMap mmap) { ExperimentRequest experimentRequest = experimentRequestService.selectExperimentRequestById(objid); + experimentRequest.setStatus(2L); mmap.put("experimentRequest", experimentRequest); - return prefix + "/edit"; + return prefix +"/editExperimentContent"; } /** @@ -177,23 +177,11 @@ public class ExperimentRequestController extends BaseController */ @GetMapping("/editDesc/{objid}") public String editDesc(@PathVariable("objid") Long objid, ModelMap mmap) - { - ExperimentRequest experimentRequest = experimentRequestService.selectExperimentRequestById(objid); - experimentRequest.setStatus(2L); - mmap.put("experimentRequest", experimentRequest); - return prefix + "/editDesc"; - } - - /** - * 修改实验申请信息 - */ - @GetMapping("/editExperimentContent/{objid}") - public String editExperimentContent(@PathVariable("objid") Long objid, ModelMap mmap) { ExperimentRequest experimentRequest = experimentRequestService.selectExperimentRequestById(objid); experimentRequest.setStatus(1L); mmap.put("experimentRequest", experimentRequest); - return prefix + "/editExperimentContent"; + return prefix + "/editDesc"; } /** diff --git a/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestRelationServiceImpl.java b/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestRelationServiceImpl.java index dbbed4a..ed5cd9b 100644 --- a/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestRelationServiceImpl.java +++ b/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestRelationServiceImpl.java @@ -51,13 +51,16 @@ public class ExperimentRequestRelationServiceImpl implements IExperimentRequestR .selectExperimentRequestRelationList(experimentRequestRelation); for (ExperimentRequestRelation requestRelation : experimentRequestRelations) { - Long ObjId = requestRelation.getPojectId(); ExperimentRequest experimentRequest = experimentRequestMapper.selectExperimentRequestById(ObjId); - if (requestRelation.getStatus() == 1L){ +/* if (requestRelation.getStatus() == 1L){ requestRelation.setContent(experimentRequest.getExperimentContent()); }else if (requestRelation.getStatus() == 2L){ + requestRelation.setContent(experimentRequest.getExperimentDesc());*/ + if (requestRelation.getStatus() == 1L){ requestRelation.setContent(experimentRequest.getExperimentDesc()); + }else if (requestRelation.getStatus() == 2L){ + requestRelation.setContent(experimentRequest.getExperimentContent()); }else if (requestRelation.getStatus() == 3L){ requestRelation.setContent(experimentRequest.getPreparationTools()); }else if (requestRelation.getStatus() == 4L){ diff --git a/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestServiceImpl.java b/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestServiceImpl.java index 588bfd8..e592d74 100644 --- a/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestServiceImpl.java +++ b/haiwei-activiti/src/main/java/com/haiwei/activiti/service/impl/ExperimentRequestServiceImpl.java @@ -2,7 +2,6 @@ package com.haiwei.activiti.service.impl; import java.util.Date; import java.util.List; -import java.util.Objects; import com.haiwei.activiti.domain.ExperimentRequestRelation; import com.haiwei.activiti.mapper.ExperimentRequestRelationMapper; @@ -112,11 +111,14 @@ public class ExperimentRequestServiceImpl implements IExperimentRequestService * @param experimentRequest 实验申请信息 * @return 结果 */ + /** + * 更新实验请求的方法 + * @param experimentRequest 实验请求对象 + * @return 更新操作影响的行数 + */ @Transactional( rollbackFor = Exception.class ) @Override public int updateExperimentRequest(ExperimentRequest experimentRequest) { - Date nowDate = DateUtils.getNowDate(); - // 获取当前用户的主体信息 Subject subject = ShiroUtils.getSubject(); @@ -133,6 +135,7 @@ public class ExperimentRequestServiceImpl implements IExperimentRequestService List timeList = experimentRequestRelationMapper .selectExperimentRequestRelationList(experimentRequestRelation); + Date nowDate = DateUtils.getNowDate(); // 如果查询结果不为空，则进行更新操作 if (!timeList.isEmpty()) { // 设置更新时间为当前时间 @@ -143,7 +146,6 @@ public class ExperimentRequestServiceImpl implements IExperimentRequestService // 更新实验请求关系记录 experimentRequestRelationMapper.updateExperimentRequestRelation(experimentRequestRelation); - } else { // 如果查询结果为空，则进行插入操作 // 设置更新时间为当前时间 @@ -166,7 +168,7 @@ public class ExperimentRequestServiceImpl implements IExperimentRequestService * @param ids 需要删除的数据ID * @return 结果 */ - @Transactional + @Transactional( rollbackFor = Exception.class ) @Override public int deleteExperimentRequestByIds(String ids) { @@ -180,7 +182,7 @@ public class ExperimentRequestServiceImpl implements IExperimentRequestService * @param objid 实验申请信息ID * @return 结果 */ - @Transactional + @Transactional( rollbackFor = Exception.class ) @Override public int deleteExperimentRequestById(Long objid) { diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/add.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/add.html index 5f46dde..c40e48a 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/add.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/add.html @@ -65,13 +65,13 @@
- +
diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editCommunicationContent.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editCommunicationContent.html index 56d5997..ee73445 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editCommunicationContent.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editCommunicationContent.html @@ -48,28 +48,39 @@
- + - -
+ --> + +
+ + +
- - -
- --> +
@@ -94,6 +105,28 @@ --> +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
@@ -102,7 +135,7 @@
-
+ + +
@@ -143,3 +185,10 @@ + \ No newline at end of file diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editDesc.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editDesc.html index 1b624c4..b579322 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editDesc.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editDesc.html @@ -11,13 +11,15 @@
- +
- +
@@ -25,7 +27,7 @@
+ >
@@ -34,7 +36,8 @@
- +
@@ -51,42 +54,60 @@
-
- +
+ + + +
+ +
+ +
-
+ + -
+ + @@ -145,3 +175,11 @@ + + \ No newline at end of file diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editExperimentContent.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editExperimentContent.html index b2ad1bc..7192433 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editExperimentContent.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editExperimentContent.html @@ -11,13 +11,15 @@
- +
- +
@@ -34,7 +36,8 @@
- +
@@ -48,17 +51,17 @@
- + -
- + + +
+ + +
+ +
- +
- +
- +
- +
+ + -
+ +
@@ -143,3 +173,11 @@ + + \ No newline at end of file diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editTools.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editTools.html index 2eab097..69a0672 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editTools.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/editTools.html @@ -11,13 +11,13 @@
- +
- +
@@ -31,12 +31,19 @@
- + + +
+
+ + +
-
+ - @@ -60,26 +67,47 @@
- -
+
--> + +
+ + +
- +
+ +
+ +
+
@@ -98,7 +126,7 @@ --> -
+ +
@@ -139,3 +176,11 @@ + + \ No newline at end of file diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/experiment_request.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/experiment_request.html index 8020edc..577505c 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/experiment_request.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/experiment_request.html @@ -59,9 +59,9 @@ 添加 - + 删除 @@ -143,7 +143,7 @@ var descRole = [[${@permission.hasAnyRoles('admin,descRole')}]]; var experimentContentRole = [[${@permission.hasAnyRoles('admin,experimentContentRole')}]]; var toolsRole = [[${@permission.hasAnyRoles('admin,toolsRole')}]]; - var communicationContentRole = [[${@permission.hasAnyRoles('admin,common')}]]; + var communicationContentRole = [[${@permission.hasAnyRoles('admin,communicationContentRole')}]]; /* function showTimeList(objId) { @@ -180,21 +180,30 @@ success: function(response) { if (response.code === 0) { var timeList = response.data; + + // 按照 updateTime 降序排序 + timeList.sort((a, b) => new Date(b.updateTime) - new Date(a.updateTime)) + var timeline = $("#vertical-timeline"); timeline.empty(); timeList.forEach(function(item, index) { // 获取数据字典数据 var dicts = [[${@dict.getType('process_status')}]]; - // console.log(dicts); - var statusLabel = dicts.find(dict => dict.dictValue === item.status.toString())?.dictLabel || item.status; + console.log(dicts); + var statusLabel = dicts.find(dict => dict.dictValue == item.status.toString())?.dictLabel || item.status; var block = $("
").addClass("vertical-timeline-block"); var icon = $("
").addClass("vertical-timeline-icon navy-bg").append($("").addClass("fa fa-briefcase")); var content = $("
").addClass("vertical-timeline-content") - .append($("

").text(statusLabel)) // 实验状态在上面 - .append($("

").text(item.content)) // 其次是内容描述 - .append($("").addClass("vertical-date").html(item.updateTime)); // 最下面是时间 + + .append($("").addClass("vertical-date").html(item.updateTime + "
" + statusLabel + "")) + + .append($("

").text(item.projectId)) + .append($("

").text(item.content)); +/* .append($("").addClass("vertical-date").html(item.updateTime + "
" + item.status + ""));*/ + + block.append(icon).append(content); timeline.append(block); @@ -216,7 +225,6 @@ function editDesc(objId) { $.modal.open("修改" , prefix + "/editDesc/" + objId); - } function editExperimentContent(objId) { $.modal.open("修改" , prefix + "/editExperimentContent/" + objId); @@ -290,13 +298,12 @@ actions.push('时间列表 '); - /* actions.push('编辑 '); -*/ +/* actions.push('编辑 ');*/ + + actions.push('编辑实验内容 '); - actions.push('编辑 '); + actions.push('编辑实验方案 '); - actions.push('编辑实验内容 '); - actions.push('编辑讨论方案 '); actions.push('编辑准备工具 '); actions.push('编辑交流内容 '); diff --git a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/timeList.html b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/timeList.html index 50301e8..38f3730 100644 --- a/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/timeList.html +++ b/haiwei-activiti/src/main/resources/templates/activiti/experiment_request/timeList.html @@ -1,111 +1,111 @@ - - - - - - -

-
-
-
-
-
    -
  • - - -
    • -
  • - - - - - -
    • -
  • - - -
    • -
  • - 搜索 - 重置 -
    • -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
-
-
-
-
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +