From 293d4315ce81fc556d90eae06e3d87ebea754878 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 01 四月 2025 17:21:18 +0800
Subject: [PATCH] 获取赋码规则
---
business/src/main/resources/mapper/CodingRulerMapper.xml | 20 +++++++++++++++-----
common/src/main/java/com/ycl/common/enums/business/CodingRulerCodeTypeEnum.java | 2 +-
flowable/src/main/java/com/ycl/mapper/ProcessCodingMapper.java | 6 ++++++
business/src/main/java/com/ycl/mapper/CodingRulerMapper.java | 3 ++-
flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java | 5 +++++
flowable/src/main/resources/mapper/ProcessCodingMapper.xml | 15 +++++++++++++++
6 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/mapper/CodingRulerMapper.java b/business/src/main/java/com/ycl/mapper/CodingRulerMapper.java
index b7cb477..49dd616 100644
--- a/business/src/main/java/com/ycl/mapper/CodingRulerMapper.java
+++ b/business/src/main/java/com/ycl/mapper/CodingRulerMapper.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.domain.vo.CodingRulerVO;
-import com.ycl.domain.form.CodingRulerForm;
import com.ycl.domain.query.CodingRulerQuery;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@@ -31,4 +30,6 @@
*/
IPage getPage(IPage page, @Param("query") CodingRulerQuery query);
+ List<CodingRulerVO> getStartRuler();
+
}
diff --git a/business/src/main/resources/mapper/CodingRulerMapper.xml b/business/src/main/resources/mapper/CodingRulerMapper.xml
index 24e7732..b017a64 100644
--- a/business/src/main/resources/mapper/CodingRulerMapper.xml
+++ b/business/src/main/resources/mapper/CodingRulerMapper.xml
@@ -13,11 +13,21 @@
<result column="status" property="status"/>
</resultMap>
-
-
-
-
-
+ <select id="getStartRuler" resultMap="BaseResultMap">
+ select
+ TCR.project_code_type,
+ TCR.interval_type,
+ TCR.left_symbol,
+ TCR.left_value,
+ TCR.right_symbol,
+ TCR.right_value,
+ TCR.id,
+ TCR.status
+ FROM
+ t_coding_ruler TCR
+ WHERE
+ TCR.status = 1 AND TCR.deleted = 0;
+ </select>
<select id="getById" resultMap="BaseResultMap">
SELECT
diff --git a/common/src/main/java/com/ycl/common/enums/business/CodingRulerCodeTypeEnum.java b/common/src/main/java/com/ycl/common/enums/business/CodingRulerCodeTypeEnum.java
index a7f53d9..344ba24 100644
--- a/common/src/main/java/com/ycl/common/enums/business/CodingRulerCodeTypeEnum.java
+++ b/common/src/main/java/com/ycl/common/enums/business/CodingRulerCodeTypeEnum.java
@@ -11,7 +11,7 @@
@Getter
public enum CodingRulerCodeTypeEnum {
RED("red", "绾㈢爜"),
- GREEN("green","缁跨爜");
+ YELLOW("yellow","榛勭爜");
@EnumValue
@JsonValue
diff --git a/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java b/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
index 65ee250..70b4a4f 100644
--- a/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
+++ b/flowable/src/main/java/com/ycl/domain/vo/ProcessCodingVO.java
@@ -53,6 +53,11 @@
@ApiModelProperty("浠诲姟鐘舵�乬reen/red/yellow")
private String status;
+ /** 浠诲姟鐘舵��0杩涜涓�1缁撴潫 */
+ @ApiModelProperty("瓒呮椂浠诲姟鏁�")
+ private Long taskOvertimeNum;
+
+
/** 浠诲姟瓒呮椂鐘舵�� */
@ApiModelProperty("浠诲姟瓒呮椂鐘舵��")
private String overtimeStatus;
diff --git a/flowable/src/main/java/com/ycl/mapper/ProcessCodingMapper.java b/flowable/src/main/java/com/ycl/mapper/ProcessCodingMapper.java
index f5ccb6d..ee3bb11 100644
--- a/flowable/src/main/java/com/ycl/mapper/ProcessCodingMapper.java
+++ b/flowable/src/main/java/com/ycl/mapper/ProcessCodingMapper.java
@@ -38,4 +38,10 @@
void updateBatch(@Param("list") List<ProcessCoding> list);
List<ProcessCoding> findByTaskId(@Param("taskId") String taskId);
+
+ /**
+ * 鏌ヨ鍑烘瘡涓祦绋嬪疄渚媔d涓秴鏃剁殑浠诲姟鏁帮紝娴佺▼瀹炰緥id
+ * @return
+ */
+ List<ProcessCodingVO> countProjectOverTimeNum();
}
diff --git a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml b/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
index ce66ff6..cfb68b1 100644
--- a/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
+++ b/flowable/src/main/resources/mapper/ProcessCodingMapper.xml
@@ -14,6 +14,21 @@
<result column="status" property="status" />
<result column="overtime_status" property="overtimeStatus" />
</resultMap>
+ <resultMap id="projectProcessTaskOverNum" type="com.ycl.domain.vo.ProcessCodingVO">
+ <id column="id" property="id"/>
+ <result column="task_overtime_num" property="taskOvertimeNum"/>
+ <result column="process_ins_id" property="processInsId"/>
+ </resultMap>
+
+ <select id="countProjectOverTimeNum" resultMap="projectProcessTaskOverNum">
+ select TPC.id,
+ TPC.process_ins_id,
+ COUNT(TPC.overtime_status) as task_overtime_num
+ FROM t_process_coding TPC
+ where
+ TPC.overtime_status = 'overtime'
+ GROUP BY TPC.process_ins_id
+ </select>
<select id="getById" resultMap="BaseResultMap">
--
Gitblit v1.8.0