tangcy
/
aidmt-ms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作计划就是工程项目，id统一使用后projectId

This commit is contained in:
tangcy 2026-01-23 08:50:08 +08:00
parent 702ac4dba5
commit 4ef0ff2324
10 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/controller/WorkPlanController.java
View File

@ -47,9 +47,9 @@ public class WorkPlanController extends BaseController {
*/ */
@Operation(summary = "获取工作计划详细信息") @Operation(summary = "获取工作计划详细信息")
@PreAuthorize("@ss.hasPermi('contractor:workPlan:query')") @PreAuthorize("@ss.hasPermi('contractor:workPlan:query')")
@GetMapping(value = "/{planId}") @GetMapping(value = "/{projectId}")
public AjaxResult getInfo(@Parameter(description = "计划ID") @PathVariable("planId") Long planId) { public AjaxResult getInfo(@Parameter(description = "项目ID") @PathVariable("projectId") Long projectId) {
return success(workPlanService.selectWorkPlanById(planId)); return success(workPlanService.selectWorkPlanById(projectId));
} }
/** /**
@ -60,7 +60,11 @@ public class WorkPlanController extends BaseController {
@Log(title = "工作计划", businessType = BusinessType.INSERT) @Log(title = "工作计划", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@Validated @RequestBody WorkPlan workPlan) { 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 = "删除工作计划") @Operation(summary = "删除工作计划")
@PreAuthorize("@ss.hasPermi('contractor:workPlan:remove')") @PreAuthorize("@ss.hasPermi('contractor:workPlan:remove')")
@Log(title = "工作计划", businessType = BusinessType.DELETE) @Log(title = "工作计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}") @DeleteMapping("/{projectIds}")
public AjaxResult remove(@Parameter(description = "计划ID数组") @PathVariable Long[] planIds) { public AjaxResult remove(@Parameter(description = "项目ID数组") @PathVariable Long[] projectIds) {
return toAjax(workPlanService.deleteWorkPlanByIds(planIds)); return toAjax(workPlanService.deleteWorkPlanByIds(projectIds));
} }
/** /**
@ -102,8 +106,8 @@ public class WorkPlanController extends BaseController {
@Operation(summary = "提交工作计划") @Operation(summary = "提交工作计划")
@PreAuthorize("@ss.hasPermi('contractor:workPlan:edit')") @PreAuthorize("@ss.hasPermi('contractor:workPlan:edit')")
@Log(title = "工作计划", businessType = BusinessType.UPDATE) @Log(title = "工作计划", businessType = BusinessType.UPDATE)
@PutMapping("/submit/{planId}") @PutMapping("/submit/{projectId}")
public AjaxResult submit(@Parameter(description = "计划ID") @PathVariable("planId") Long planId) { public AjaxResult submit(@Parameter(description = "项目ID") @PathVariable("projectId") Long projectId) {
return toAjax(workPlanService.submitWorkPlan(planId)); return toAjax(workPlanService.submitWorkPlan(projectId));
} }
} }

4
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/domain/WorkPlan.java
View File

@ -18,8 +18,8 @@ import java.util.List;
@Schema(description = "工作计划（施工项目）") @Schema(description = "工作计划（施工项目）")
public class WorkPlan extends BaseEntity { public class WorkPlan extends BaseEntity {
@Schema(description = "计划ID") @Schema(description = "项目ID")
private Long planId; private Long projectId;
@Schema(description = "项目编号") @Schema(description = "项目编号")
private String projectCode; private String projectCode;

20
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/mapper/WorkPlanMapper.java
View File

@ -17,10 +17,10 @@ public interface WorkPlanMapper {
/** /**
* 查询工作计划 * 查询工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 工作计划信息 * @return 工作计划信息
*/ */
WorkPlan selectWorkPlanById(Long planId); WorkPlan selectWorkPlanById(Long projectId);
/** /**
* 查询工作计划列表 * 查询工作计划列表
@ -49,36 +49,36 @@ public interface WorkPlanMapper {
/** /**
* 删除工作计划 * 删除工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 结果 * @return 结果
*/ */
int deleteWorkPlanById(Long planId); int deleteWorkPlanById(Long projectId);
/** /**
* 批量删除工作计划 * 批量删除工作计划
* *
* @param planIds 需要删除的数据ID * @param projectIds 需要删除的数据ID
* @return 结果 * @return 结果
*/ */
int deleteWorkPlanByIds(@Param("planIds") Long[] planIds); int deleteWorkPlanByIds(@Param("projectIds") Long[] projectIds);
/** /**
* 更新项目状态 * 更新项目状态
* *
* @param planId 计划ID * @param projectId 项目ID
* @param projectStatus 项目状态 * @param projectStatus 项目状态
* @return 结果 * @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 进度 * @param progress 进度
* @return 结果 * @return 结果
*/ */
int updateProgress(@Param("planId") Long planId, @Param("progress") Integer progress); int updateProgress(@Param("projectId") Long projectId, @Param("progress") Integer progress);
/** /**
* 查询项目全流程状态总览列表（包含关联的工作票和出入证信息） * 查询项目全流程状态总览列表（包含关联的工作票和出入证信息）

12
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/IWorkPlanService.java
View File

@ -14,10 +14,10 @@ public interface IWorkPlanService {
/** /**
* 查询工作计划 * 查询工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 工作计划信息 * @return 工作计划信息
*/ */
WorkPlan selectWorkPlanById(Long planId); WorkPlan selectWorkPlanById(Long projectId);
/** /**
* 查询工作计划列表 * 查询工作计划列表
@ -46,10 +46,10 @@ public interface IWorkPlanService {
/** /**
* 批量删除工作计划 * 批量删除工作计划
* *
* @param planIds 需要删除的计划ID * @param projectIds 需要删除的项目ID
* @return 结果 * @return 结果
*/ */
int deleteWorkPlanByIds(Long[] planIds); int deleteWorkPlanByIds(Long[] projectIds);
/** /**
* 保存草稿 * 保存草稿
@ -62,10 +62,10 @@ public interface IWorkPlanService {
/** /**
* 提交工作计划 * 提交工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 结果 * @return 结果
*/ */
int submitWorkPlan(Long planId); int submitWorkPlan(Long projectId);
/** /**
* 查询项目全流程状态总览列表（包含关联的工作票和出入证信息） * 查询项目全流程状态总览列表（包含关联的工作票和出入证信息）

22
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/contractor/service/impl/WorkPlanServiceImpl.java
View File

@ -38,12 +38,12 @@ public class WorkPlanServiceImpl implements IWorkPlanService {
/** /**
* 查询工作计划 * 查询工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 工作计划信息 * @return 工作计划信息
*/ */
@Override @Override
public WorkPlan selectWorkPlanById(Long planId) { public WorkPlan selectWorkPlanById(Long projectId) {
WorkPlan workPlan = workPlanMapper.selectWorkPlanById(planId); WorkPlan workPlan = workPlanMapper.selectWorkPlanById(projectId);
if (workPlan != null) { if (workPlan != null) {
// 查询作业班成员用户信息 // 查询作业班成员用户信息
loadSysUsers(workPlan); loadSysUsers(workPlan);
@ -193,13 +193,13 @@ public class WorkPlanServiceImpl implements IWorkPlanService {
/** /**
* 批量删除工作计划 * 批量删除工作计划
* *
* @param planIds 需要删除的计划ID * @param projectIds 需要删除的项目ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int deleteWorkPlanByIds(Long[] planIds) { public int deleteWorkPlanByIds(Long[] projectIds) {
return workPlanMapper.deleteWorkPlanByIds(planIds); return workPlanMapper.deleteWorkPlanByIds(projectIds);
} }
/** /**
@ -212,7 +212,7 @@ public class WorkPlanServiceImpl implements IWorkPlanService {
@Transactional @Transactional
public int saveDraft(WorkPlan workPlan) { public int saveDraft(WorkPlan workPlan) {
workPlan.setProjectStatus("0"); // 草稿状态 workPlan.setProjectStatus("0"); // 草稿状态
if (workPlan.getPlanId() == null) { if (workPlan.getProjectId() == null) {
return insertWorkPlan(workPlan); return insertWorkPlan(workPlan);
} else { } else {
return updateWorkPlan(workPlan); return updateWorkPlan(workPlan);
@ -222,17 +222,17 @@ public class WorkPlanServiceImpl implements IWorkPlanService {
/** /**
* 提交工作计划 * 提交工作计划
* *
* @param planId 计划ID * @param projectId 项目ID
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional @Transactional
public int submitWorkPlan(Long planId) { public int submitWorkPlan(Long projectId) {
WorkPlan workPlan = workPlanMapper.selectWorkPlanById(planId); WorkPlan workPlan = workPlanMapper.selectWorkPlanById(projectId);
if (workPlan == null) { if (workPlan == null) {
throw new ServiceException("工作计划不存在"); throw new ServiceException("工作计划不存在");
} }
return workPlanMapper.updateProjectStatus(planId, "1"); // 已提交 return workPlanMapper.updateProjectStatus(projectId, "1"); // 已提交
} }
/** /**

4
ruoyi-modules/aidmt-manage-ms/src/main/java/com/admin/property/service/impl/PcRiskProjectServiceImpl.java
View File

@ -86,7 +86,7 @@ public class PcRiskProjectServiceImpl implements IPcRiskProjectService {
} }
// 从工作计划填充数据 // 从工作计划填充数据
project.setPlanId(workPlan.getPlanId()); project.setPlanId(workPlan.getProjectId());
project.setProjectName(workPlan.getProjectName()); project.setProjectName(workPlan.getProjectName());
project.setProjectCode(workPlan.getProjectCode()); project.setProjectCode(workPlan.getProjectCode());
project.setConstructionUnit(workPlan.getConstructionUnitName()); project.setConstructionUnit(workPlan.getConstructionUnitName());
@ -204,7 +204,7 @@ public class PcRiskProjectServiceImpl implements IPcRiskProjectService {
// 构建返回对象，包含从工作计划获取的信息 // 构建返回对象，包含从工作计划获取的信息
PcRiskProject result = new PcRiskProject(); PcRiskProject result = new PcRiskProject();
result.setWorkTicketId(ticketId); result.setWorkTicketId(ticketId);
result.setPlanId(workPlan.getPlanId()); result.setPlanId(workPlan.getProjectId());
result.setProjectName(workPlan.getProjectName()); result.setProjectName(workPlan.getProjectName());
result.setProjectCode(workPlan.getProjectCode()); result.setProjectCode(workPlan.getProjectCode());
result.setConstructionUnit(workPlan.getConstructionUnitName()); result.setConstructionUnit(workPlan.getConstructionUnitName());

4
ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/PcRiskProjectMapper.xml
View File

@ -28,7 +28,7 @@
<result property="contactPerson" column="contact_person"/> <result property="contactPerson" column="contact_person"/>
<result property="contactPhone" column="contact_phone"/> <result property="contactPhone" column="contact_phone"/>
<result property="workTicketId" column="work_ticket_id"/> <result property="workTicketId" column="work_ticket_id"/>
<result property="planId" column="plan_id"/> <result property="planId" column="project_id"/>
<!-- 复核/审核/归档字段 --> <!-- 复核/审核/归档字段 -->
<result property="supervisionReviewStatus" column="supervision_review_status"/> <result property="supervisionReviewStatus" column="supervision_review_status"/>
@ -74,7 +74,7 @@
project_name, project_code, construction_unit, work_location, project_name, project_code, construction_unit, work_location,
work_start, work_end, risk_type, need_camera_cnt, alloc_status, work_start, work_end, risk_type, need_camera_cnt, alloc_status,
installation_location, contact_person, contact_phone, 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 remark, del_flag, create_by, create_time, update_by, update_time
) values ( ) values (
#{projectName}, #{projectCode}, #{constructionUnit}, #{workLocation}, #{projectName}, #{projectCode}, #{constructionUnit}, #{workLocation},

26
ruoyi-modules/aidmt-manage-ms/src/main/resources/mapper/WorkPlanMapper.xml
View File

@ -5,7 +5,7 @@
<mapper namespace="com.admin.contractor.mapper.WorkPlanMapper"> <mapper namespace="com.admin.contractor.mapper.WorkPlanMapper">
<resultMap id="WorkPlanResult" type="com.admin.contractor.domain.WorkPlan"> <resultMap id="WorkPlanResult" type="com.admin.contractor.domain.WorkPlan">
<id property="planId" column="plan_id" /> <id property="projectId" column="project_id" />
<result property="projectCode" column="project_code" /> <result property="projectCode" column="project_code" />
<result property="projectName" column="project_name" /> <result property="projectName" column="project_name" />
<result property="workLocation" column="work_location" /> <result property="workLocation" column="work_location" />
@ -44,7 +44,7 @@
<select id="selectWorkPlanById" parameterType="Long" resultMap="WorkPlanResult"> <select id="selectWorkPlanById" parameterType="Long" resultMap="WorkPlanResult">
select * from work_plan select * from work_plan
where plan_id = #{planId} and del_flag = '0' where project_id = #{projectId} and del_flag = '0'
</select> </select>
<select id="selectWorkPlanList" parameterType="com.admin.contractor.domain.WorkPlan" resultMap="WorkPlanResult"> <select id="selectWorkPlanList" parameterType="com.admin.contractor.domain.WorkPlan" resultMap="WorkPlanResult">
@ -71,7 +71,7 @@
order by create_time desc order by create_time desc
</select> </select>
<insert id="insertWorkPlan" parameterType="com.admin.contractor.domain.WorkPlan" useGeneratedKeys="true" keyProperty="planId"> <insert id="insertWorkPlan" parameterType="com.admin.contractor.domain.WorkPlan" useGeneratedKeys="true" keyProperty="projectId">
insert into work_plan( insert into work_plan(
project_code, project_name, work_location, work_location_detail, project_code, project_name, work_location, work_location_detail,
longitude, latitude, work_start_time, work_end_time, longitude, latitude, work_start_time, work_end_time,
@ -114,17 +114,17 @@
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update_time = now() update_time = now()
</set> </set>
where plan_id = #{planId} where project_id = #{projectId}
</update> </update>
<update id="deleteWorkPlanById" parameterType="Long"> <update id="deleteWorkPlanById" parameterType="Long">
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> </update>
<update id="deleteWorkPlanByIds" parameterType="String"> <update id="deleteWorkPlanByIds" parameterType="String">
update work_plan set del_flag = '2', update_time = now() where plan_id in update work_plan set del_flag = '2', update_time = now() where project_id in
<foreach item="planId" collection="planIds" open="(" separator="," close=")"> <foreach item="projectId" collection="projectIds" open="(" separator="," close=")">
#{planId} #{projectId}
</foreach> </foreach>
</update> </update>
@ -132,20 +132,20 @@
update work_plan update work_plan
set project_status = #{projectStatus}, set project_status = #{projectStatus},
update_time = now() update_time = now()
where plan_id = #{planId} where project_id = #{projectId}
</update> </update>
<update id="updateProgress"> <update id="updateProgress">
update work_plan update work_plan
set current_progress = #{progress}, set current_progress = #{progress},
update_time = now() update_time = now()
where plan_id = #{planId} where project_id = #{projectId}
</update> </update>
<!-- 项目全流程状态总览查询（包含关联信息） --> <!-- 项目全流程状态总览查询（包含关联信息） -->
<select id="selectProjectFullProcessList" parameterType="com.admin.contractor.domain.WorkPlan" resultMap="WorkPlanResult"> <select id="selectProjectFullProcessList" parameterType="com.admin.contractor.domain.WorkPlan" resultMap="WorkPlanResult">
select select
wp.plan_id, wp.project_id,
wp.project_code, wp.project_code,
wp.project_name, wp.project_name,
wp.work_location, wp.work_location,
@ -180,8 +180,8 @@
'' as supervision_review_status, '' as supervision_review_status,
'' as property_review_status '' as property_review_status
from work_plan wp from work_plan wp
left join work_ticket wt on wt.project_id = wp.plan_id and wt.del_flag = '0' left join work_ticket wt on wt.project_id = wp.project_id and wt.del_flag = '0'
left join access_permit ap on ap.project_id = wp.plan_id and ap.del_flag = '0' left join access_permit ap on ap.project_id = wp.project_id and ap.del_flag = '0'
where wp.del_flag = '0' where wp.del_flag = '0'
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
and (wp.project_name like concat('%', #{projectName}, '%') or wp.project_code like concat('%', #{projectName}, '%')) and (wp.project_name like concat('%', #{projectName}, '%') or wp.project_code like concat('%', #{projectName}, '%'))

2
ruoyi-modules/aidmt-system-ms/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system; package com.ruoyi.system;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import com.ruoyi.common.security.annotation.EnableCustomConfig; import com.ruoyi.common.security.annotation.EnableCustomConfig;
@ -13,6 +14,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
@EnableCustomConfig @EnableCustomConfig
@EnableRyFeignClients @EnableRyFeignClients
@SpringBootApplication @SpringBootApplication
@MapperScan("com.ruoyi.system.mapper")
public class RuoYiSystemApplication public class RuoYiSystemApplication
{ {
public static void main(String[] args) public static void main(String[] args)

2
ruoyi-modules/aidmt-system-ms/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
View File

@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
import java.util.List; import java.util.List;
import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysConfig;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 参数配置 数据层 * 参数配置 数据层
* *
* @author ruoyi * @author ruoyi
*/ */
@Mapper
public interface SysConfigMapper public interface SysConfigMapper
{ {
/** /**