diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInspectRecordController.java index cdcd7b1..09b1b94 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInspectRecordController.java @@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; import com.zhgd.xmgl.modules.safety.entity.InspectRecord; @@ -42,6 +43,23 @@ public class EntInspectRecordController { @Autowired private IInspectRecordService inspectRecordsService; + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询投资支付合同工程信息") + @ApiOperation(value = " 分页列表查询投资支付合同工程信息", notes = "分页列表查询投资支付合同工程信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/engineeringPage") + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + return Result.success(inspectRecordsService.pageListForSuperior(map)); + } + /** * 检查台账顶部统计信息 * @return diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java index 9b0d9f4..42d3d60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentApplyController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; import com.zhgd.xmgl.modules.basicdata.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.entity.InvestmentApply; @@ -46,6 +47,23 @@ public class EntInvestmentApplyController { @Autowired private IEngineeringService engineeringService; + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询投资支付合同工程信息") + @ApiOperation(value = " 分页列表查询投资支付合同工程信息", notes = "分页列表查询投资支付合同工程信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/engineeringPage") + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + return Result.success(investmentApplyService.pageListForSuperior(map)); + } + /** * 分页列表查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentContractController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentContractController.java index 199c60c..b6340bf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntInvestmentContractController.java @@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.safety.dto.InvestmentEntPageDto; import com.zhgd.xmgl.modules.safety.entity.InvestmentContract; import com.zhgd.xmgl.modules.safety.service.IInvestmentContractService; import io.swagger.annotations.Api; @@ -41,6 +42,23 @@ public class EntInvestmentContractController { @Autowired private IInvestmentContractService investmentContractService; + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询投资支付合同工程信息") + @ApiOperation(value = " 分页列表查询投资支付合同工程信息", notes = "分页列表查询投资支付合同工程信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/engineeringPage") + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + return Result.success(investmentContractService.pageListForSuperior(map)); + } + /** * 分页列表查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java index 641edb0..09ccb9e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInspectRecordController.java @@ -9,14 +9,16 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; -import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; +import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.basicdata.entity.Engineering; -import com.zhgd.xmgl.modules.safety.entity.InspectRecord; import com.zhgd.xmgl.modules.basicdata.entity.Project; import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; -import com.zhgd.xmgl.modules.safety.service.IInspectRecordService; import com.zhgd.xmgl.modules.basicdata.service.IProjectService; +import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; +import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; +import com.zhgd.xmgl.modules.safety.entity.InspectRecord; +import com.zhgd.xmgl.modules.safety.service.IInspectRecordService; import com.zhgd.xmgl.modules.safety.vo.InspectRecordVo; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; @@ -61,6 +63,40 @@ public class GovInspectRecordController { @Autowired private IEngineeringService engineeringService; + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询投资支付合同工程信息") + @ApiOperation(value = " 分页列表查询投资支付合同工程信息", notes = "分页列表查询投资支付合同工程信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/engineeringPage") + public Result> engineeringPageList(@ApiIgnore @RequestBody Map map) { + return Result.success(inspectRecordsService.pageListForSuperior(map)); + } + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "扬尘管理", operType = "分页查询", operDesc = "分页列表查询投资支付合同项目信息") + @ApiOperation(value = " 分页列表查询投资支付合同项目信息", notes = "分页列表查询投资支付合同项目信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + }) + @PostMapping(value = "/projectPage") + public Result> projectPageList(@ApiIgnore @RequestBody Map map) { + return Result.success(inspectRecordsService.pageListByGov(map)); + } + /** * 分页列表查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java index 54fc107..4d75061 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java @@ -7,7 +7,6 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; -import com.zhgd.xmgl.modules.basicdata.service.IEngineeringService; import com.zhgd.xmgl.modules.safety.dto.InvestmentEntPageDto; import com.zhgd.xmgl.modules.safety.dto.InvestmentProPageDto; import com.zhgd.xmgl.modules.safety.entity.InvestmentContract; @@ -45,9 +44,6 @@ public class GovInvestmentContractController { @Autowired private IInvestmentContractService investmentContractService; - @Autowired - private IEngineeringService engineeringService; - /** * 分页列表查询 * diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInspectRecordService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInspectRecordService.java index 37ef638..c45a3be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInspectRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInspectRecordService.java @@ -2,6 +2,8 @@ package com.zhgd.xmgl.modules.safety.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; +import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordDto; import com.zhgd.xmgl.modules.safety.dto.InspectRecordStatDto; import com.zhgd.xmgl.modules.safety.entity.InspectRecord; @@ -17,6 +19,10 @@ import java.util.Map; */ public interface IInspectRecordService extends IService { + Page pageListForSuperior(Map map); + + Page pageListByGov(Map map); + Page pageList(Page page, Map map); InspectRecordDto getDetail(Long id); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index f072434..5948dad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.handler.exception.CustomException; +import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto; +import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto; import com.zhgd.xmgl.modules.basicdata.entity.Engineering; import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.Project; @@ -64,6 +66,16 @@ public class InspectRecordServiceImpl extends ServiceImpl pageListForSuperior(Map map) { + return engineeringService.pageListForSuperior(map); + } + + @Override + public Page pageListByGov(Map map) { + return projectService.pageListForGov(map); + } + @Override public Page pageList(Page page, Map map) { String userId = SecurityUtil.getUser().getUserId(); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java index 7522cf7..c4bd6b6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java @@ -287,13 +287,13 @@ public class ProjectSubItemServiceImpl extends ServiceImpl 0){ -// if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) { -// projectSubItem.setState(6); -// } else if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) { -// projectSubItem.setState(4); -// } else { + if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) { + projectSubItem.setState(6); + } else if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) { projectSubItem.setState(4); -// } + } else { + projectSubItem.setState(5); + } } else if (task.getPercentageComplete().intValue() == 100 || (actualFinishDate != null && actualFinishDate.getTime() <= System.currentTimeMillis())) { projectSubItem.setState(3); } else if (task.getPercentageComplete().intValue() == 0 || actualStartDate == null || actualStartDate.getTime() > System.currentTimeMillis()) {