diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ProjectController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ProjectController.java index f94b76b..b9e26a9 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ProjectController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/ProjectController.java @@ -1,5 +1,6 @@ package com.bonus.project.controller; +import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.RequestParamUtils; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -13,6 +14,7 @@ import com.bonus.project.domain.ConsUnit; import com.bonus.project.domain.Project; import com.bonus.project.domain.SupervisoryUnit; import com.bonus.project.service.ProjectService; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -301,4 +303,12 @@ public class ProjectController extends BaseController { } return error("系统异常,请联系管理员"); } + + @ApiOperation(value = "查询工程必填项") + @PostMapping(value = "/getProRequest") + public AjaxResult getProRequest(@RequestBody Project entity) { + return projectService.getProRequest(entity); + + } + } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Project.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Project.java index 2c5bb93..e57ef72 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Project.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/Project.java @@ -24,8 +24,11 @@ public class Project{ @Excel(name = "序号",sort =Integer.MIN_VALUE, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.NUMERIC, prompt = "序号") private int exportId; - + /** + * 工程iD + */ private Long proId; + private String supUuid; /** * uuid @@ -194,5 +197,8 @@ public class Project{ ", materialId='" + materialId + '\'' + '}'; } - + /** + * 参数iD + */ + private String supId; } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ProjectMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ProjectMapper.java index 0b20157..3378824 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ProjectMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/ProjectMapper.java @@ -1,6 +1,7 @@ package com.bonus.project.mapper; import com.bonus.common.core.domain.BaseBean; +import com.bonus.common.core.domain.RequestEntity; import com.bonus.project.domain.*; import com.bonus.common.entity.SysUser; import com.bonus.common.entity.SysUserPost; @@ -339,4 +340,11 @@ public interface ProjectMapper { * @return */ int getSupervisoryUnitUser(SupervisoryUnit bean); + + /** + * 查询工程必填项 + * @param entity + * @return + */ + List getProRequest(Project entity); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/ProjectService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/ProjectService.java index aa6e40b..593dc1f 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/ProjectService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/ProjectService.java @@ -1,5 +1,6 @@ package com.bonus.project.service; +import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.project.domain.ConsUnit; import com.bonus.project.domain.Project; @@ -96,4 +97,11 @@ public interface ProjectService { * @return */ AjaxResult addSupervisoryUnitUser(SupervisoryUnit bean); + + /** + * 查询工程必填项 + * @param entity + * @return + */ + AjaxResult getProRequest(Project entity); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java index 85154cd..90b01f3 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.project.service.impl; import com.bonus.common.core.domain.BaseBean; import com.bonus.common.core.domain.MsgBean; +import com.bonus.common.core.domain.RequestEntity; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StaticVariableUtils; import com.bonus.common.core.utils.StringUtils; @@ -271,8 +272,22 @@ public class ProjectServiceImpl implements ProjectService { return AjaxResult.error("监理单位添加失败,请联系管理员"); } - - + /** + * 查询工程必填项 + * @param entity + * @return + */ + @Override + public AjaxResult getProRequest(Project entity) { + try{ + List list=projectMapper.getProRequest(entity); + String data= String.join(",", list); + return AjaxResult.success(data); + }catch (Exception e){ + log.error(e.toString(),e); + } + return AjaxResult.error("查询参数异常"); + } /** * 新增承包商单位 diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/ProjectMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/ProjectMapper.xml index dc5913f..5988d95 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/ProjectMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/ProjectMapper.xml @@ -432,4 +432,10 @@ +