From fe005521e622b0dc03703bb2e6537adfcab8b538 Mon Sep 17 00:00:00 2001 From: ye1023 <12588209+ye1023@user.noreply.gitee.com> Date: Fri, 29 May 2026 15:33:45 +0800 Subject: [PATCH] =?UTF-8?q?yxk-20260529-=E5=B7=A1=E8=A7=86=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E5=8D=87=E5=8F=B0=E8=B4=A6=EF=BC=8C=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B8=85=E5=8D=95=201=E3=80=81=E5=B0=86=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=20+=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=E2=80=9D=E7=9A=84=E6=89=81?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=B4=A6=E3=80=82=202=E3=80=81=E6=AF=8F?= =?UTF-8?q?=E4=B8=80=E8=A1=8C=E4=BB=8D=E4=BB=A3=E8=A1=A8=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=A1=A5=E9=BD=90?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=85=B6=E6=89=80=E5=B1=9E=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=88=86=E7=B1=BB=E3=80=81=E9=9D=A2=E4=B8=8A=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=81=E5=85=B7=E4=BD=93=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=203=E3=80=81=E7=9B=B8=E5=90=8C=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E3=80=81=E9=9D=A2=E4=B8=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E5=85=B7=E4=BD=93=E9=97=AE=E9=A2=98=E5=9C=A8=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E4=B8=AD=E4=BD=BF=E7=94=A8=20rowSpan=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC=EF=BC=8C=E5=BD=A2=E6=88=90?= =?UTF-8?q?=E7=9B=B4=E8=A7=82=E5=8F=B0=E8=B4=A6=E3=80=82=204=E3=80=81?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E4=BB=8D=E4=BB=A5=E2=80=9C?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=BB=BB=E5=8A=A1=E2=80=9D=E4=B8=BA=E7=B2=92?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E5=8D=B3=E6=AF=8F=E6=9D=A1=E6=95=B4=E6=94=B9?= =?UTF-8?q?=E6=8E=AA=E6=96=BD=E5=8D=95=E7=8B=AC=E5=8F=91=E8=B5=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DqInspectTaskController.java | 19 +++ .../mapper/DqInspectTaskMapper.java | 12 ++ .../mapper/xml/DqInspectTaskMapper.xml | 69 ++++++++++- .../service/IDqInspectTaskService.java | 12 ++ .../impl/DqInspectTaskServiceImpl.java | 8 ++ .../vo/DqInspectTaskLedgerVo.java | 113 ++++++++++++++++++ 6 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java index e256837..23c1f04 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java @@ -26,6 +26,7 @@ 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.DqInspectTaskLedgerVo; import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskPage; import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectTaskService; import org.jeecg.modules.demo.dqinspecttask.service.IDqInspectProgressService; @@ -83,6 +84,24 @@ public class DqInspectTaskController { IPage pageList = dqInspectTaskService.page(page, queryWrapper); return Result.OK(pageList); } + + /** + * 整改任务台账：一行一条整改任务，补齐问题分类、面上问题、具体问题。 + * + * @param dqInspectTask + * @param pageNo + * @param pageSize + * @return + */ + @Operation(summary="dq_inspect_task-台账分页列表查询") + @GetMapping(value = "/ledgerList") + public Result> queryLedgerList(DqInspectTask dqInspectTask, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + Page page = new Page(pageNo, pageSize); + IPage pageList = dqInspectTaskService.queryLedgerPage(page, dqInspectTask); + return Result.OK(pageList); + } /** * 添加 diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java index a446fd3..a54d3fc 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/DqInspectTaskMapper.java @@ -2,9 +2,12 @@ package org.jeecg.modules.demo.dqinspecttask.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; /** * @Description: dq_inspect_task @@ -14,4 +17,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface DqInspectTaskMapper extends BaseMapper { + /** + * 查询整改任务台账，补齐问题分类、面上问题、具体问题信息。 + * + * @param page 分页参数 + * @param task 查询条件 + * @return 台账分页 + */ + IPage queryLedgerPage(Page page, @Param("task") DqInspectTask task); + } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml index 7abca71..2b15231 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml @@ -2,4 +2,71 @@ - \ No newline at end of file + + + diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java index 61f9eb1..4c2b977 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/IDqInspectTaskService.java @@ -1,8 +1,11 @@ package org.jeecg.modules.demo.dqinspecttask.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectProgress; import org.jeecg.modules.demo.dqinspecttask.entity.DqInspectTask; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; import java.io.Serializable; import java.util.Collection; import java.util.List; @@ -44,5 +47,14 @@ public interface IDqInspectTaskService extends IService { * @param idList */ public void delBatchMain (Collection idList); + + /** + * 查询整改任务台账。 + * + * @param page 分页参数 + * @param dqInspectTask 查询条件 + * @return 台账分页 + */ + IPage queryLedgerPage(Page page, DqInspectTask dqInspectTask); } diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java index 48627f2..5340aea 100644 --- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/service/impl/DqInspectTaskServiceImpl.java @@ -9,7 +9,10 @@ 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.jeecg.modules.demo.dqinspecttask.vo.DqInspectTaskLedgerVo; import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -82,6 +85,11 @@ public class DqInspectTaskServiceImpl extends ServiceImpl queryLedgerPage(Page page, DqInspectTask dqInspectTask) { + return dqInspectTaskMapper.queryLedgerPage(page, dqInspectTask); + } + /** * 整改任务必须挂在问题清单的“具体问题”节点下，避免接口绕过前端产生非法层级数据。 */ diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java new file mode 100644 index 0000000..4b31dee --- /dev/null +++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/vo/DqInspectTaskLedgerVo.java @@ -0,0 +1,113 @@ +package org.jeecg.modules.demo.dqinspecttask.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 整改任务台账行：一行对应一条整改任务，同时带出所属的问题层级信息。 + */ +@Data +@Schema(description = "整改任务台账") +public class DqInspectTaskLedgerVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "任务ID") + private String id; + + @Schema(description = "问题分类ID") + private String categoryId; + + @Schema(description = "问题分类") + private String categoryName; + + @Schema(description = "面上问题ID") + private String surfaceId; + + @Schema(description = "面上问题") + private String surfaceName; + + @Schema(description = "具体问题ID") + private String specificId; + + @Schema(description = "具体问题") + private String specificName; + + @Schema(description = "具体问题ID") + private String problemId; + + @Schema(description = "巡视建议") + private String inspectAdvice; + + @Dict(dicCode = "secret_level") + @Schema(description = "密级") + private String secretLevel; + + @Schema(description = "整改措施") + private String improveMeasure; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @Schema(description = "完成时限") + private Date deadline; + + @Schema(description = "目标节点") + private String targetNode; + + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Schema(description = "措施责任领导") + private String measureResLeader; + + @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") + @Schema(description = "措施责任部门") + private String measureResDept; + + @Schema(description = "整改交付成果") + private String rectificationEvidence; + + @Schema(description = "成效评价标准") + private String evaluationCriterion; + + @Dict(dicCode = "yn") + @Schema(description = "是否需要党群领导审批") + private String isNeedAppro; + + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username") + @Schema(description = "党群领导") + private String supDeptleaderid; + + @Schema(description = "检查情况") + private String inspectionStatus; + + @Schema(description = "监督意见") + private String supervisoryOpinion; + + @Schema(description = "措施数量") + private Integer measureCount; + + @Schema(description = "流程实例ID") + private String bpmProcessId; + + @Dict(dicCode = "super_status") + @Schema(description = "流程状态") + private String bpmStatus; + + @Schema(description = "整改状态") + private String taskStatus; + + @Schema(description = "督办次数") + private String superviseCount; + + @Schema(description = "排序") + private Integer sortNo; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "创建时间") + private Date createTime; +}