首页统计

qianhe-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -180,41 +180,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 	<select id="selectDeptList_ejdw" parameterType="SysDept" resultMap="SysDeptResult">
-		select * from sys_dept d
+		select d.dept_id, d.parent_id,
+		d.ancestors,
+		CONCAT(p.dept_name,'/',d.dept_name) dept_name,
+		d.order_num, d.leader, d.phone,
+		d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl from sys_dept d
+		LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
 		where d.del_flag = '0'
 		and d.dept_id !='972'
-		and dwjb = '3'
+		and d.dwjb = '3'
 		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
+			AND d.dept_id = #{deptId}
 		</if>
 		<if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
+			AND d.parent_id = #{parentId}
 		</if>
 		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
+			AND d.dept_name like concat('%', #{deptName}, '%')
 		</if>
 		<if test="status != null and status != ''">
-			AND status = #{status}
+			AND d.status = #{status}
 		</if>
 		order by d.parent_id, d.order_num
 	</select>
 
 	<select id="selectDeptList_sjdw" parameterType="SysDept" resultMap="SysDeptResult">
-		select * from sys_dept d
+		select d.dept_id, d.parent_id,
+		d.ancestors,
+		CONCAT(p.dept_name,'/',d.dept_name) dept_name,
+		d.order_num, d.leader, d.phone,
+		d.email, d.status, d.del_flag, d.create_by, d.create_time,d.dwjb, d.dept_lx, d.dept_dfl, d.dept_ywfl from sys_dept d
+		LEFT JOIN  sys_dept p on d.parent_id = p.dept_id
 		where d.del_flag = '0'
 		and d.parent_id !='972'
-		and dwjb = '4'
+		and d.dwjb = '4'
 		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
+			AND d.dept_id = #{deptId}
 		</if>
 		<if test="parentId != null and parentId != 0">
-			AND parent_id = #{parentId}
+			AND d.parent_id = #{parentId}
 		</if>
 		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
+			AND d.dept_name like concat('%', #{deptName}, '%')
 		</if>
 		<if test="status != null and status != ''">
-			AND status = #{status}
+			AND d.status = #{status}
 		</if>
 		order by d.parent_id, d.order_num
 	</select>

qianhe-ydsj/src/main/java/com/qianhe/domain/Amain.java

@@ -18,4 +18,5 @@ public class Amain extends BaseEntity
 
     private String nd;
 
+
 }

qianhe-ydsj/src/main/java/com/qianhe/domain/AmainXq.java

+package com.qianhe.domain;
+
+import com.qianhe.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 公共附件对象 gg_fjb
+ *
+ * @author qianhe
+ * @date 2025-08-04
+ */
+@Data
+public class AmainXq extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long deptId;
+    /** 部门名称 */
+    private String deptName;
+
+    private String Q1;
+    private String Q2;
+    private String Q3;
+    private String Q4;
+
+    private String Y01;
+    private String Y02;
+    private String Y03;
+    private String Y04;
+    private String Y05;
+    private String Y06;
+    private String Y07;
+    private String Y08;
+    private String Y09;
+    private String Y10;
+    private String Y11;
+    private String Y12;
+
+    public AmainXq(Long deptId,String deptName) {
+        this.deptId = deptId;
+        this.deptName = deptName;
+
+        this.Q1 = "未提交";
+        this.Q2 = "未提交";
+        this.Q3 = "未提交";
+        this.Q4 = "未提交";
+
+        this.Y01 = "未提交";
+        this.Y02 = "未提交";
+        this.Y03 = "未提交";
+        this.Y04 = "未提交";
+        this.Y05 = "未提交";
+        this.Y06 = "未提交";
+        this.Y07 = "未提交";
+        this.Y08 = "未提交";
+        this.Y09 = "未提交";
+        this.Y10 = "未提交";
+        this.Y11 = "未提交";
+        this.Y12 = "未提交";
+    }
+
+
+}

qianhe-ydsj/src/main/java/com/qianhe/service/IAmainService.java

@@ -16,14 +16,36 @@ import java.util.stream.Collectors;
 public interface IAmainService
 {
 
+    /**
+     * 查询例会查询情况， 看二级例会情况，看三级例会情况
+     */
     public  Map<String, Map<String, Integer>> statisticsMeetings(List<SysDept> depts, List<SjLhsc> lhList);
+    public  List<AmainXq> getDeptQuarterlyStatus(List<SysDept> depts, List<SjLhsc> lhList);
 
+
+    /**
+     * 查询费用提交情况
+     */
     public  Map countDepartmentExpenses(List<SysDept> depts, List<SjFybpZb> fyList);
+    public  List<AmainXq> getExpenseStatus(List<SysDept> depts, List<SjFybpZb> fyList);
 
 
+    /**
+     * 查询直属单位对基层单位的分档评价情况
+     */
     public  Map<String, Map<String, Integer>> statisticsGradingEvaluation(List<SysDept> depts, List<SjGfjsZsdwkhpjZb> fdpjList);
+    public  List<AmainXq> getEvaluationStatus(List<SysDept> depts, List<SjGfjsZsdwkhpjZb> fdpjList);
 
+    /**
+     * 查询基层单位月度问题清单提交情况
+     */
     public  Map<String, Map<String, Integer>> statisticsMonthlyIssues(List<SysDept> depts, List<SjGfjsYdjcjl> ydwtList);
+    public  List<AmainXq> getMonthlyIssueStatus(List<SysDept> depts, List<SjGfjsYdjcjl> ydwtList) ;
+
 
+    /**
+     * 查询基层单位季度自测提交情况
+     */
     public  Map<String, Map<String, Integer>> statisticsQuarterlyTests(List<SysDept> depts, List<SjGfjsZsdwkhpjZb> fdpjList);
+    public  List<AmainXq> getQuarterlyTestStatus(List<SysDept> depts, List<SjGfjsZsdwkhpjZb> fdpjList);
 }