sz-team/supervision-test-repo
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!115 chore(supervision): 删除废弃 flow 模块并清理 pom 引用

Browse Source 
Merge pull request !115 from wsm/refactor/supervision_module
This commit is contained in:
wsm
2026-08-06 06:56:55 +00:00
committed by Gitee
parent 21a6394a51 a88ea47b5a
commit 5ef5826768
192 changed files with 590 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -10,6 +10,7 @@ localDocs
**/.claude
**/yml
*.bundle
jeecg-module-system/jeecg-system-start/config/
## front
**/*.lock
jeecg-boot-module/jeecg-module-flow/pom.xml
-57
View File
@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>jeecg-boot-module</artifactId>
<groupId>org.jeecgframework.boot</groupId>
<version>${jeecgProjectVersion}</version>
</parent>
<artifactId>jeecg-module-flow</artifactId>
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>false</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-base-core</artifactId>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-local-api</artifactId>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-module-bpm-flowable</artifactId>
<version>3.8.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-system-biz</artifactId>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-module-supervision</artifactId>
</dependency>
</dependencies>
</project>
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-AUDIT.md
-244
View File
@@ -1,244 +0,0 @@
# 流程模块架构审计报告
> 审计范围：`org.jeecg` 下 4 个流程模块（xispeak / xispeakfb / inspectimprove / inspectcloseout）
> 共 18 个 Java 文件，含 4 个 Config、4 个 Flow、10 个 Listener
## 一、模块概览
| 模块 | 文件数 | Flow 行数 | 业务完整度 | DI 健康度 |
|------|--------|-----------|-----------|-----------|
| xispeak | 9 (1C+1F+7L) | 432 | 完整 | 4/7 正常，3/7 有问题 |
| xispeakfb | 3 (1C+1F+1L) | 322 | 完整 | 正常 |
| inspectimprove | 3 (1C+1F+1L) | 164 | TODO 未完成 | 正常 |
| inspectcloseout | 3 (1C+1F+1L) | 132 | TODO 未完成 | 正常 |
---
## 二、P0 致命问题
### 2.1 `StringUtil` 拼写错误 — 编译/运行时报错
**文件** `AfterSDWApproveHqListener.java` 第 50 行：
```java
if(org.apache.commons.lang.StringUtil.isEmpty(url)) {
```
Apache Commons Lang 中不存在 `StringUtil` 类，应为 `StringUtils`。
**影响**：该行不会通过编译；如果通过（如 IDE 自动导入），运行时会抛出 `NoClassDefFoundError`。
### 2.2 链式调用直接 NPE（3 处）
**`XiSpeakFlow.java`：**
1. **行 166**：`xiSpeakConfig.getXiSpeak().getNeedSdwApproveCode()` — `getXiSpeak()` 可能返回 null（yml 缺失此段落时 Spring Boot 不会注入默认值，导致属性为 null）
2. **行 172**：`xiSpeakConfig.getXiSpeak().getFeedbackRightNowCode()` — 同上
3. **行 178**：`xiSpeakConfig.getXiSpeak().getSdwLeaderListKey()` — 同上
同类方法 `getBgDeptLdUserIdList()` 行 37-41 做了守卫判断，但上述 3 处遗漏。
**`XiSpeakFlow.java` 行 310：**
```java
public int getImplDeptIsEnd(DelegateExecution execution) {
return getDeptApproveDetail(execution).getIsEnd();
}
```
`getDeptApproveDetail()` 可能返回 null（当 businessKey 为空、deptVar 为 null、entity 不存在时），直接调 `.getIsEnd()` 必抛 NPE。
### 2.3 `InspectImproveFlow` / `InspectCloseoutFlow` 所有公开方法配置 NPE
```java
public List<String> getMeasureResLeaderList(Object jsonData) {
InspectImproveConfig.InspectImproveProperties props = inspectImproveConfig.getInspectImprove();
return getListFromData(jsonData, props.getMeasureResLeaderKey(), "...");
}
```
`getInspectImprove()` 无 null 守卫。如果 yml 中 `inspect-improve` 或 `inspect-closeout` 配置节缺失，所有公开方法调用时接连抛出 NPE。
---
## 三、P1 高危问题
### 3.1 JSON 解析方法大面织重复（~180 行）
同一个 "JSONObject / JSONString / POJO 三种类型兼容解析" 逻辑在以下 7 个方法中独立实现：
| 类 | 方法 | 返回类型 |
|----|------|----------|
| `XiSpeakFlow` | `getCodeValueFromData` | `Integer` |
| `XiSpeakFlow` | `getListCodeValueFromData` | `List<String>` |
| `XiSpeakFlow` | `getImplDeptNums` | `Integer` (变体) |
| `InspectImproveFlow` | `getStringFromData` | `String` |
| `InspectImproveFlow` | `getListFromData` | `List<String>` |
| `InspectCloseoutFlow` | `getStringFromData` | `String` |
| `InspectCloseoutFlow` | `getListFromData` | `List<String>` |
**建议**：抽取为 `FlowJsonParser` 工具类，提供 `getString(jsonData, key)` / `getInteger(jsonData, key, default)` / `getStringList(jsonData, key)` 三个通用方法。
### 3.2 2 级父 Execution 攀爬逻辑三重复制（~135 行）
三个 Listener 中有逐行相同的 45 行核心逻辑，仅变量名不同：
| Listener | 存储变量名 |
|----------|-----------|
| `AfterImplDeptLeaderApproveListener` | 硬编码 `"tem_impl_leader"` |
| `AfterImplWorkerTemStoreListener` | 硬编码 `"tem_impl_worker"` |
| `AfterBgLeaderApproveListener` | 配置 `props.getTemBgLeaderKey()` |
**建议**：提取抽象模板方法，参数化变量名和日志前缀。
### 3.3 `getListSize()` 重复定义（3 处）
`XiSpeakFlow` 行 340、`InspectImproveFlow` 行 155、`InspectCloseoutFlow` 行 123 都有语义完全相同的实现。
**建议**：移入共用工具类。
### 3.4 依赖注入混乱（3 个 Listener）
| Listener | 注入方式 | 问题 |
|----------|---------|------|
| `AfterSDWApproveHqListener` | `@RequiredArgsConstructor`(2 final) **+** `@Autowired` 字段注入 `RuntimeService` | 混合注入，风格撕裂 |
| `AfterImplDeptLeaderApproveListener` | `@RequiredArgsConstructor` 零 final + `static { SpringContextUtils.getBean(...) }` | 注解虚设，static 块获取 Bean 有容器未就绪风险 |
| `AfterImplWorkerTemStoreListener` | 同上 | 同上 |
**建议**：统一为 `@RequiredArgsConstructor(onConstructor_ = @Autowired)` + private final 字段。
### 3.5 事务注解缺失
`AfterBgWorkerFinalApproveListener` 执行 `bgXiSpeakService.updateById(entity)` 却**没有** `@Transactional`。
虽然 MyBatis-Plus 的 `updateById` 自身在一条 SQL 中完成，但如果后续有人在此方法中增加第二个 DB 操作，不会感知到缺少事务边界。
### 3.6 悲观锁 vs 无锁策略不一致
| Listener | 读方法 | 锁 |
|----------|--------|----|
| `AfterImplWorkerApproveListener` | `getByIdForUpdate` | 悲观锁 (SELECT FOR UPDATE) |
| `AfterImplDeptLeaderStoreJsonListener` | `getById` | 无锁 |
| xispeakfb `AfterImplDeptLeaderApproveListener` | `getById` | 无锁 |
多实例并行会签场景下，无锁的 `getById` →修改→ `updateById` 存在**丢失更新**风险。
---
## 四、P2 中危问题
### 4.1 `parseDeptId` 两个版本功能不对等
- **xispeak 版** (`AfterImplDeptLeaderStoreJsonListener` 行 115-137)：处理 null / Collection / 普通字符串 / `[1001,1002]` 数组字符串
- **xispeakfb 版** (`AfterImplDeptLeaderApproveListener` 行 115-123)：仅处理 Collection / 普通字符串，缺失数组字符串兼容
如果 xispeakfb 流程中传入 `[deptA, deptB]` 格式的变量值（这在 xispeak 流程中很常见），解析结果会包含方括号导致后续匹配失败。
### 4.2 流程变量 fallback 模式重复（4 处）
同一 "先 `getVariableLocal` 再 `getVariable`" 的 4 行模式出现在 4 个不同位置，无统一封装。
### 4.3 `AfterSDWApproveHqListener` 日志硬编码字段名
行 80 的日志 `"解析 JSON 字段 pending_depts_id 失败"` 硬编码了特定字段名，与运行时通过 `props.getImplDeptKey()` 读取的实际字段名可能不一致，降低排查效率。
### 4.4 StringUtils 库引用混乱
| 类 | 使用的 StringUtils |
|----|--------------------|
| `XiSpeakFlow` | `org.apache.shiro.util.StringUtils`、`org.apache.commons.lang.StringUtils`、`org.apache.commons.lang3.StringUtils` — 三个库混用 |
| `XiSpeakFeedbackFlow` | `org.apache.commons.lang3.StringUtils` 统一 |
| `InspectImproveFlow` | `org.apache.commons.lang.StringUtils` (lang) |
| `InspectCloseoutFlow` | `org.apache.commons.lang.StringUtils` (lang) |
| 各 Listener | lang 和 lang3 混用 |
同一类中三种 `StringUtils` 混用增加混淆。Apache Commons Lang (`lang`) 是旧版，`lang3` 是新版，`shiro` 是第三方。
---
## 五、P3 低危问题
### 5.1 两个新的 Listener 含 TODO 未实现
- `AfterInspectImproveCompleteListener` 行 44：只输出日志，未更新业务表
- `AfterCloseoutApprovedListener` 行 35：同上
### 5.2 大量未使用的 Import
约 7 个 Listener 包含从模板复刻过来的未使用 import（如 `LambdaQueryWrapper`、`FlowNodeExpression`、`WorkFlowGlobals`、`TaskTask`、`ITaskTaskService`），推测是从其他文件复制后未清理。
### 5.3 缺少 `@Override`
xispeakfb `AfterImplDeptLeaderApproveListener` 的 `notify()` 方法缺少 `@Override`，失去编译期接口契约校验。
### 5.4 硬编码变量名 vs 配置化
`AfterImplDeptLeaderApproveListener` 和 `AfterImplWorkerTemStoreListener` 分别硬编码 `"tem_impl_leader"` 和 `"tem_impl_worker"`，而 `AfterBgLeaderApproveListener` 正确地通过 Config 读取。行为不一致。
### 5.5 `getImplDeptLeader()` 逻辑矛盾
```java
// XiSpeakFlow 行 246-252
public String getImplDeptLeader(DelegateExecution execution) {
DeptApproveDetail detail = getDeptApproveDetail(execution);
if (detail != null && detail.getIsEnd() != null) {
return String.valueOf(detail.getImplWorker()); // isEnd 非 null → 取 implWorker
}
return detail == null ? "" : detail.getImplWorker(); // isEnd 为 null → 也取 implWorker
}
```
两个分支返回同一个字段，`isEnd` 判断形同虚设（可能是条件写反）。
---
## 六、架构演进建议
### 6.1 短期（本迭代）
1. 修复 4 处 P0 致命问题（`StringUtil` 拼写、3 处 NPE）
2. 统一 `AfterSDWApproveHqListener` 注入方式
3. 统一两处错误注入（static 块 → 构造注入）
4. 补上 `AfterInspectImproveCompleteListener` 和 `AfterCloseoutApprovedListener` 的 TODO
### 6.2 中期（下个迭代）
5. 将 `getStringFromData` / `getListFromData` / `getListSize` 提取为共用 `FlowJsonParser` 工具类
6. 将 2 级父 Execution 攀爬逻辑提取为可复用的模板方法或工具方法
7. 统一 `parseDeptId` 到完整版
8. 统一 `StringUtils` 引用为 `org.apache.commons.lang3.StringUtils`
9. 清理未使用的 import
### 6.3 长期（架构层面）
10. 考虑引入流程模块 SDK 层（`flow-module-sdk`），包含：
- 基类 `AbstractFlowConfig` / `AbstractFlowExpression`
- 泛型 JSON 解析器
- 通用 Listener 模板（变量攀爬、审批记录持久化）
11. 统一事务策略文档：哪些 Listener 需要 `@Transactional`，何时用悲观锁 vs 乐观锁
12. 建立模块创建 CheckList，新模块上线前逐项验证（DI 一致性、NPE 防御、事务标注、无硬编码等）
---
## 七、CheckList：新流程模块自查项
| # | 检查项 | 说明 |
|---|--------|------|
| 1 | Config 注入方式 | `@Component` + `@ConfigurationProperties(prefix = "flow-biz")` |
| 2 | Config 内嵌类 | 属性名与 yml key 中划线自动映射驼峰 |
| 3 | Flow 注入方式 | `@RequiredArgsConstructor(onConstructor_ = @Autowired)` + private final |
| 4 | Flow Bean 命名 | `@Component("xxxFlow")`，避免与其它模块冲突 |
| 5 | 所有公开方法守卫 null | Flow 方法中检查 `getXxx()` 返回 null |
| 6 | 是否复用 `getStringFromData` / `getListFromData` | 优先使用共用工具类，不复写 |
| 7 | Listener 注入方式 | 统一构造注入，禁止 static 块和字段注入 |
| 8 | Listener 类型选择 | 需在任务创建前初始化变量 → ExecutionListener；任务完成回调 → TaskListener |
| 9 | 事务注解 | 有 DB 写操作加 `@Transactional(rollbackFor = Exception.class)` |
| 10 | 锁策略 | 并发写同一行 → `getByIdForUpdate`；无并发 → `getById` |
| 11 | 异常处理策略 | 需阻断流程 → rethrow；可容忍 → catch + log + 返回默认值 |
| 12 | `StringUtils` | 统一使用 `org.apache.commons.lang3.StringUtils` |
| 13 | 无硬编码变量名 | 变量名统一从 Config 读取 |
| 14 | 无未使用 import | 提交前 IDE 自动优化 imports |
| 15 | `@Override` | 所有 `notify()` 方法加 `@Override` |
| 16 | yml 配置节 | 与 Config 内嵌类属性一一对应 |
| 17 | 无 TODO | 功能完整的 Listener 不应留 TODO |
| 18 | 日志规范 | 异常用 `log.error`、业务用 `log.info`、跳过/降级用 `log.warn` |
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/FLOW-MODULE-GUIDE.md
-139
View File
@@ -1,139 +0,0 @@
# 流程模块开发指南
本文档说明如何为业务模块创建对应的流程集成包，基于 `org.jeecg.xispeak` 的设计模式。
## 目录结构
```
org/jeecg/<module>/
├── XxxConfig.java # 配置类，映射 YAML
├── XxxFlow.java # 流程表达式 Bean
└── listener/
├── AfterXxxListener.java # TaskListener / ExecutionListener
└── ...
```
## 三步创建流程模块
### Step 1: 创建 Config 配置类
读取 `application-flow.yml` 中 `flow-biz.<module-name>` 段落。
```java
@Data
@Component
@ConfigurationProperties(prefix = "flow-biz")
public class XxxConfig {
private XxxProperties xxx; // 对应 yml 中 xxx 节点
@Data
public static class XxxProperties {
private String businessKey; // 业务主键变量名
private String jsonDataKey; // JSON 数据变量名
private String formUrl; // 业务表单路径
private String flowCode; // 流程定义编码（可选）
// ... 按需添加字段名配置
}
}
```
**要点：**
- 外层类 `@ConfigurationProperties(prefix = "flow-biz")`，内层属性名对应 YAML 键名
- Spring 自动做中划线 → 驼峰映射（`business-key` → `businessKey`）
- 将业务字段名配置化，避免硬编码，方便流程设计调整
### Step 2: 创建 Flow 表达式 Bean
供 Flowable 流程表达式 `${xxxFlow.method(args)}` 调用。
```java
@Slf4j
@Component("xxxFlow") // Bean 名即流程表达式前缀
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class XxxFlow {
private final XxxConfig xxxConfig;
// 注入需要的 Service
// 提供流程表达式方法
public List<String> getApproverList(Object jsonData) { ... }
public int getApproverListLength(Object jsonData) { ... }
}
```
**常用方法模式：**
| 方法 | 用途 | 表达式示例 |
|------|------|-----------|
| `getXxxList(jsonData)` | 从 JSON 解析列表 | `${xxxFlow.getApproverList(json_data)}` |
| `getXxxListLength(jsonData)` | 返回列表长度 | `${xxxFlow.getApproverListLength(json_data) > 0}` |
| `getXxx(jsonData)` | 从 JSON 解析单值 | `${xxxFlow.getApplicant(json_data)}` |
| `getListSize(str)` | 逗号分隔字符串计数 | `${xxxFlow.getListSize(someVar)}` |
**要点：**
- Bean 名要有命名空间意识，不可与其它模块冲突
- 所有方法需防御 null/空字符串输入
- Length 类方法用于流程网关条件判断
### Step 3: 创建 Listener
监听流程节点事件，执行业务回调。
```java
@Slf4j
@Component("AfterXxxListener") // Bean 名供 Flowable 设计器引用
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class AfterXxxListener implements TaskListener {
private final XxxConfig xxxConfig;
@Override
public void notify(DelegateTask delegateTask) {
// 1. 读取流程变量
// 2. 执行业务逻辑
// 3. 异常时慎重决定是否 rethrow
}
}
```
**Listener 类型：**
- `TaskListener` — 用户任务完成/创建时触发
- `ExecutionListener` — 流程实例/节点生命周期事件
**要点：**
- 必须在 `notify` 开头做 null 防御（assignee、变量等可能为空）
- 需要读写业务表时加 `@Transactional(rollbackFor = Exception.class)`
- 异常处理：阻断流程 rethrow，不阻断 catch 后 log
### Step 4: 添加 YAML 配置
在 `application-flow.yml` 的 `flow-biz` 下新增配置节：
```yaml
flow-biz:
<module-name>:
business-key: "business_id"
json-data-key: "json_data"
form-url: "path/to/BPMForm"
flow-code: "process_xxx"
# ... 模块专属字段
```
## 已有模块速查
| 模块 | 包路径 | YAML 节点 | Flow Bean | 对应业务实体 |
|------|--------|-----------|-----------|-------------|
| 习讲话 | `org.jeecg.xispeak` | `xi-speak` | `xiSpeakFlow` | `BgXiSpeak` |
| 巡视整改 | `org.jeecg.inspectimprove` | `inspect-improve` | `inspectImproveFlow` | `DjInspectImprove` |
| 巡视整改销号 | `org.jeecg.inspectcloseout` | `inspect-closeout` | `inspectCloseoutFlow` | 待定 |
## 流程表达式调试
在 Flowable 流程设计器中，表达式写法为 `${beanName.methodName(args)}`：
```
${xiSpeakFlow.getNeedSdwApproval(json_data) == 1}
${inspectImproveFlow.getMeasureResLeaderListLength(json_data) > 0}
${inspectCloseoutFlow.getApproverListLength(json_data) == 0}
```
`json_data` 变量由子流程启动监听器（如 `AfterSDWApproveHqListener`）从主流程注入，具体变量名见各模块 YAML 的 `json-data-key`。
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/Main.java
-17
View File
@@ -1,17 +0,0 @@
package org.jeecg;
//TIP 要<b>运行</b>代码，请按 <shortcut actionId="Run"/> 或
// 点击装订区域中的 <icon src="AllIcons.Actions.Execute"/> 图标。
public class Main {
public static void main(String[] args) {
//TIP 当文本光标位于高亮显示的文本处时按 <shortcut actionId="ShowIntentionActions"/>
// 查看 IntelliJ IDEA 建议如何修正。
System.out.printf("Hello and welcome!");
for (int i = 1; i <= 5; i++) {
//TIP 按 <shortcut actionId="Debug"/> 开始调试代码。我们已经设置了一个 <icon src="AllIcons.Debugger.Db_set_breakpoint"/> 断点
// 但您始终可以通过按 <shortcut actionId="ToggleLineBreakpoint"/> 添加更多断点。
System.out.println("i = " + i);
}
}
}
jeecg-boot-module/pom.xml
-1
View File
@@ -18,7 +18,6 @@
<!-- <module>jeecg-boot-module-easyoa</module>
<module>jeecg-boot-module-wps</module>-->
<module>jeecg-boot-module-airag</module>
<module>jeecg-module-flow</module>
<module>jeecg-module-tools</module>
<module>jeecg-module-im</module>
</modules>
jeecg-module-supervision/src/main/java/org/jeecg/Main.java
-17
View File
@@ -1,17 +0,0 @@
package org.jeecg;
//TIP 要<b>运行</b>代码，请按 <shortcut actionId="Run"/> 或
// 点击装订区域中的 <icon src="AllIcons.Actions.Execute"/> 图标。
public class Main {
public static void main(String[] args) {
//TIP 当文本光标位于高亮显示的文本处时按 <shortcut actionId="ShowIntentionActions"/>
// 查看 IntelliJ IDEA 建议如何修正。
System.out.printf("Hello and welcome!");
for (int i = 1; i <= 5; i++) {
//TIP 按 <shortcut actionId="Debug"/> 开始调试代码。我们已经设置了一个 <icon src="AllIcons.Debugger.Db_set_breakpoint"/> 断点
// 但您始终可以通过按 <shortcut actionId="ToggleLineBreakpoint"/> 添加更多断点。
System.out.println("i = " + i);
}
}
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/IProcessPortalService.java
-8
View File
@@ -1,8 +0,0 @@
package org.jeecg.modules.dashboard.service;
import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO;
public interface IProcessPortalService {
ProcessPortalStatsDTO getStats(String userId);
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/constant/BgPartymatterConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/constant/BgPartymatterConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bgpartymatter.constant;
package org.jeecg.modules.supervision.bgpartymatter.constant;
/**
* 党委/所务会事项模块常量类
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/controller/BgPartymatterController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/controller/BgPartymatterController.java
+11 -11
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bgpartymatter.controller;
package org.jeecg.modules.supervision.bgpartymatter.controller;
import com.alibaba.fastjson.JSONObject;
import org.flowable.engine.RuntimeService;
@@ -11,10 +11,10 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.excel.ExcelAnnotationUtils;
import org.jeecg.modules.bg.constant.BpmStatus;
import org.jeecg.modules.bg.constant.SupervisionConstant;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.common.BpmStatus;
import org.jeecg.modules.supervision.common.SupervisionConstant;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,12 +29,12 @@ import java.util.List;
import java.util.Map;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.bgpartymatter.dto.BgPartymatterBpmSaveDTO;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService;
import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService;
import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant;
import org.jeecg.modules.supervision.bgpartymatter.dto.BgPartymatterBpmSaveDTO;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService;
import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService;
import org.jeecg.modules.supervision.bgpartymatter.constant.BgPartymatterConstant;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.jeecg.common.aspect.annotation.AutoLog;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/dto/BgPartymatterBpmSaveDTO.java
+2 -2
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.bgpartymatter.dto;
package org.jeecg.modules.supervision.bgpartymatter.dto;
import java.io.Serializable;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatter.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatter.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bgpartymatter.entity;
package org.jeecg.modules.supervision.bgpartymatter.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/entity/BgPartymatterFeedback.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/entity/BgPartymatterFeedback.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bgpartymatter.entity;
package org.jeecg.modules.supervision.bgpartymatter.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterFeedbackMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.bgpartymatter.mapper;
package org.jeecg.modules.supervision.bgpartymatter.mapper;
import java.util.List;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/BgPartymatterMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/BgPartymatterMapper.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.demo.bgpartymatter.mapper;
package org.jeecg.modules.supervision.bgpartymatter.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterFeedbackMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper">
<mapper namespace="org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -9,7 +9,7 @@
main_id = #{mainId}
</delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback">
SELECT *
FROM bg_partymatter_feedback
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/mapper/xml/BgPartymatterMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/mapper/xml/BgPartymatterMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?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.demo.bgpartymatter.mapper.BgPartymatterMapper">
<mapper namespace="org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterMapper">
</mapper>
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterFeedbackService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterFeedbackService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.demo.bgpartymatter.service;
package org.jeecg.modules.supervision.bgpartymatter.service;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/IBgPartymatterService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/IBgPartymatterService.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.bgpartymatter.service;
package org.jeecg.modules.supervision.bgpartymatter.service;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.Serializable;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterFeedbackServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.bgpartymatter.service.impl;
package org.jeecg.modules.supervision.bgpartymatter.service.impl;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterFeedbackService;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatterFeedback;
import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterFeedbackService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bgpartymatter/service/impl/BgPartymatterServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bgpartymatter/service/impl/BgPartymatterServiceImpl.java
+5 -5
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.demo.bgpartymatter.service.impl;
package org.jeecg.modules.supervision.bgpartymatter.service.impl;
import org.jeecg.modules.demo.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
import org.jeecg.modules.demo.bgpartymatter.mapper.BgPartymatterMapper;
import org.jeecg.modules.demo.bgpartymatter.service.IBgPartymatterService;
import org.jeecg.modules.supervision.bgpartymatter.entity.BgPartymatter;
import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterFeedbackMapper;
import org.jeecg.modules.supervision.bgpartymatter.mapper.BgPartymatterMapper;
import org.jeecg.modules.supervision.bgpartymatter.service.IBgPartymatterService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/controller/BgTakepulseController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/controller/BgTakepulseController.java
+10 -10
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bqtakepulse.controller;
package org.jeecg.modules.supervision.bqtakepulse.controller;
import java.io.IOException;
import java.util.ArrayList;
@@ -13,9 +13,9 @@ import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import org.flowable.engine.RuntimeService;
import org.jeecg.modules.bg.constant.BpmStatus;
import org.jeecg.modules.bg.constant.SupervisionConstant;
import org.jeecg.modules.bg.xispeak.entity.BgXiSpeak;
import org.jeecg.modules.supervision.common.BpmStatus;
import org.jeecg.modules.supervision.common.SupervisionConstant;
import org.jeecg.modules.supervision.xispeak.entity.BgXiSpeak;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -29,12 +29,12 @@ import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.excel.ExcelAnnotationUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.bqtakepulse.dto.BgTakepulseBpmSaveDTO;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.demo.bqtakepulse.vo.BgTakepulsePage;
import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService;
import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService;
import org.jeecg.modules.supervision.bqtakepulse.dto.BgTakepulseBpmSaveDTO;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.vo.BgTakepulsePage;
import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService;
import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/dto/BgTakepulseBpmSaveDTO.java
+2 -2
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.bqtakepulse.dto;
package org.jeecg.modules.supervision.bqtakepulse.dto;
import java.io.Serializable;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulse.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulse.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bqtakepulse.entity;
package org.jeecg.modules.supervision.bqtakepulse.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/entity/BgTakepulseFeedback.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/entity/BgTakepulseFeedback.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.bqtakepulse.entity;
package org.jeecg.modules.supervision.bqtakepulse.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseFeedbackMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.bqtakepulse.mapper;
package org.jeecg.modules.supervision.bqtakepulse.mapper;
import java.util.List;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/BgTakepulseMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/BgTakepulseMapper.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.demo.bqtakepulse.mapper;
package org.jeecg.modules.supervision.bqtakepulse.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseFeedbackMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper">
<mapper namespace="org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback">
SELECT *
FROM bg_takepulse_feedback
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/mapper/xml/BgTakepulseMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/mapper/xml/BgTakepulseMapper.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?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.demo.bqtakepulse.mapper.BgTakepulseMapper">
<mapper namespace="org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseMapper">
</mapper>
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseFeedbackService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseFeedbackService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.demo.bqtakepulse.service;
package org.jeecg.modules.supervision.bqtakepulse.service;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/IBgTakepulseService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/IBgTakepulseService.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.bqtakepulse.service;
package org.jeecg.modules.supervision.bqtakepulse.service;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.Serializable;
import java.util.Collection;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseFeedbackServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.bqtakepulse.service.impl;
package org.jeecg.modules.supervision.bqtakepulse.service.impl;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper;
import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseFeedbackService;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper;
import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseFeedbackService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/service/impl/BgTakepulseServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/service/impl/BgTakepulseServiceImpl.java
+6 -6
View File
@@ -1,10 +1,10 @@
package org.jeecg.modules.demo.bqtakepulse.service.impl;
package org.jeecg.modules.supervision.bqtakepulse.service.impl;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseFeedbackMapper;
import org.jeecg.modules.demo.bqtakepulse.mapper.BgTakepulseMapper;
import org.jeecg.modules.demo.bqtakepulse.service.IBgTakepulseService;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseFeedbackMapper;
import org.jeecg.modules.supervision.bqtakepulse.mapper.BgTakepulseMapper;
import org.jeecg.modules.supervision.bqtakepulse.service.IBgTakepulseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/bqtakepulse/vo/BgTakepulsePage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/bqtakepulse/vo/BgTakepulsePage.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.bqtakepulse.vo;
package org.jeecg.modules.supervision.bqtakepulse.vo;
import java.util.List;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.demo.bqtakepulse.entity.BgTakepulseFeedback;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulse;
import org.jeecg.modules.supervision.bqtakepulse.entity.BgTakepulseFeedback;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelEntity;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/BpmStatus.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/BpmStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.constant;
package org.jeecg.modules.supervision.common;
import java.util.Arrays;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/OrgConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/OrgConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg;
package org.jeecg.modules.supervision.common;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/constant/SupervisionConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/common/SupervisionConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.constant;
package org.jeecg.modules.supervision.common;
/**
* 监督模块通用常量
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/controller/ProcessPortalController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/controller/ProcessPortalController.java
+3 -3
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.dashboard.controller;
package org.jeecg.modules.supervision.dashboard.controller;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -6,8 +6,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO;
import org.jeecg.modules.dashboard.service.IProcessPortalService;
import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO;
import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/dto/ProcessPortalStatsDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/dto/ProcessPortalStatsDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.dashboard.dto;
package org.jeecg.modules.supervision.dashboard.dto;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/mapper/ProcessPortalMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/mapper/ProcessPortalMapper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.dashboard.mapper;
package org.jeecg.modules.supervision.dashboard.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/IProcessPortalService.java
+8
View File
@@ -0,0 +1,8 @@
package org.jeecg.modules.supervision.dashboard.service;
import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO;
public interface IProcessPortalService {
ProcessPortalStatsDTO getStats(String userId);
}
jeecg-module-supervision/src/main/java/org/jeecg/modules/dashboard/service/impl/ProcessPortalServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dashboard/service/impl/ProcessPortalServiceImpl.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.dashboard.service.impl;
package org.jeecg.modules.supervision.dashboard.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.dashboard.dto.ProcessPortalStatsDTO;
import org.jeecg.modules.dashboard.mapper.ProcessPortalMapper;
import org.jeecg.modules.dashboard.service.IProcessPortalService;
import org.jeecg.modules.supervision.dashboard.dto.ProcessPortalStatsDTO;
import org.jeecg.modules.supervision.dashboard.mapper.ProcessPortalMapper;
import org.jeecg.modules.supervision.dashboard.service.IProcessPortalService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/controller/DqInspectProblemController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/controller/DqInspectProblemController.java
+3 -3
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspectproblem.controller;
package org.jeecg.modules.supervision.dqinspectproblem.controller;
import java.util.Arrays;
import java.util.List;
@@ -13,8 +13,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.vo.SelectTreeModel;
import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService;
import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/entity/DqInspectProblem.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/entity/DqInspectProblem.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspectproblem.entity;
package org.jeecg.modules.supervision.dqinspectproblem.entity;
import java.io.Serializable;
import java.util.Date;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/DqInspectProblemMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/DqInspectProblemMapper.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.demo.dqinspectproblem.mapper;
package org.jeecg.modules.supervision.dqinspectproblem.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.common.system.vo.SelectTreeModel;
import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem;
import java.util.List;
import java.util.Map;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/mapper/xml/DqInspectProblemMapper.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?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.demo.dqinspectproblem.mapper.DqInspectProblemMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspectproblem.mapper.DqInspectProblemMapper">
<update id="updateTreeNodeStatus" parameterType="java.lang.String">
update dq_inspect_problem set has_child = #{status} where id = #{id}
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/IDqInspectProblemService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/IDqInspectProblemService.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.dqinspectproblem.service;
package org.jeecg.modules.supervision.dqinspectproblem.service;
import org.jeecg.common.system.vo.SelectTreeModel;
import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.exception.JeecgBootException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspectproblem/service/impl/DqInspectProblemServiceImpl.java
+4 -4
View File
@@ -1,12 +1,12 @@
package org.jeecg.modules.demo.dqinspectproblem.service.impl;
package org.jeecg.modules.supervision.dqinspectproblem.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.vo.SelectTreeModel;
import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.demo.dqinspectproblem.mapper.DqInspectProblemMapper;
import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService;
import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.supervision.dqinspectproblem.mapper.DqInspectProblemMapper;
import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.transaction.annotation.Transactional;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectProgressController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectProgressController.java
+3 -3
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspecttask.controller;
package org.jeecg.modules.supervision.dqinspecttask.controller;
import java.util.Arrays;
import java.io.IOException;
@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/controller/DqInspectTaskController.java
+7 -7
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspecttask.controller;
package org.jeecg.modules.supervision.dqinspecttask.controller;
import java.io.UnsupportedEncodingException;
import java.io.IOException;
@@ -26,12 +26,12 @@ import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.excel.ExcelAnnotationUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskPage;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskPage;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectProgress.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspecttask.entity;
package org.jeecg.modules.supervision.dqinspecttask.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/entity/DqInspectTask.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspecttask.entity;
package org.jeecg.modules.supervision.dqinspecttask.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectProgressMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.demo.dqinspecttask.mapper;
package org.jeecg.modules.supervision.dqinspecttask.mapper;
import java.util.List;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/DqInspectTaskMapper.java
+3 -3
View File
@@ -1,13 +1,13 @@
package org.jeecg.modules.demo.dqinspecttask.mapper;
package org.jeecg.modules.supervision.dqinspecttask.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo;
/**
* @Description: dq_inspect_task
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.demo.dqinspecttask.mapper.DqInspectProgressMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress">
SELECT *
FROM dq_inspect_progress
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?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.demo.dqinspecttask.mapper.DqInspectTaskMapper">
<mapper namespace="org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectTaskMapper">
<select id="queryLedgerPage" resultType="org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo">
<select id="queryLedgerPage" resultType="org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo">
select
t.id,
p_category.id as categoryId,
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectProgressService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.demo.dqinspecttask.service;
package org.jeecg.modules.supervision.dqinspecttask.service;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/IDqInspectTaskService.java
+4 -4
View File
@@ -1,11 +1,11 @@
package org.jeecg.modules.demo.dqinspecttask.service;
package org.jeecg.modules.supervision.dqinspecttask.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.dqinspecttask.service.impl;
package org.jeecg.modules.supervision.dqinspecttask.service.impl;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectProgressService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java
+9 -9
View File
@@ -1,15 +1,15 @@
package org.jeecg.modules.demo.dqinspecttask.service.impl;
package org.jeecg.modules.supervision.dqinspecttask.service.impl;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.demo.dqinspectproblem.service.IDqInspectProblemService;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper;
import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper;
import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.jeecg.modules.supervision.dqinspectproblem.entity.DqInspectProblem;
import org.jeecg.modules.supervision.dqinspectproblem.service.IDqInspectProblemService;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectProgressMapper;
import org.jeecg.modules.supervision.dqinspecttask.mapper.DqInspectTaskMapper;
import org.jeecg.modules.supervision.dqinspecttask.service.IDqInspectTaskService;
import org.jeecg.modules.supervision.dqinspecttask.vo.DqInspectTaskLedgerVo;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskLedgerVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.demo.dqinspecttask.vo;
package org.jeecg.modules.supervision.dqinspecttask.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/dqinspecttask/vo/DqInspectTaskPage.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.demo.dqinspecttask.vo;
package org.jeecg.modules.supervision.dqinspecttask.vo;
import java.util.List;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectTask;
import org.jeecg.modules.supervision.dqinspecttask.entity.DqInspectProgress;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelEntity;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/constant/FixContactConstant.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/constant/FixContactConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.constant;
package org.jeecg.modules.supervision.fixcontact.constant;
/**
* 定点联系模块常量
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/controller/FixedContact20260730Controller.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/controller/FixedContact20260730Controller.java
+9 -9
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.controller;
package org.jeecg.modules.supervision.fixcontact.controller;
import java.util.*;
import java.io.IOException;
@@ -16,14 +16,14 @@ import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.excel.ExcelAnnotationUtils;
import org.jeecg.modules.bg.constant.BpmStatus;
import org.jeecg.modules.bg.constant.SupervisionConstant;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service;
import org.jeecg.modules.bg.fixcontact.dto.FixedContact20260730BpmSaveDTO;
import org.jeecg.modules.bg.fixcontact.vo.FixedContact20260730Page;
import org.jeecg.modules.supervision.common.BpmStatus;
import org.jeecg.modules.supervision.common.SupervisionConstant;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service;
import org.jeecg.modules.supervision.fixcontact.dto.FixedContact20260730BpmSaveDTO;
import org.jeecg.modules.supervision.fixcontact.vo.FixedContact20260730Page;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.flowable.engine.RuntimeService;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/dto/FixedContact20260730BpmSaveDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/dto/FixedContact20260730BpmSaveDTO.java
+2 -2
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.bg.fixcontact.dto;
package org.jeecg.modules.supervision.fixcontact.dto;
import java.io.Serializable;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContact20260730.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContact20260730.java
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.entity;
package org.jeecg.modules.supervision.fixcontact.entity;
import java.io.Serializable;
import java.util.Date;
@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.AutoLogIgnore;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
@Data
@TableName(value = "fixed_contact_20260730", autoResultMap = true)
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/entity/FixedContactFeedback20260730.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/entity/FixedContactFeedback20260730.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.entity;
package org.jeecg.modules.supervision.fixcontact.entity;
import java.io.Serializable;
import java.util.Date;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/flow/FixContactFlow.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/flow/FixContactFlow.java
+8 -8
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.flow;
package org.jeecg.modules.supervision.fixcontact.flow;
import com.alibaba.fastjson.JSONObject;
import com.jeecg.weibo.exception.BusinessException;
@@ -8,13 +8,13 @@ import org.apache.commons.lang.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.DelegateExecution;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.extbpm.process.common.expression.FlowNodeExpression;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactDeptLeaderApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactDeptLeaderApproveListener.java
+2 -2
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.listener;
package org.jeecg.modules.supervision.fixcontact.listener;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -7,7 +7,7 @@ import org.flowable.engine.delegate.TaskListener;
import org.flowable.engine.runtime.Execution;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant;
import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant;
import org.springframework.stereotype.Component;
/**
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/listener/FixContactWorkerApproveListener.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/listener/FixContactWorkerApproveListener.java
+6 -6
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.listener;
package org.jeecg.modules.supervision.fixcontact.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -6,11 +6,11 @@ import org.apache.commons.lang.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.delegate.TaskListener;
import org.flowable.task.service.delegate.DelegateTask;
import org.jeecg.modules.bg.fixcontact.constant.FixContactConstant;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.fixcontact.constant.FixContactConstant;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContact20260730Mapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContact20260730Mapper.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.bg.fixcontact.mapper;
package org.jeecg.modules.supervision.fixcontact.mapper;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface FixedContact20260730Mapper extends BaseMapper<FixedContact20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/mapper/FixedContactFeedback20260730Mapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/mapper/FixedContactFeedback20260730Mapper.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.jeecg.modules.bg.fixcontact.mapper;
package org.jeecg.modules.supervision.fixcontact.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface FixedContactFeedback20260730Mapper extends BaseMapper<FixedContactFeedback20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContact20260730Service.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContact20260730Service.java
+3 -3
View File
@@ -1,10 +1,10 @@
package org.jeecg.modules.bg.fixcontact.service;
package org.jeecg.modules.supervision.fixcontact.service;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import com.baomidou.mybatisplus.extension.service.IService;
public interface IFixedContact20260730Service extends IService<FixedContact20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/IFixedContactFeedback20260730Service.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/IFixedContactFeedback20260730Service.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.bg.fixcontact.service;
package org.jeecg.modules.supervision.fixcontact.service;
import java.util.List;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import com.baomidou.mybatisplus.extension.service.IService;
public interface IFixedContactFeedback20260730Service extends IService<FixedContactFeedback20260730> {
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContact20260730ServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContact20260730ServiceImpl.java
+8 -8
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.bg.fixcontact.service.impl;
package org.jeecg.modules.supervision.fixcontact.service.impl;
import java.io.Serializable;
import java.util.ArrayList;
@@ -6,13 +6,13 @@ import java.util.Collection;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.bg.fixcontact.mapper.FixedContact20260730Mapper;
import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper;
import org.jeecg.modules.bg.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.bg.xispeak.entity.DeptApproveDetailMap;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.mapper.FixedContact20260730Mapper;
import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContact20260730Service;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetail;
import org.jeecg.modules.supervision.xispeak.entity.DeptApproveDetailMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/service/impl/FixedContactFeedback20260730ServiceImpl.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.bg.fixcontact.service.impl;
package org.jeecg.modules.supervision.fixcontact.service.impl;
import java.util.List;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.bg.fixcontact.mapper.FixedContactFeedback20260730Mapper;
import org.jeecg.modules.bg.fixcontact.service.IFixedContactFeedback20260730Service;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.mapper.FixedContactFeedback20260730Mapper;
import org.jeecg.modules.supervision.fixcontact.service.IFixedContactFeedback20260730Service;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/fixcontact/vo/FixedContact20260730Page.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/fixcontact/vo/FixedContact20260730Page.java
+3 -3
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.bg.fixcontact.vo;
package org.jeecg.modules.supervision.fixcontact.vo;
import java.util.List;
import org.jeecg.modules.bg.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.bg.fixcontact.entity.FixedContactFeedback20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContact20260730;
import org.jeecg.modules.supervision.fixcontact.entity.FixedContactFeedback20260730;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.jeecgframework.poi.excel.annotation.ExcelCollection;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/controller/ImprovementProposalController.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/controller/ImprovementProposalController.java
+12 -12
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.controller;
package org.jeecg.modules.supervision.improvementproposal.controller;
import java.io.UnsupportedEncodingException;
import java.io.IOException;
@@ -25,17 +25,17 @@ import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.modules.improvementproposal.vo.ImprovementProposalPage;
import org.jeecg.modules.improvementproposal.service.IImprovementProposalService;
import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService;
import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.modules.supervision.improvementproposal.vo.ImprovementProposalPage;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementDeptScoreBpmDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import java.math.BigDecimal;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementInstituteVoteCandidateDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import java.io.Serializable;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalBpmActionDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalBpmActionDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import java.io.Serializable;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/dto/ImprovementProposalDepartmentDTO.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/dto/ImprovementProposalDepartmentDTO.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.dto;
package org.jeecg.modules.supervision.improvementproposal.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementDeptScore.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementDeptScore.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.entity;
package org.jeecg.modules.supervision.improvementproposal.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementInstituteVote.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementInstituteVote.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.entity;
package org.jeecg.modules.supervision.improvementproposal.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/entity/ImprovementProposal.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/entity/ImprovementProposal.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.modules.improvementproposal.entity;
package org.jeecg.modules.supervision.improvementproposal.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementDeptScoreMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementDeptScoreMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.improvementproposal.mapper;
package org.jeecg.modules.supervision.improvementproposal.mapper;
import java.util.List;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementInstituteVoteMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementInstituteVoteMapper.java
+2 -2
View File
@@ -1,7 +1,7 @@
package org.jeecg.modules.improvementproposal.mapper;
package org.jeecg.modules.supervision.improvementproposal.mapper;
import java.util.List;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/ImprovementProposalMapper.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/ImprovementProposalMapper.java
+3 -3
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.improvementproposal.mapper;
package org.jeecg.modules.supervision.improvementproposal.mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementDeptScoreMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.improvementproposal.mapper.ImprovementDeptScoreMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore">
SELECT *
FROM improvement_dept_score
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementInstituteVoteMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.improvementproposal.mapper.ImprovementInstituteVoteMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper">
<delete id="deleteByMainId" parameterType="java.lang.String">
DELETE
@@ -8,7 +8,7 @@
WHERE
main_id = #{mainId} </delete>
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote">
<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote">
SELECT *
FROM improvement_institute_vote
WHERE
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/mapper/xml/ImprovementProposalMapper.xml → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/mapper/xml/ImprovementProposalMapper.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?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.improvementproposal.mapper.ImprovementProposalMapper">
<mapper namespace="org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementProposalMapper">
<select id="selectLatestProposalNoByYear" resultType="java.lang.String">
SELECT proposal_no FROM improvement_proposal
@@ -25,7 +25,7 @@
</select>
<!-- 角色名单由服务端查询，前端只能从该受控集合中选择。 -->
<select id="selectInstituteVoteCandidates" resultType="org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO">
<select id="selectInstituteVoteCandidates" resultType="org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO">
SELECT DISTINCT u.id, u.username, u.realname
FROM sys_role r
INNER JOIN sys_user_role ur ON ur.role_id = r.id
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementDeptScoreService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementDeptScoreService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.improvementproposal.service;
package org.jeecg.modules.supervision.improvementproposal.service;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementInstituteVoteService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementInstituteVoteService.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.jeecg.modules.improvementproposal.service;
package org.jeecg.modules.supervision.improvementproposal.service;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/IImprovementProposalService.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/IImprovementProposalService.java
+8 -8
View File
@@ -1,12 +1,12 @@
package org.jeecg.modules.improvementproposal.service;
package org.jeecg.modules.supervision.improvementproposal.service;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.common.system.vo.LoginUser;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletRequest;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementDeptScoreServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.improvementproposal.service.impl;
package org.jeecg.modules.supervision.improvementproposal.service.impl;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper;
import org.jeecg.modules.improvementproposal.service.IImprovementDeptScoreService;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementDeptScoreService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementInstituteVoteServiceImpl.java
+4 -4
View File
@@ -1,8 +1,8 @@
package org.jeecg.modules.improvementproposal.service.impl;
package org.jeecg.modules.supervision.improvementproposal.service.impl;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper;
import org.jeecg.modules.improvementproposal.service.IImprovementInstituteVoteService;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementInstituteVoteService;
import org.springframework.stereotype.Service;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/service/impl/ImprovementProposalServiceImpl.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/service/impl/ImprovementProposalServiceImpl.java
+12 -12
View File
@@ -1,16 +1,16 @@
package org.jeecg.modules.improvementproposal.service.impl;
package org.jeecg.modules.supervision.improvementproposal.service.impl;
import org.jeecg.modules.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.modules.improvementproposal.mapper.ImprovementDeptScoreMapper;
import org.jeecg.modules.improvementproposal.mapper.ImprovementInstituteVoteMapper;
import org.jeecg.modules.improvementproposal.mapper.ImprovementProposalMapper;
import org.jeecg.modules.improvementproposal.service.IImprovementProposalService;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementDeptScoreBpmDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementInstituteVoteCandidateDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalBpmActionDTO;
import org.jeecg.modules.supervision.improvementproposal.dto.ImprovementProposalDepartmentDTO;
import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementDeptScoreMapper;
import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementInstituteVoteMapper;
import org.jeecg.modules.supervision.improvementproposal.mapper.ImprovementProposalMapper;
import org.jeecg.modules.supervision.improvementproposal.service.IImprovementProposalService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.common.system.vo.LoginUser;
jeecg-module-supervision/src/main/java/org/jeecg/modules/improvementproposal/vo/ImprovementProposalPage.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/improvementproposal/vo/ImprovementProposalPage.java
+4 -4
View File
@@ -1,9 +1,9 @@
package org.jeecg.modules.improvementproposal.vo;
package org.jeecg.modules.supervision.improvementproposal.vo;
import java.util.List;
import org.jeecg.modules.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.improvementproposal.entity.ImprovementInstituteVote;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementProposal;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementDeptScore;
import org.jeecg.modules.supervision.improvementproposal.entity.ImprovementInstituteVote;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecgframework.poi.excel.annotation.ExcelEntity;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectcloseout/InspectCloseoutConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectCloseoutConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectcloseout;
package org.jeecg.modules.supervision.inspectimprove.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
jeecg-boot-module/jeecg-module-flow/src/main/java/org/jeecg/inspectimprove/InspectImproveConfig.java → jeecg-module-supervision/src/main/java/org/jeecg/modules/supervision/inspectimprove/config/InspectImproveConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jeecg.inspectimprove;
package org.jeecg.modules.supervision.inspectimprove.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

Some files were not shown because too many files have changed in this diff Show More