From c4eddf6f793986516c919add6493ad2be2c63b82 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 13:57:47 +0800
Subject: [PATCH] 修改flow基础代码,添加设备岗位查询用户
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml | 8 ++++
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java | 31 ++++++++-------
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java | 39 +++++++++++--------
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java | 8 ++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java | 8 ++++
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java | 11 +++++
7 files changed, 76 insertions(+), 31 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
index 72d3f84..07c540b 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml
@@ -12,7 +12,7 @@
flow_my_business.process_definition_key,
flow_my_business.process_definition_id,
flow_my_business.process_instance_id,
- ACT_RU_TASK.ASSIGNEE_ as todoUsers,
+ flow_my_business.todo_users as todoUsers,
flow_my_business.done_Users,
ACT_HI_PROCINST.START_TIME_ AS start_time,
ACT_HI_PROCINST.END_TIME_ AS end_time,
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
index ce39c92..28f101e 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
@@ -102,23 +102,30 @@
item.setPreNode(historicActivityInstance.getActivityName());
}
}
- if (item.getDoneUsers() == null){
- item.setDoneUsers("");
- }else {
- //鍘婚櫎[]
- item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
- item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
- }
- //璁＄畻澶勭悊鏃堕暱
- Date kssj=item.getStartTime();
- Date jssj;
- if (item.getEndTime() != null){
- jssj=item.getEndTime();
- }else {
- jssj=new Date();
- }
- item.setDuration(TimeUtil.howLong(kssj, jssj,2));
+ if (item.getTodoUsers() == null){
+ item.setTodoUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
+ }
+ if (item.getDoneUsers() == null){
+ item.setDoneUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
+ }
+ //璁＄畻澶勭悊鏃堕暱
+ Date kssj=item.getStartTime();
+ Date jssj;
+ if (item.getEndTime() != null){
+ jssj=item.getEndTime();
+ }else {
+ jssj=new Date();
+ }
+ item.setDuration(TimeUtil.howLong(kssj, jssj,2));
});
return flowMyBusinessDtoIPage;
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
index 1404edb..f989792 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java
@@ -6,11 +6,13 @@
import com.google.common.collect.Lists;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.api.ISysBaseAPI;
+import org.jeecg.common.system.vo.DictModel;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.flowable.apithird.entity.SysCategory;
import org.jeecg.modules.flowable.apithird.entity.SysRole;
import org.jeecg.modules.flowable.apithird.entity.SysUser;
import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
+import org.jeecg.modules.system.service.ISysDictService;
import org.jeecg.modules.system.service.impl.SysRoleServiceImpl;
import org.jeecg.modules.system.service.impl.SysUserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +35,8 @@
SysUserServiceImpl sysUserService;
@Autowired
SysRoleServiceImpl sysRoleService;
+ @Autowired
+ ISysDictService sysDictService;
@Override
public SysUser getLoginUser() {
LoginUser sysUser = null;
@@ -80,20 +84,19 @@
}
@Override
public List<SysCategory> getAllCategory() {
- // todo 鑾峰彇娴佺▼鍒嗙被淇℃伅锛屾澶勪负渚嬪瓙
- SysCategory category1 = new SysCategory();
- category1.setId("drApproval");
- category1.setName("鎸囨淳NC绋嬪簭鑷宠澶�");
- SysCategory category2 = new SysCategory();
- category2.setId("ggApproval");
- category2.setName("NC绋嬪簭绛炬淳");
- SysCategory category3= new SysCategory();
- category3.setId("sbdjApproval");
- category3.setName("璁惧鐐规");
- SysCategory category4= new SysCategory();
- category4.setId("sbwxApproval");
- category4.setName("璁惧缁翠慨");
- return Lists.newArrayList(category1,category2,category3,category4);
+ List<DictModel> list = sysDictService.getDictItems("flow_type");
+ List<SysCategory> categoryList = Lists.newArrayList();
+ if (list == null || list.isEmpty()) {
+ return null;
+ }else {
+ list.forEach(o -> {
+ SysCategory sysCategory = new SysCategory();
+ sysCategory.setId(o.getValue());
+ sysCategory.setName(o.getText());
+ categoryList.add(sysCategory);
+ });
+ }
+ return categoryList;
}
@Override
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java
index 2fd2cfb..e7c392f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/MdcUserProductionMapper.java
@@ -48,4 +48,12 @@
* @return
*/
List<SysUser> getUserPermsByDeviceId(String deviceId);
+
+ /**
+ * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
+ * @param post
+ * @param proId
+ * @return
+ */
+ List<SysUser> queryByPostAndProId(@Param("post") String post, @Param("proId") String proId);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml
index 3e04e0e..2127abf 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/MdcUserProductionMapper.xml
@@ -50,4 +50,12 @@
(select user_id from nc_device_permission where device_id=#{deviceId}) p
on u.id=p.user_id
</select>
+ <select id="queryByPostAndProId" resultType="org.jeecg.modules.system.entity.SysUser">
+ select u.*
+ from sys_user u
+ inner join
+ (select user_id from mdc_user_production where pro_id=#{proId}) p
+ on u.id=p.user_id
+ where u.post = #{post}
+ </select>
</mapper>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java
index 5b2ca52..a321830 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcUserProductionService.java
@@ -65,6 +65,14 @@
*/
List<SysUser> getUserPermsByDeviceId(String proId);
+ /**
+ * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
+ * @param post
+ * @param proId
+ * @return
+ */
+ List<SysUser> queryByPostAndProId(String post, String proId);
+
MdcUserProduction getByUserIdAndGroupId(String userId, String proId);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java
index bbe3b74..f236c24 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java
@@ -129,6 +129,17 @@
return super.getBaseMapper().getUserPermsByDeviceId(proId);
}
+ /**
+ * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
+ * @param post
+ * @param proId
+ * @return
+ */
+ @Override
+ public List<SysUser> queryByPostAndProId(String post, String proId){
+ return super.getBaseMapper().queryByPostAndProId(post, proId);
+ }
+
@Override
public MdcUserProduction getByUserIdAndGroupId(String userId, String proId){
if(StrUtil.isEmpty(userId) || StrUtil.isEmpty(proId))
--
Gitblit v1.9.3