From d415d7060a2bbbfae17d4cf4961a46c531d613b7 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 20 Feb 2024 10:45:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=80=83=E6=A0=B8=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/supervise/dto/ClassifyDTO.java    | 1 +
 .../main/java/com/logpm/supervise/dto/IndicatorsDTO.java  | 2 ++
 .../main/java/com/logpm/supervise/vo/IndicatorsVO.java    | 2 ++
 .../java/com/logpm/supervise/mapper/ClassifyMapper.xml    | 3 +++
 .../java/com/logpm/supervise/mapper/IndicatorsMapper.xml  | 8 +++++++-
 .../logpm/supervise/service/impl/ClassifyServiceImpl.java | 5 +++++
 .../supervise/service/impl/IndicatorsServiceImpl.java     | 4 ++++
 7 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java
index 9d9f27bb8..6e776d93f 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/ClassifyDTO.java
@@ -11,6 +11,7 @@ import java.util.List;
 public class ClassifyDTO extends ClassifyEntity {
 
 	private String ids;
+	private String createDeptName;
 
 	private Integer isPid;
 
diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java
index 5e7465f30..069a92a8a 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/dto/IndicatorsDTO.java
@@ -27,4 +27,6 @@ public class IndicatorsDTO extends IndicatorsEntity {
 	private Date start;
 	private Date end;
 
+	private String createDeptName;
+
 }
diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
index d389318a3..e86731a33 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java
@@ -27,6 +27,8 @@ public class IndicatorsVO extends IndicatorsEntity {
 
 	private String parentClassifyName;
 
+	private String examineDeptName;
+
 	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();
 
 	private List<IndicatorsAnnexEntity> files = new ArrayList<>();
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
index 061171e2b..4e949f5b2 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml
@@ -37,6 +37,9 @@
             <if test="param.name != null and param.name != ''">
                 and `name` like #{param.name}
             </if>
+            <if test="param.createDept != null and param.createDept != ''">
+                and create_dept like #{param.createDept}
+            </if>
         </where>
         order by create_time desc
     </select>
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index 20673b28c..ff7b1d49c 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -7,6 +7,7 @@
         select si.id id,
                sc.id classifyId,
                sc.name classifyName,
+               sc.examine_dept_name examineDeptName,
                psc.id parentClassifyId,
                psc.name parentClassifyName,
                psc.id parentClassifyId,
@@ -16,7 +17,9 @@
                si.remark remark,
                si.indicators_status indicatorsStatus,
                si.is_objection isObjection,
-               si.objection_remark objectionRemark
+               si.objection_remark objectionRemark,
+               si.create_time createTime,
+               si.create_dept createDept
         from sup_indicators si
         left join sup_classify sc on sc.id = si.classify_id
         left join sup_classify psc on psc.id = sc.p_id
@@ -34,6 +37,9 @@
         <if test="param.end != null">
             and si.create_time &lt;= #{param.end}
         </if>
+        <if test="param.createDept != null">
+            and si.create_dept = #{param.createDept}
+        </if>
 
     </select>
 
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
index 3c315df57..c742923ed 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java
@@ -101,13 +101,18 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		String pId = (String) classify.get("pid");
 		String name = (String) classify.get("name");
 		String isPid = (String) classify.get("isPid");
+		String createDeptName = (String) classify.get("createDeptName");
 
 		ClassifyDTO classifyDTO = new ClassifyDTO();
 		if (StringUtil.isNotBlank(pId)) {
 			classifyDTO.setPId(Long.parseLong(pId));
 		}
+
+		Long createDept = deptClient.findIdByName(createDeptName);
+
 		classifyDTO.setName(name);
 		classifyDTO.setIsPid(Integer.parseInt(isPid));
+		classifyDTO.setCreateDept(createDept);
 
 		IPage<ClassifyVO> pages = baseMapper.pageList(page, classifyDTO);
 		List<ClassifyVO> records = pages.getRecords();
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
index ec689a30e..4559d60fa 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java
@@ -39,11 +39,15 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 
 		String startDateStr = indicatorsDTO.getStartDateStr();
 		String endDateStr = indicatorsDTO.getEndDateStr();
+		String createDeptName = indicatorsDTO.getCreateDeptName();
+
+		Long createDept = deptClient.findIdByName(createDeptName);
 
 		Date start = CommonUtil.getStartByDateStr(startDateStr);
 		Date end = CommonUtil.getEndByDateStr(endDateStr);
 		indicatorsDTO.setStart(start);
 		indicatorsDTO.setEnd(end);
+		indicatorsDTO.setCreateDept(createDept);
 
 		IPage<IndicatorsVO> pages = baseMapper.pageList(page,indicatorsDTO);