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, 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; } 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 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与岗位id筛选用户 * @param post * @param proId * @return */ List<SysUser> queryByPostAndProId(@Param("post") String post, @Param("proId") String proId); } 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> 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与岗位id筛选用户 * @param post * @param proId * @return */ List<SysUser> queryByPostAndProId(String post, String proId); MdcUserProduction getByUserIdAndGroupId(String userId, String proId); } 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与岗位id筛选用户 * @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))
