From 0c9b8b3752b0a83c4b0b12b7aa6d40b413f91782 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 24 一月 2025 11:31:26 +0800
Subject: [PATCH] NC程序签派流程配置
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiSignExamineServiceimpl.java | 11 ++
lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IActivitiSignExamineService.java | 9 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java | 18 ++--
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java | 38 ++++----
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/mapper/ActivitiSignExamineMapper.java | 7 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiSignExamine.java | 53 +++++++++++++
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java | 2
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java | 4 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java | 1
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 3
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml | 2
lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiSignExamineController.java | 66 ++++++++++++++++
14 files changed, 186 insertions(+), 32 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
index 2c7f306..ea9b77f 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiDefinitionController.java
@@ -15,15 +15,15 @@
import org.springframework.web.bind.annotation.*;
@Slf4j
-@Api(tags = "DNC娴佺▼閰嶇疆")
+@Api(tags = "DNC鎸囨淳璁惧娴佺▼閰嶇疆")
@RestController
@RequestMapping("/nc/definition")
public class ActivitiDefinitionController {
@Autowired
private IActivitiDefinitionService definitionService;
- @AutoLog(value = "DNC娴佺▼閰嶇疆-娣诲姞閰嶇疆")
- @ApiOperation(value = "DNC娴佺▼閰嶇疆-娣诲姞閰嶇疆", notes = "DNC娴佺▼閰嶇疆-娣诲姞閰嶇疆")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-娣诲姞閰嶇疆")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-娣诲姞閰嶇疆", notes = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-娣诲姞閰嶇疆")
@PostMapping("/add")
public ResponseResult addDefinition(@RequestBody ActivitiDefinition definition) {
boolean b = definitionService.addDefinition(definition);
@@ -32,8 +32,8 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆")
- @ApiOperation(value = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆", notes = "DNC娴佺▼閰嶇疆-淇敼閰嶇疆")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-淇敼閰嶇疆")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-淇敼閰嶇疆", notes = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-淇敼閰嶇疆")
@PutMapping("/edit")
public ResponseResult editDefinition( @RequestBody ActivitiDefinition definition) {
boolean b = definitionService.updateById(definition);
@@ -42,8 +42,8 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
- @ApiOperation(value = "DNC娴佺▼閰嶇疆-鍒犻櫎閰嶇疆", notes = "DNC娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒犻櫎閰嶇疆", notes = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
@DeleteMapping("/delete")
public ResponseResult deleteDefinition(@RequestParam("id") String id) {
boolean b = definitionService.deleteDefinition(id);
@@ -52,8 +52,8 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
- @ApiOperation(value = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃", notes = "DNC娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃", notes = "DNC鎸囨淳璁惧娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
@GetMapping("/find/page")
public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiSignExamineController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiSignExamineController.java
new file mode 100644
index 0000000..a265ab3
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/ActivitiSignExamineController.java
@@ -0,0 +1,66 @@
+package org.jeecg.modules.activiti.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
+import org.jeecg.modules.activiti.request.ActivitiDefinitionRequest;
+import org.jeecg.modules.activiti.service.IActivitiDefinitionService;
+import org.jeecg.modules.activiti.service.IActivitiSignExamineService;
+import org.jeecg.modules.dnc.response.CommonCode;
+import org.jeecg.modules.dnc.response.ResponseResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Struct;
+
+@Slf4j
+@Api(tags = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆")
+@RestController
+@RequestMapping("/nc/activitiSignExamine")
+public class ActivitiSignExamineController {
+ @Autowired
+ private IActivitiSignExamineService iActivitiSignExamineService;
+
+ @AutoLog(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-娣诲姞閰嶇疆")
+ @ApiOperation(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-娣诲姞閰嶇疆", notes = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-娣诲姞閰嶇疆")
+ @PostMapping("/add")
+ public Result<?> addDefinition(@RequestBody ActivitiSignExamine activitiSignExamine) {
+ iActivitiSignExamineService.save(activitiSignExamine);
+ return Result.ok("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-淇敼閰嶇疆")
+ @ApiOperation(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-淇敼閰嶇疆", notes = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-淇敼閰嶇疆")
+ @PutMapping("/edit")
+ public Result<?> editDefinition( @RequestBody ActivitiSignExamine activitiSignExamine) {
+ iActivitiSignExamineService.updateById(activitiSignExamine);
+ return Result.ok("缂栬緫鎴愬姛!");
+ }
+
+ @AutoLog(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
+ @ApiOperation(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒犻櫎閰嶇疆", notes = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒犻櫎閰嶇疆")
+ @DeleteMapping("/delete")
+ public Result<?> deleteDefinition(@RequestParam("id") String id) {
+ iActivitiSignExamineService.removeById(id);
+ return Result.ok("鍒犻櫎鎴愬姛!");
+ }
+
+ @AutoLog(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
+ @ApiOperation(value = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃", notes = "NC绋嬪簭绛炬淳娴佺▼閰嶇疆-鍒嗛〉鏌ヨ閰嶇疆鍒楄〃")
+ @GetMapping("/find/page")
+ public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ ActivitiSignExamine activitiSignExamine) {
+ QueryWrapper<ActivitiSignExamine> queryWrapper=new QueryWrapper<>();
+ queryWrapper.like(StrUtil.isNotEmpty(activitiSignExamine.getActName()),"act_name",activitiSignExamine.getActName());
+ queryWrapper.orderByDesc("create_time");
+ IPage<ActivitiSignExamine> page=iActivitiSignExamineService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<ActivitiSignExamine>(pageNo, pageSize),queryWrapper);
+ return Result.ok(page);
+ }
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java
index fbec878..ae4580a 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/controller/AssignFileStreamController.java
@@ -21,15 +21,15 @@
import java.util.List;
@Slf4j
-@Api(tags = "DNC娴佺▼鎿嶄綔")
+@Api(tags = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔")
@RestController
@RequestMapping("/nc/activit")
public class AssignFileStreamController {
@Autowired
private IAssignFileStreamService assignFileStreamService;
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey", notes = "DNC娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey")
@PostMapping("/assign/file/apply")
public ResponseResult applyAssignFile(@RequestBody AssignFileStream stream) {
ResponseResult b = assignFileStreamService.applyAssignFile(stream);
@@ -39,8 +39,8 @@
return b;
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟", notes = "DNC娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-瀹℃壒鏈嶅姟")
@PostMapping("/assign/file/approve/{taskId}/{streamId}")
public ResponseResult approveAssignFile(@PathVariable("taskId") String taskId, @PathVariable("streamId") String streamId,
@RequestBody AssignFileStream stream) {
@@ -50,8 +50,8 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟", notes = "DNC娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇褰撳墠鐢ㄦ埛鐨勫緟鍔炲強鍙嬀鍙栫殑浠诲姟")
@GetMapping("/find/task/list")
public Result<?> getUndoTaskList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@@ -59,8 +59,8 @@
return Result.ok(actTaskExtIPage);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�", notes = "DNC娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺鎸囨淳鍒拌澶�")
@PostMapping("/assign/file/batch/apply")
public ResponseResult applyBatchAssignFile(@RequestBody AssignFileRequest assignFileRequest) {
boolean b = assignFileStreamService.applyBatchAssignFile(assignFileRequest);
@@ -69,8 +69,8 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鎵归噺瀹℃壒")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鎵归噺瀹℃壒", notes = "DNC娴佺▼鎿嶄綔-鎵归噺瀹℃壒")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵归噺瀹℃壒")
@PostMapping("/assign/file/batch/approve")
public ResponseResult approveBatchAssignFile(@RequestBody ApproveBatchRequest approveBatchRequest) {
boolean b = assignFileStreamService.approveBatchAssignFile(approveBatchRequest);
@@ -79,31 +79,31 @@
return new ResponseResult(CommonCode.FAIL);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇", notes = "DNC娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-宸插姙鍒楄〃鑾峰彇")
@GetMapping("/find/page")
public Result<?> findPageList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, AssignFileStreamQueryRequest request) {
return assignFileStreamService.findPageList(pageNo, pageSize, request);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�", notes = "DNC娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鏌ヨ鏂囨。鐨勫鎵硅褰�")
@GetMapping("/find/page/{page}/{size}/{docId}")
public QueryPageResponseResult<AssignFileStreamExt> findPageListByDocId(@PathVariable("page") int page, @PathVariable("size") int size, @PathVariable("docId") String docId) {
return assignFileStreamService.findPageListByDocId(page, size, docId);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�", notes = "DNC娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鑾峰彇鍚敤娴佺▼鐨勬爣璁�")
@GetMapping("/get/enable/flag")
public DataResponseResult<Boolean> getActiveEnable() {
Boolean b = assignFileStreamService.getActiveEnable();
return new DataResponseResult<>(CommonCode.SUCCESS, b);
}
- @AutoLog(value = "DNC娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊")
- @ApiOperation(value = "DNC娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊", notes = "DNC娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊")
+ @AutoLog(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊")
+ @ApiOperation(value = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊", notes = "DNC鎸囨淳璁惧娴佺▼鎿嶄綔-鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊")
@PostMapping("/transfer/doc")
public ResponseResult transferDocFile(String pnCode, String deviceNo) {
boolean b = assignFileStreamService.transferDocFile(pnCode, deviceNo);
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
index f6eb454..34e5ef3 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiDefinition.java
@@ -13,7 +13,7 @@
@Data
@NoArgsConstructor
@TableName("nc_activiti_definition_info")
-@Api(value= "娴佺▼瀹氫箟")
+@Api(value= "DNC鎸囨淳璁惧娴佺▼瀹氫箟")
public class ActivitiDefinition {
@TableId(value = "id")
private String id;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiSignExamine.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiSignExamine.java
new file mode 100644
index 0000000..9741240
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/ActivitiSignExamine.java
@@ -0,0 +1,53 @@
+package org.jeecg.modules.activiti.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.jeecg.common.aspect.annotation.Dict;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@TableName("nc_assign_to_sign_examine")
+@Api(value= "NC绋嬪簭绛炬淳娴佺▼瀹氫箟")
+public class ActivitiSignExamine {
+ @TableId(value = "id")
+ private String id;
+ @TableField(value = "act_name")
+ private String actName;
+ @TableField(value = "depart_id")
+ @Dict(dictTable = "sys_department",dicCode = "depart_id",dicText = "depart_name")
+ private String departId;
+ @TableField(value = "proofreader_user")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+ private String proofreaderUser;
+ @TableField(value = "approving_user")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+ private String approveUser;
+ @TableField(value = "cutter_user")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+ private String cutterUser;
+ @TableField(value = "typecast_user")
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+ private String typecastUser;
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ @TableField(value = "create_time", fill = FieldFill.INSERT)
+ private Date createTime;
+ @TableField(value = "update_time", fill = FieldFill.UPDATE)
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+ private Date updateTime;
+ @JsonIgnore
+ @TableField(value = "create_by", select = false, fill = FieldFill.INSERT)
+ private String createBy;
+ @JsonIgnore
+ @TableField(value = "update_by", select = false, fill = FieldFill.UPDATE)
+ private String updateBy;
+ @JsonIgnore
+ @TableLogic
+ @TableField(value = "delete_flag", select = false)
+ private Integer deleteFlag = 0;
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java
index 7439e48..4c8896c 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/entity/AssignFileStream.java
@@ -13,7 +13,7 @@
@Data
@NoArgsConstructor
@TableName("nc_assign_file_stream")
-@Api(value= "娴佺▼鎿嶄綔")
+@Api(value= "DNC鎸囨淳璁惧娴佺▼鎿嶄綔")
public class AssignFileStream {
@TableId(value = "stream_id")
private String streamId;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/mapper/ActivitiSignExamineMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/mapper/ActivitiSignExamineMapper.java
new file mode 100644
index 0000000..c8db5d0
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/mapper/ActivitiSignExamineMapper.java
@@ -0,0 +1,7 @@
+package org.jeecg.modules.activiti.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
+
+public interface ActivitiSignExamineMapper extends BaseMapper<ActivitiSignExamine> {
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IActivitiSignExamineService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IActivitiSignExamineService.java
new file mode 100644
index 0000000..ab5e090
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/IActivitiSignExamineService.java
@@ -0,0 +1,9 @@
+package org.jeecg.modules.activiti.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
+
+
+public interface IActivitiSignExamineService extends IService<ActivitiSignExamine> {
+
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiSignExamineServiceimpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiSignExamineServiceimpl.java
new file mode 100644
index 0000000..6d6b3b2
--- /dev/null
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/activiti/service/impl/ActivitiSignExamineServiceimpl.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.activiti.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.activiti.entity.ActivitiSignExamine;
+import org.jeecg.modules.activiti.mapper.ActivitiSignExamineMapper;
+import org.jeecg.modules.activiti.service.IActivitiSignExamineService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ActivitiSignExamineServiceimpl extends ServiceImpl<ActivitiSignExamineMapper, ActivitiSignExamine> implements IActivitiSignExamineService {
+}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java
index 166c0a0..57322b4 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/ProcessionDepartmentMapper.java
@@ -26,3 +26,4 @@
List<MdcProduction> getDepartNonPermsByProcessId(@Param("procession") String processionId);
}
+
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml
index d4c0344..abdecd6 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessionDepartmentMapper.xml
@@ -10,7 +10,7 @@
, org_code
from mdc_production u
inner join
- (select depart_id from nc_process_department where process_id=#{c}) p
+ (select depart_id from nc_process_department where process_id=#{procession}) p
on u.id=p.depart_id
</select>
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
index e0511bb..120968b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -77,6 +77,9 @@
query.orderByAsc(MdcProduction::getProductionOrder);
List<MdcProduction> list = this.list(query);
for (MdcProduction production : list) {
+ if (production.getDescription().isEmpty()){
+ production.setDescription("");
+ }
listResult.add(new MdcProductionTreeModel(production));
}
return listResult;
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
index a46ec96..e9af14d 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/util/FindsProductionsChildrenUtil.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.system.util;
+import cn.hutool.core.util.StrUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.model.MdcProductionTreeModel;
@@ -25,6 +26,9 @@
List<MdcProductionTreeModel> records = new ArrayList<>();
for (int i = 0; i < recordList.size(); i++) {
MdcProduction mdcProduction = recordList.get(i);
+ if (StrUtil.isEmpty(mdcProduction.getDescription())){
+ mdcProduction.setDescription("");
+ }
records.add(new MdcProductionTreeModel(mdcProduction));
}
List<MdcProductionTreeModel> tree = findChildren(records, idList);
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 481e2df..29d0a03 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -151,7 +151,7 @@
async-executor-activate: false
async-executor-enabled: true
activiti:
- enable: false # true 鍚敤瀹℃壒 false 涓嶅惎鐢ㄥ鎵�
+ enable: true # true 鍚敤瀹℃壒 false 涓嶅惎鐢ㄥ鎵�
#mybatis plus 璁剧疆
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
--
Gitblit v1.9.3