From 22bbbce68d92a8725d0bcdcd3e4916d2402f39b9 Mon Sep 17 00:00:00 2001 From: hhyykk Date: Sat, 21 Dec 2024 21:35:50 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E8=AF=A6=E6=83=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectTrackingController.java | 15 ++- .../vo/ProjectTrackingDetailVO.java | 113 ++++++++++++++++++ .../vo/ProjectTrackingPageReqVO.java | 9 ++ .../vo/ProjectTrackingRespVO.java | 18 ++- .../vo/ProjectTrackingSaveReqVO.java | 6 +- .../projecttracking/ProjectTrackingDO.java | 6 +- .../ProjectTrackingDetailDO.java | 32 +++++ .../ProjectTrackingMapper.java | 25 ++++ .../ProjectTrackingService.java | 4 +- .../ProjectTrackingServiceImpl.java | 17 ++- 10 files changed, 230 insertions(+), 15 deletions(-) create mode 100644 yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingDetailVO.java create mode 100644 yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/ProjectTrackingController.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/ProjectTrackingController.java index 000360fda..8d2b2be60 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/ProjectTrackingController.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/ProjectTrackingController.java @@ -1,5 +1,7 @@ package cn.iocoder.yudao.module.pm.controller.admin.projecttracking; +import cn.iocoder.yudao.framework.common.util.file.FileUtils; +import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDetailDO; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -66,16 +68,20 @@ public class ProjectTrackingController { @Operation(summary = "获得项目跟踪 ") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('pm:project-tracking:query')") - public CommonResult getProjectTracking(@RequestParam("id") Long id) { + public CommonResult getProjectTracking(@RequestParam("id") Long id) { ProjectTrackingDO projectTracking = projectTrackingService.getProjectTracking(id); - return success(BeanUtils.toBean(projectTracking, ProjectTrackingRespVO.class)); + ProjectTrackingDetailVO vo = new ProjectTrackingDetailVO(); + org.springframework.beans.BeanUtils.copyProperties(projectTracking, vo, "emergencyDocUrl"); + // 转换文件 + vo.setEmergencyDocUrl(FileUtils.covertJSONStringToFile(projectTracking.getEmergencyDocUrl())); + return success(vo); } @GetMapping("/page") @Operation(summary = "获得项目跟踪 分页") @PreAuthorize("@ss.hasPermission('pm:project-tracking:query')") public CommonResult> getProjectTrackingPage(@Valid ProjectTrackingPageReqVO pageReqVO) { - PageResult pageResult = projectTrackingService.getProjectTrackingPage(pageReqVO); + PageResult pageResult = projectTrackingService.getProjectTrackingPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProjectTrackingRespVO.class)); } @@ -86,10 +92,9 @@ public class ProjectTrackingController { public void exportProjectTrackingExcel(@Valid ProjectTrackingPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = projectTrackingService.getProjectTrackingPage(pageReqVO).getList(); + List list = projectTrackingService.getProjectTrackingPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "项目跟踪 .xls", "数据", ProjectTrackingRespVO.class, BeanUtils.toBean(list, ProjectTrackingRespVO.class)); } - } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingDetailVO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingDetailVO.java new file mode 100644 index 000000000..4c66d36ad --- /dev/null +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingDetailVO.java @@ -0,0 +1,113 @@ +package cn.iocoder.yudao.module.pm.controller.admin.projecttracking.vo; + +import cn.iocoder.yudao.framework.common.pojo.FileDTO; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Schema(description = "管理后台-项目跟踪详情VO") +@Data +@ExcelIgnoreUnannotated +public class ProjectTrackingDetailVO { + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17734") + private Long id; + + @Schema(description = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @NotEmpty(message = "项目名称不能为空") + private String name; + + @Schema(description = "建设单位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9765") + @NotNull(message = "建设单位id不能为空") + private Long constructionId; + + @Schema(description = "联系人 ", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "联系人 不能为空") + private String contacts; + + @Schema(description = "联系方式", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "联系方式不能为空") + private String phone; + + @Schema(description = "主控部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30103") + @NotNull(message = "主控部门id不能为空") + private Long deptId; + + @Schema(description = "项目负责人id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21123") + @NotNull(message = "项目负责人id不能为空") + private Long pmId; + + @Schema(description = "预计合同额", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "预计合同额不能为空") + private String contractAmount; + + @Schema(description = "省份id", requiredMode = Schema.RequiredMode.REQUIRED, example = "331") + @NotNull(message = "省份id不能为空") + private Long provincId; + + @Schema(description = "城市id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15332") + @NotNull(message = "城市id不能为空") + private Long cityId; + + @Schema(description = "地址", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "地址不能为空") + private String address; + + @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotEmpty(message = "业务类型不能为空") + private String businessType; + + @Schema(description = "项目情况", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "项目情况不能为空") + private String situation; + + @Schema(description = "是否为应急项目", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否为应急项目不能为空") + private Boolean emergency; + + @Schema(description = "委托方式", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "委托方式不能为空") + private String entrustmentMethod; + + @Schema(description = "应急项目附件id", example = "20206") + private List emergencyDocUrl; + + @Schema(description = "是否业务合作项目", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否业务合作项目不能为空") + private Boolean collaborativeProjects; + + @Schema(description = "合作单位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13695") + @NotNull(message = "合作单位id不能为空") + private Long cooperativeCompanyId; + + @Schema(description = "落地可能性", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "落地可能性不能为空") + private String landingPossibility; + + @Schema(description = "预计落地时间", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "预计落地时间不能为空") + private LocalDateTime expectedTime; + + @Schema(description = "变更事项") + private String changeOfMatters; + + @Schema(description = "变更原因 ", example = "不好") + private String changeReason; + + @Schema(description = "变更前") + private String beforeChange; + + @Schema(description = "变更后") + private String afterChange; + + @Schema(description = "委托方式其他") + private String entrustmentOther; + + @Schema(description = "项目状态") + private String status; + +} diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java index 3134aaf84..57118759b 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingPageReqVO.java @@ -36,4 +36,13 @@ public class ProjectTrackingPageReqVO extends PageParam { @Schema(description = "落地可能性") private String landingPossibility; + @Schema(description = "主控部门名称", example = "王五") + private String deptName; + + @Schema(description = "项目负责人名称", example = "王五") + private String pmName; + + @Schema(description = "状态", example = "1") + private String status; + } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java index 6c215002d..b66399ba0 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingRespVO.java @@ -23,17 +23,26 @@ public class ProjectTrackingRespVO { private String name; @Schema(description = "建设单位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9765") - @ExcelProperty("建设单位id") private Long constructionId; @Schema(description = "主控部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "30103") - @ExcelProperty("主控部门id") private Long deptId; @Schema(description = "项目负责人id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21123") - @ExcelProperty("项目负责人id") private Long pmId; + @Schema(description = "建设单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("建设单位") + private String constructionName; + + @Schema(description = "主控部门", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("主控部门") + private String deptName; + + @Schema(description = "项目负责人", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("项目负责人") + private String pmName; + @Schema(description = "预计合同额", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("预计合同额") private String contractAmount; @@ -52,4 +61,7 @@ public class ProjectTrackingRespVO { @ExcelProperty("预计落地时间") private LocalDateTime expectedTime; + @Schema(description = "状态",example = "1") + private String status; + } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java index 1e859f79f..c04b7d5f1 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/controller/admin/projecttracking/vo/ProjectTrackingSaveReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.pm.controller.admin.projecttracking.vo; +import cn.iocoder.yudao.framework.common.pojo.FileDTO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -71,7 +72,7 @@ public class ProjectTrackingSaveReqVO { private String entrustmentMethod; @Schema(description = "应急项目附件id", example = "20206") - private Long emergencyDocId; + private List emergencyDocUrl; @Schema(description = "是否业务合作项目", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "是否业务合作项目不能为空") @@ -104,4 +105,7 @@ public class ProjectTrackingSaveReqVO { @Schema(description = "委托方式其他") private String entrustmentOther; + @Schema(description = "状态",example = "1") + private String status; + } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDO.java index 4b7da5b18..d23af5098 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDO.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDO.java @@ -91,7 +91,7 @@ public class ProjectTrackingDO extends BaseDO { /** * 应急项目附件id */ - private Long emergencyDocId; + private String emergencyDocUrl; /** * 是否业务合作项目 */ @@ -133,9 +133,9 @@ public class ProjectTrackingDO extends BaseDO { */ private String entrustmentOther; /** - * 拓展字段2 + * 状态 */ - private String exTxt2; + private String status; /** * 拓展字段3 */ diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java new file mode 100644 index 000000000..3e00fa5ed --- /dev/null +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/dataobject/projecttracking/ProjectTrackingDetailDO.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking; + +import lombok.Data; + +/** + * 项目跟踪 明细 DO + */ +@Data +public class ProjectTrackingDetailDO extends ProjectTrackingDO{ + /** + * 建造单位名称 + */ + private String constructionName; + /** + * 主控部门名称 + */ + private String deptName; + /** + * 项目经理名称 + */ + private String pmName; + + /** + * 城市名称 + */ + private String city; + + /** + * 省份名称 + */ + private String province; +} diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/mysql/projecttracking/ProjectTrackingMapper.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/mysql/projecttracking/ProjectTrackingMapper.java index 34f0d2b39..460d64886 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/mysql/projecttracking/ProjectTrackingMapper.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/dal/mysql/projecttracking/ProjectTrackingMapper.java @@ -5,7 +5,12 @@ import java.util.*; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.pm.dal.dataobject.customer.CustomerDO; import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDO; +import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDetailDO; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; +import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import cn.iocoder.yudao.module.pm.controller.admin.projecttracking.vo.*; @@ -29,4 +34,24 @@ public interface ProjectTrackingMapper extends BaseMapperX { .orderByDesc(ProjectTrackingDO::getId)); } + default PageResult selectDetailPage(ProjectTrackingPageReqVO reqVO) { + return selectJoinPage(reqVO, ProjectTrackingDetailDO.class, new MPJLambdaWrapper() + .selectAll(ProjectTrackingDO.class) + .selectAs(CustomerDO::getName, ProjectTrackingDetailDO::getConstructionName) // 映射到ProjectTrackingDetailDO的constructionName + .selectAs(DeptDO::getName, ProjectTrackingDetailDO::getDeptName) // 映射到ProjectTrackingDetailDO的deptName0000000 + .selectAs(AdminUserDO::getNickname, ProjectTrackingDetailDO::getPmName) // 映射到ProjectTrackingDetailDO的pmName + .likeIfExists(ProjectTrackingDO::getName, reqVO.getName()) + .eqIfExists(ProjectTrackingDO::getConstructionId, reqVO.getConstructionId()) + .likeIfExists(DeptDO::getName, reqVO.getDeptName()) + .likeIfExists(AdminUserDO::getNickname, reqVO.getPmName()) + .likeIfExists(ProjectTrackingDO::getContractAmount, reqVO.getContractAmount()) + .eqIfExists(ProjectTrackingDO::getBusinessType, reqVO.getBusinessType()) + .eqIfExists(ProjectTrackingDO::getLandingPossibility, reqVO.getLandingPossibility()) + .leftJoin(CustomerDO.class, CustomerDO::getId, ProjectTrackingDO::getConstructionId) + .leftJoin(DeptDO.class, DeptDO::getId, ProjectTrackingDO::getDeptId) + .leftJoin(AdminUserDO.class, AdminUserDO::getId, ProjectTrackingDO::getPmId) + .orderByDesc(ProjectTrackingDO::getId)); + + } + } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingService.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingService.java index c2e359d88..83d874c9b 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingService.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingService.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.pm.service.projecttracking; import java.util.*; + +import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDetailDO; import jakarta.validation.*; import cn.iocoder.yudao.module.pm.controller.admin.projecttracking.vo.*; import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDO; @@ -50,6 +52,6 @@ public interface ProjectTrackingService { * @param pageReqVO 分页查询 * @return 项目跟踪 分页 */ - PageResult getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO); + PageResult getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingServiceImpl.java b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingServiceImpl.java index 5b56c3e8b..33b385fa4 100644 --- a/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingServiceImpl.java +++ b/yudao-module-pm/yudao-module-pm-biz/src/main/java/cn/iocoder/yudao/module/pm/service/projecttracking/ProjectTrackingServiceImpl.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.pm.service.projecttracking; +import cn.iocoder.yudao.framework.common.util.file.FileUtils; +import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; +import cn.iocoder.yudao.module.pm.dal.dataobject.projecttracking.ProjectTrackingDetailDO; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -33,7 +36,13 @@ public class ProjectTrackingServiceImpl implements ProjectTrackingService { public Long createProjectTracking(ProjectTrackingSaveReqVO createReqVO) { // 插入 ProjectTrackingDO projectTracking = BeanUtils.toBean(createReqVO, ProjectTrackingDO.class); + + // 处理文件 + projectTracking.setEmergencyDocUrl(FileUtils.covertFileToJSONString(createReqVO.getEmergencyDocUrl())); + projectTrackingMapper.insert(projectTracking); + // 启动流程 + // 返回 return projectTracking.getId(); } @@ -42,8 +51,12 @@ public class ProjectTrackingServiceImpl implements ProjectTrackingService { public void updateProjectTracking(ProjectTrackingSaveReqVO updateReqVO) { // 校验存在 validateProjectTrackingExists(updateReqVO.getId()); + // 更新 ProjectTrackingDO updateObj = BeanUtils.toBean(updateReqVO, ProjectTrackingDO.class); + // 处理文件转换 + updateObj.setEmergencyDocUrl(FileUtils.covertFileToJSONString(updateReqVO.getEmergencyDocUrl())); + projectTrackingMapper.updateById(updateObj); } @@ -67,8 +80,8 @@ public class ProjectTrackingServiceImpl implements ProjectTrackingService { } @Override - public PageResult getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO) { - return projectTrackingMapper.selectPage(pageReqVO); + public PageResult getProjectTrackingPage(ProjectTrackingPageReqVO pageReqVO) { + return projectTrackingMapper.selectDetailPage(pageReqVO); } } \ No newline at end of file