Merge remote-tracking branch 'origin/master'

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

@@ -164,6 +164,7 @@ public class THiddenTroubleInfoServiceImpl implements ITHiddenTroubleInfoService
         tHiddenDangerStandingBook.setBeyondEnterpriseId(hiddenTroubleInfo.getBeyondEnterpriseId());
         tHiddenDangerStandingBook.setCreateTime(new Date());
         tHiddenDangerStandingBook.setHiddenTroubleType(hiddenTroubleInfo.getHiddenTroubleType());
+        tHiddenDangerStandingBook.setDealPlanUrl(hiddenTroubleInfo.getDealUrl());
         tHiddenDangerStandingBookMapper.insertTHiddenDangerStandingBook(tHiddenDangerStandingBook);
         return tHiddenTroubleInfoMapper.updateTHiddenTroubleInfo(tHiddenTroubleInfo);
     }

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

 package com.zehong.system.service.impl;
 
 import java.util.List;
+
+import com.zehong.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TStaEnterpriseInforMapper;
@@ -52,6 +54,7 @@ public class TStaEnterpriseInforServiceImpl implements ITStaEnterpriseInforServi
     @Override
     public int insertTStaEnterpriseInfor(TStaEnterpriseInfor tStaEnterpriseInfor)
     {
+        tStaEnterpriseInfor.setfCreateTime(DateUtils.getNowDate());
         return tStaEnterpriseInforMapper.insertTStaEnterpriseInfor(tStaEnterpriseInfor);
     }
 

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

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fMethod != null  and fMethod != ''"> and spot.f_method = #{fMethod}</if>
             <if test="govUploadState != null  and govUploadState != ''"> and spot.f_gov_upload_state = #{govUploadState}</if>
         </where>
+        order by spot.f_ins_spot_rec_infor_id desc
     </select>
     
     <select id="selectTInsSpotRecInforById" parameterType="Long" resultMap="TInsSpotRecInforResult">

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

@@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isReport != null "> and is_report = #{isReport}</if>
             <if test="fYear != null "> and f_year = #{fYear}</if>
         </where>
+        order by f_create_time  desc
     </select>
 
     <select id="selectTStaEnterpriseInforById" parameterType="Long" resultMap="TStaEnterpriseInforResult">

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

@@ -40,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="publishTime != null "> and publish_time = #{publishTime}</if>
             <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectTTrainManageById" parameterType="Long" resultMap="TTrainManageResult">

zh-baseversion-web/src/views/space/archive/index.vue

@@ -75,7 +75,7 @@
           @click="handleDelete"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -84,7 +84,7 @@
           :loading="exportLoading"
           @click="handleExport"
         >导出</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -697,23 +697,16 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateSpace(this.form).then(response => {
+            this.form.relationDeviceType = '3';
+            var tConfinedSpaceParam = {
+              tConfinedSpace: this.form,
+              tDeviceInfoS: this.datalist
+            }
+            updateSpace(JSON.stringify(tConfinedSpaceParam)).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
-            if (this.datalist != null && this.datalist.length > 0) {
-              this.form.relationDeviceType = '3';
-              var tConfinedSpaceParam = {
-                tConfinedSpace: this.form,
-                tDeviceInfoS: this.datalist
-              }
-              //重新绑定修改后的关联设备
-              updateDetailInfoLists(JSON.stringify(tConfinedSpaceParam)).then(response => {
-                this.open = false;
-                this.getList();
-              });
-            }
           } else {
             if (valid) {
               const deviceIds = this.ids;

zh-baseversion-web/src/views/statistic/hiddenStatisticAnalysis/index.vue

@@ -63,7 +63,7 @@
           <span
             class="dbtn"
             @click="checkFile(scope.row.dealPlanUrl)"
-            v-if="scope.row.dealPlan != ''"
+            v-if="scope.row.dealPlanUrl != '' && scope.row.dealPlanUrl != null"
           >
             <i class="el-icon el-icon-view"></i>查看/下载
           </span>
@@ -129,7 +129,7 @@
               <el-row>
                 <el-col :span="23">
                   <el-form-item label="处理方案:">
-                    <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
+                    <span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlanUrl != '' && detailForm.dealPlanUrl != null">
                       <i class="el-icon el-icon-view"></i>查看/下载
                     </span>
                     <span v-else><el-input disabled/></span>