Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

zh-baseversion-system/src/main/java/com/zehong/system/controller/TPlanInfoController.java

@@ -99,4 +99,11 @@ public class TPlanInfoController extends BaseController
     {
         return AjaxResult.success(tPlanInfoService.selectEnterprise());
     }
+
+
+    @GetMapping("/transferEnterpriseList/{complainDealId}")
+    public AjaxResult geTtransferEnterpriseList(@PathVariable("complainDealId") Long complainDealId)
+    {
+        return AjaxResult.success(tPlanInfoService.transferEnterpriseList(complainDealId));
+    }
 }

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

@@ -23,7 +23,7 @@ public class TComplainDealTransfer extends BaseEntity
     private Long complainDealId;
 
     /** 企业id-省平台调整改成字符创 uuid */
-    @Excel(name = "企业id-省平台调整改成字符创 uuid")
+    //@Excel(name = "企业id-省平台调整改成字符创 uuid")
     private String enterpriseId;
 
     /** 企业名称-结果反显 */
@@ -31,10 +31,10 @@ public class TComplainDealTransfer extends BaseEntity
     private String enterpriseName;
 
     /** 指派人 */
-    @Excel(name = "指派人id")
+    //@Excel(name = "指派人id")
     private Long complainAssignManId;
 
-    /** 指派人id */
+    /** 指派人 */
     @Excel(name = "指派人")
     private String complainAssignMan;
 

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

@@ -27,7 +27,7 @@ public class TWorkOrder extends BaseEntity
     private String workTitle;
 
     /** 任务类型：1.入户安检 2.巡检 3.报警巡查 4.其他 */
-    @Excel(name = "任务类型：1.入户安检 2.巡检 3.报警巡查 4.其他")
+    @Excel(name = "任务类型", readConverterExp = "1=入户安检,2=巡检,3=报警巡查,4=其他")
     private String workType;
 
     /** 任务内容 */
@@ -39,7 +39,7 @@ public class TWorkOrder extends BaseEntity
     private String workCreateEnterpriseName;
 
     /** 创建单位id */
-    @Excel(name = "创建单位id")
+//    @Excel(name = "创建单位id")
     private String workCreateEnterpriseId;
 
     /** 指派单位名称 */
@@ -47,19 +47,19 @@ public class TWorkOrder extends BaseEntity
     private String workAssignEnterproseName;
 
     /** 指派单位id */
-    @Excel(name = "指派单位id")
+//    @Excel(name = "指派单位id")
     private String workAssignEnterproseId;
 
     /** 指派人 */
-    @Excel(name = "指派人")
+//    @Excel(name = "指派人")
     private Long workAssignManId;
 
     /** 指派人id */
-    @Excel(name = "指派人id")
+    @Excel(name = "指派人")
     private String workAssignMan;
 
     /** 任务状态：1.派发中 2.反馈 3.归档 */
-    @Excel(name = "任务状态：1.派发中 2.反馈 3.归档")
+    @Excel(name = "任务状态", readConverterExp = "1=派发中,2=反馈,3=归档")
     private String workStatus;
 
     /** 巡检时间 */
@@ -103,7 +103,7 @@ public class TWorkOrder extends BaseEntity
     private Date expiryDate;
 
     /** 是否删除(0正常，1删除) */
-    @Excel(name = "是否删除(0正常，1删除)")
+    @Excel(name = "是否删除", readConverterExp = "0=否,1=是")
     private String isDel;
 
     /** 备注 */

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.system.domain.TPlanInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 应急预案Mapper接口
@@ -65,4 +66,10 @@ public interface TPlanInfoMapper
      * 公司列表
      */
     public List<Map<String,Object>> selectEnterprise();
+
+    /**
+     * 公司列表 - 转办时使用 - 排除了一些之前派发的公司
+     * @return
+     */
+    public List<Map<String,Object>> transferEnterpriseList(@Param(value = "excludeEnterpriseIdList") List<String> excludeEnterpriseIdList);
 }

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

@@ -62,4 +62,6 @@ public interface ITPlanInfoService
     public int deleteTPlanInfoById(Long planId);
 
     public List<Map<String,Object>> selectEnterprise();
