From cf7d913ff24fce658f72cb996d056ccdaf1b96e0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 17 三月 2025 11:36:50 +0800
Subject: [PATCH] 新增设备类信息管理，修改bug，删除多余结构
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java | 3
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 16 +++--
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java | 4
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/dncFlow/FlowThirdServiceImpl.java | 20 +-----
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java | 4
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 7 -
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java | 12 ++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java | 18 ++++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java | 3
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java | 3
/dev/null | 29 ---------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceManagementService.java | 7 ++
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessSpecVersion.java | 7 -
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java | 2
16 files changed, 66 insertions(+), 73 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java
index 4064ff9..c7a7c2d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/DeviceManagementController.java
@@ -125,4 +125,16 @@
return Result.OK(deviceManagementService.getDeviceManagementListByProductionId(productionId));
}
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @ApiOperation(value = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅", notes = "璁惧绫荤鐞嗕俊鎭�-閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅")
+ @GetMapping("/getEquipmentListById")
+ public Result<?> getEquipmentListByProductionId(String id){
+ return Result.OK(deviceManagementService.getEquipmentListById(id));
+ }
+
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessSpecVersion.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessSpecVersion.java
index 65661eb..6068331 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessSpecVersion.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessSpecVersion.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.dnc.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
@@ -21,7 +18,7 @@
public class ProcessSpecVersion implements Serializable {
private static final long serialVersionUID = 1529244980533421687L;
//id
- @TableField(value = "id")
+ @TableId(value = "id")
private String id;
//浜у搧id
@TableField(value = "product_id")
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index eb70788..84e5d7a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -1,9 +1,6 @@
package org.jeecg.modules.dnc.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
@@ -21,7 +18,7 @@
public class WorkStep implements Serializable {
private static final long serialVersionUID = 1529244980533421687L;
//宸ユid
- @TableField(value = "id")
+ @TableId(value = "id")
private String id;
//浜у搧id
@TableField(value = "product_id")
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartApproveUserMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartApproveUserMapper.java
deleted file mode 100644
index bf29cba..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartApproveUserMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.jeecg.modules.dnc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.dnc.ucenter.DepartApproveUser;
-
-public interface DepartApproveUserMapper extends BaseMapper<DepartApproveUser> {
-}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentMapper.java
deleted file mode 100644
index 0601b9c..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentMapper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.jeecg.modules.dnc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.dnc.dto.DepartmentExt;
-import org.jeecg.modules.dnc.ucenter.Department;
-
-import java.util.List;
-
-public interface DepartmentMapper extends BaseMapper<Department> {
- /**
- * 鑾峰彇鐢ㄦ埛鏈垎閰嶇殑閮ㄩ棬鍒楄〃
- * @param userId
- * @return
- */
- List<Department> getUserNonPermDepart(@Param("userId") String userId);
-
- /**
- * 鑾峰彇鐢ㄦ埛宸插垎閰嶇殑閮ㄩ棬鍒楄〃
- * @param userId
- * @return
- */
- List<Department> getUserPermDepart(@Param("userId") String userId);
-
- /**
- * 鑾峰彇閮ㄩ棬鍒楄〃 鐖跺瓙鍏崇郴
- * @return
- */
- List<DepartmentExt> findExtAll();
-
- /**
- * 鏍规嵁鐖惰妭鐐规煡鎵惧瓙鑺傜偣
- * @param parentId
- * @return
- */
- List<DepartmentExt> findByParentId(@Param("parentId") String parentId);
-
- /**
- * 鑾峰彇閮ㄩ棬鏈寚瀹氱殑瀹℃壒浜�
- * @param departId
- * @return
- */
- List<SysUser> getUserNonApproveDepart(@Param("departId") String departId);
-
- /**
- * 鑾峰彇閮ㄩ棬宸叉寚瀹氱殑瀹℃壒浜�
- * @param departId
- * @return
- */
- List<SysUser> getUserApproveDepart(@Param("departId") String departId);
-
-}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentUserMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentUserMapper.java
deleted file mode 100644
index 5cb248f..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/DepartmentUserMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.jeecg.modules.dnc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.dnc.ucenter.DepartmentUser;
-
-public interface DepartmentUserMapper extends BaseMapper<DepartmentUser> {
-}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DepartmentMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DepartmentMapper.xml
deleted file mode 100644
index df80d9b..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DepartmentMapper.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="org.jeecg.modules.dnc.mapper.DepartmentMapper">
- <select id="getUserPermDepart" resultType="org.jeecg.modules.dnc.ucenter.Department" parameterType="String">
- select r.depart_id, r.depart_name, r.depart_code, r.description
- from
- (select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
- inner join
- (select depart_id from sys_depart_user where user_id=#{userId}) ur
- on r.depart_id=ur.depart_id
- </select>
-
- <select id="getUserNonPermDepart" resultType="org.jeecg.modules.dnc.ucenter.Department" parameterType="String">
- select r.depart_id, r.depart_name, r.depart_code, r.description
- from (select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
- where r.depart_id not in
- (select depart_id from sys_depart_user where user_id=#{userId})
- </select>
-
- <resultMap id="deptExtBaseResult" type="org.jeecg.modules.dnc.dto.DepartmentExt">
- <id column="depart_id" property="departId" />
- <collection column="depart_id" property="childList" select="findByParentId">
- </collection>
- </resultMap>
-
- <select id="findExtAll" resultMap="deptExtBaseResult">
- select
- depart_id
- , depart_name
- , depart_code
- , parent_id
- , priority
- , rank_level
- , mgr_man
- , description
- from sys_department
- where rank_level= 1 and delete_flag = 0
- </select>
-
- <select id="findByParentId" resultMap="deptExtBaseResult">
- select
- depart_id
- , depart_name
- , depart_code
- , parent_id
- , priority
- , rank_level
- , mgr_man
- , description
- from sys_department
- where delete_flag = 0 and parent_id=#{parentId}
- </select>
-
- <select id="getUserApproveDepart" parameterType="String" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.password
- , u.user_type
- , u.status
- , u.avatar
- , u.birthday
- , u.sex
- , u.phone
- , u.email
- from sys_user u
- inner join (select user_id from sys_depart_approve_user where depart_id=#{departId}) d
- on u.id=d.user_id
- </select>
-
- <select id="getUserNonApproveDepart" parameterType="String" resultType="org.jeecg.modules.system.entity.SysUser">
- select u.id
- , u.username
- , u.realname
- , u.password
- , u.user_type
- , u.status
- , u.avatar
- , u.birthday
- , u.sex
- , u.phone
- , u.email
- from sys_user u
- where u.id not in (select user_id from sys_depart_approve_user where depart_id=#{departId})
- </select>
-</mapper>
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceManagementService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceManagementService.java
index fa35400..b81c2f9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceManagementService.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/IDeviceManagementService.java
@@ -66,4 +66,11 @@
* @return
*/
List<DeviceManagement> getDeviceManagementListByProductionId(String productionId);
+
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param id
+ * @return
+ */
+ List<MdcEquipment> getEquipmentListById(String id);
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
index 4a56a91..716979e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DeviceManagementServiceImpl.java
@@ -25,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -218,4 +219,21 @@
queryWrapper.orderByDesc("create_time");
return super.list(queryWrapper);
}
+
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍒楄〃淇℃伅
+ * @param id
+ * @return
+ */
+ @Override
+ public List<MdcEquipment> getEquipmentListById(String id){
+ DeviceManagement deviceManagement = super.getById(id);
+ if (deviceManagement == null) {
+ return null;
+ }else {
+ List<String> equipmentIds = Arrays.asList(deviceManagement.getEquipmentIds().split(","));
+ return equipmentService.list(new QueryWrapper<MdcEquipment>()
+ .in("equipment_id", equipmentIds));
+ }
+ }
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java
index d33676b..bec7eda 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java
@@ -225,7 +225,7 @@
ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST);
List<ProcessStream> processStreams = processStreamService.findBypsvId(id);
if(processStreams!= null &&!processStreams.isEmpty())
- ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST);
+ ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_PROCESS_EXIST);
boolean b = processSpecVersionPermissionService.deleteByPsvId(processSpecVersion.getId());
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartApproveUser.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartApproveUser.java
deleted file mode 100644
index 07b997a..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartApproveUser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.dnc.ucenter;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@TableName("sys_depart_approve_user")
-public class DepartApproveUser {
- @TableId(value = "approve_id")
- private String approveId;
- @TableField(value = "depart_id")
- private String departId;
- @TableField(value = "user_id")
- private String userId;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
- private Date createTime;
- @JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
-}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartmentUser.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartmentUser.java
deleted file mode 100644
index 7708003..0000000
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/ucenter/DepartmentUser.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.jeecg.modules.dnc.ucenter;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@TableName(value = "sys_depart_user")
-public class DepartmentUser {
- @TableId
- private String departUserId;
- private String departId;
- private String userId;
- //宀椾綅绫诲瀷
- private Integer positionType;
- @JsonIgnore
- @TableField(value = "create_time", select = false, fill = FieldFill.INSERT)
- private Date createTime;
- @JsonIgnore
- @TableField(value = "create_user", select = false, fill = FieldFill.INSERT)
- private String createUser;
-}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
index 9ffe196..a991f2d 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
@@ -69,8 +69,8 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- Page<FlowMyBusinessDto> page = new Page<FlowMyBusinessDto>(pageNo, pageSize);
- IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.findPageList(page, flowMyBusinessDto);
+ Page page = new Page(pageNo, pageSize);
+ IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.getPageList(page, flowMyBusinessDto);
pageList.getRecords().forEach(item -> {
//鍘婚櫎[]
item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java
index f7df053..4bc94eb 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/HisWorkTask.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@
public class HisWorkTask implements Serializable {
/**涓婚敭*/
//flow_my_business
- @TableField("id")
+ @TableId(value = "id")
private String id;
@TableField("name")
private String name;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java
index 93944cb..f1c360c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/UserRole.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -9,7 +10,7 @@
@Data
@TableName("sys_role")
public class UserRole implements Serializable {
- @TableField("id")
+ @TableId(value = "id")
private String id;
@TableField("role_name")
private String roleName;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java
index 417b65a..b4c34a0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/entity/WorkTaskData.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.dncFlow.entity;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -18,7 +19,7 @@
@ApiModel(value="act_ru_task", description="宸ヤ綔娴佷换鍔℃暟鎹�")
public class WorkTaskData implements Serializable {
/**涓婚敭*/
- @TableField("id_")
+ @TableId("id_")
private String id;
/**鐗堟湰鍙凤紝鐢ㄤ簬涔愯閿佹帶鍒跺苟鍙戞洿鏂�*/
@TableField("rev_")
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java
index df24518..6922fac 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/FlowMyBusinessMapper.java
@@ -20,6 +20,6 @@
* @param flowMyBusinessDto
* @return
*/
- IPage<FlowMyBusinessDto> getPageList(@Param("page") Page page, @Param("flowMyBusinessDto") FlowMyBusinessDto flowMyBusinessDto);
+ IPage<FlowMyBusinessDto> PageList(@Param("page") Page page, @Param("flowMyBusinessDto") FlowMyBusinessDto flowMyBusinessDto);
}
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 5b0cd76..221ab77 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.flowable.apithird.business.mapper.FlowMyBusinessMapper">
- <select id="getPageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
+ <select id="PageList" resultType="org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto">
SELECT
flow_my_business.*,
ACT_HI_PROCINST.START_TIME_ as start_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 1b92cfb..3ad18b5 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
@@ -45,7 +45,7 @@
* @param flowMyBusinessDto
* @return
*/
- public IPage<FlowMyBusinessDto> findPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
- return flowMyBusinessMapper.getPageList(page,flowMyBusinessDto);
+ public IPage<FlowMyBusinessDto> getPageList(Page page, FlowMyBusinessDto flowMyBusinessDto){
+ return flowMyBusinessMapper.PageList(page,flowMyBusinessDto);
}
}
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
index 3fe1de0..b2d0ca1 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1,6 +1,5 @@
package org.jeecg.modules.flowable.service.impl;
-
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
@@ -13,8 +12,8 @@
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.*;
+import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.identity.Authentication;
@@ -39,13 +38,13 @@
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
+import org.jeecg.modules.flowable.apithird.common.constant.ProcessConstants;
+import org.jeecg.modules.flowable.apithird.common.enums.FlowComment;
+import org.jeecg.modules.flowable.apithird.common.exception.CustomException;
import org.jeecg.modules.flowable.apithird.entity.ActStatus;
import org.jeecg.modules.flowable.apithird.entity.SysUser;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
-import org.jeecg.modules.flowable.apithird.common.constant.ProcessConstants;
-import org.jeecg.modules.flowable.apithird.common.enums.FlowComment;
-import org.jeecg.modules.flowable.apithird.common.exception.CustomException;
import org.jeecg.modules.flowable.domain.dto.FlowCommentDto;
import org.jeecg.modules.flowable.domain.dto.FlowNextDto;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
@@ -872,7 +871,7 @@
String myTaskId = null;
HistoricTaskInstance myTask = null;
for (HistoricTaskInstance hti : htiList) {
- if (loginUser.getUsername().toString().equals(hti.getAssignee())) {
+ if (loginUser.getUsername().equals(hti.getAssignee())) {
myTaskId = hti.getId();
myTask = hti;
break;
@@ -992,7 +991,10 @@
flowTask.setProcDefId(histTask.getProcessDefinitionId());
flowTask.setTaskDefKey(histTask.getTaskDefinitionKey());
flowTask.setTaskName(histTask.getName());
- flowTask.setDescription(flowMyBusinessService.getByProcessInstanceId(histTask.getProcessInstanceId()).getTitle());
+ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getByProcessInstanceId(histTask.getProcessInstanceId());
+ if (flowMyBusiness != null) {
+ flowTask.setDescription(flowMyBusiness.getTitle());
+ }
// 娴佺▼瀹氫箟淇℃伅
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
.processDefinitionId(histTask.getProcessDefinitionId())
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 3311b89..3a5ec62 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
@@ -16,7 +16,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -84,24 +83,11 @@
// todo 鑾峰彇娴佺▼鍒嗙被淇℃伅锛屾澶勪负渚嬪瓙
SysCategory category1 = new SysCategory();
category1.setId("drApproval");
- category1.setName("瀵煎叆瀹℃壒娴佺▼");
+ category1.setName("鎸囨淳NC绋嬪簭鑷宠澶�");
SysCategory category2 = new SysCategory();
category2.setId("ggApproval");
- category2.setName("璁捐鏇存敼鍗曟祦绋�");
- SysCategory category3 = new SysCategory();
- category3.setId("jjApproval");
- category3.setName("鏈哄姞宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category4 = new SysCategory();
- category4.setId("lsApproval");
- category4.setName("涓存椂宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category5 = new SysCategory();
- category5.setId("fxApproval");
- category5.setName("杩斾慨宸ヨ壓瑙勭▼娴佺▼");
- SysCategory category6 = new SysCategory();
- category6.setId("jjggApproval");
- category6.setName("鏈哄姞鏇存敼鍗曟祦绋�");
- ArrayList<SysCategory> sysCategories = Lists.newArrayList(category1,category2,category3,category4,category5,category6);
- return sysCategories;
+ category2.setName("NC绋嬪簭绛炬淳");
+ return Lists.newArrayList(category1,category2);
}
@Override
--
Gitblit v1.9.3