检查记录-调研结果上传状态添加

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

@@ -187,6 +187,10 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService
         JSONObject reportResult = governmentDataUtil.setInfo("inspection/record/information","WRITE",data);
         log.info("上传检查记录结果===================" + reportResult.toJSONString());
         if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传检查记录市局接口失败");
+        recInfor.setGovUploadState("1");
+        recInfor.setGovUploadTime(new Date());
+        int i = tInsRecInforMapper.updateTInsRecInfor(recInfor);
+        if(i == 0) throw new CustomException("检查记录上传状态更新失败");
         return 1;
     }
 }

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

@@ -124,6 +124,10 @@ public class TInsSpotRecInforServiceImpl implements ITInsSpotRecInforService
         JSONObject reportResult = governmentDataUtil.setInfo("inspection/record/information","WRITE",data);
         log.info("上传调查结果===================" + reportResult.toJSONString());
         if(!"0".equals(reportResult.getString("resultCode"))) throw new CustomException("上传调查结果市局接口失败");
+        insSpotRecInfor.setGovUploadState("1");
+        insSpotRecInfor.setGovUploadTime(new Date());
+        int i = tInsSpotRecInforMapper.updateTInsSpotRecInfor(insSpotRecInfor);
+        if(i == 0) throw new CustomException("调研结果上传状态更新失败");
         return 1;
     }
 }

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

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fObjectType != null  and fObjectType != ''"> and rec.f_object_type = #{fObjectType}</if>
             <if test="fCheckManName != null  and fCheckManName != ''"> and rec.f_check_man_name like concat('%', #{fCheckManName}, '%')</if>
             <if test="fCheckManPhone != null  and fCheckManPhone != ''"> and rec.f_check_man_phone like concat('%', #{fCheckManPhone}, '%')</if>
+            <if test="govUploadState != null  and govUploadState != ''"> and rec.f_gov_upload_state = #{govUploadState}</if>
         </where>
         ORDER BY f_last_update_time DESC
     </select>

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

@@ -52,6 +52,13 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="上传时间">
+            <span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
       </el-row>
 
     </el-form>

zh-baseversion-web/src/views/supervision/findings/index.vue

@@ -29,6 +29,12 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="上传状态" prop="govUploadState">
+        <el-select v-model="queryParams.govUploadState" placeholder="请选择上传状态">
+          <el-option label="未上传" value="0"/>
+          <el-option label="已上传" value="1"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -102,6 +108,19 @@
           <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="上传状态" align="center" prop="govUploadState">
+        <template slot-scope="scope">
+          <span v-if="scope.row.govUploadState == '1'">已上传</span>
+          <span v-else-if="scope.row.govUploadState == '0'">未上传</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上传时间" align="center" prop="govUploadTime" width="180">
+        <template slot-scope="scope">
+          <span v-if="scope.row.govUploadTime">{{ parseTime(scope.row.govUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
           <el-button
@@ -253,6 +272,7 @@ export default {
         fCheckCode: null,
         fName: null,
         fMethod: null,
+        govUploadState: null
       },
       // 表单参数
       form: {},

zh-baseversion-web/src/views/supervision/record/components/InspectInfo.vue

@@ -88,7 +88,14 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="上传时间">
+              <span v-if="detailInfo.govUploadTime">{{ detailInfo.govUploadTime }}</span>
+              <span v-else>-</span>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
             <el-form-item label="检查单等照片">
               <el-image
                 :src="detailInfo.fAnnex"

zh-baseversion-web/src/views/supervision/record/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="130px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="检查记录编码" prop="fCheckCode">
         <el-input
           v-model="queryParams.fCheckCode"
@@ -29,7 +29,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检查人员联系电话" prop="fCheckManPhone">
+      <el-form-item label="联系电话" prop="fCheckManPhone">
         <el-input
           v-model="queryParams.fCheckManPhone"
           placeholder="请输入检查人员联系电话"
@@ -38,6 +38,13 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
+      <el-form-item label="上传状态" prop="govUploadState">
+        <el-select v-model="queryParams.govUploadState" placeholder="请选择上传状态">
+          <el-option label="未上传" value="0"/>
+          <el-option label="已上传" value="1"/>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -90,8 +97,8 @@
     <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="检查记录编码" align="center" prop="fCheckCode" width="150"/>
-      <el-table-column label="任务编码" align="center" prop="fCheckTaskCode" />
-      <el-table-column label="任务名称" align="center" prop="taskName">
+      <el-table-column label="任务编码" align="center" prop="fCheckTaskCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="任务名称" align="center" prop="taskName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span
             @click="taskDetail(scope.row.fCheckTaskCode)"
@@ -103,29 +110,42 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="县级行政区" align="center" prop="countyName" />
-      <el-table-column label="检查对象分类" align="center" prop="fObjectType"/>
-      <el-table-column label="对象编码" align="center" prop="fObjectCode" />
-      <el-table-column label="检查人员姓名" align="center" prop="fCheckManName" />
+      <el-table-column label="县级行政区" align="center" prop="countyName" width="100"/>
+      <el-table-column label="检查对象分类" align="center" prop="fObjectType" width="100"/>
+      <el-table-column label="对象编码" align="center" prop="fObjectCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="检查人员姓名" align="center" prop="fCheckManName" width="120"/>
       <el-table-column label="检查人员联系电话" align="center" prop="fCheckManPhone" width="150">
         <template slot-scope="scope">
           <span v-if="scope.row.fCheckManPhone">{{ scope.row.fCheckManPhone }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="检查时间" align="center" prop="fCheckTime" />
+      <el-table-column label="检查时间" align="center" prop="fCheckTime" width="100"/>
       <el-table-column label="隐患数量" align="center" prop="fHazardsNum">
         <template slot-scope="scope">
           <span v-if="scope.row.fHazardsNum">{{ scope.row.fHazardsNum }}</span>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否需执法" align="center" prop="fDoscNeedExecute">
+     <!-- <el-table-column label="是否需执法" align="center" prop="fDoscNeedExecute" width="90">
         <template slot-scope="scope">
           <span v-if="scope.row.fDoscNeedExecute == '1'">是</span>
           <span v-else-if="scope.row.fDoscNeedExecute == '0'">否</span>
           <span v-else>-</span>
         </template>
+      </el-table-column>-->
+      <el-table-column label="上传状态" align="center" prop="govUploadState">
+        <template slot-scope="scope">
+          <span v-if="scope.row.govUploadState == '1'">已上传</span>
+          <span v-else-if="scope.row.govUploadState == '0'">未上传</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="上传时间" align="center" prop="govUploadTime" width="180">
+        <template slot-scope="scope">
+          <span v-if="scope.row.govUploadTime">{{ parseTime(scope.row.govUploadTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
@@ -379,6 +399,7 @@ export default {
         fObjectType: null,
         fCheckManName: null,
         fCheckManPhone: null,
+        govUploadState: null
       },
       // 表单参数
       form: {},