老旧管网上传

zh-baseversion-admin/src/main/java/com/zehong/web/controller/oldpipesystem/TPipeOldPlanProcessController.java

+package com.zehong.web.controller.oldpipesystem;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TPipeOldPlanProcess;
+import com.zehong.system.service.ITPipeOldPlanProcessService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 老旧管网-改造计划和进度Controller
+ * 
+ * @author zehong
+ * @date 2024-06-15
+ */
+@RestController
+@RequestMapping("/oldPipeSystem/plan")
+public class TPipeOldPlanProcessController extends BaseController
+{
+    @Autowired
+    private ITPipeOldPlanProcessService tPipeOldPlanProcessService;
+
+    /**
+     * 查询老旧管网-改造计划和进度列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        startPage();
+        List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出老旧管网-改造计划和进度列表
+     */
+    @Log(title = "老旧管网-改造计划和进度", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        List<TPipeOldPlanProcess> list = tPipeOldPlanProcessService.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
+        ExcelUtil<TPipeOldPlanProcess> util = new ExcelUtil<TPipeOldPlanProcess>(TPipeOldPlanProcess.class);
+        return util.exportExcel(list, "老旧管网-改造计划和进度数据");
+    }
+
+    /**
+     * 获取老旧管网-改造计划和进度详细信息
+     */
+    @GetMapping(value = "/{fOldPlanProcessId}")
+    public AjaxResult getInfo(@PathVariable("fOldPlanProcessId") Long fOldPlanProcessId)
+    {
+        return AjaxResult.success(tPipeOldPlanProcessService.selectTPipeOldPlanProcessById(fOldPlanProcessId));
+    }
+
+    /**
+     * 新增老旧管网-改造计划和进度
+     */
+    @Log(title = "老旧管网-改造计划和进度", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        return toAjax(tPipeOldPlanProcessService.insertTPipeOldPlanProcess(tPipeOldPlanProcess));
+    }
+
+    /**
+     * 修改老旧管网-改造计划和进度
+     */
+    @Log(title = "老旧管网-改造计划和进度", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        return toAjax(tPipeOldPlanProcessService.updateTPipeOldPlanProcess(tPipeOldPlanProcess));
+    }
+
+    /**
+     * 删除老旧管网-改造计划和进度
+     */
+    @Log(title = "老旧管网-改造计划和进度", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fOldPlanProcessIds}")
+    public AjaxResult remove(@PathVariable Long[] fOldPlanProcessIds)
+    {
+        return toAjax(tPipeOldPlanProcessService.deleteTPipeOldPlanProcessByIds(fOldPlanProcessIds));
+    }
+
+    /**
+     * 上传计划和进度
+     * @param fOldPlanProcessId 计划id
+     * @return
+     */
+    @GetMapping("/reportPipeOldPlanProcess")
+    public AjaxResult reportPipeOldPlanProcess(Long fOldPlanProcessId){
+        try{
+            return toAjax(tPipeOldPlanProcessService.reportPipeOldPlanProcess(fOldPlanProcessId));
+        }catch (Exception e){
+            logger.error("上传计划和进度接口异常=====",e);
+            return AjaxResult.error("上传计划和进度接口异常");
+        }
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TPipeOldPlanProcess.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 老旧管网-改造计划和进度对象 t_pipe_old_plan_process
+ * 
+ * @author zehong
+ * @date 2024-06-15
+ */
+public class TPipeOldPlanProcess extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long fOldPlanProcessId;
+
+    /** uuid:省平台对接必传参数 */
+    private String fUuid;
+
+    /** 燃气企业编码，可为空 */
+    @Excel(name = "燃气企业编码")
+    private String fEntUuid;
+
+    /** 项目所在县级行政区ID */
+    @Excel(name = "项目所在县级行政区ID")
+    private Long fRegion;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String fProjectName;
+
+    /** 关联对象类型
+
+            PIPE(市政管网管线分段)
+
+            YARD(庭院管网所在小区)
+
+            STATION(厂站和设施)
+
+            RESIDENT（居民用户）
+
+            UNIT(单位用户) */
+    @Excel(name = "关联对象类型", dictType = "t_relation_object_type")
+    private String fRelationObjectType;
+
+    /** 年度(格式 yyyy) */
+    @Excel(name = "年度")
+    private String fYear;
+
+    /** 项目开始时间 */
+    @Excel(name = "项目开始时间")
+    private String fStartTime;
+
+    /** 项目结束时间 */
+    @Excel(name = "项目结束时间")
+    private String fEndTime;
+
+    /** 项目总投资，单位：万元 */
+    private Long fTotalInvestment;
+
+    /** 创建时间 */
+    private String fCreateTime;
+
+    /** 修改时间 */
+    private String fUpdateTime;
+
+    /** 实施主体 */
+    private String fSubjectImplementation;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String fConcatPerson;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String fConcatTel;
+
+    /** 建设内容 */
+    @Excel(name = "建设内容")
+    private String fConstructionContent;
+
+    /** 实际改造完成时间*/
+    @Excel(name = "实际改造完成时间")
+    private String fActualFinishTime;
+
+    /** 当前改造进度，填写百分比，100为完成 */
+    @Excel(name = "当前改造进度")
+    private Long fReconstructionProgress;
+
+    /** 当前资金拨付进度，填写百分比，100为完成 */
+    @Excel(name = "当前资金拨付进度")
+    private Long fFundsDisbursementProgress;
+
+    /** 是否已上传，1-是，0-否 */
+    @Excel(name = "是否已上传",readConverterExp = "1=是,0=否")
+    private String fUploadType;
+
+    /** 上传时间，yyyy-MM-dd hh:mm:ss */
+    @Excel(name = "上传时间")
+    private String fUploadTime;
+
+    public void setfOldPlanProcessId(Long fOldPlanProcessId) 
+    {
+        this.fOldPlanProcessId = fOldPlanProcessId;
+    }
+
+    public Long getfOldPlanProcessId() 
+    {
+        return fOldPlanProcessId;
+    }
+    public void setfUuid(String fUuid) 
+    {
+        this.fUuid = fUuid;
+    }
+
+    public String getfUuid() 
+    {
+        return fUuid;
+    }
+    public void setfEntUuid(String fEntUuid) 
+    {
+        this.fEntUuid = fEntUuid;
+    }
+
+    public String getfEntUuid() 
+    {
+        return fEntUuid;
+    }
+    public void setfRegion(Long fRegion) 
+    {
+        this.fRegion = fRegion;
+    }
+
+    public Long getfRegion() 
+    {
+        return fRegion;
+    }
+    public void setfProjectName(String fProjectName) 
+    {
+        this.fProjectName = fProjectName;
+    }
+
+    public String getfProjectName() 
+    {
+        return fProjectName;
+    }
+    public void setfRelationObjectType(String fRelationObjectType) 
+    {
+        this.fRelationObjectType = fRelationObjectType;
+    }
+
+    public String getfRelationObjectType() 
+    {
+        return fRelationObjectType;
+    }
+    public void setfYear(String fYear) 
+    {
+        this.fYear = fYear;
+    }
+
+    public String getfYear() 
+    {
+        return fYear;
+    }
+    public void setfStartTime(String fStartTime) 
+    {
+        this.fStartTime = fStartTime;
+    }
+
+    public String getfStartTime() 
+    {
+        return fStartTime;
+    }
+    public void setfEndTime(String fEndTime) 
+    {
+        this.fEndTime = fEndTime;
+    }
+
+    public String getfEndTime() 
+    {
+        return fEndTime;
+    }
+    public void setfTotalInvestment(Long fTotalInvestment) 
+    {
+        this.fTotalInvestment = fTotalInvestment;
+    }
+
+    public Long getfTotalInvestment() 
+    {
+        return fTotalInvestment;
+    }
+    public void setfCreateTime(String fCreateTime) 
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public String getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateTime(String fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public String getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+    public void setfSubjectImplementation(String fSubjectImplementation) 
+    {
+        this.fSubjectImplementation = fSubjectImplementation;
+    }
+
+    public String getfSubjectImplementation() 
+    {
+        return fSubjectImplementation;
+    }
+    public void setfConcatPerson(String fConcatPerson) 
+    {
+        this.fConcatPerson = fConcatPerson;
+    }
+
+    public String getfConcatPerson() 
+    {
+        return fConcatPerson;
+    }
+    public void setfConcatTel(String fConcatTel) 
+    {
+        this.fConcatTel = fConcatTel;
+    }
+
+    public String getfConcatTel() 
+    {
+        return fConcatTel;
+    }
+    public void setfConstructionContent(String fConstructionContent) 
+    {
+        this.fConstructionContent = fConstructionContent;
+    }
+
+    public String getfConstructionContent() 
+    {
+        return fConstructionContent;
+    }
+    public void setfActualFinishTime(String fActualFinishTime) 
+    {
+        this.fActualFinishTime = fActualFinishTime;
+    }
+
+    public String getfActualFinishTime() 
+    {
+        return fActualFinishTime;
+    }
+    public void setfReconstructionProgress(Long fReconstructionProgress) 
+    {
+        this.fReconstructionProgress = fReconstructionProgress;
+    }
+
+    public Long getfReconstructionProgress() 
+    {
+        return fReconstructionProgress;
+    }
+    public void setfFundsDisbursementProgress(Long fFundsDisbursementProgress) 
+    {
+        this.fFundsDisbursementProgress = fFundsDisbursementProgress;
+    }
+
+    public Long getfFundsDisbursementProgress() 
+    {
+        return fFundsDisbursementProgress;
+    }
+    public void setfUploadType(String fUploadType) 
+    {
+        this.fUploadType = fUploadType;
+    }
+
+    public String getfUploadType() 
+    {
+        return fUploadType;
+    }
+    public void setfUploadTime(String fUploadTime) 
+    {
+        this.fUploadTime = fUploadTime;
+    }
+
+    public String getfUploadTime() 
+    {
+        return fUploadTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fOldPlanProcessId", getfOldPlanProcessId())
+            .append("fUuid", getfUuid())
+            .append("fEntUuid", getfEntUuid())
+            .append("fRegion", getfRegion())
+            .append("fProjectName", getfProjectName())
+            .append("fRelationObjectType", getfRelationObjectType())
+            .append("fYear", getfYear())
+            .append("fStartTime", getfStartTime())
+            .append("fEndTime", getfEndTime())
+            .append("fTotalInvestment", getfTotalInvestment())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateTime", getfUpdateTime())
+            .append("fSubjectImplementation", getfSubjectImplementation())
+            .append("fConcatPerson", getfConcatPerson())
+            .append("fConcatTel", getfConcatTel())
+            .append("fConstructionContent", getfConstructionContent())
+            .append("fActualFinishTime", getfActualFinishTime())
+            .append("fReconstructionProgress", getfReconstructionProgress())
+            .append("fFundsDisbursementProgress", getfFundsDisbursementProgress())
+            .append("fUploadType", getfUploadType())
+            .append("fUploadTime", getfUploadTime())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TPipeOldPlanProcessVo.java

+package com.zehong.system.domain.vo;
+
+public class TPipeOldPlanProcessVo {
+
+    /** 唯一键*/
+    private String uuid;
+
+    /** 燃气企业编码*/
+    private String entUuid;
+
+    /** 项目所在县级行政区*/
+    private Integer region;
+
+    /**项目名称 */
+    private String projectName;
+
+    /** 关联对象类型*/
+    private String relationObjectType;
+
+    /** 年度*/
+    private String year;
+
+    /** 项目开始日期*/
+    private String startTime;
+
+    /** 项目结束日期*/
+    private String endTime;
+
+    /** 项目总投资，单位：万元*/
+    private String totalInvestment;
+
+    /** 创建时间*/
+    private String createTime;
+
+    /** 修改时间*/
+    private String updateTime;
+
+    /** 实施主体*/
+    private String subjectImplementation;
+
+    /** 联系人*/
+    private String concatPerson;
+
+    /** 联系电话*/
+    private String concatTel;
+
+    /** 建设内容*/
+    private String constructionContent;
+
+    /**实际改造完成时间 */
+    private String actualFinishTime;
+
+    /** 当前改造进度*/
+    private String reconstructionProgress;
+
+    /** 当前资金拨付进度*/
+    private String fundsDisbursementProgress;
+
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getEntUuid() {
+        return entUuid;
+    }
+
+    public void setEntUuid(String entUuid) {
+        this.entUuid = entUuid;
+    }
+
+    public Integer getRegion() {
+        return region;
+    }
+
+    public void setRegion(Integer region) {
+        this.region = region;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getRelationObjectType() {
+        return relationObjectType;
+    }
+
+    public void setRelationObjectType(String relationObjectType) {
+        this.relationObjectType = relationObjectType;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getTotalInvestment() {
+        return totalInvestment;
+    }
+
+    public void setTotalInvestment(String totalInvestment) {
+        this.totalInvestment = totalInvestment;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getSubjectImplementation() {
+        return subjectImplementation;
+    }
+
+    public void setSubjectImplementation(String subjectImplementation) {
+        this.subjectImplementation = subjectImplementation;
+    }
+
+    public String getConcatPerson() {
+        return concatPerson;
+    }
+
+    public void setConcatPerson(String concatPerson) {
+        this.concatPerson = concatPerson;
+    }
+
+    public String getConcatTel() {
+        return concatTel;
+    }
+
+    public void setConcatTel(String concatTel) {
+        this.concatTel = concatTel;
+    }
+
+    public String getConstructionContent() {
+        return constructionContent;
+    }
+
+    public void setConstructionContent(String constructionContent) {
+        this.constructionContent = constructionContent;
+    }
+
+    public String getActualFinishTime() {
+        return actualFinishTime;
+    }
+
+    public void setActualFinishTime(String actualFinishTime) {
+        this.actualFinishTime = actualFinishTime;
+    }
+
+    public String getReconstructionProgress() {
+        return reconstructionProgress;
+    }
+
+    public void setReconstructionProgress(String reconstructionProgress) {
+        this.reconstructionProgress = reconstructionProgress;
+    }
+
+    public String getFundsDisbursementProgress() {
+        return fundsDisbursementProgress;
+    }
+
+    public void setFundsDisbursementProgress(String fundsDisbursementProgress) {
+        this.fundsDisbursementProgress = fundsDisbursementProgress;
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TPipeOldPlanProcessMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPipeOldPlanProcess;
+
+/**
+ * 老旧管网-改造计划和进度Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-15
+ */
+public interface TPipeOldPlanProcessMapper 
+{
+    /**
+     * 查询老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 老旧管网-改造计划和进度
+     */
+    public TPipeOldPlanProcess selectTPipeOldPlanProcessById(Long fOldPlanProcessId);
+
+    /**
+     * 查询老旧管网-改造计划和进度列表
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 老旧管网-改造计划和进度集合
+     */
+    public List<TPipeOldPlanProcess> selectTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 新增老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    public int insertTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 修改老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    public int updateTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 删除老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 结果
+     */
+    public int deleteTPipeOldPlanProcessById(Long fOldPlanProcessId);
+
+    /**
+     * 批量删除老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPipeOldPlanProcessByIds(Long[] fOldPlanProcessIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITPipeOldPlanProcessService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPipeOldPlanProcess;
+
+/**
+ * 老旧管网-改造计划和进度Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-15
+ */
+public interface ITPipeOldPlanProcessService 
+{
+    /**
+     * 查询老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 老旧管网-改造计划和进度
+     */
+    public TPipeOldPlanProcess selectTPipeOldPlanProcessById(Long fOldPlanProcessId);
+
+    /**
+     * 查询老旧管网-改造计划和进度列表
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 老旧管网-改造计划和进度集合
+     */
+    public List<TPipeOldPlanProcess> selectTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 新增老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    public int insertTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 修改老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    public int updateTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess);
+
+    /**
+     * 批量删除老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessIds 需要删除的老旧管网-改造计划和进度ID
+     * @return 结果
+     */
+    public int deleteTPipeOldPlanProcessByIds(Long[] fOldPlanProcessIds);
+
+    /**
+     * 删除老旧管网-改造计划和进度信息
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 结果
+     */
+    public int deleteTPipeOldPlanProcessById(Long fOldPlanProcessId);
+
+    /**
+     * 上传计划和进度
+     * @param fOldPlanProcessId 计划id
+     * @return
+     */
+    int reportPipeOldPlanProcess(Long fOldPlanProcessId) throws Exception;
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TPipeOldPlanProcessServiceImpl.java

+package com.zehong.system.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.GovernmentDataCopyUtil;
+import com.zehong.common.utils.GovernmentDataUtil;
+import com.zehong.common.utils.uuid.IdUtils;
+import com.zehong.system.domain.TPipeOldPlanProcess;
+import com.zehong.system.domain.vo.TPipeOldPlanProcessVo;
+import com.zehong.system.mapper.TPipeOldPlanProcessMapper;
+import com.zehong.system.service.ITPipeOldPlanProcessService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 老旧管网-改造计划和进度Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-15
+ */
+@Service
+public class TPipeOldPlanProcessServiceImpl implements ITPipeOldPlanProcessService 
+{
+    private static final Logger log = LoggerFactory.getLogger(TPipeOldPlanProcessServiceImpl.class);
+
+    @Autowired
+    private TPipeOldPlanProcessMapper tPipeOldPlanProcessMapper;
+
+    @Resource
+    private GovernmentDataUtil governmentDataUtil;
+
+    /**
+     * 查询老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 老旧管网-改造计划和进度
+     */
+    @Override
+    public TPipeOldPlanProcess selectTPipeOldPlanProcessById(Long fOldPlanProcessId)
+    {
+        return tPipeOldPlanProcessMapper.selectTPipeOldPlanProcessById(fOldPlanProcessId);
+    }
+
+    /**
+     * 查询老旧管网-改造计划和进度列表
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 老旧管网-改造计划和进度
+     */
+    @Override
+    public List<TPipeOldPlanProcess> selectTPipeOldPlanProcessList(TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        return tPipeOldPlanProcessMapper.selectTPipeOldPlanProcessList(tPipeOldPlanProcess);
+    }
+
+    /**
+     * 新增老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    @Override
+    public int insertTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        tPipeOldPlanProcess.setfUuid(IdUtils.fastSimpleUUID());
+        tPipeOldPlanProcess.setfCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        return tPipeOldPlanProcessMapper.insertTPipeOldPlanProcess(tPipeOldPlanProcess);
+    }
+
+    /**
+     * 修改老旧管网-改造计划和进度
+     * 
+     * @param tPipeOldPlanProcess 老旧管网-改造计划和进度
+     * @return 结果
+     */
+    @Override
+    public int updateTPipeOldPlanProcess(TPipeOldPlanProcess tPipeOldPlanProcess)
+    {
+        tPipeOldPlanProcess.setfUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        return tPipeOldPlanProcessMapper.updateTPipeOldPlanProcess(tPipeOldPlanProcess);
+    }
+
+    /**
+     * 批量删除老旧管网-改造计划和进度
+     * 
+     * @param fOldPlanProcessIds 需要删除的老旧管网-改造计划和进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPipeOldPlanProcessByIds(Long[] fOldPlanProcessIds)
+    {
+        return tPipeOldPlanProcessMapper.deleteTPipeOldPlanProcessByIds(fOldPlanProcessIds);
+    }
+
+    /**
+     * 删除老旧管网-改造计划和进度信息
+     * 
+     * @param fOldPlanProcessId 老旧管网-改造计划和进度ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPipeOldPlanProcessById(Long fOldPlanProcessId)
+    {
+        return tPipeOldPlanProcessMapper.deleteTPipeOldPlanProcessById(fOldPlanProcessId);
+    }
+
+    @Override
+    public int reportPipeOldPlanProcess(Long fOldPlanProcessId) throws Exception {
+        TPipeOldPlanProcess tPipeOldPlanProcess = tPipeOldPlanProcessMapper.selectTPipeOldPlanProcessById(fOldPlanProcessId);
+        TPipeOldPlanProcessVo pipeOldPlanProcessVo = new TPipeOldPlanProcessVo();
+        GovernmentDataCopyUtil.copyToGovernData(tPipeOldPlanProcess,pipeOldPlanProcessVo);
+        List<TPipeOldPlanProcessVo> data = new ArrayList<>();
+        JSONObject reportResult = governmentDataUtil.setInfo("pipeline/old/plan/process","WRITE",data);
+        log.info("上传计划和进度结果===================" + reportResult.toJSONString());
+        if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传计划和进度接口失败");
+        return 1;
+    }
+}

zh-baseversion-system/src/main/resources/mapper/system/TPipeOldPlanProcessMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TPipeOldPlanProcessMapper">
+    
+    <resultMap type="TPipeOldPlanProcess" id="TPipeOldPlanProcessResult">
+        <result property="fOldPlanProcessId"    column="f_old_plan_process_id"    />
+        <result property="fUuid"    column="f_uuid"    />
+        <result property="fEntUuid"    column="f_ent_uuid"    />
+        <result property="fRegion"    column="f_region"    />
+        <result property="fProjectName"    column="f_project_name"    />
+        <result property="fRelationObjectType"    column="f_relation_object_type"    />
+        <result property="fYear"    column="f_year"    />
+        <result property="fStartTime"    column="f_start_time"    />
+        <result property="fEndTime"    column="f_end_time"    />
+        <result property="fTotalInvestment"    column="f_total_investment"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fSubjectImplementation"    column="f_subject_implementation"    />
+        <result property="fConcatPerson"    column="f_concat_person"    />
+        <result property="fConcatTel"    column="f_concat_tel"    />
+        <result property="fConstructionContent"    column="f_construction_content"    />
+        <result property="fActualFinishTime"    column="f_actual_finish_time"    />
+        <result property="fReconstructionProgress"    column="f_reconstruction_progress"    />
+        <result property="fFundsDisbursementProgress"    column="f_funds_disbursement_progress"    />
+        <result property="fUploadType"    column="f_upload_type"    />
+        <result property="fUploadTime"    column="f_upload_time"    />
+    </resultMap>
+
+    <sql id="selectTPipeOldPlanProcessVo">
+        select f_old_plan_process_id, f_uuid, f_ent_uuid, f_region, f_project_name, f_relation_object_type, f_year, f_start_time, f_end_time, f_total_investment, f_create_time, f_update_time, f_subject_implementation, f_concat_person, f_concat_tel, f_construction_content, f_actual_finish_time, f_reconstruction_progress, f_funds_disbursement_progress, f_upload_type, f_upload_time from t_pipe_old_plan_process
+    </sql>
+
+    <select id="selectTPipeOldPlanProcessList" parameterType="TPipeOldPlanProcess" resultMap="TPipeOldPlanProcessResult">
+        <include refid="selectTPipeOldPlanProcessVo"/>
+        <where>  
+            <if test="fProjectName != null  and fProjectName != ''"> and f_project_name like concat('%', #{fProjectName}, '%')</if>
+            <if test="fRelationObjectType != null  and fRelationObjectType != ''"> and f_relation_object_type = #{fRelationObjectType}</if>
+            <if test="fConcatPerson != null  and fConcatPerson != ''"> and f_concat_person like concat('%', #{fConcatPerson}, '%')</if>
+            <if test="fConcatTel != null  and fConcatTel != ''"> and f_concat_tel like concat('%', #{fConcatTel}, '%')</if>
+            <if test="fFundsDisbursementProgress != null "> and f_funds_disbursement_progress = #{fFundsDisbursementProgress}</if>
+            <if test="fUploadType != null  and fUploadType != ''"> and f_upload_type = #{fUploadType}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPipeOldPlanProcessById" parameterType="Long" resultMap="TPipeOldPlanProcessResult">
+        <include refid="selectTPipeOldPlanProcessVo"/>
+        where f_old_plan_process_id = #{fOldPlanProcessId}
+    </select>
+        
+    <insert id="insertTPipeOldPlanProcess" parameterType="TPipeOldPlanProcess" useGeneratedKeys="true" keyProperty="fOldPlanProcessId">
+        insert into t_pipe_old_plan_process
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fUuid != null and fUuid != ''">f_uuid,</if>
+            <if test="fEntUuid != null">f_ent_uuid,</if>
+            <if test="fRegion != null">f_region,</if>
+            <if test="fProjectName != null">f_project_name,</if>
+            <if test="fRelationObjectType != null">f_relation_object_type,</if>
+            <if test="fYear != null">f_year,</if>
+            <if test="fStartTime != null">f_start_time,</if>
+            <if test="fEndTime != null">f_end_time,</if>
+            <if test="fTotalInvestment != null">f_total_investment,</if>
+            <if test="fCreateTime != null">f_create_time,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fSubjectImplementation != null">f_subject_implementation,</if>
+            <if test="fConcatPerson != null">f_concat_person,</if>
+            <if test="fConcatTel != null">f_concat_tel,</if>
+            <if test="fConstructionContent != null">f_construction_content,</if>
+            <if test="fActualFinishTime != null">f_actual_finish_time,</if>
+            <if test="fReconstructionProgress != null">f_reconstruction_progress,</if>
+            <if test="fFundsDisbursementProgress != null">f_funds_disbursement_progress,</if>
+            <if test="fUploadType != null">f_upload_type,</if>
+            <if test="fUploadTime != null">f_upload_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fUuid != null and fUuid != ''">#{fUuid},</if>
+            <if test="fEntUuid != null">#{fEntUuid},</if>
+            <if test="fRegion != null">#{fRegion},</if>
+            <if test="fProjectName != null">#{fProjectName},</if>
+            <if test="fRelationObjectType != null">#{fRelationObjectType},</if>
+            <if test="fYear != null">#{fYear},</if>
+            <if test="fStartTime != null">#{fStartTime},</if>
+            <if test="fEndTime != null">#{fEndTime},</if>
+            <if test="fTotalInvestment != null">#{fTotalInvestment},</if>
+            <if test="fCreateTime != null">#{fCreateTime},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fSubjectImplementation != null">#{fSubjectImplementation},</if>
+            <if test="fConcatPerson != null">#{fConcatPerson},</if>
+            <if test="fConcatTel != null">#{fConcatTel},</if>
+            <if test="fConstructionContent != null">#{fConstructionContent},</if>
+            <if test="fActualFinishTime != null">#{fActualFinishTime},</if>
+            <if test="fReconstructionProgress != null">#{fReconstructionProgress},</if>
+            <if test="fFundsDisbursementProgress != null">#{fFundsDisbursementProgress},</if>
+            <if test="fUploadType != null">#{fUploadType},</if>
+            <if test="fUploadTime != null">#{fUploadTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPipeOldPlanProcess" parameterType="TPipeOldPlanProcess">
+        update t_pipe_old_plan_process
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fUuid != null and fUuid != ''">f_uuid = #{fUuid},</if>
+            <if test="fEntUuid != null">f_ent_uuid = #{fEntUuid},</if>
+            <if test="fRegion != null">f_region = #{fRegion},</if>
+            <if test="fProjectName != null">f_project_name = #{fProjectName},</if>
+            <if test="fRelationObjectType != null">f_relation_object_type = #{fRelationObjectType},</if>
+            <if test="fYear != null">f_year = #{fYear},</if>
+            <if test="fStartTime != null">f_start_time = #{fStartTime},</if>
+            <if test="fEndTime != null">f_end_time = #{fEndTime},</if>
+            <if test="fTotalInvestment != null">f_total_investment = #{fTotalInvestment},</if>
+            <if test="fCreateTime != null">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fSubjectImplementation != null">f_subject_implementation = #{fSubjectImplementation},</if>
+            <if test="fConcatPerson != null">f_concat_person = #{fConcatPerson},</if>
+            <if test="fConcatTel != null">f_concat_tel = #{fConcatTel},</if>
+            <if test="fConstructionContent != null">f_construction_content = #{fConstructionContent},</if>
+            <if test="fActualFinishTime != null">f_actual_finish_time = #{fActualFinishTime},</if>
+            <if test="fReconstructionProgress != null">f_reconstruction_progress = #{fReconstructionProgress},</if>
+            <if test="fFundsDisbursementProgress != null">f_funds_disbursement_progress = #{fFundsDisbursementProgress},</if>
+            <if test="fUploadType != null">f_upload_type = #{fUploadType},</if>
+            <if test="fUploadTime != null">f_upload_time = #{fUploadTime},</if>
+        </trim>
+        where f_old_plan_process_id = #{fOldPlanProcessId}
+    </update>
+
+    <delete id="deleteTPipeOldPlanProcessById" parameterType="Long">
+        delete from t_pipe_old_plan_process where f_old_plan_process_id = #{fOldPlanProcessId}
+    </delete>
+
+    <delete id="deleteTPipeOldPlanProcessByIds" parameterType="String">
+        delete from t_pipe_old_plan_process where f_old_plan_process_id in 
+        <foreach item="fOldPlanProcessId" collection="array" open="(" separator="," close=")">
+            #{fOldPlanProcessId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/oldpipesystem/process.js

+import request from '@/utils/request'
+
+// 查询老旧管网-改造计划和进度列表
+export function listProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询老旧管网-改造计划和进度详细
+export function getProcess(fOldPlanProcessId) {
+  return request({
+    url: '/oldPipeSystem/plan/' + fOldPlanProcessId,
+    method: 'get'
+  })
+}
+
+// 新增老旧管网-改造计划和进度
+export function addProcess(data) {
+  return request({
+    url: '/oldPipeSystem/plan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改老旧管网-改造计划和进度
+export function updateProcess(data) {
+  return request({
+    url: '/oldPipeSystem/plan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除老旧管网-改造计划和进度
+export function delProcess(fOldPlanProcessId) {
+  return request({
+    url: '/oldPipeSystem/plan/' + fOldPlanProcessId,
+    method: 'delete'
+  })
+}
+
+// 导出老旧管网-改造计划和进度
+export function exportProcess(query) {
+  return request({
+    url: '/oldPipeSystem/plan/export',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/oldpipesystem/process/components/DetailInfo.vue

+<template>
+  <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
+    <el-form label-width="170px">
+      <el-row class="el-row-table">
+        <el-col :span="12">
+          <el-form-item label="项目名称">
+            <span v-if="detailInfo.fProjectName">{{ detailInfo.fProjectName }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="燃气企业编码" >
+            <span v-if="detailInfo.fEntUuid">{{ detailInfo.fEntUuid }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="项目所在县级行政区ID" >
+            <span v-if="detailInfo.fRegion">{{ detailInfo.fRegion }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="关联对象类型" >
+            <span v-if="detailInfo.fIdNo">{{ $parent.fRelationObjectTypeFormat(detailInfo) }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="年度" >
+            <span v-if="detailInfo.fYear">{{ detailInfo.fYear }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="项目开始时间" >
+            <span v-if="detailInfo.fStartTime">{{ detailInfo.fStartTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="项目结束时间" >
+            <span v-if="detailInfo.fEndTime">{{ detailInfo.fEndTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="项目总投资/万元" >
+            <span v-if="detailInfo.fTotalInvestment">{{ detailInfo.fTotalInvestment }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="实施主体" >
+            <span v-if="detailInfo.fSubjectImplementation">{{ detailInfo.fSubjectImplementation }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="联系人" >
+            <span v-if="detailInfo.fConcatPerson">{{ detailInfo.fConcatPerson }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="联系电话" >
+            <span v-if="detailInfo.fConcatTel">{{ detailInfo.fConcatTel }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="实际改造完成时间" >
+            <span v-if="detailInfo.fActualFinishTime">{{ detailInfo.fActualFinishTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="建设内容" >
+            <span v-if="detailInfo.fConstructionContent">{{ detailInfo.fConstructionContent }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="当前改造进度/百分比" >
+            <span v-if="detailInfo.fReconstructionProgress">{{ detailInfo.fReconstructionProgress }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="当前资金拨付进度/百分比" >
+            <span v-if="detailInfo.fFundsDisbursementProgress">{{ detailInfo.fFundsDisbursementProgress }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建时间" >
+            <span v-if="detailInfo.fCreateTime">{{ detailInfo.fCreateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="更新时间" >
+            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="是否已上传" >
+            <span v-if="detailInfo.fUploadType == '0'">否</span>
+            <span v-else-if="detailInfo.fUploadType == '1'">是</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="上传时间" >
+              <span v-if="detailInfo.fUploadTime">{{ detailInfo.fUploadTime }}</span>
+              <span v-else>-</span>
+            </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+  import { getProcess } from "@/api/oldpipesystem/process";
+  export default {
+    name: "detail-info",
+    data(){
+        return{
+          detailInfo: {},
+          detailOpen: false
+        }
+    },
+    methods:{
+      getDetailInfo(id){
+        getProcess(id).then(res =>{
+          if(res.code == 200 && res.data){
+            this.detailInfo = res.data;
+            this.detailOpen = true;
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>