bug1204,1171

data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -102,7 +102,7 @@
     <el-table v-loading="loading" :data="projectsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="70" align="center"/>
       <el-table-column label="属地辖区" align="center" prop="territoriality"/>
-      <el-table-column label="所属开发区" align="center" prop="park" :show-overflow-tooltip="true"/>
+      <el-table-column label="所属开发区" align="center" prop="parkLabel" :show-overflow-tooltip="true"/>
       <!--      <el-table-column label="开发区中心点经度" align="center" prop="parkLongitude"/>-->
       <!--      <el-table-column label="开发区中心点纬度" align="center" prop="parkLatitude"/>-->
       <el-table-column label="项目名称" align="center" prop="projectName" width="150" :show-overflow-tooltip="true"/>
@@ -820,6 +820,7 @@ export default {
         introduction: null,
         parkLongitude: null,
         parkLatitude: null,
+        parkLabel:null
       },
       historyQueryParams: {
         startTIme: null,
@@ -919,7 +920,6 @@ export default {
   },
   created() {
     this.getTreeselect();
-
     selectCenterMonitorlList(this.queryParams).then(response => {
       this.cameraList = response.data;
     });
@@ -979,7 +979,7 @@ export default {
       this.loading = true;
       await listProjects(this.queryParams).then(response => {
         this.projectsList = response.rows;
-        let projectsList1 = []
+    /*    let projectsList1 = []
         this.projectsList.forEach(item1 => {
           this.deptOptionsPark.forEach(item => {
             if (item1.park == item.deptId) {
@@ -988,7 +988,7 @@ export default {
           })
           projectsList1.push(item1)
         })
-        this.projectsList = projectsList1;
+        this.projectsList = projectsList1;*/
         this.total = response.total;
         this.loading = false;
       });

src/main/java/com/sooka/sponest/data/digitalwater/service/impl/CenterdataTHydraulicPatrolPlanRecordServiceImpl.java

@@ -48,7 +48,7 @@ public class CenterdataTHydraulicPatrolPlanRecordServiceImpl implements ICenterd
         centerdataTHydraulicPatrolPlanRecord.setId(UuidUtils.generateUuid());
         centerdataTHydraulicPatrolPlanRecord.setBeginTime(DateUtils.getTime());
         centerdataTHydraulicPatrolPlanRecord.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getUserId().toString());
-        centerdataTHydraulicPatrolPlanRecord.setCreateName(SecurityUtils.getUsername());
+        centerdataTHydraulicPatrolPlanRecord.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHydraulicPatrolPlanRecord.setCreateTime(DateUtils.getNowDate());
         centerdataTHydraulicPatrolPlanRecordMapper.insertCenterdataTHydraulicPatrolPlanRecord(centerdataTHydraulicPatrolPlanRecord);
         return centerdataTHydraulicPatrolPlanRecord.getId();
@@ -64,7 +64,7 @@ public class CenterdataTHydraulicPatrolPlanRecordServiceImpl implements ICenterd
             planRecord.setEndTime(DateUtils.getTime());
             planRecord.setStatus("1");
             centerdataTHydraulicPatrolPlanRecord.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getUserId());
-            centerdataTHydraulicPatrolPlanRecord.setUpdateName(SecurityUtils.getUsername());
+            centerdataTHydraulicPatrolPlanRecord.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
             centerdataTHydraulicPatrolPlanRecord.setUpdateTime(DateUtils.getNowDate());
             centerdataTHydraulicPatrolPlanRecordMapper.finishRecoed(centerdataTHydraulicPatrolPlanRecord);
         }
@@ -81,7 +81,7 @@ public class CenterdataTHydraulicPatrolPlanRecordServiceImpl implements ICenterd
         centerdataTHydraulicPatrolPlanRecord.setEndTime(DateUtils.getTime());
         centerdataTHydraulicPatrolPlanRecord.setStatus("1");
         centerdataTHydraulicPatrolPlanRecord.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getUserId());
-        centerdataTHydraulicPatrolPlanRecord.setUpdateName(SecurityUtils.getUsername());
+        centerdataTHydraulicPatrolPlanRecord.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centerdataTHydraulicPatrolPlanRecord.setUpdateTime(DateUtils.getNowDate());
         return centerdataTHydraulicPatrolPlanRecordMapper.finishRecoed(centerdataTHydraulicPatrolPlanRecord);
     }

src/main/java/com/sooka/sponest/data/generalbusiness/domain/CenterdataTKeyProjects.java

@@ -39,9 +39,14 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
      * 所属开发区
      */
     @ApiModelProperty(value = "所属开发区", required = false)
-    @Excel(name = "所属开发区",dictType = "centerdata_park")
+   // @Excel(name = "所属开发区",dictType = "centerdata_park")
     private String park;
 
+
+
+    @Excel(name = "所属开发区")
+    private String parkLabel;
+
     /**
      * 开发区中心点经度
      */
@@ -516,6 +521,14 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
         this.deviceList = deviceList;
     }
 
+    public String getParkLabel() {
+        return parkLabel;
+    }
+
+    public void setParkLabel(String parkLabel) {
+        this.parkLabel = parkLabel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/resources/mapper/generalbusiness/CenterdataTKeyProjectsMapper.xml

@@ -44,6 +44,7 @@
         <result property="secretary" column="secretary"/>
         <result property="secretaryDuties" column="secretary_duties"/>
         <result property="secretaryPhone" column="secretary_phone"/>
+        <result property="parkLabel" column="parkLabel"/>
     </resultMap>
 
     <sql id="selectCenterdataTKeyProjectsVo">
@@ -53,8 +54,11 @@
 
     <select id="selectCenterdataTKeyProjectsList" parameterType="CenterdataTKeyProjects"
             resultMap="CenterdataTKeyProjectsResult">
-        select a.* from centerdata_t_key_projects a
+        select a.* ,
+        dd.dept_name as parkLabel
+        from centerdata_t_key_projects a
         left join ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        LEFT JOIN ${database_system}.sys_dept dd on dd.dept_id = a.park
         <where>
             <if test="projectName != null  and projectName != ''">and project_name like concat('%', #{projectName},
                 '%')