From 5415114245e53716d77eabf3a5dc769284df1b14 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 11 Aug 2023 18:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=99=AF=E8=AE=A1=E5=88=92=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../government/GovEngineeringController.java | 3 +- .../GovInvestmentContractController.java | 2 +- .../GovProjectNodePlanController.java | 24 +++++ .../basicdata/dto/EngineeringPageDto.java | 3 + .../modules/basicdata/entity/Engineering.java | 8 ++ .../mapper/xml/EngineeringMapper.xml | 2 +- .../service/impl/EngineeringServiceImpl.java | 3 - .../safety/entity/InvestmentContract.java | 3 +- .../safety/entity/ProjectNodePlan.java | 90 ++++++------------- .../mapper/InvestmentContractMapper.java | 5 ++ .../mapper/xml/InvestmentContractMapper.xml | 4 + .../service/IInvestmentContractService.java | 3 + .../impl/InvestmentContractServiceImpl.java | 6 ++ .../impl/ProjectNodePlanServiceImpl.java | 8 +- src/main/resources/application-dev.properties | 6 +- 15 files changed, 90 insertions(+), 80 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java index a9ebfab..8766827 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java @@ -20,7 +20,6 @@ import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; import com.zhgd.xmgl.valid.AddGroup; -import com.zhgd.xmgl.valid.EditGroup; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -132,7 +131,7 @@ public class GovEngineeringController { @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "编辑项目工程表信息") @ApiOperation(value = "编辑项目工程表信息", notes = "编辑项目工程表信息" , httpMethod="POST") @PostMapping(value = "/edit") - public Result edit(@RequestBody @Validated(EditGroup.class) Engineering engineering) { + public Result edit(@RequestBody Engineering engineering) { Result result = new Result(); Engineering engineeringEntity = engineeringService.getById(engineering.getId()); if(engineeringEntity==null) { 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 4d75061..53ac3fd 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 @@ -97,7 +97,7 @@ public class GovInvestmentContractController { public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentContract.class, map); Page page = PageUtil.getPage(map); - IPage pageList = investmentContractService.page(page, queryWrapper); + IPage pageList = investmentContractService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java index a671081..b7b8cbf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.government; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -156,6 +157,9 @@ public class GovProjectNodePlanController { if (projectNodePlanEntity == null) { result.error500("未找到对应实体"); } else { + if (projectNodePlan.getFillState() == 4 || projectNodePlan.getFillState() == 3) { + projectNodePlan.setFillState(1); + } boolean ok = projectNodePlanService.updateById(projectNodePlan); if (ok) { result.success("修改成功!"); @@ -211,4 +215,24 @@ public class GovProjectNodePlanController { } return result; } + + /** + * 审核/重新填报 + * + * @param projectNodePlan + * @return + */ + @OperLog(operModul = "项目全景计划管理", operType = "列表查询", operDesc = "审核/重新填报") + @ApiOperation(value = " 审核/重新填报", notes = "审核/重新填报", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "全景计划ID", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "fillState", value = "填报状态（2:已审核、3:已驳回、4:重新填报）", paramType = "body", required = true, dataType = "Integer") + }) + @PostMapping(value = "/examine") + public Result examine(@RequestBody ProjectNodePlan projectNodePlan) { + LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate(); + wrapper.set(ProjectNodePlan::getFillState, projectNodePlan.getFillState()); + wrapper.eq(ProjectNodePlan::getId, projectNodePlan.getId()); + return Result.success(projectNodePlanService.update(wrapper)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/EngineeringPageDto.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/EngineeringPageDto.java index 7f82d44..2664c77 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/EngineeringPageDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/dto/EngineeringPageDto.java @@ -11,6 +11,9 @@ public class EngineeringPageDto { @ApiModelProperty(value = "工程名称") private String engineeringName; + @ApiModelProperty(value = "工程ID") + private Long id; + @ApiModelProperty(value = "工程sn") private String engineeringSn; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java index 113e41f..0106d8c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java @@ -302,6 +302,14 @@ public class Engineering implements Serializable { @ApiModelProperty(value = "工程AI预警信息统计") private String aiAlarmStat; + /** + * 结算定额日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "结算定额日期") + private Date settlementTime; + /** * AI预警状态(true预警;false正常) */ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml index 1e170e2..2e09e4c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml @@ -13,7 +13,7 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java index 4a256d9..da33977 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java @@ -19,8 +19,6 @@ import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService; import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService; -import com.zhgd.xmgl.security.SecurityUser; -import com.zhgd.xmgl.security.SecurityUtil; import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.ParamEnum; import org.apache.commons.collections.MapUtils; @@ -105,7 +103,6 @@ public class EngineeringServiceImpl extends ServiceImpl { + Page pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml index 0e0b9d6..4b310da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml @@ -2,4 +2,8 @@ + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentContractService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentContractService.java index 062f01a..3e19ce4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentContractService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentContractService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.safety.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.safety.dto.InvestmentEntPageDto; import com.zhgd.xmgl.modules.safety.dto.InvestmentProPageDto; @@ -21,5 +22,7 @@ public interface IInvestmentContractService extends IService Page pageListByGov(Map map); + Page pageList(Page page, QueryWrapper queryWrapper); + boolean saveInfo(InvestmentContract investmentContract); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java index 6cc43ca..53ba9ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.safety.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -52,6 +53,11 @@ public class InvestmentContractServiceImpl extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { + return baseMapper.pageList(page, queryWrapper); + } + @Override public boolean saveInfo(InvestmentContract investmentContract) { if (StringUtils.isNotBlank(investmentContract.getEngineeringSn())) { diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java index 9a3b564..475c601 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java @@ -12,7 +12,6 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.modules.safety.entity.ProjectNodePlan; import com.zhgd.xmgl.modules.safety.mapper.ProjectNodePlanMapper; import com.zhgd.xmgl.modules.safety.service.IProjectNodePlanService; -import com.zhgd.xmgl.util.CommonUtil; import com.zhgd.xmgl.util.ParamEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,11 +49,6 @@ public class ProjectNodePlanServiceImpl extends ServiceImpl pageList(Page page, Wrapper wrapper) { - Page pageList = baseMapper.selectPage(page, wrapper); - List systemDictData = systemDictDataService.getByType(String.valueOf(ParamEnum.SysDictType.NODE_PLAN_STATE)); - for (ProjectNodePlan record : pageList.getRecords()) { - record.setStatus(CommonUtil.getDictValue(systemDictData, record.getState())); - } - return pageList; + return baseMapper.selectPage(page, wrapper); } } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 6acd831..493a631 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -3,13 +3,13 @@ http.port=6023 server.port=6688 # 数据库配置 #182.90.224.147 -spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsitezw_hzxmgl?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.url=jdbc:mysql://localhost:3306/wisdomsitezw_hzxmgl?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false # 数据库加密配置 #spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) #spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) spring.datasource.username=root -spring.datasource.password=JXJ@admin -#spring.datasource.password=root +#spring.datasource.password=JXJ@admin +spring.datasource.password=root # 文件存储路径 basePath=D:/itbgpImage/ # 文件访问路径