diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java index 5c76b0a..f513333 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/ProjectManagerController.java @@ -2,14 +2,14 @@ package com.easy.admin.modules.huzhou.controller; import com.alibaba.excel.EasyExcel; +import com.easy.admin.common.api.vo.Result; +import com.easy.admin.modules.huzhou.entity.HuzhouProjectinfoMoney; +import com.easy.admin.modules.huzhou.entity.HuzhouSubProjectinfo; import com.easy.admin.modules.huzhou.entity.ProjectManager; import com.easy.admin.modules.huzhou.listener.ProjectManagerListener; import com.easy.admin.modules.huzhou.service.ProjectManagerService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -58,4 +58,16 @@ public class ProjectManagerController { .sheet("项目联系人信息"+currentDate) .doWrite(projectManagerService.getData()); } + + @GetMapping("/getInfo") + public Result getProjectManagerInfo(String projectId){ + ProjectManager projectManagerInfo = projectManagerService.getProjectManagerInfo(projectId); + return Result.OK(projectManagerInfo); + } + + @PostMapping("/add") + public Result addProjectManager(@RequestBody ProjectManager projectManager){ + projectManagerService.save(projectManager); + return Result.OK("增加项目联系人成功!"); + } } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java index 085771c..353591b 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/HuzhouProjectinfo.java @@ -1,5 +1,6 @@ package com.easy.admin.modules.huzhou.entity; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @@ -164,5 +165,11 @@ public class HuzhouProjectinfo extends BaseEntity { * 造价建议金额 */ private Double suggestedCostAmount; + @TableField(exist = false) + @ExcelProperty(value = "项目负责人") + private String manager; + @TableField(exist = false) + @ExcelProperty(value = "联系方式") + private String managerPhone; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectManager.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectManager.java index 4423cb6..e5a244d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectManager.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/entity/ProjectManager.java @@ -1,7 +1,10 @@ package com.easy.admin.modules.huzhou.entity; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -17,8 +20,8 @@ import java.io.Serializable; public class ProjectManager implements Serializable { @ExcelProperty(value = "序号") - //@TableId(type = IdType.AUTO) - @TableField(exist = false) + @TableId(type = IdType.AUTO) + //@TableField(exist = false) private Integer id; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/ProjectManagerService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/ProjectManagerService.java index fb9caef..34da81d 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/ProjectManagerService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/ProjectManagerService.java @@ -24,4 +24,11 @@ public interface ProjectManagerService extends IService { * @return */ public List getData(); + + /** + * 获取项目负责人信息 + * @param projectId + * @return + */ + ProjectManager getProjectManagerInfo(String projectId); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 673171f..b06f650 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -108,7 +108,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl list) { this.saveBatch(list); @@ -32,6 +37,16 @@ public class ProjectManagerServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProjectManager::getProjectName,projectName); + ProjectManager projectManager = projectManagerMapper.selectOne(queryWrapper); + return projectManager; + } + }