1 监督检查，供需平衡，第三方施工模块测试问题修复。

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

@@ -32,7 +32,7 @@ public class TRiskDevMajInfor extends BaseEntity
 
     /** 县级行政区ID */
     @Excel(name = "县级行政区ID")
-    private Long fRegionId;
+    private String fRegionId;
 
     /** 重要风险点类型，1 密闭空间，2 人员密集场
 
@@ -108,12 +108,12 @@ public class TRiskDevMajInfor extends BaseEntity
     {
         return fCompanyId;
     }
-    public void setfRegionId(Long fRegionId) 
+    public void setfRegionId(String fRegionId)
     {
         this.fRegionId = fRegionId;
     }
 
-    public Long getfRegionId() 
+    public String getfRegionId()
     {
         return fRegionId;
     }

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

@@ -43,7 +43,7 @@ public class TSupBalGasSup extends BaseEntity
     private Long fStorageVol;
 
     /** 监管气量日期 */
-    @Excel(name = "监管气量日期")
+    @Excel(name = "监管气量日期", dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date fSupDate;
 

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

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
 import com.zehong.common.utils.GovernmentDataCopyUtil;
 import com.zehong.common.utils.GovernmentDataUtil;
 import com.zehong.common.utils.StringUtils;
@@ -86,6 +87,7 @@ public class TConGasProInforServiceImpl implements ITConGasProInforService
         Map<String,String> num = itSerialNumberInfoService.getSerialNumberByTableType("t_con_gas_pro_infor");
         if(null == num || StringUtils.isEmpty(num.get("f_project_code"))) throw new CustomException("项目档案项目编码未配置！");
         tConGasProInfor.setfProjectCode(code.getSystemValue()+ Year.now().getValue() + num.get("f_project_code"));
+        tConGasProInfor.setfUpdateTime(DateUtils.getTime());
         return tConGasProInforMapper.insertTConGasProInfor(tConGasProInfor);
     }
 
@@ -97,6 +99,7 @@ public class TConGasProInforServiceImpl implements ITConGasProInforService
      */
     @Override
     public int updateTConGasProInfor(TConGasProInfor tConGasProInfor){
+        tConGasProInfor.setfUpdateTime(DateUtils.getTime());
         return tConGasProInforMapper.updateTConGasProInfor(tConGasProInfor);
     }
 

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

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fRemark != null  and fRemark != ''"> and inc.f_remark = #{fRemark}</if>
             <if test="fUpdateTime != null  and fUpdateTime != ''"> and inc.f_update_time = #{fUpdateTime}</if>
         </where>
+        order by f_update_time desc
     </select>
     
     <select id="selectTConGasProIncById" parameterType="Long" resultMap="TConGasProIncResult">

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

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fProjectName != null  and fProjectName != ''"> and f_project_name like concat('%', #{fProjectName}, '%')</if>
             <if test="fPipePress != null  and fPipePress != ''"> and f_pipe_press = #{fPipePress}</if>
         </where>
+        order by f_update_time desc
     </select>
     
     <select id="selectTConGasProInforById" parameterType="Long" resultMap="TConGasProInforResult">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fRiskName != null  and fRiskName != ''"> and f_risk_name like concat('%', #{fRiskName}, '%')</if>
             <if test="fRiskType != null "> and f_risk_type = #{fRiskType}</if>
         </where>
+        order by f_update_time desc
     </select>
     
     <select id="selectTRiskDevMajInforById" parameterType="Long" resultMap="TRiskDevMajInforResult">

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

@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fReportStatus != null and fReportStatus != ''">da.f_report_status = #{fReportStatus}</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and en.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
         </where>
+        order by f_create_time desc
     </select>
     
     <select id="selectTSupBalUsgDayById" parameterType="Long" resultMap="TSupBalUsgDayResult">

zh-baseversion-web/src/views/supervision/rectification/components/DetailInfo.vue

@@ -87,7 +87,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="24">
           <el-form-item label="整改或管控措施描述">
             <span v-if="detailInfo.fControlMeasure">{{ detailInfo.fControlMeasure }}</span>
             <span v-else>-</span>

zh-baseversion-web/src/views/supplybalance/day/index.vue

@@ -15,7 +15,7 @@
 
         <el-form-item label="上报时间">
           <el-date-picker
-            v-model="dateRange"
+            v-model="dateRangeValue"
             size="small"
             style="width: 240px"
             type="daterange"
@@ -253,14 +253,14 @@
                 <el-col :span="13">
                   <div class="label-warp">状态</div>
                   <div class="value-warp">
-                    <span v-if="reportForm.fRepStatus == '1'">已上报</span>
+                    <span v-if="reportForm.fReportStatus == '1'">已上报</span>
                     <span v-else>未上报</span>
                   </div>
                 </el-col>
                 <el-col :span="11" style="text-align: right">
                   <div class="label-warp">上报时间</div>
                   <div class="value-warp">
-                    <span v-if="reportForm.fRepDate">{{ reportForm.fRepDate }}</span>
+                    <span v-if="reportForm.fReportTime">{{ reportForm.fReportTime }}</span>
                     <span v-else>暂无</span>
                   </div>
                 </el-col>
@@ -458,7 +458,7 @@ export default {
         fCompanyInfoId: null,
         enterpriseName: null,
         beginRepDate: null,
-        endRepDate: null
+        endRepDate: null,
       },
       // 表单参数
       form: {},
@@ -479,7 +479,7 @@ export default {
       ],
       reportForm: {},
       reportDate: moment().format('YYYY-MM-DD'),
-      dateRange: []
+      dateRangeValue: []
     };
   },
   created() {
@@ -492,6 +492,8 @@ export default {
     // 获取当月结束时间
     const endOfMonth = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
     this.currentMonthReportInfo(startOfMonth,endOfMonth);
+
+    
   },
   mounted(){
     this.getReportInfo();
@@ -572,6 +574,14 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      console.log("this.dateRangeValue = " + this.dateRangeValue)
+      if (this.dateRangeValue != null) {
+        this.queryParams.beginRepDate = this.dateRangeValue[0];
+        this.queryParams.endRepDate = this.dateRangeValue[1];
+      } else {
+        this.queryParams.beginRepDate = null;
+        this.queryParams.endRepDate = null;
+      }
       this.getList();
     },
     /** 重置按钮操作 */
@@ -709,8 +719,6 @@ export default {
       this.$refs.detail.getDetailInfo(row.fRepUsgDayId);
     },
     timeChange(val){
-      this.queryParams.beginRepDate = val[0];
-      this.queryParams.endRepDate = val[1];
     },
   }
 };