+
+    public List<Map<String,Object>> transferEnterpriseList(Long complainDealId);
 }

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

 package com.zehong.system.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TComplainDealTransfer;
+import com.zehong.system.mapper.TComplainDealTransferMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TPlanInfoMapper;
@@ -22,6 +26,9 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
     @Autowired
     private TPlanInfoMapper tPlanInfoMapper;
 
+    @Autowired
+    private TComplainDealTransferMapper tComplainDealTransferMapper;
+
     /**
      * 查询应急预案
      * 
@@ -101,4 +108,16 @@ public class TPlanInfoServiceImpl implements ITPlanInfoService
     public List<Map<String,Object>> selectEnterprise(){
         return tPlanInfoMapper.selectEnterprise();
     }
+
+    @Override
+    public List<Map<String, Object>> transferEnterpriseList(Long complainDealId) {
+        List<TComplainDealTransfer> tComplainDealTransfers =
+                tComplainDealTransferMapper.queryComplainDealTransferListByComplainDealId(complainDealId);
+        if (tComplainDealTransfers != null && tComplainDealTransfers.size() > 0) {
+            List<String> collect = tComplainDealTransfers.stream().map(TComplainDealTransfer::getEnterpriseId).collect(Collectors.toList());
+            return tPlanInfoMapper.transferEnterpriseList(collect);
+        } else {
+            return new ArrayList<>();
+        }
+    }
 }

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

@@ -38,13 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectTHiddenTroubleInfoVo">
         select hidden_trouble_id, work_id, hidden_trouble_name, hidden_trouble_level, hidden_trouble_type,hidden_source,
          longitude, latitude, picture_url, hidden_trouble_describe, report_time,reject_content,fuhe_group_num,
-         (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name,
-         report_person, hidden_trouble_deal_status, hidden_trouble_deal_condition, fuhe_time,deal_video,
+         suer.nick_name as report_person, report_person_id,hidden_trouble_deal_status, hidden_trouble_deal_condition, fuhe_time,deal_video,
          fuhe_person,deal_person,video_url,
          hidden_trouble_deal_finish_time, is_del, remarks,beyond_enterprise_id,deal_url,is_report
-         from t_hidden_trouble_info
+         from t_hidden_trouble_info info left join sys_user suer on info.report_person_id = suer.user_id
     </sql>
 
+
     <select id="selectTHiddenTroubleInfoList" parameterType="THiddenTroubleInfo" resultMap="THiddenTroubleInfoResult">
         <include refid="selectTHiddenTroubleInfoVo"/>
         <where>
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportTime != null "> and report_time = #{reportTime}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenTroubleDealStatus != null  and hiddenTroubleDealStatus != ''"> and hidden_trouble_deal_status = #{hiddenTroubleDealStatus}</if>
             <if test="hiddenTroubleDealCondition != null  and hiddenTroubleDealCondition != ''"> and hidden_trouble_deal_condition = #{hiddenTroubleDealCondition}</if>
             <if test="hiddenTroubleDealFinishTime != null "> and hidden_trouble_deal_finish_time = #{hiddenTroubleDealFinishTime}</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         COUNT(*) AS countNum
 
-        FROM t_hidden_trouble_info
+        FROM t_hidden_trouble_info info left join sys_user suer on info.report_person_id = suer.user_id
         <where>
             is_del='0'
             <if test="workId != null "> and work_id = #{workId}</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="hiddenTroubleType != null  and hiddenTroubleType != ''"> and hidden_trouble_type = #{hiddenTroubleType}</if>
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenTroubleDealStatus != null  and hiddenTroubleDealStatus != ''"> and hidden_trouble_deal_status = #{hiddenTroubleDealStatus}</if>
         </where>
     </select>
@@ -107,15 +107,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (CASE hidden_trouble_level WHEN '1' THEN 'I级' WHEN '2' THEN 'II级'WHEN '3' THEN 'III级'end) as   hidden_trouble_level,
         (CASE hidden_trouble_type WHEN '1' THEN '漏气' WHEN '2' THEN '腐蚀'WHEN '3' THEN '裂缝' WHEN '4' THEN '设备故障' WHEN '5' THEN '安全距离不足' WHEN '6' THEN '管道承重'WHEN '7' THEN '其他'end) as   hidden_trouble_type,
          longitude, latitude, picture_url, hidden_trouble_describe,
-        report_time, (select u.user_name from sys_user u where u.user_id = report_person) AS report_person_name, report_person,
+        report_time, report_person,
         (CASE hidden_trouble_deal_status WHEN '1' THEN '待处理' WHEN '2' THEN '处理中'WHEN '3' THEN '已完成'end) as  hidden_trouble_deal_status,
         hidden_trouble_deal_condition, hidden_trouble_deal_finish_time, is_del, remarks,is_report
-        from t_hidden_trouble_info
+        from t_hidden_trouble_info  info left join sys_user suer on info.report_person_id = suer.user_id
         <where>
             is_del='0'
             <if test="beyondEnterpriseId != null  and beyondEnterpriseId != -2"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
             <if test="hiddenTroubleName != null  and hiddenTroubleName != ''"> and hidden_trouble_name like concat('%', #{hiddenTroubleName}, '%')</if>
-            <if test="reportPerson != null  and reportPerson != ''"> and report_person = #{reportPerson}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and suer.nick_name like concat('%', #{reportPerson}, '%')</if>
             <if test="hiddenSource!=null"> and hidden_source = #{hiddenSource}</if>
             <if test="reportBeginTime != null  and reportEndTime!=null">and report_time BETWEEN #{reportBeginTime} and #{reportEndTime}</if>
         </where>

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

@@ -113,4 +113,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT enterprise_id as enterpriseId,enterprise_name as enterpriseName FROM t_enterprise_info
         WHERE is_del = 0
     </select>
+    <select id="transferEnterpriseList" resultType="java.util.HashMap">
+        SELECT enterprise_id as enterpriseId,enterprise_name as enterpriseName FROM t_enterprise_info
+        WHERE is_del = 0
+        and enterprise_id not in
+        <foreach collection="excludeEnterpriseIdList" close=")" index="i" item="item" open="(" separator=",">
+            #{item}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

zh-baseversion-web/src/api/system/eventInfo.js

@@ -8,6 +8,15 @@ export function listEventInfo(query) {
     params: query
   })
 }
+
+// 公司列表 - 转办使用 - 排除了一些之前派发的公司的数据
+export function transferEnterpriseListMethod(complainDealId) {
+  return request({
+    url: '/system/planInfo/transferEnterpriseList/' + complainDealId,
+    method: 'get'
+  })
+}
+
 // 公司列表
 export function enterpriseList() {
   return request({

zh-baseversion-web/src/views/inspectionWork/workOrder/components/HiddenFeedTrouble.vue

@@ -299,13 +299,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const hiddenTroubleId = row.hiddenTroubleId;
+      const hiddenTroubleDealStatus = row.hiddenTroubleDealStatus;
       this.$confirm('是否确认删除隐患名称为"' + row.hiddenTroubleName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
           //return delHiddenInfo(hiddenTroubleId);
-           return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1'})
+           return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1',hiddenTroubleDealStatus: hiddenTroubleDealStatus})
         }).then(() => {
         this.getHiddenInfoList({workId:this.workId});
         this.msgSuccess("删除成功");

zh-baseversion-web/src/views/inspectionWork/workOrder/index.vue

@@ -1006,6 +1006,7 @@ export default {
         this.getEnterpriseLists();
         this.getInspectionUserList(response.data.workAssignEnterproseId);
         this.supervisorData(this.form.workId);
+        console.log("response.data = " + response.data)
         this.init(response.data.locationList);
         //[[117.979221,39.805144],[117.979221,39.825144]]
       });
@@ -1226,7 +1227,7 @@ export default {
     init(pipePath) {
       this.$nextTick(() => {
         const path = eval(this.$store.state.user.systemSetting.map_center);
-      console.log("path",path);
+      console.log("path111111",path);
       this.map = new EditorMap("getposmap", {center:path}, this);
         console.log(pipePath)
         if (pipePath!=null && pipePath.length > 0) {

zh-baseversion-web/src/views/system/info/index.vue

@@ -271,7 +271,7 @@
     </el-dialog>
 
     <!-- 燃气隐患详情对话框 -->
-    <el-dialog :title="detailsTitle" :visible.sync="detailsOpen"  width="800px" append-to-body>
+    <el-dialog :title="detailsTitle" :visible.sync="detailsOpen" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="hiddenDangerRules" label-width="150px">
 
         <el-row>
@@ -337,6 +337,7 @@
             <el-form-item label="上传照片" :disabled="true">
               <FileUpload
                 :disabled="true"
+                v-if="detailsOpen"
                 listType="picture"
                 @resFun="getFileInfo"
                 @remove="listRemove"
@@ -374,6 +375,7 @@
             <el-form-item label="上传照片" :disabled="true"  v-if="form.hiddenTroubleDealStatus==3">
               <FileUpload
                 :disabled="true"
+                v-if="detailsOpen"
                 listType="picture"
                 @resFun="getFileInfon"
                 @remove="listRemoven"
@@ -440,7 +442,7 @@
 
 
     <!-- 添加或修改燃气隐患对话框 -->
-    <el-dialog :title="title" :visible.sync="open"  width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
 
         <el-row>
@@ -506,6 +508,7 @@
             <el-form-item label="上传照片">
               <FileUpload
                 listType="picture"
+                v-if="open" 
                 @resFun="getFileInfo"
                 @remove="listRemove"
                 :fileArr="fileList"
@@ -640,6 +643,7 @@
         url: 'http://192.168.2.16:8905/gassafety/profile/upload/2023/09/08/c55c2d49-2839-46a0-b3cd-7ec1e344efba.jpg',
         srcList: [],
         pictureUrlList:[],
+        pictureUrlListn:[],
         //头像
         fileList: [],
         fileListn:[],
@@ -701,6 +705,9 @@
           hiddenTroubleType: [
             { required: true, message: "请选择隐患类型", trigger: "blur" },
           ],
+          beyondEnterpriseId: [
+            { required: true, message: "所属单位必选", trigger: "blur" },
+          ],
         },
         //隐患处理表单效验
         hiddenDangerRules: {
@@ -720,11 +727,17 @@
       this.getEnterpriseLists();
     },
     methods: {
-      /**上传头像*/
-      getFileInfo(res){
+      // 处理隐患时上传图片组合
+      // pictureUrlListn
+      // fileListn
+
+      // 隐患信息 上传图片组合
+      // pictureUrlList
+      // fileList
+      /**上传图片*/
+      getFileInfo(res){ 
         this.form.dealPlan = res.fileName;
         this.pictureUrlList.push(res.url)
-        console.log(this.pictureUrlList)
         this.form.pictureUrl=this.pictureUrlList.join(",");
         this.form.burl=res.burl;
         this.fileList.push({
@@ -733,6 +746,19 @@
           burl:res.burl,
         });
       },
+      
+      /**处理隐患 上传图片*/
+      getFileInfon(res){ 
+        this.form.dealPlan = res.fileName;
+        this.pictureUrlListn.push(res.url)
+        this.form.dealUrl=this.pictureUrlListn.join(",");
+        this.form.burl=res.burl;
+        this.fileListn.push({
+          name: res.fileName,
+          url: uploadfile,
+          burl:res.burl,
+        });
+      },
       listRemove(e) {
         this.form.dealPlan = "";
         this.fileList.delete(e.uid)
@@ -883,6 +909,17 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+
+        // 隐患信息 上传照片清空
+        this.fileList = [];
+        this.pictureUrlList = [];
+        
+        // 隐患处理 上传照片清空
+        this.fileListn = [];
+        this.pictureUrlListn = [];
+
+        // 上传视频 清空
+        this.fileListVideo = [];
         this.open = true;
         this.title = "添加隐患信息";
         this.getEnterpriseLists();
@@ -997,18 +1034,6 @@
           }
         });
       },
-      /**上传头像*/
-      getFileInfon(res){
-        this.form.dealPlan = res.fileName;
-        this.pictureUrlList.push(res.url)
-        this.form.dealUrl=this.pictureUrlList.join(",");
-        this.form.burl=res.burl;
-        this.fileListn.push({
-          name: res.fileName,
-          url: uploadfile,
-          burl:res.burl,
-        });
-      },
       /**处理隐患提交按钮*/
       submitFormHiddenDanger(){
         this.$refs["form"].validate(valid => {