根据新excel表修改xispeak表单，xispeakfeedback表单

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/controller/feedback/BgXiSpeakFeedbackController.java

@@ -7,8 +7,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.bg.xispeak.entity.BgXiSpeakFeedback;
 import org.jeecg.modules.bg.xispeak.service.IBgXiSpeakFeedbackService;
@@ -70,6 +73,49 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
 		return Result.OK(pageList);
 	}
 
+	/**
+	 * 分页列表查询
+	 *
+	 * @param bgXiSpeakFeedback
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@Operation(summary="习总书记重要讲话反馈表-分页列表查询（含当前用户部门过滤）")
+	@GetMapping(value = "/listBgXiSpeakFeedbackByMainIdWithUserDept")
+	public Result<IPage<BgXiSpeakFeedback>> queryPageListWithUserDept(BgXiSpeakFeedback bgXiSpeakFeedback,
+																	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	  HttpServletRequest req) {
+		// 1. 初始化通用的查询条件
+		QueryWrapper<BgXiSpeakFeedback> queryWrapper = QueryGenerator.initQueryWrapper(bgXiSpeakFeedback, req.getParameterMap());
+
+		// 2. 获取当前登录用户
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if (sysUser != null) {
+			// 3. 获取当前用户的部门 ID
+			// 在 JeecgBoot 中，如果是多部门或当前登录部门，通常从 sysUser.getOrgCode() 或通过系统的部门服务获取
+			// 这里假设从当前登录上下文可以直接获取到部门 ID (或者你系统里支持的 sysUser.getDepartIds())
+			String currentDeptId = sysUser.getDepartIds(); // 或者是你业务逻辑里获取当前选中部门的方法
+
+			// 4. 将部门 ID 写入 queryWrapper 实施强制过滤（小范围控制）
+			if (oConvertUtils.isNotEmpty(currentDeptId)) {
+				// 如果用户属于多个部门，用 in；如果是单个部门，用 eq
+				if (currentDeptId.contains(",")) {
+					queryWrapper.in("respon_deptid", currentDeptId.split(","));
+				} else {
+					queryWrapper.eq("respon_deptid", currentDeptId);
+				}
+			}
+		}
+
+		// 5. 执行分页查询
+		Page<BgXiSpeakFeedback> page = new Page<BgXiSpeakFeedback>(pageNo, pageSize);
+		IPage<BgXiSpeakFeedback> pageList = bgXiSpeakFeedbackService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
 	/**
 	 * 添加
 	 *

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeak.java

@@ -168,6 +168,11 @@ public class BgXiSpeak implements Serializable {
     @Schema(description = "是否需要sdw审批")
     private java.lang.Integer needSdwApproval;
 
+    /**dw领导userId字段*/
+    @Excel(name = "截止日期", width = 15)
+    @Schema(description = "截止日期")
+    private java.util.Date deadline;
+
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, DeptApproveDetail> approveInfo;
 

jeecg-module-supervision/src/main/java/org/jeecg/modules/bg/xispeak/entity/BgXiSpeakFeedback.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -77,10 +78,18 @@ public class BgXiSpeakFeedback implements Serializable {
 	@Excel(name = "落实情况", width = 15)
     @Schema(description = "落实情况")
     private java.lang.String implStatus;
-	/**完成状态*/
-	@Excel(name = "完成状态", width = 15)
-    @Schema(description = "完成状态")
+
+    /**完成状态*/
+	@Excel(name = "反馈措施完成状态", width = 15)
+    @Schema(description = "反馈措施完成状态(0推进中，1已完成)")
+    @Dict( dicCode = "measure_complete_status")
     private java.lang.String completionStatus;
+
+    /**是否存在完成风险(0不存在，1存在)*/
+    @Excel(name = "是否有报送上级报告(0不存在，1存在)", width = 15)
+    @Schema(description = "是否有报送上级报告(0不存在，1存在)")
+    @Dict( dicCode = "need_report_higher")
+    private java.lang.Integer isReportedToHigher;
 	/**外键*/
 	@Excel(name = "外键", width = 15)
     @Schema(description = "外键")
@@ -112,6 +121,18 @@ public class BgXiSpeakFeedback implements Serializable {
     @Schema(description = "进展情况")
     private java.lang.String progress;
 
+    /**是否存在完成风险(0不存在，1存在)*/
+    @Excel(name = "是否存在完成风险(0不存在，1存在)", width = 15)
+    @Schema(description = "是否存在完成风险(0不存在，1存在)")
+    private java.lang.Integer isCompletionRisk;
+    /**拖期风险应对措施*/
+    @Excel(name = "拖期风险应对措施", width = 15)
+    @Schema(description = "拖期风险应对措施")
+    private java.lang.String delayRiskMitigation;
+    /**报告反馈情况*/
+    @Excel(name = "报告反馈情况", width = 15)
+    @Schema(description = "报告反馈情况")
+    private java.lang.String reportFeedbackStatus;	/**报告反馈情况*/
 
     @Excel(name = "落实计划", width = 15)
     @Schema(description = "落实计划")
@@ -142,26 +163,4 @@ public class BgXiSpeakFeedback implements Serializable {
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, DeptApproveDetail> approveInfo;
 
-//    /**发起类型 0立即 1周期*/
-//    @Excel(name = "发起类型 0立即 1周期", width = 15)
-//    @Schema(description = "发起类型 0立即 1周期")
-//    private java.lang.Integer launchType;
-//
-//    /**周期类型 1日 2周 3两周 4月 5季*/
-//    @Excel(name = "周期类型", width = 15)
-//    @Schema(description = "周期类型 1日 2周 3两周 4月 5季")
-//    private java.lang.Integer intervalType;
-//
-//    /**周期任务数量*/
-//    @Excel(name = "周期任务数量", width = 15)
-//    @Schema(description = "周期任务数量")
-//    private java.lang.Integer startCount;
-//
-//    /**周期开始时间*/
-//    @Excel(name = "周期开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @Schema(description = "周期开始时间")
-//    private java.util.Date startTime;
-
 }