yxk-20260527-巡视整改提升台账，任务清单和工作进展反馈子表代码生成

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java

@@ -0,0 +1,274 @@
+package org.jeecg.modules.demo.dqinspecttask.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.vo.LoginUser;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
+import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskPage;
+import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
+import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSON;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+
+ /**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Tag(name="dq_inspect_task")
+@RestController
+@RequestMapping("/dqinspecttask/dqInspectTask")
+@Slf4j
+public class DqInspectTaskController {
+	@Autowired
+	private IDqInspectTaskService dqInspectTaskService;
+	@Autowired
+	private IDqInspectProgressService dqInspectProgressService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param dqInspectTask
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "dq_inspect_task-分页列表查询")
+	@Operation(summary="dq_inspect_task-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<DqInspectTask>> queryPageList(DqInspectTask dqInspectTask,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+        QueryWrapper<DqInspectTask> queryWrapper = QueryGenerator.initQueryWrapper(dqInspectTask, req.getParameterMap());
+		Page<DqInspectTask> page = new Page<DqInspectTask>(pageNo, pageSize);
+		IPage<DqInspectTask> pageList = dqInspectTaskService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param dqInspectTaskPage
+	 * @return
+	 */
+	@AutoLog(value = "dq_inspect_task-添加")
+	@Operation(summary="dq_inspect_task-添加")
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody DqInspectTaskPage dqInspectTaskPage) {
+		DqInspectTask dqInspectTask = new DqInspectTask();
+		BeanUtils.copyProperties(dqInspectTaskPage, dqInspectTask);
+        dqInspectTask.setBpmStatus("1");
+        if (oConvertUtils.isEmpty(dqInspectTask.getDelFlag())) {
+            dqInspectTask.setDelFlag("0");
+        }
+		dqInspectTaskService.saveMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param dqInspectTaskPage
+	 * @return
+	 */
+	@AutoLog(value = "dq_inspect_task-编辑")
+	@Operation(summary="dq_inspect_task-编辑")
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody DqInspectTaskPage dqInspectTaskPage) {
+		DqInspectTask dqInspectTask = new DqInspectTask();
+		BeanUtils.copyProperties(dqInspectTaskPage, dqInspectTask);
+		DqInspectTask dqInspectTaskEntity = dqInspectTaskService.getById(dqInspectTask.getId());
+		if(dqInspectTaskEntity==null) {
+			return Result.error("未找到对应数据");
+		}
+		dqInspectTaskService.updateMain(dqInspectTask, dqInspectTaskPage.getDqInspectProgressList());
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "dq_inspect_task-通过id删除")
+	@Operation(summary="dq_inspect_task-通过id删除")
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		dqInspectTaskService.delMain(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "dq_inspect_task-批量删除")
+	@Operation(summary="dq_inspect_task-批量删除")
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.dqInspectTaskService.delBatchMain(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "dq_inspect_task-通过id查询")
+	@Operation(summary="dq_inspect_task-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<DqInspectTask> queryById(@RequestParam(name="id",required=true) String id) {
+		DqInspectTask dqInspectTask = dqInspectTaskService.getById(id);
+		if(dqInspectTask==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(dqInspectTask);
+
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "工作进展反馈通过主表ID查询")
+	@Operation(summary="工作进展反馈主表ID查询")
+	@GetMapping(value = "/queryDqInspectProgressByMainId")
+	public Result<List<DqInspectProgress>> queryDqInspectProgressListByMainId(@RequestParam(name="id",required=true) String id) {
+		List<DqInspectProgress> dqInspectProgressList = dqInspectProgressService.selectByMainId(id);
+		return Result.OK(dqInspectProgressList);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param dqInspectTask
+    */
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DqInspectTask dqInspectTask) {
+
+      // Step.1 组装查询条件查询数据
+      QueryWrapper<DqInspectTask> queryWrapper = QueryGenerator.initQueryWrapper(dqInspectTask, request.getParameterMap());
+      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+      //配置选中数据查询条件
+      String selections = request.getParameter("selections");
+      if(oConvertUtils.isNotEmpty(selections)) {
+         List<String> selectionList = Arrays.asList(selections.split(","));
+         queryWrapper.in("id",selectionList);
+      }
+      //Step.2 获取导出数据
+      List<DqInspectTask> dqInspectTaskList = dqInspectTaskService.list(queryWrapper);
+
+      // Step.3 组装pageList
+      List<DqInspectTaskPage> pageList = new ArrayList<DqInspectTaskPage>();
+      for (DqInspectTask main : dqInspectTaskList) {
+          DqInspectTaskPage vo = new DqInspectTaskPage();
+          BeanUtils.copyProperties(main, vo);
+          List<DqInspectProgress> dqInspectProgressList = dqInspectProgressService.selectByMainId(main.getId());
+          vo.setDqInspectProgressList(dqInspectProgressList);
+          pageList.add(vo);
+      }
+
+      // Step.4 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      mv.addObject(NormalExcelConstants.FILE_NAME, "dq_inspect_task列表");
+      mv.addObject(NormalExcelConstants.CLASS, DqInspectTaskPage.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("dq_inspect_task数据", "导出人:"+sysUser.getRealname(), "dq_inspect_task"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+    }
+
+    /**
+    * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          // 获取上传文件对象
+          MultipartFile file = entity.getValue();
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<DqInspectTaskPage> list = ExcelImportUtil.importExcel(file.getInputStream(), DqInspectTaskPage.class, params);
+              for (DqInspectTaskPage page : list) {
+                  DqInspectTask po = new DqInspectTask();
+                  BeanUtils.copyProperties(page, po);
+                  dqInspectTaskService.saveMain(po, page.getDqInspectProgressList());
+              }
+              return Result.OK("文件导入成功！数据行数:" + list.size());
+          } catch (Exception e) {
+              log.error(e.getMessage(),e);
+              return Result.error("文件导入失败:"+e.getMessage());
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.OK("文件导入失败！");
+    }
+
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectProgress.java

@@ -0,0 +1,91 @@
+package org.jeecg.modules.demo.dqinspecttask.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Description: 工作进展反馈
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Schema(description="工作进展反馈")
+@Data
+@TableName("dq_inspect_progress")
+public class DqInspectProgress implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "id")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@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 createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@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 updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**反馈部门ID*/
+	@Excel(name = "反馈部门ID", width = 15)
+    @Schema(description = "反馈部门ID")
+    private java.lang.String feedbackDeptId;
+	/**反馈部门名称*/
+	@Excel(name = "反馈部门名称", width = 15)
+    @Schema(description = "反馈部门名称")
+    private java.lang.String feedbackDeptName;
+	/**反馈人ID*/
+	@Excel(name = "反馈人ID", width = 15)
+    @Schema(description = "反馈人ID")
+    private java.lang.String feedbackPersonId;
+	/**反馈人姓名*/
+	@Excel(name = "反馈人姓名", width = 15)
+    @Schema(description = "反馈人姓名")
+    private java.lang.String feedbackPersonName;
+	/**实际完成时间*/
+	@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 actualTime;
+	/**工作进展*/
+	@Excel(name = "工作进展", width = 15)
+    @Schema(description = "工作进展")
+    private java.lang.String workProgress;
+	/**进展状态*/
+	@Excel(name = "进展状态", width = 15, dicCode = "feedback_status")
+    @Schema(description = "进展状态")
+    private java.lang.String bpmStatus;
+	/**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+    @Schema(description = "删除标识")
+    @TableLogic
+    private java.lang.String delFlag;
+	/**整改措施任务ID*/
+    @Schema(description = "整改措施任务ID")
+    private java.lang.String mainId;
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/entity/DqInspectTask.java

@@ -0,0 +1,144 @@
+package org.jeecg.modules.demo.dqinspecttask.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Schema(description="dq_inspect_task")
+@Data
+@TableName("dq_inspect_task")
+public class DqInspectTask implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "id")
+    private java.lang.String id;
+	/**创建人*/
+    @Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@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 createTime;
+	/**更新人*/
+    @Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@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 updateTime;
+	/**所属部门*/
+    @Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**具体问题ID*/
+	@Excel(name = "具体问题ID", width = 15)
+    @Schema(description = "具体问题ID")
+    private java.lang.String problemId;
+	/**密级*/
+	@Excel(name = "密级", width = 15, dicCode = "secret_level")
+    @Dict(dicCode = "secret_level")
+    @Schema(description = "密级")
+    private java.lang.String secretLevel;
+	/**整改措施*/
+	@Excel(name = "整改措施", width = 15)
+    @Schema(description = "整改措施")
+    private java.lang.String improveMeasure;
+	/**完成时限*/
+	@Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "完成时限")
+    private java.util.Date deadline;
+	/**目标节点*/
+	@Excel(name = "目标节点", width = 15)
+    @Schema(description = "目标节点")
+    private java.lang.String targetNode;
+	/**措施责任领导*/
+	@Excel(name = "措施责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Schema(description = "措施责任领导")
+    private java.lang.String measureResLeader;
+	/**措施责任部门*/
+	@Excel(name = "措施责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Schema(description = "措施责任部门")
+    private java.lang.String measureResDept;
+	/**整改交付成果*/
+	@Excel(name = "整改交付成果", width = 15)
+    @Schema(description = "整改交付成果")
+    private java.lang.String rectificationEvidence;
+	/**成效评价标准*/
+	@Excel(name = "成效评价标准", width = 15)
+    @Schema(description = "成效评价标准")
+    private java.lang.String evaluationCriterion;
+	/**是否需要党群领导审批*/
+	@Excel(name = "是否需要党群领导审批", width = 15, dicCode = "yn")
+    @Dict(dicCode = "yn")
+    @Schema(description = "是否需要党群领导审批")
+    private java.lang.String isNeedAppro;
+	/**党群领导*/
+	@Excel(name = "党群领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Schema(description = "党群领导")
+    private java.lang.String supDeptleaderid;
+	/**检查情况*/
+	@Excel(name = "检查情况", width = 15)
+    @Schema(description = "检查情况")
+    private java.lang.String inspectionStatus;
+	/**监督意见*/
+	@Excel(name = "监督意见", width = 15)
+    @Schema(description = "监督意见")
+    private java.lang.String supervisoryOpinion;
+	/**措施数量*/
+	@Excel(name = "措施数量", width = 15)
+    @Schema(description = "措施数量")
+    private java.lang.Integer measureCount;
+	/**流程实例ID*/
+	@Excel(name = "流程实例ID", width = 15)
+    @Schema(description = "流程实例ID")
+    private java.lang.String bpmProcessId;
+	/**流程状态*/
+	@Excel(name = "流程状态", width = 15, dicCode = "super_status")
+    @Dict(dicCode = "super_status")
+    @Schema(description = "流程状态")
+    private java.lang.String bpmStatus;
+	/**整改状态*/
+	@Excel(name = "整改状态", width = 15)
+    @Schema(description = "整改状态")
+    private java.lang.String taskStatus;
+	/**督办次数*/
+	@Excel(name = "督办次数", width = 15)
+    @Schema(description = "督办次数")
+    private java.lang.String superviseCount;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+    @Schema(description = "排序")
+    private java.lang.Integer sortNo;
+	/**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+    @Schema(description = "删除标识")
+    @TableLogic
+    private java.lang.String delFlag;
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectProgressMapper.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.demo.dqinspecttask.mapper;
+
+import java.util.List;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @Description: 工作进展反馈
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+public interface DqInspectProgressMapper extends BaseMapper<DqInspectProgress> {
+
+	/**
+	 * 通过主表id删除子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return boolean
+	 */
+	public boolean deleteByMainId(@Param("mainId") String mainId);
+
+  /**
+   * 通过主表id查询子表数据
+   *
+   * @param mainId 主表id
+   * @return List<DqInspectProgress>
+   */
+	public List<DqInspectProgress> selectByMainId(@Param("mainId") String mainId);
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.dqinspecttask.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+public interface DqInspectTaskMapper extends BaseMapper<DqInspectTask> {
+
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectProgressMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  dq_inspect_progress 
+		WHERE
+			 main_id = #{mainId} 	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress">
+		SELECT * 
+		FROM  dq_inspect_progress
+		WHERE
+			 main_id = #{mainId} 	</select>
+</mapper>

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper">
+
+</mapper>

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectProgressService.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.demo.dqinspecttask.service;
+
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 工作进展反馈
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+public interface IDqInspectProgressService extends IService<DqInspectProgress> {
+
+	/**
+	 * 通过主表id查询子表数据
+	 *
+	 * @param mainId 主表id
+	 * @return List<DqInspectProgress>
+	 */
+	public List<DqInspectProgress> selectByMainId(String mainId);
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.demo.dqinspecttask.service;
+
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+public interface IDqInspectTaskService extends IService<DqInspectTask> {
+
+	/**
+	 * 添加一对多
+	 *
+	 * @param dqInspectTask
+	 * @param dqInspectProgressList
+	 */
+	public void saveMain(DqInspectTask dqInspectTask,List<DqInspectProgress> dqInspectProgressList) ;
+	
+	/**
+	 * 修改一对多
+	 *
+   * @param dqInspectTask
+   * @param dqInspectProgressList
+	 */
+	public void updateMain(DqInspectTask dqInspectTask,List<DqInspectProgress> dqInspectProgressList);
+	
+	/**
+	 * 删除一对多
+	 *
+	 * @param id
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 *
+	 * @param idList
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectProgressServiceImpl.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.demo.dqinspecttask.service.impl;
+
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper;
+import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 工作进展反馈
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Service
+public class DqInspectProgressServiceImpl extends ServiceImpl<DqInspectProgressMapper, DqInspectProgress> implements IDqInspectProgressService {
+	
+	@Autowired
+	private DqInspectProgressMapper dqInspectProgressMapper;
+	
+	@Override
+	public List<DqInspectProgress> selectByMainId(String mainId) {
+		return dqInspectProgressMapper.selectByMainId(mainId);
+	}
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.demo.dqinspecttask.service.impl;
+
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectProgressMapper;
+import org.jeecg.modules.demo.dqinspecttask.mapper.DqInspectTaskMapper;
+import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Service
+public class DqInspectTaskServiceImpl extends ServiceImpl<DqInspectTaskMapper, DqInspectTask> implements IDqInspectTaskService {
+
+	@Autowired
+	private DqInspectTaskMapper dqInspectTaskMapper;
+	@Autowired
+	private DqInspectProgressMapper dqInspectProgressMapper;
+	
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void saveMain(DqInspectTask dqInspectTask, List<DqInspectProgress> dqInspectProgressList) {
+		dqInspectTaskMapper.insert(dqInspectTask);
+		if(dqInspectProgressList!=null && dqInspectProgressList.size()>0) {
+			for(DqInspectProgress entity:dqInspectProgressList) {
+				//外键设置
+				entity.setMainId(dqInspectTask.getId());
+				dqInspectProgressMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMain(DqInspectTask dqInspectTask,List<DqInspectProgress> dqInspectProgressList) {
+		dqInspectTaskMapper.updateById(dqInspectTask);
+		
+		//1.先删除子表数据
+		dqInspectProgressMapper.deleteByMainId(dqInspectTask.getId());
+		
+		//2.子表数据重新插入
+		if(dqInspectProgressList!=null && dqInspectProgressList.size()>0) {
+			for(DqInspectProgress entity:dqInspectProgressList) {
+				//外键设置
+				entity.setMainId(dqInspectTask.getId());
+				dqInspectProgressMapper.insert(entity);
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delMain(String id) {
+		dqInspectProgressMapper.deleteByMainId(id);
+		dqInspectTaskMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			dqInspectProgressMapper.deleteByMainId(id.toString());
+			dqInspectTaskMapper.deleteById(id);
+		}
+	}
+	
+}

jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskPage.java

@@ -0,0 +1,144 @@
+package org.jeecg.modules.demo.dqinspecttask.vo;
+
+import java.util.List;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask;
+import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.ProvinceCityArea;
+import org.jeecg.common.util.SpringContextUtils;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * @Description: dq_inspect_task
+ * @Author: jeecg-boot
+ * @Date:   2026-05-28
+ * @Version: V1.0
+ */
+@Data
+@Schema(description="dq_inspect_task")
+public class DqInspectTaskPage {
+
+	/**id*/
+	@Schema(description = "id")
+    private java.lang.String id;
+	/**创建人*/
+	@Schema(description = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@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 createTime;
+	/**更新人*/
+	@Schema(description = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@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 updateTime;
+	/**所属部门*/
+	@Schema(description = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**具体问题ID*/
+	@Excel(name = "具体问题ID", width = 15)
+	@Schema(description = "具体问题ID")
+    private java.lang.String problemId;
+	/**密级*/
+	@Excel(name = "密级", width = 15, dicCode = "secret_level")
+    @Dict(dicCode = "secret_level")
+	@Schema(description = "密级")
+    private java.lang.String secretLevel;
+	/**整改措施*/
+	@Excel(name = "整改措施", width = 15)
+	@Schema(description = "整改措施")
+    private java.lang.String improveMeasure;
+	/**完成时限*/
+	@Excel(name = "完成时限", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Schema(description = "完成时限")
+    private java.util.Date deadline;
+	/**目标节点*/
+	@Excel(name = "目标节点", width = 15)
+	@Schema(description = "目标节点")
+    private java.lang.String targetNode;
+	/**措施责任领导*/
+	@Excel(name = "措施责任领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Schema(description = "措施责任领导")
+    private java.lang.String measureResLeader;
+	/**措施责任部门*/
+	@Excel(name = "措施责任部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
+	@Schema(description = "措施责任部门")
+    private java.lang.String measureResDept;
+	/**整改交付成果*/
+	@Excel(name = "整改交付成果", width = 15)
+	@Schema(description = "整改交付成果")
+    private java.lang.String rectificationEvidence;
+	/**成效评价标准*/
+	@Excel(name = "成效评价标准", width = 15)
+	@Schema(description = "成效评价标准")
+    private java.lang.String evaluationCriterion;
+	/**是否需要党群领导审批*/
+	@Excel(name = "是否需要党群领导审批", width = 15, dicCode = "yn")
+    @Dict(dicCode = "yn")
+	@Schema(description = "是否需要党群领导审批")
+    private java.lang.String isNeedAppro;
+	/**党群领导*/
+	@Excel(name = "党群领导", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
+    @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
+	@Schema(description = "党群领导")
+    private java.lang.String supDeptleaderid;
+	/**检查情况*/
+	@Excel(name = "检查情况", width = 15)
+	@Schema(description = "检查情况")
+    private java.lang.String inspectionStatus;
+	/**监督意见*/
+	@Excel(name = "监督意见", width = 15)
+	@Schema(description = "监督意见")
+    private java.lang.String supervisoryOpinion;
+	/**措施数量*/
+	@Excel(name = "措施数量", width = 15)
+	@Schema(description = "措施数量")
+    private java.lang.Integer measureCount;
+	/**流程实例ID*/
+	@Excel(name = "流程实例ID", width = 15)
+	@Schema(description = "流程实例ID")
+    private java.lang.String bpmProcessId;
+	/**流程状态*/
+	@Excel(name = "流程状态", width = 15, dicCode = "super_status")
+    @Dict(dicCode = "super_status")
+	@Schema(description = "流程状态")
+    private java.lang.String bpmStatus;
+	/**整改状态*/
+	@Excel(name = "整改状态", width = 15)
+	@Schema(description = "整改状态")
+    private java.lang.String taskStatus;
+	/**督办次数*/
+	@Excel(name = "督办次数", width = 15)
+	@Schema(description = "督办次数")
+    private java.lang.String superviseCount;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	@Schema(description = "排序")
+    private java.lang.Integer sortNo;
+	/**删除标识*/
+	@Excel(name = "删除标识", width = 15)
+	@Schema(description = "删除标识")
+    private java.lang.String delFlag;
+
+	@ExcelCollection(name="工作进展反馈")
+	@Schema(description = "工作进展反馈")
+	private List<DqInspectProgress> dqInspectProgressList;
+
+}