From 4ef0ff23247c848e7f0117b68fed79ded221d84d Mon Sep 17 00:00:00 2001 From: tangcy <406968399@qq.com> Date: Fri, 23 Jan 2026 08:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E8=AE=A1=E5=88=92=E5=B0=B1?= =?UTF-8?q?=E6=98=AF=E5=B7=A5=E7=A8=8B=E9=A1=B9=E7=9B=AE=EF=BC=8Cid?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E5=90=8EprojectId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkPlanController.java | 24 ++++++++++------- .../com/admin/contractor/domain/WorkPlan.java | 4 +-- .../contractor/mapper/WorkPlanMapper.java | 20 +++++++------- .../contractor/service/IWorkPlanService.java | 12 ++++----- .../service/impl/WorkPlanServiceImpl.java | 22 ++++++++-------- .../impl/PcRiskProjectServiceImpl.java | 4 +-- .../resources/mapper/PcRiskProjectMapper.xml | 4 +-- .../main/resources/mapper/WorkPlanMapper.xml | 26 +++++++++---------- .../ruoyi/system/RuoYiSystemApplication.java | 2 ++ .../ruoyi/system/mapper/SysConfigMapper.java | 2 ++ 10 files changed, 64 insertions(+), 56 deletions(-) diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/controller/WorkPlanController.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/controller/WorkPlanController.java index a7caa458..1adcad77 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/controller/WorkPlanController.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/controller/WorkPlanController.java @@ -47,9 +47,9 @@ public class WorkPlanController extends BaseController { */ @Operation(summary = "获取工作计划详细信息") @PreAuthorize("@ss.hasPermi('contractor:workPlan:query')") - @GetMapping(value = "/{planId}") - public AjaxResult getInfo(@Parameter(description = "计划ID") @PathVariable("planId") Long planId) { - return success(workPlanService.selectWorkPlanById(planId)); + @GetMapping(value = "/{projectId}") + public AjaxResult getInfo(@Parameter(description = "项目ID") @PathVariable("projectId") Long projectId) { + return success(workPlanService.selectWorkPlanById(projectId)); } /** @@ -60,7 +60,11 @@ public class WorkPlanController extends BaseController { @Log(title = "工作计划", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@Validated @RequestBody WorkPlan workPlan) { - return toAjax(workPlanService.insertWorkPlan(workPlan)); + int rows = workPlanService.insertWorkPlan(workPlan); + if (rows > 0) { + return success(workPlan.getProjectId()); + } + return error("新增工作计划失败"); } /** @@ -80,9 +84,9 @@ public class WorkPlanController extends BaseController { @Operation(summary = "删除工作计划") @PreAuthorize("@ss.hasPermi('contractor:workPlan:remove')") @Log(title = "工作计划", businessType = BusinessType.DELETE) - @DeleteMapping("/{planIds}") - public AjaxResult remove(@Parameter(description = "计划ID数组") @PathVariable Long[] planIds) { - return toAjax(workPlanService.deleteWorkPlanByIds(planIds)); + @DeleteMapping("/{projectIds}") + public AjaxResult remove(@Parameter(description = "项目ID数组") @PathVariable Long[] projectIds) { + return toAjax(workPlanService.deleteWorkPlanByIds(projectIds)); } /** @@ -102,8 +106,8 @@ public class WorkPlanController extends BaseController { @Operation(summary = "提交工作计划") @PreAuthorize("@ss.hasPermi('contractor:workPlan:edit')") @Log(title = "工作计划", businessType = BusinessType.UPDATE) - @PutMapping("/submit/{planId}") - public AjaxResult submit(@Parameter(description = "计划ID") @PathVariable("planId") Long planId) { - return toAjax(workPlanService.submitWorkPlan(planId)); + @PutMapping("/submit/{projectId}") + public AjaxResult submit(@Parameter(description = "项目ID") @PathVariable("projectId") Long projectId) { + return toAjax(workPlanService.submitWorkPlan(projectId)); } } diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/WorkPlan.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/WorkPlan.java index 349345e4..60fe1bd3 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/WorkPlan.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/WorkPlan.java @@ -18,8 +18,8 @@ import java.util.List; @Schema(description = "工作计划（施工项目）") public class WorkPlan extends BaseEntity { - @Schema(description = "计划ID") - private Long planId; + @Schema(description = "项目ID") + private Long projectId; @Schema(description = "项目编号") private String projectCode; diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/mapper/WorkPlanMapper.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/mapper/WorkPlanMapper.java index 37847ed2..332fed69 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/mapper/WorkPlanMapper.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/mapper/WorkPlanMapper.java @@ -17,10 +17,10 @@ public interface WorkPlanMapper { /** * 查询工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 工作计划信息 */ - WorkPlan selectWorkPlanById(Long planId); + WorkPlan selectWorkPlanById(Long projectId); /** * 查询工作计划列表 @@ -49,36 +49,36 @@ public interface WorkPlanMapper { /** * 删除工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 结果 */ - int deleteWorkPlanById(Long planId); + int deleteWorkPlanById(Long projectId); /** * 批量删除工作计划 * - * @param planIds 需要删除的数据ID + * @param projectIds 需要删除的数据ID * @return 结果 */ - int deleteWorkPlanByIds(@Param("planIds") Long[] planIds); + int deleteWorkPlanByIds(@Param("projectIds") Long[] projectIds); /** * 更新项目状态 * - * @param planId 计划ID + * @param projectId 项目ID * @param projectStatus 项目状态 * @return 结果 */ - int updateProjectStatus(@Param("planId") Long planId, @Param("projectStatus") String projectStatus); + int updateProjectStatus(@Param("projectId") Long projectId, @Param("projectStatus") String projectStatus); /** * 更新项目进度 * - * @param planId 计划ID + * @param projectId 项目ID * @param progress 进度 * @return 结果 */ - int updateProgress(@Param("planId") Long planId, @Param("progress") Integer progress); + int updateProgress(@Param("projectId") Long projectId, @Param("progress") Integer progress); /** * 查询项目全流程状态总览列表（包含关联的工作票和出入证信息） diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/IWorkPlanService.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/IWorkPlanService.java index 2205bfb3..55bfea99 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/IWorkPlanService.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/IWorkPlanService.java @@ -14,10 +14,10 @@ public interface IWorkPlanService { /** * 查询工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 工作计划信息 */ - WorkPlan selectWorkPlanById(Long planId); + WorkPlan selectWorkPlanById(Long projectId); /** * 查询工作计划列表 @@ -46,10 +46,10 @@ public interface IWorkPlanService { /** * 批量删除工作计划 * - * @param planIds 需要删除的计划ID + * @param projectIds 需要删除的项目ID * @return 结果 */ - int deleteWorkPlanByIds(Long[] planIds); + int deleteWorkPlanByIds(Long[] projectIds); /** * 保存草稿 @@ -62,10 +62,10 @@ public interface IWorkPlanService { /** * 提交工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 结果 */ - int submitWorkPlan(Long planId); + int submitWorkPlan(Long projectId); /** * 查询项目全流程状态总览列表（包含关联的工作票和出入证信息） diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/impl/WorkPlanServiceImpl.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/impl/WorkPlanServiceImpl.java index 0d548bc5..63608614 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/impl/WorkPlanServiceImpl.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/impl/WorkPlanServiceImpl.java @@ -38,12 +38,12 @@ public class WorkPlanServiceImpl implements IWorkPlanService { /** * 查询工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 工作计划信息 */ @Override - public WorkPlan selectWorkPlanById(Long planId) { - WorkPlan workPlan = workPlanMapper.selectWorkPlanById(planId); + public WorkPlan selectWorkPlanById(Long projectId) { + WorkPlan workPlan = workPlanMapper.selectWorkPlanById(projectId); if (workPlan != null) { // 查询作业班成员用户信息 loadSysUsers(workPlan); @@ -193,13 +193,13 @@ public class WorkPlanServiceImpl implements IWorkPlanService { /** * 批量删除工作计划 * - * @param planIds 需要删除的计划ID + * @param projectIds 需要删除的项目ID * @return 结果 */ @Override @Transactional - public int deleteWorkPlanByIds(Long[] planIds) { - return workPlanMapper.deleteWorkPlanByIds(planIds); + public int deleteWorkPlanByIds(Long[] projectIds) { + return workPlanMapper.deleteWorkPlanByIds(projectIds); } /** @@ -212,7 +212,7 @@ public class WorkPlanServiceImpl implements IWorkPlanService { @Transactional public int saveDraft(WorkPlan workPlan) { workPlan.setProjectStatus("0"); // 草稿状态 - if (workPlan.getPlanId() == null) { + if (workPlan.getProjectId() == null) { return insertWorkPlan(workPlan); } else { return updateWorkPlan(workPlan); @@ -222,17 +222,17 @@ public class WorkPlanServiceImpl implements IWorkPlanService { /** * 提交工作计划 * - * @param planId 计划ID + * @param projectId 项目ID * @return 结果 */ @Override @Transactional - public int submitWorkPlan(Long planId) { - WorkPlan workPlan = workPlanMapper.selectWorkPlanById(planId); + public int submitWorkPlan(Long projectId) { + WorkPlan workPlan = workPlanMapper.selectWorkPlanById(projectId); if (workPlan == null) { throw new ServiceException("工作计划不存在"); } - return workPlanMapper.updateProjectStatus(planId, "1"); // 已提交 + return workPlanMapper.updateProjectStatus(projectId, "1"); // 已提交 } /** diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/property/service/impl/PcRiskProjectServiceImpl.java b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/property/service/impl/PcRiskProjectServiceImpl.java index 4c45f1f5..7438e34f 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/property/service/impl/PcRiskProjectServiceImpl.java +++ b/ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/property/service/impl/PcRiskProjectServiceImpl.java @@ -86,7 +86,7 @@ public class PcRiskProjectServiceImpl implements IPcRiskProjectService { } // 从工作计划填充数据 - project.setPlanId(workPlan.getPlanId()); + project.setPlanId(workPlan.getProjectId()); project.setProjectName(workPlan.getProjectName()); project.setProjectCode(workPlan.getProjectCode()); project.setConstructionUnit(workPlan.getConstructionUnitName()); @@ -204,7 +204,7 @@ public class PcRiskProjectServiceImpl implements IPcRiskProjectService { // 构建返回对象，包含从工作计划获取的信息 PcRiskProject result = new PcRiskProject(); result.setWorkTicketId(ticketId); - result.setPlanId(workPlan.getPlanId()); + result.setPlanId(workPlan.getProjectId()); result.setProjectName(workPlan.getProjectName()); result.setProjectCode(workPlan.getProjectCode()); result.setConstructionUnit(workPlan.getConstructionUnitName()); diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/PcRiskProjectMapper.xml b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/PcRiskProjectMapper.xml index c9dde2ab..765f57db 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/PcRiskProjectMapper.xml +++ b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/PcRiskProjectMapper.xml @@ -28,7 +28,7 @@ - + @@ -74,7 +74,7 @@ project_name, project_code, construction_unit, work_location, work_start, work_end, risk_type, need_camera_cnt, alloc_status, installation_location, contact_person, contact_phone, - work_ticket_id, plan_id, + work_ticket_id, project_id, remark, del_flag, create_by, create_time, update_by, update_time ) values ( #{projectName}, #{projectCode}, #{constructionUnit}, #{workLocation}, diff --git a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/WorkPlanMapper.xml b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/WorkPlanMapper.xml index 1458ad71..520f28dc 100644 --- a/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/WorkPlanMapper.xml +++ b/ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/WorkPlanMapper.xml @@ -5,7 +5,7 @@ - + @@ -44,7 +44,7 @@ - + insert into work_plan( project_code, project_name, work_location, work_location_detail, longitude, latitude, work_start_time, work_end_time, @@ -114,17 +114,17 @@ update_by = #{updateBy}, update_time = now() - where plan_id = #{planId} + where project_id = #{projectId} - update work_plan set del_flag = '2', update_time = now() where plan_id = #{planId} + update work_plan set del_flag = '2', update_time = now() where project_id = #{projectId} - update work_plan set del_flag = '2', update_time = now() where plan_id in - - #{planId} + update work_plan set del_flag = '2', update_time = now() where project_id in + + #{projectId} @@ -132,20 +132,20 @@ update work_plan set project_status = #{projectStatus}, update_time = now() - where plan_id = #{planId} + where project_id = #{projectId} update work_plan set current_progress = #{progress}, update_time = now() - where plan_id = #{planId} + where project_id = #{projectId}