Skip to content

Z
zh-baseversion-project
Commit 2f12e913 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

供需平衡问题修改

parent b1f03280
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 17 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TSupBalStopSup.java
View file @ 2f12e913
......@@ -23,7 +23,7 @@ public class TSupBalStopSup extends BaseEntity
/** 企业uuid */
private String fCompanyInfoId;
@Excel(name = "企业名称")
//@Excel(name = "企业名称")
private String enterpriseName;
/** 停气开始日期 */
......@@ -37,7 +37,7 @@ public class TSupBalStopSup extends BaseEntity
private Date fEndDate;
/** 停气类型 */
@Excel(name = "停气类型")
@Excel(name = "停气类型",dictType = "t_stop_type")
private String fStopType;
/** 影响用户 */
......@@ -53,7 +53,7 @@ public class TSupBalStopSup extends BaseEntity
private String fStopRange;
/** 停气进度 */
@Excel(name = "停气进度")
@Excel(name = "停气进度",dictType = "t_stop_progress")
private String fStopProgress;
/** 恢复供气时间 */
......@@ -62,7 +62,7 @@ public class TSupBalStopSup extends BaseEntity
private Date fRecoveryGasTime;
/** 上报状态 0-未上报，1-已上报 */
@Excel(name = "上报状态 0-未上报，1-已上报")
@Excel(name = "上报状态",readConverterExp = " 0=未上报,1=已上报")
private String fRepStatus;
/**
......@@ -76,7 +76,6 @@ public class TSupBalStopSup extends BaseEntity
private String fGasStopArea;
/** 是否删除(0正常，1删除) */
@Excel(name = "是否删除(0正常，1删除)")
private String isDel;
/** 备注 */
......
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TSupBalUsgDayServiceImpl.java
View file @ 2f12e913
......@@ -104,7 +104,7 @@ public class TSupBalUsgDayServiceImpl implements ITSupBalUsgDayService
/**
* 获取上报信息
* @param companyId 企业id
* @param reportDate 上报时间
* @param calendarDate 上报时间
* @return
*/
@Override
......
zh-baseversion-system/src/main/resources/mapper/system/TSupBalStopSupMapper.xml
View file @ 2f12e913
......@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fStopProgress != null and fStopProgress != ''">f_stop_progress,</if>
<if test="fRecoveryGasTime != null">f_recovery_gas_time,</if>
<if test="fRepStatus != null and fRepStatus != ''">f_rep_status,</if>
<if test="entRepTime != null and entRepTime != ''">f_ent_rep_time,</if>
<if test="entRepTime != null">f_ent_rep_time,</if>
<if test="fGasStopArea != null">f_gas_stop_area,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
......@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fStopProgress != null and fStopProgress != ''">#{fStopProgress},</if>
<if test="fRecoveryGasTime != null">#{fRecoveryGasTime},</if>
<if test="fRepStatus != null and fRepStatus != ''">#{fRepStatus},</if>
<if test="entRepTime != null and entRepTime != ''">#{entRepTime},</if>
<if test="entRepTime != null">#{entRepTime},</if>
<if test="fGasStopArea != null">#{fGasStopArea},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
......@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fStopProgress != null and fStopProgress != ''">f_stop_progress = #{fStopProgress},</if>
<if test="fRecoveryGasTime != null">f_recovery_gas_time = #{fRecoveryGasTime},</if>
<if test="fRepStatus != null and fRepStatus != ''">f_rep_status = #{fRepStatus},</if>
<if test="entRepTime != null and entRepTime != ''">f_ent_rep_time = #{entRepTime},</if>
<if test="entRepTime != null">f_ent_rep_time = #{entRepTime},</if>
<if test="fGasStopArea != null">f_gas_stop_area = #{fGasStopArea},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
......
zh-baseversion-web/src/views/supplybalance/day/components/DetailInfo.vue
View file @ 2f12e913
......@@ -143,12 +143,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="上报时间">
<el-form-item label="企业端上报时间">
<span v-if="detailInfo.fReportTime">{{ detailInfo.fReportTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
<el-form-item label="政府端上报时间">
<span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</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>
......
zh-baseversion-web/src/views/supplybalance/gas/components/DetailInfo.vue
View file @ 2f12e913
......@@ -46,16 +46,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="上报状态">
<span v-if="detailInfo.fRepStatus == '0'">未上报</span>
<span v-else-if="detailInfo.fRepStatus == '1'">已上报</span>
<el-form-item label="企业端上报时间">
<span v-if="detailInfo.fRepDate">{{ detailInfo.fRepDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上报日期">
<span v-if="detailInfo.fRepDate">{{ detailInfo.fRepDate }}</span>
<el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
<el-form-item label="政府端上报时间">
<span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
......
zh-baseversion-web/src/views/supplybalance/stop/components/DetailInfo.vue
View file @ 2f12e913
......@@ -54,6 +54,20 @@
</el-form-item>
</el-col>
<el-col :span="12" v-if="detailInfo.fRepStatus == '1'">
<el-form-item label="企业上报时间">
<span v-if="detailInfo.entRepTime">{{ detailInfo.entRepTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12" v-if="-2 == $store.state.user.enterpriseId">
<el-form-item label="政府端上报时间">
<span v-if="detailInfo.fGovUploadTime">{{ detailInfo.fGovUploadTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间">
<span v-if="detailInfo.createTime">{{ detailInfo.createTime }}</span>
......
zh-baseversion-web/src/views/supplybalance/stop/index.vue
View file @ 2f12e913
......@@ -121,6 +121,12 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="上报时间" align="center" prop="entRepTime" width="150" v-if="-2 != $store.state.user.enterpriseId">
<template slot-scope="scope">
<span v-if="scope.row.entRepTime">{{ parseTime(scope.row.entRepTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="上报状态" align="center" prop="fGovUploadStatus" v-if="-2 == $store.state.user.enterpriseId">
<template slot-scope="scope">
<span v-if="scope.row.fGovUploadStatus == '0'">未上报</span>
......@@ -307,6 +313,7 @@ import { listSup, getSup, delSup, addSup, updateSup, exportSup, reportSupBalStop
// 如果需要画多个，则用这个
import DrawArea from "@/components/GasShutDownDrawArea"
import DetailInfo from "./components/DetailInfo";
import moment from "moment";
export default {
name: "Sup",
components: {
......@@ -597,7 +604,7 @@ export default {
if(-2 == that.$store.state.user.enterpriseId){
return reportSupBalStopSupRecInfo({fGasStopId : row.fGasStopId});
}
return updateSup({fGasStopId : row.fGasStopId,fRepStatus : '1'});
return updateSup({fGasStopId : row.fGasStopId,fRepStatus : '1',entRepTime: moment().format('YYYY-MM-DD HH:mm:ss')});
}).then(() => {
this.getList();
this.msgSuccess("上报成功");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment