From 681e4456965b30d8e8394033ebd4d46b1130c962 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 17:35:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/ProjectPlanRecordService.java | 2
business/src/main/java/com/ycl/controller/PlanController.java | 2
business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java | 2
business/src/main/java/com/ycl/mapper/FlowLogMapper.java | 2
business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java | 2
business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java | 7 +--
business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java | 2
business/src/main/java/com/ycl/mapper/PlanMapper.java | 2
start/src/main/java/com/ycl/web/controller/tool/TestController.java | 10 ++--
business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java | 2
business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java | 2
business/src/main/java/com/ycl/domain/entity/FlowLog.java | 4 +-
business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java | 2
business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java | 2
business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java | 2
business/src/main/java/com/ycl/service/PlanService.java | 2
business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java | 2
business/src/main/java/com/ycl/domain/vo/FlowLogVO.java | 4 +-
business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java | 2
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 4 ++
business/src/main/java/com/ycl/service/FlowLogService.java | 4 +-
business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java | 3 -
22 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/PlanController.java b/business/src/main/java/com/ycl/controller/PlanController.java
index f7d6b75..023254d 100644
--- a/business/src/main/java/com/ycl/controller/PlanController.java
+++ b/business/src/main/java/com/ycl/controller/PlanController.java
@@ -70,7 +70,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
@PreAuthorize("hasAuthority('plan:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return planService.detail(id);
}
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
index 5cd3961..4111cb5 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanExamineRecordController.java
@@ -71,7 +71,7 @@
@GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
@PreAuthorize("hasAuthority('projectPlanExamineRecord:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return projectPlanExamineRecordService.detail(id);
}
diff --git a/business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java b/business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java
index ef43001..745cb5c 100644
--- a/business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectPlanRecordController.java
@@ -71,7 +71,7 @@
@PostMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
// @PreAuthorize("hasAuthority('projectPlanRecord:detail')")
- public Result detail(@PathVariable("id") Integer id) {
+ public Result detail(@PathVariable("id") Long id) {
return projectPlanRecordService.detail(id);
}
diff --git a/business/src/main/java/com/ycl/domain/entity/FlowLog.java b/business/src/main/java/com/ycl/domain/entity/FlowLog.java
index c851688..4cd774b 100644
--- a/business/src/main/java/com/ycl/domain/entity/FlowLog.java
+++ b/business/src/main/java/com/ycl/domain/entity/FlowLog.java
@@ -28,7 +28,7 @@
@TableField("project_id")
/** 椤圭洰id */
- private Integer projectId;
+ private Long projectId;
@TableField("flow_ins_id")
/** 娴佺▼瀹炰緥id */
@@ -36,7 +36,7 @@
@TableField("user_id")
/** 浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹� */
- private Integer userId;
+ private Long userId;
@TableField("event_data_json")
/** 浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭� */
diff --git a/business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java b/business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java
index 9d628fa..86c1a6b 100644
--- a/business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java
+++ b/business/src/main/java/com/ycl/domain/form/TaskDelegationForm.java
@@ -35,7 +35,7 @@
private String targetId;
@ApiModelProperty("椤圭洰id锛岀敤浜庝繚瀛樻棩蹇�")
- private Integer projectId;
+ private Long projectId;
@ApiModelProperty("娴佺▼瀹炰緥id锛岀敤浜庝繚瀛樻棩蹇�")
private String processInsId;
diff --git a/business/src/main/java/com/ycl/domain/vo/FlowLogVO.java b/business/src/main/java/com/ycl/domain/vo/FlowLogVO.java
index 4983434..9e66afb 100644
--- a/business/src/main/java/com/ycl/domain/vo/FlowLogVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/FlowLogVO.java
@@ -30,7 +30,7 @@
/** 椤圭洰id */
@ApiModelProperty("椤圭洰id")
- private Integer projectId;
+ private Long projectId;
/** 娴佺▼瀹炰緥id */
@ApiModelProperty("娴佺▼瀹炰緥id")
@@ -38,7 +38,7 @@
/** 浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹� */
@ApiModelProperty("浜х敓鏃ュ織鐨勪汉/鎴栧叾瀹�")
- private Integer userId;
+ private Long userId;
/** 浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭� */
@ApiModelProperty("浜嬩欢鏁版嵁锛屾牴鎹笉鍚岀殑浜嬩欢鍙瓨鍌ㄥ搴旂殑鎵╁睍鏁版嵁銆傚杞姙浜嬩欢鍙瓨鍌ㄨ浆鍔炲墠鍚庣殑澶勭悊浜轰俊鎭�")
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java
index 21a51d1..ad4aeb1 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java
@@ -8,7 +8,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class ProjectPlanResponseVO {
- private Integer id;
+ private Long id;
private String projectName;
private Integer reportStatus;
private String projectCode;
diff --git a/business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java b/business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java
index 6bfc7a4..e542da9 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProjetPlanRecordItem.java
@@ -12,7 +12,7 @@
@NoArgsConstructor
public class ProjetPlanRecordItem {
// 椤圭洰璁″垝璁板綍id
- private Integer id;
+ private Long id;
// 椤圭洰鍚嶇О
private String projectName;
// 椤圭洰浠ｇ爜
diff --git a/business/src/main/java/com/ycl/mapper/FlowLogMapper.java b/business/src/main/java/com/ycl/mapper/FlowLogMapper.java
index 0ece857..17908f1 100644
--- a/business/src/main/java/com/ycl/mapper/FlowLogMapper.java
+++ b/business/src/main/java/com/ycl/mapper/FlowLogMapper.java
@@ -23,7 +23,7 @@
* @param id
* @return
*/
- FlowLogVO getById(Integer id);
+ FlowLogVO getById(Long id);
/**
* 鍒嗛〉
diff --git a/business/src/main/java/com/ycl/mapper/PlanMapper.java b/business/src/main/java/com/ycl/mapper/PlanMapper.java
index 0f30ffb..1e2695b 100644
--- a/business/src/main/java/com/ycl/mapper/PlanMapper.java
+++ b/business/src/main/java/com/ycl/mapper/PlanMapper.java
@@ -22,7 +22,7 @@
* @param id
* @return
*/
- PlanVO getById(Integer id);
+ PlanVO getById(Long id);
/**
* 鍒嗛〉
diff --git a/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java b/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
index db58339..3319cb6 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectPlanExamineRecordMapper.java
@@ -27,7 +27,7 @@
* @param id
* @return
*/
- ProjectPlanExamineRecordVO getById(Integer id);
+ ProjectPlanExamineRecordVO getById(Long id);
/**
* 鍒嗛〉
diff --git a/business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java b/business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java
index 1d5a729..ce18253 100644
--- a/business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java
+++ b/business/src/main/java/com/ycl/mapper/ProjectPlanRecordMapper.java
@@ -37,7 +37,7 @@
/**
* 鏍规嵁椤圭洰id鍜屾爣蹇楁煡璇㈣鍒掑垪琛�
*/
- List<ProjetPlanRecordItem> selectPlanList(@Param("id") Integer id, @Param("flag") Integer flag);
+ List<ProjetPlanRecordItem> selectPlanList(@Param("id") Long id, @Param("flag") Integer flag);
void insertItem(ProjectPlanRecord item);
}
diff --git a/business/src/main/java/com/ycl/service/FlowLogService.java b/business/src/main/java/com/ycl/service/FlowLogService.java
index 3b9ec6f..da784df 100644
--- a/business/src/main/java/com/ycl/service/FlowLogService.java
+++ b/business/src/main/java/com/ycl/service/FlowLogService.java
@@ -23,7 +23,7 @@
* @param projectId 椤圭洰id
* @param eventDataJson json鎵╁睍鍐呭
*/
- void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Integer projectId, String eventDataJson);
+ void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson);
/**
* 鎵归噺鍒犻櫎
@@ -51,7 +51,7 @@
* @param id
* @return
*/
- Result detail(Integer id);
+ Result detail(Long id);
/**
* 鍒楄〃
diff --git a/business/src/main/java/com/ycl/service/PlanService.java b/business/src/main/java/com/ycl/service/PlanService.java
index 6b39151..a44fc3c 100644
--- a/business/src/main/java/com/ycl/service/PlanService.java
+++ b/business/src/main/java/com/ycl/service/PlanService.java
@@ -62,7 +62,7 @@
* @param id
* @return
*/
- Result detail(Integer id);
+ Result detail(Long id);
/**
* 鍒楄〃
diff --git a/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java b/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
index e84c542..4f2d28c 100644
--- a/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
+++ b/business/src/main/java/com/ycl/service/ProjectPlanExamineRecordService.java
@@ -57,7 +57,7 @@
* @param id
* @return
*/
- Result detail(Integer id);
+ Result detail(Long id);
/**
* 鍒楄〃
diff --git a/business/src/main/java/com/ycl/service/ProjectPlanRecordService.java b/business/src/main/java/com/ycl/service/ProjectPlanRecordService.java
index 4c149fb..0f2259f 100644
--- a/business/src/main/java/com/ycl/service/ProjectPlanRecordService.java
+++ b/business/src/main/java/com/ycl/service/ProjectPlanRecordService.java
@@ -57,7 +57,7 @@
* @param id
* @return
*/
- Result detail(Integer id);
+ Result detail(Long id);
/**
* 鍒楄〃
diff --git a/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
index b70c29b..4e0bf3d 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowLogServiceImpl.java
@@ -31,15 +31,14 @@
/**
* 娣诲姞鏃ュ織
- *
- * @param taskId 浠诲姟id
+ * @param taskId 浠诲姟id
* @param flowInsId 娴佺▼瀹炰緥id
* @param eventType 浜嬩欢绫诲瀷
* @param projectId 椤圭洰id
* @param eventDataJson json鎵╁睍鍐呭
*/
@Override
- public void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Integer projectId, String eventDataJson) {
+ public void add(String taskId, String flowInsId, FlowLogEventTypeEnum eventType, Long projectId, String eventDataJson) {
FlowLog log = new FlowLog();
log.setTaskId(taskId);
log.setFlowInsId(flowInsId);
@@ -89,7 +88,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
FlowLogVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
diff --git a/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java b/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
index b091217..4a161da 100644
--- a/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/PlanServiceImpl.java
@@ -8,7 +8,6 @@
import com.ycl.common.enums.business.ProjectTypeEnum;
import com.ycl.common.utils.DateUtils;
import com.ycl.domain.entity.Plan;
-import com.ycl.domain.entity.ProjectPlanRecord;
import com.ycl.domain.vo.ProjectPlanResponseVO;
import com.ycl.domain.vo.ProjetPlanRecordItem;
import com.ycl.framework.utils.PageUtil;
@@ -247,7 +246,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
PlanVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
index f7c8a6a..5b149f2 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanExamineRecordServiceImpl.java
@@ -114,7 +114,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
ProjectPlanExamineRecordVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
index 3c30414..f563322 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectPlanRecordServiceImpl.java
@@ -178,7 +178,7 @@
* @return
*/
@Override
- public Result detail(Integer id) {
+ public Result detail(Long id) {
ProjectPlanRecordResponseVO vo = new ProjectPlanRecordResponseVO();
// 鑾峰彇鏈堝害璁″垝
vo.setMonthRecords(baseMapper.selectPlanList(id, MONTH_FLAG));
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 032deda..dc5b220 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -343,6 +343,10 @@
}
}
}
+ taskVO.setHandlerId(handlerIds);
+ taskVO.setHandlerName(handlerNames);
+ taskVO.setHandlerUnitId(handlerUnitIds);
+ taskVO.setHandlerUnitName(handlerUnitNames);
vos.add(taskVO);
}
result.put("taskList", vos);
diff --git a/start/src/main/java/com/ycl/web/controller/tool/TestController.java b/start/src/main/java/com/ycl/web/controller/tool/TestController.java
index c4629de..5c775d1 100644
--- a/start/src/main/java/com/ycl/web/controller/tool/TestController.java
+++ b/start/src/main/java/com/ycl/web/controller/tool/TestController.java
@@ -47,9 +47,9 @@
}
@ApiOperation("鑾峰彇鐢ㄦ埛璇︾粏")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Long.class)
@GetMapping("/{userId}")
- public R<UserEntity> getUser(@PathVariable Integer userId)
+ public R<UserEntity> getUser(@PathVariable Long userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
@@ -63,7 +63,7 @@
@ApiOperation("鏂板鐢ㄦ埛")
@ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛id", dataType = "Integer", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛id", dataType = "long", dataTypeClass = Long.class),
@ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚嶇О", dataType = "String", dataTypeClass = String.class),
@ApiImplicitParam(name = "password", value = "鐢ㄦ埛瀵嗙爜", dataType = "String", dataTypeClass = String.class),
@ApiImplicitParam(name = "mobile", value = "鐢ㄦ埛鎵嬫満", dataType = "String", dataTypeClass = String.class)
@@ -97,9 +97,9 @@
}
@ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
- @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "userId", value = "鐢ㄦ埛ID", required = true, dataType = "long", paramType = "path", dataTypeClass = Long.class)
@DeleteMapping("/{userId}")
- public R<String> delete(@PathVariable Integer userId)
+ public R<String> delete(@PathVariable Long userId)
{
if (!users.isEmpty() && users.containsKey(userId))
{
--
Gitblit v1.8.0