admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

全景计划调整

Browse Source
This commit is contained in:
pengjie 2023-08-11 18:30:44 +08:00
parent 78139ade2f
commit 5415114245
15 changed files with 90 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovEngineeringController.java
View File

@ -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<Engineering> edit(@RequestBody @Validated(EditGroup.class) Engineering engineering) {
public Result<Engineering> edit(@RequestBody Engineering engineering) {
Result<Engineering> result = new Result<Engineering>();
Engineering engineeringEntity = engineeringService.getById(engineering.getId());
if(engineeringEntity==null) {

2
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java
View File

@ -97,7 +97,7 @@ public class GovInvestmentContractController {
public Result<IPage<InvestmentContract>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
QueryWrapper<InvestmentContract> queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentContract.class, map);
Page<InvestmentContract> page = PageUtil.getPage(map);
IPage<InvestmentContract> pageList = investmentContractService.page(page, queryWrapper);
IPage<InvestmentContract> pageList = investmentContractService.pageList(page, queryWrapper);
return Result.success(pageList);
}

24
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java
View File

@ -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<Object> examine(@RequestBody ProjectNodePlan projectNodePlan) {
LambdaUpdateWrapper<ProjectNodePlan> wrapper = Wrappers.<ProjectNodePlan>lambdaUpdate();
wrapper.set(ProjectNodePlan::getFillState, projectNodePlan.getFillState());
wrapper.eq(ProjectNodePlan::getId, projectNodePlan.getId());
return Result.success(projectNodePlanService.update(wrapper));
}
}

3
src/main/java/com/zhgd/xmgl/modules/basicdata/dto/EngineeringPageDto.java
View File

@ -11,6 +11,9 @@ public class EngineeringPageDto {
@ApiModelProperty(value = "工程名称")
private String engineeringName;
@ApiModelProperty(value = "工程ID")
private Long id;
@ApiModelProperty(value = "工程sn")
private String engineeringSn;

8
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Engineering.java
View File

@ -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正常)
*/

2
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/EngineeringMapper.xml
View File

@ -13,7 +13,7 @@
</select>
<select id="pageListForSuperior" resultType="com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto">
SELECT e.engineering_sn, e.engineering_name, e.province, e.city, e.district, e.address, e.state, e.longitude, e.latitude, e.ai_alarm_stat FROM engineering e
SELECT e.id, e.engineering_sn, e.engineering_name, e.province, e.city, e.district, e.address, e.state, e.longitude, e.latitude, e.ai_alarm_stat FROM engineering e
${ew.customSqlSegment}
</select>

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java
View File

@ -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<EngineeringMapper, Engin
@Override
public boolean saveInfo(EngineeringVo engineeringVo) {
SecurityUser user = SecurityUtil.getUser();
engineeringVo.setState(1);
engineeringVo.setCreateTime(new Date());
engineeringVo.setProjectSn(projectService.list().get(0).getProjectSn());

3
src/main/java/com/zhgd/xmgl/modules/safety/entity/InvestmentContract.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.safety.entity;
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 com.fasterxml.jackson.annotation.JsonFormat;
@ -53,7 +54,7 @@ public class InvestmentContract implements Serializable {
/**
* 结算定额日期
*/
@Excel(name = "结算定额日期", width = 15, format = "yyyy-MM-dd")
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "结算定额日期")

90
src/main/java/com/zhgd/xmgl/modules/safety/entity/ProjectNodePlan.java
View File

@ -1,7 +1,6 @@
package com.zhgd.xmgl.modules.safety.entity;
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 com.fasterxml.jackson.annotation.JsonFormat;
@ -12,6 +11,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -33,23 +33,17 @@ public class ProjectNodePlan implements Serializable {
@ApiModelProperty(value = "全景计划节点ID(主键)")
private Long id;
/**
* 节点编号
* 分部分项工程名称
*/
@Excel(name = "节点编号", width = 15)
@ApiModelProperty(value = "节点编号")
private String nodeNumber;
@Excel(name = "分部分项工程名称", width = 15)
@ApiModelProperty(value = "分部分项工程名称")
private String subItemName;
/**
* 节点名称
* 子分项名称（非必填项）
*/
@Excel(name = "节点名称", width = 15)
@ApiModelProperty(value = "节点名称")
private String nodeName;
/**
* 节点类型
*/
@Excel(name = "节点类型", width = 15)
@ApiModelProperty(value = "节点类型")
private String type;
@Excel(name = "子分项名称（非必填项）", width = 15)
@ApiModelProperty(value = "子分项名称（非必填项）")
private String childName;
/**
* 标准完成时间
*/
@ -58,6 +52,12 @@ public class ProjectNodePlan implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "标准完成时间")
private Date standardCompleteTime;
/**
* 负责人
*/
@Excel(name = "负责人", width = 15)
@ApiModelProperty(value = "负责人")
private String commander;
/**
* 计划开始日期
*/
@ -83,53 +83,23 @@ public class ProjectNodePlan implements Serializable {
@ApiModelProperty(value = "实际完成时间")
private Date realCompleteTime;
/**
* 状态(字典数据)
* 完成比率
*/
@Excel(name = "状态(字典数据)", width = 15)
@ApiModelProperty(value = "状态(字典数据)")
@Excel(name = "完成比率", width = 15)
@ApiModelProperty(value = "完成比率")
private BigDecimal completeRatio;
/**
* 状态(1:未开始;2:进行中(推进中);3:已完成(按期完成);4:临期;5:逾期(超期);6:逾期已完成(逾期完成);7:暂停;)
*/
@Excel(name = "状态(1:未开始;2:进行中(推进中);3:已完成(按期完成);4:临期;5:逾期(超期);6:逾期已完成(逾期完成);7:暂停;)", width = 15)
@ApiModelProperty(value = "状态(1:未开始;2:进行中(推进中);3:已完成(按期完成);4:临期;5:逾期(超期);6:逾期已完成(逾期完成);7:暂停;)")
private Integer state;
/**
* 职能条线
* 填报状态（1:已填报、2:已审核、3:已驳回、4:重新填报）
*/
@Excel(name = "职能条线", width = 15)
@ApiModelProperty(value = "职能条线")
private String phaseName;
/**
* 节点责任人
*/
@Excel(name = "节点责任人", width = 15)
@ApiModelProperty(value = "节点责任人")
private String chargerName;
/**
* 节点责任人联系方式
*/
@Excel(name = "节点责任人联系方式", width = 15)
@ApiModelProperty(value = "节点责任人联系方式")
private String chargerPhone;
/**
* 节点失效标记：0-有效、1-失效
*/
@Excel(name = "节点失效标记：0-有效、1-失效", width = 15)
@ApiModelProperty(value = "节点失效标记：0-有效、1-失效")
private String isDeleted;
/**
* 是否退回：0-否、1-是
*/
@Excel(name = "是否退回：0-否、1-是", width = 15)
@ApiModelProperty(value = "是否退回：0-否、1-是")
private String isSendBack;
/**
* 实际偏差
*/
@Excel(name = "实际偏差", width = 15)
@ApiModelProperty(value = "实际偏差")
private String actualDeviation;
/**
* 附件信息
*/
@Excel(name = "附件信息", width = 15)
@ApiModelProperty(value = "附件信息")
private String annexFile;
@Excel(name = "填报状态（1:已填报、2:已审核、3:已驳回、4:重新填报）", width = 15)
@ApiModelProperty(value = "填报状态（1:已填报、2:已审核、3:已驳回、4:重新填报）")
private Integer fillState;
/**
* 项目sn
*/
@ -142,8 +112,4 @@ public class ProjectNodePlan implements Serializable {
@Excel(name = "工程sn", width = 15)
@ApiModelProperty(value = "工程sn")
private String engineeringSn;
@TableField(exist = false)
@ApiModelProperty(value = "状态")
private String status;
}

5
src/main/java/com/zhgd/xmgl/modules/safety/mapper/InvestmentContractMapper.java
View File

@ -1,9 +1,13 @@
package com.zhgd.xmgl.modules.safety.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.modules.safety.entity.InvestmentContract;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 投资支付合同
@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
@DataScope
public interface InvestmentContractMapper extends BaseMapper<InvestmentContract> {
Page<InvestmentContract> pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper<InvestmentContract> queryWrapper);
}

4
src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/InvestmentContractMapper.xml
View File

@ -2,4 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.safety.mapper.InvestmentContractMapper">
<select id="pageList" resultType="com.zhgd.xmgl.modules.safety.entity.InvestmentContract">
SELECT * FROM (SELECT i.*, e.settlement_time FROM investment_contract i LEFT JOIN engineering e ON i.engineering_sn = e.engineering_sn) a
${ew.customSqlSegment}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentContractService.java
View File

@ -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<InvestmentContract>
Page<InvestmentProPageDto> pageListByGov(Map<String, Object> map);
Page<InvestmentContract> pageList(Page page, QueryWrapper<InvestmentContract> queryWrapper);
boolean saveInfo(InvestmentContract investmentContract);
}

6
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentContractServiceImpl.java
View File

@ -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<InvestmentContrac
return pageList;
}
@Override
public Page<InvestmentContract> pageList(Page page, QueryWrapper<InvestmentContract> queryWrapper) {
return baseMapper.pageList(page, queryWrapper);
}
@Override
public boolean saveInfo(InvestmentContract investmentContract) {
if (StringUtils.isNotBlank(investmentContract.getEngineeringSn())) {

8
src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectNodePlanServiceImpl.java
View File

@ -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<ProjectNodePlanMappe
@Override
public Page<ProjectNodePlan> pageList(Page page, Wrapper<ProjectNodePlan> wrapper) {
Page<ProjectNodePlan> pageList = baseMapper.selectPage(page, wrapper);
List<SystemDictData> 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);
}
}

6
src/main/resources/application-dev.properties
View File

@ -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/
# 文件访问路径