禅道bug733,735,737

data-ui/src/views/data/other/atmospheric/index.vue

@@ -185,6 +185,10 @@
       <el-table-column label="湿度" align="center" prop="humidity"/>
       <!--<el-table-column label="部门id" align="center" prop="deptId"/>-->
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isQuery">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/breed_resources/index.vue

@@ -45,6 +45,10 @@
       <el-table-column label="养殖数量" align="center" prop="quantity"/>
       <el-table-column label="营收情况" align="center" prop="revenue"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['breed_resources:BreedResources:edit']">

data-ui/src/views/data/other/checkpoint/index.vue

@@ -44,6 +44,10 @@
       <el-table-column label="地址" align="center" prop="checkpointAddress"/>
       <el-table-column label="备注" align="center" prop="checkpointRemarks"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['forest:checkpoint:edit']">

data-ui/src/views/data/other/device/index.vue

@@ -59,6 +59,10 @@
       </el-table-column>
       <el-table-column label="保养周期" align="center" prop="maintenance"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['forest:device:edit']">

data-ui/src/views/data/other/devicerepair/index.vue

@@ -46,6 +46,10 @@
       <el-table-column label="负责人" align="center" prop="charger"/>
       <el-table-column label="备注" align="center" prop="remarks"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['forest:devicerepair:edit']">

data-ui/src/views/data/other/enterprise/index.vue

@@ -199,6 +199,10 @@
       <!--      <el-table-column label="所属部门id" align="center" prop="deptId" />-->
       <el-table-column label="所属部门名称" align="center" prop="deptName"/>
       <el-table-column label="主要负责人" align="center" prop="charger"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <!--      <el-table-column label="主要负责人电话" align="center" prop="chargerPhone" />-->
       <!--      <el-table-column label="安全负责人" align="center" prop="secCharger" />-->
       <!--      <el-table-column label="安全负责人电话" align="center" prop="secChargerPhone" />-->

data-ui/src/views/data/other/forest/index.vue

@@ -72,6 +72,10 @@
       <el-table-column label="占地范围" align="center" prop="zdfw"/>
       <el-table-column label="占地面积(万公顷)" align="center" prop="landArea"/>
       <el-table-column label="部门名称" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/hydroenergy/index.vue

@@ -79,6 +79,10 @@
       <el-table-column label="电话" align="center" prop="phone"/>
       <el-table-column label="联系人" align="center" prop="person"/>
       <el-table-column label="部门名称" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/inspectiontype/index.vue

@@ -138,7 +138,11 @@
             <span>{{ scope.row.inspectionName }}</span>
           </router-link>
           </template>-->
-      </el-table-column><!--      <el-table-column label="备注" align="center" prop="inspectionRemark" />-->
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/><!--      <el-table-column label="备注" align="center" prop="inspectionRemark" />-->
 <!--      <el-table-column label="级别" align="center" prop="level" />-->
 <!--      <el-table-column label="父ID" align="center" prop="parentId" />-->
 <!--      <el-table-column label="${comment}" align="center" prop="owndeptid" />-->

data-ui/src/views/data/other/land/index.vue

@@ -86,6 +86,10 @@
         </template>
       </el-table-column>
       <el-table-column label="占地面积(万公顷)" align="center" prop="landArea"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <!--                    <el-table-column label="经度" align="center" prop="longitude" />-->
       <!--                    <el-table-column label="纬度" align="center" prop="latitude" />-->
       <!--                    <el-table-column label="部门id" align="center" prop="deptId" />-->

data-ui/src/views/data/other/land_info/index.vue

@@ -43,6 +43,10 @@
       <el-table-column label="面积(单位㎡)" align="center" prop="area"/>
       <el-table-column label="土地年限" align="center" prop="landYears"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['land_info:LandInfo:edit']">

data-ui/src/views/data/other/livestock_protect_info/index.vue

@@ -33,6 +33,10 @@
       <el-table-column label="单位名称" align="center" prop="name"/>
       <el-table-column label="详细通讯地址" align="center" prop="address"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['livestock_protect_info:LivestockProtectInfo:edit']">

data-ui/src/views/data/other/patrolpoint/index.vue

@@ -97,6 +97,10 @@
       <!--    <el-table-column label="备注" align="center" prop="pointRemark" />-->
       <el-table-column label="绑定条码" align="center" prop="barCode"/>
       <el-table-column label="巡更点状态" align="center" prop="patrolpointStatus"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <!--     <el-table-column label="${comment}" align="center" prop="enterpriseName" />
            <el-table-column label="${comment}" align="center" prop="owndeptid" />-->
       <!-- <el-table-column label="数据所属部门(政或党的id)" align="center" prop="dataDeptId" />-->

data-ui/src/views/data/other/person/index.vue

@@ -112,6 +112,10 @@
           <dict-tag :options="dict.type.emergency_personnel_job" :value="scope.row.userType"/>
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <!--                    <el-table-column label="部门id" align="center" prop="deptId" />-->
       <!--                    <el-table-column label="部门名称" align="center" prop="deptName" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

data-ui/src/views/data/other/pollution/index.vue

@@ -200,6 +200,10 @@
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="部门id" align="center" prop="deptId"/>-->
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isQuery">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/prohibitionarea/index.vue

@@ -43,6 +43,10 @@
       <el-table-column label="负责人" align="center" prop="principal"/>
       <el-table-column label="联系电话" align="center" prop="contactsPhone"/>
       <el-table-column label="部门名称" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['environment:prohibitionarea:edit']">

data-ui/src/views/data/other/soil/index.vue

@@ -155,6 +155,10 @@
       <el-table-column label="钾" align="center" prop="potassium"/>
       <!--<el-table-column label="部门id" align="center" prop="deptId"/>-->
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isQuery">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/waterenvironment/index.vue

@@ -145,6 +145,10 @@
       <el-table-column label="重金属" align="center" prop="heavyMetal"/>
       <!--<el-table-column label="部门id" align="center" prop="deptId"/>-->
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="!isQuery">
         <template slot-scope="scope">
           <el-button

data-ui/src/views/data/other/weatherstation/index.vue

@@ -56,6 +56,10 @@
       <el-table-column label="地址" align="center" prop="weatherstationAddress"/>
       <el-table-column label="备注" align="center" prop="weatherstationRemarks"/>
       <el-table-column label="所属部门" align="center" prop="deptName"/>
+      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="修改人" align="center" prop="updateName"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['forest:weatherstation:edit']">

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestKeyFireproofPlotsController.java

@@ -78,7 +78,7 @@ public class CenterdataTForestKeyFireproofPlotsController extends BaseController
      */
     @ApiOperation(value = "数据中心导出重点防火地块列表", notes = "数据中心导出重点防火地块列表")
     @RequiresPermissions("forest:keyFireproofPlots:export")
-    @Log(title = "起降点", businessType = BusinessType.EXPORT)
+    @Log(title = "重点防火地块", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CenterdataTForestKeyFireproofPlots centerdataTForestKeyFireproofPlots) {
         List<CenterdataTForestKeyFireproofPlots> list = centerdataTForestKeyFireproofPlotsService.selectCenterdataTForestKeyFireproofPlotsList(centerdataTForestKeyFireproofPlots);

src/main/java/com/sooka/sponest/data/other/forest/service/impl/CenterdataTResourcesForestServiceImplImpl.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.other.forest.service.impl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.other.forest.domain.CenterdataTResourcesForest;
 import com.sooka.sponest.data.other.forest.mapper.CenterdataTResourcesForestMapper;
@@ -57,6 +58,8 @@ public class CenterdataTResourcesForestServiceImplImpl extends BaseServiceImpl i
     public int insertCenterdataTResourcesForest(CenterdataTResourcesForest centerdataTResourcesForest) {
         centerdataTResourcesForest.setId(IdUtils.fastSimpleUUID());
         centerdataTResourcesForest.setCreateTime(DateUtils.getNowDate());
+        centerdataTResourcesForest.setCreateBy(SecurityUtils.getUserId().toString());
+        centerdataTResourcesForest.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesForestMapper.insertCenterdataTResourcesForest(centerdataTResourcesForest);
     }
 
@@ -69,6 +72,8 @@ public class CenterdataTResourcesForestServiceImplImpl extends BaseServiceImpl i
     @Override
     public int updateCenterdataTResourcesForest(CenterdataTResourcesForest centerdataTResourcesForest) {
         centerdataTResourcesForest.setUpdateTime(DateUtils.getNowDate());
+        centerdataTResourcesForest.setUpdateBy(SecurityUtils.getUserId());
+        centerdataTResourcesForest.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesForestMapper.updateCenterdataTResourcesForest(centerdataTResourcesForest);
     }
 

src/main/java/com/sooka/sponest/data/other/hydroenergy/service/impl/CenterdataTResourcesHydroenergyServiceImplImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.other.hydroenergy.domain.CenterdataTResourcesHydroenergy;
 import com.sooka.sponest.data.other.hydroenergy.mapper.CenterdataTResourcesHydroenergyMapper;
@@ -60,6 +61,8 @@ public class CenterdataTResourcesHydroenergyServiceImplImpl extends BaseServiceI
     public int insertCenterdataTResourcesHydroenergy(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) {
         centerdataTResourcesHydroenergy.setId(IdUtils.fastSimpleUUID());
         centerdataTResourcesHydroenergy.setCreateTime(DateUtils.getNowDate());
+        centerdataTResourcesHydroenergy.setCreateBy(SecurityUtils.getUserId().toString());
+        centerdataTResourcesHydroenergy.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesHydroenergyMapper.insertCenterdataTResourcesHydroenergy(centerdataTResourcesHydroenergy);
     }
 
@@ -72,6 +75,8 @@ public class CenterdataTResourcesHydroenergyServiceImplImpl extends BaseServiceI
     @Override
     public int updateCenterdataTResourcesHydroenergy(CenterdataTResourcesHydroenergy centerdataTResourcesHydroenergy) {
         centerdataTResourcesHydroenergy.setUpdateTime(DateUtils.getNowDate());
+        centerdataTResourcesHydroenergy.setUpdateBy(SecurityUtils.getUserId());
+        centerdataTResourcesHydroenergy.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesHydroenergyMapper.updateCenterdataTResourcesHydroenergy(centerdataTResourcesHydroenergy);
     }
 

src/main/java/com/sooka/sponest/data/other/inspectiontype/service/impl/CenterdataTEmergencyInspectiontypeServiceImpl.java

@@ -4,6 +4,7 @@ package com.sooka.sponest.data.other.inspectiontype.service.impl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalemergency.domain.vo.TreeSelectCenterDataBody;
 import com.sooka.sponest.data.other.inspectiontype.domain.CenterdataTEmergencyInspectiontype;
@@ -61,6 +62,7 @@ public class CenterdataTEmergencyInspectiontypeServiceImpl extends BaseServiceIm
     public int insertCenterdataTEmergencyInspectiontype(CenterdataTEmergencyInspectiontype centerdataTEmergencyInspectiontype) {
         centerdataTEmergencyInspectiontype.setId(IdUtils.fastSimpleUUID());
         centerdataTEmergencyInspectiontype.setCreateTime(DateUtils.getNowDate());
+        centerdataTEmergencyInspectiontype.setCreateBy(SecurityUtils.getUserId().toString());
         return centerdataTEmergencyInspectiontypeMapper.insertCenterdataTEmergencyInspectiontype(centerdataTEmergencyInspectiontype);
     }
 
@@ -73,6 +75,7 @@ public class CenterdataTEmergencyInspectiontypeServiceImpl extends BaseServiceIm
     @Override
     public int updateCenterdataTEmergencyInspectiontype(CenterdataTEmergencyInspectiontype centerdataTEmergencyInspectiontype) {
         centerdataTEmergencyInspectiontype.setUpdateTime(DateUtils.getNowDate());
+        centerdataTEmergencyInspectiontype.setUpdateBy(SecurityUtils.getUserId());
         return centerdataTEmergencyInspectiontypeMapper.updateCenterdataTEmergencyInspectiontype(centerdataTEmergencyInspectiontype);
     }
 

src/main/java/com/sooka/sponest/data/other/land/service/impl/CenterdataTResourcesLandServiceImplImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.DictUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.other.land.domain.CenterdataTResourcesLand;
 import com.sooka.sponest.data.other.land.mapper.CenterdataTResourcesLandMapper;
@@ -60,6 +61,8 @@ public class CenterdataTResourcesLandServiceImplImpl extends BaseServiceImpl imp
     public int insertCenterdataTResourcesLand(CenterdataTResourcesLand centerdataTResourcesLand) {
         centerdataTResourcesLand.setId(IdUtils.fastSimpleUUID());
         centerdataTResourcesLand.setCreateTime(DateUtils.getNowDate());
+        centerdataTResourcesLand.setCreateBy(SecurityUtils.getUserId().toString());
+        centerdataTResourcesLand.setCreateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesLandMapper.insertCenterdataTResourcesLand(centerdataTResourcesLand);
     }
 
@@ -72,6 +75,8 @@ public class CenterdataTResourcesLandServiceImplImpl extends BaseServiceImpl imp
     @Override
     public int updateCenterdataTResourcesLand(CenterdataTResourcesLand centerdataTResourcesLand) {
         centerdataTResourcesLand.setUpdateTime(DateUtils.getNowDate());
+        centerdataTResourcesLand.setUpdateBy(SecurityUtils.getUserId());
+        centerdataTResourcesLand.setUpdateName( SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTResourcesLandMapper.updateCenterdataTResourcesLand(centerdataTResourcesLand);
     }
 

src/main/java/com/sooka/sponest/data/other/pollution/domain/CenterdataTEnvironmentPollution.java

@@ -111,15 +111,6 @@ public class CenterdataTEnvironmentPollution extends BaseBusinessEntity {
     @Excel(name = "部门名称")
     private String deptName;
 
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 更新人姓名
-     */
-    private String updateName;
 
     public void setId(String id) {
         this.id = id;
@@ -233,21 +224,6 @@ public class CenterdataTEnvironmentPollution extends BaseBusinessEntity {
         return deptName;
     }
 
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
 
     @Override
     public String toString() {

src/main/java/com/sooka/sponest/data/other/prohibitionarea/domain/CenterdataTEnvironmentProhibitionArea.java

@@ -92,15 +92,6 @@ public class CenterdataTEnvironmentProhibitionArea extends BaseBusinessEntity {
     @NotBlank(message = "部门名称不能为空")
     private String deptName;
 
-    /**
-     * 创建人姓名
-     */
-    private String createName;
-
-    /**
-     * 更新人姓名
-     */
-    private String updateName;
 
     public void setId(String id) {
         this.id = id;
@@ -174,25 +165,6 @@ public class CenterdataTEnvironmentProhibitionArea extends BaseBusinessEntity {
         return deptName;
     }
 
-    @Override
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    @Override
-    public String getCreateName() {
-        return createName;
-    }
-
-    @Override
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-
-    @Override
-    public String getUpdateName() {
-        return updateName;
-    }
 
     @Override
     public String toString() {

src/main/resources/mapper/other/CenterdataSink.xml

@@ -11,6 +11,8 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="deleteBy" column="delete_by"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="deleteTime" column="delete_time"/>
         <result property="dataStatus" column="data_status"/>
         <result property="name" column="name"/>
@@ -28,7 +30,10 @@
 
     <select id="selectCenterdataTEmergencyPersonList" parameterType="CenterdataTEmergencyPerson"
             resultMap="CenterdataTEmergencyPersonResult">
-        <include refid="selectCenterdataTEmergencyPersonVo"/>
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.delete_by, a.delete_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status, a.name, a.user_id, a.phone, a.user_type,a.identifiedcode as id_code from centerdata_t_emergency_person a
+        LEFT JOIN onest_system.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN onest_system.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="deleteBy != null  and deleteBy != ''">and delete_by = #{deleteBy}</if>
             <if test="deleteTime != null ">and delete_time = #{deleteTime}</if>

src/main/resources/mapper/other/CenterdataTEmergencyEnterpriseMapper.xml

@@ -10,6 +10,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="dataDeptId" column="data_dept_id"/>
         <result property="dataStatus" column="data_status"/>
         <result property="name" column="name"/>
@@ -35,11 +37,14 @@
 
     <select id="selectCenterdataTEmergencyEnterpriseList" parameterType="EmergencyEnterprise"
             resultMap="CenterdataTEmergencyEnterpriseResult">
-        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.data_dept_id, a.data_status,
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.data_dept_id, a.data_status,
         a.name, a.enterprise_address, a.enterprise_workaddress, a.organization_code, a.dept_id, a.dept_name,
         a.charger, a.charger_phone, a.sec_charger, a.sec_charger_phone, a.longitude, a.latitude, a.management,
         a.industry_management, a.email from centerdata_t_emergency_enterprise a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="dataDeptId != null ">and a.data_dept_id = #{dataDeptId}</if>
             <if test="dataStatus != null  and dataStatus != ''">and a.data_status = #{dataStatus}</if>

src/main/resources/mapper/other/CenterdataTEmergencyInspectiontypeMapper.xml

@@ -10,6 +10,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="deleteBy" column="delete_by"/>
         <result property="deleteTime" column="delete_time"/>
         <result property="dataStatus" column="data_status"/>
@@ -55,7 +57,10 @@
 
     <select id="selectCenterdataTEmergencyInspectiontypeList" parameterType="EmergencyInspectiontype"
             resultMap="CenterdataTEmergencyInspectiontypeResult">
-        <include refid="selectCenterdataTEmergencyInspectiontypeVo"/>
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.delete_by, a.delete_time, a.data_status, a.inspection_name, a.inspection_remark, a.level, a.parent_id, a.owndeptid, a.data_dept_id from centerdata_t_emergency_inspectiontype a
+        LEFT JOIN onest_system.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN onest_system.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="deleteBy != null  and deleteBy != ''">and delete_by = #{deleteBy}</if>
             <if test="deleteTime != null ">and delete_time = #{deleteTime}</if>

src/main/resources/mapper/other/CenterdataTEmergencyPatrolpointMapper.xml

@@ -10,6 +10,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="deleteBy" column="delete_by"/>
         <result property="deleteTime" column="delete_time"/>
         <result property="dataStatus" column="data_status"/>
@@ -38,11 +40,14 @@
 
     <select id="selectCenterdataTEmergencyPatrolpointList" parameterType="CenterdataTEmergencyPatrolpoint"
             resultMap="CenterdataTEmergencyPatrolpointResult">
-        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.delete_by, a.delete_time, a.data_status,
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.delete_by, a.delete_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status,
         a.name, a.longitude, a.latitude, a.enterprise_id, a.patrolpoint_address,a.patrol_nexttime,
         a.patrol_lasttime, a.patrol_cycle, a.alert_day, charger, a.charger_phone, a.point_remark, a.bar_code,
         a.patrolpoint_status, a.enterprise_name, a.owndeptid, a.data_dept_id from centerdata_t_emergency_patrolpoint a
         left join ${database_system}.sys_dept d on a.data_dept_id=d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="deleteBy != null  and deleteBy != ''">and delete_by = #{deleteBy}</if>
             <if test="deleteTime != null ">and delete_time = #{deleteTime}</if>

src/main/resources/mapper/other/CenterdataTFarmBreedResourcesMapper.xml

@@ -19,9 +19,11 @@
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
         <result property="createBy" column="create_by"/>
-        <result property="createDate" column="create_date"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
-        <result property="updateDate" column="update_date"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="remarks" column="remarks"/>
         <result property="delFlag" column="del_flag"/>
         <result property="deptId" column="dept_id"/>
@@ -35,9 +37,12 @@
 
     <select id="selectCenterdataTFarmBreedResourcesList" parameterType="CenterdataTFarmBreedResources"
             resultMap="CenterdataTFarmBreedResourcesResult">
-        <include refid="selectCenterdataTFarmBreedResourcesVo"/>
-        left join ${database_system}.sys_dept d
-        on a.dept_id = d.dept_id
+        select a.id, a.breeder_type, a.name, a.address, a.longitude, a.latitude, a.type, a.varieties, a.quantity, a.excrement_area, a.excrement_product, a.excrement_explain, a.revenue, a.create_by, a.create_date as create_time, a.update_by,u.nick_name as create_name,
+        su.nick_name as update_name, a.update_date as update_time, a.remarks, a.del_flag, a.dept_id, a.dept_name
+        from centerdata_t_farm_breed_resources a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="breederType != null  and breederType != ''">and a.breeder_type = #{breederType}</if>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
@@ -52,8 +57,8 @@
             </if>
             <if test="excrementExplain != null  and excrementExplain != ''">and a.excrement_explain = #{excrementExplain}
             </if>
-            <if test="createDate != null ">and a.create_date = #{createDate}</if>
-            <if test="updateDate != null ">and a.update_date = #{updateDate}</if>
+            <if test="createTime != null ">and a.create_date = #{createTime}</if>
+            <if test="updateTime != null ">and a.update_date = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''">and a.deptId = #{deptId}</if>
             ${params.dataScope}

src/main/resources/mapper/other/CenterdataTFarmLandInfoMapper.xml

@@ -18,9 +18,11 @@
         <result property="type" column="type"/>
         <result property="supermapCode" column="supermap_code"/>
         <result property="createBy" column="create_by"/>
-        <result property="createDate" column="create_date"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
-        <result property="updateDate" column="update_date"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="remarks" column="remarks"/>
         <result property="delFlag" column="del_flag"/>
         <result property="deptId" column="dept_id"/>
@@ -35,10 +37,13 @@
     <select id="selectCenterdataTFarmLandInfoList" parameterType="CenterdataTFarmLandInfo"
             resultMap="CenterdataTFarmLandInfoResult">
         select a.id, a.name, a.code, a.attribute, a.city, a.district, a.village, a.area, a.land_calendar_years,
-        a.land_years, a.type, a.supermap_code, a.create_by, a.create_date, a.update_by, a.update_date, a.remarks,
+        a.land_years, a.type, a.supermap_code, a.create_by, a.create_date as create_time, a.update_by, a.update_date as update_time ,u.nick_name as create_name,
+        su.nick_name as update_name, a.remarks,
         a.del_flag, a.dept_id, a.dept_name
         from centerdata_t_farm_land_info a
         left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
             <if test="code != null  and code != ''">and a.code = #{code}</if>
@@ -53,8 +58,8 @@
             <if test="landYears != null  and landYears != ''">and a.land_years = #{landYears}</if>
             <if test="type != null  and type != ''">and a.type = #{type}</if>
             <if test="supermapCode != null  and supermapCode != ''">and a.supermap_code = #{supermapCode}</if>
-            <if test="createDate != null ">and a.create_date = #{createDate}</if>
-            <if test="updateDate != null ">and a.update_date = #{updateDate}</if>
+            <if test="createTime != null ">and a.create_date = #{createTime}</if>
+            <if test="updateTime != null ">and a.update_date = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''">and a.deptId = #{deptId}</if>
             ${params.dataScope}

src/main/resources/mapper/other/CenterdataTFarmLivestockProtectInfoMapper.xml

@@ -19,9 +19,11 @@
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
         <result property="createBy" column="create_by"/>
-        <result property="createDate" column="create_date"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
-        <result property="updateDate" column="update_date"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="remarks" column="remarks"/>
         <result property="delFlag" column="del_flag"/>
         <result property="deptId" column="dept_id"/>
@@ -35,9 +37,12 @@
 
     <select id="selectCenterdataTFarmLivestockProtectInfoList" parameterType="CenterdataTFarmLivestockProtectInfo"
             resultMap="CenterdataTFarmLivestockProtectInfoResult">
-        <include refid="selectCenterdataTFarmLivestockProtectInfoVo"/>
-        left join ${database_system}.sys_dept d
-        on a.dept_id = d.dept_id
+        select a.id, a.name, a.address, a.longitude, a.latitude, a.registration_authority, a.register_date, a.register_capital, a.legal_person, a.phone, a.land_use_mode, a.lease_term, a.members_num, a.create_by, a.create_date as create_time, a.update_by, a.update_date as update_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.remarks, a.del_flag, a.dept_id, a.dept_name
+        from centerdata_t_farm_livestock_protect_info a
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="name != null  and name != ''">and a.name like concat('%', #{name}, '%')</if>
             <if test="address != null  and address != ''">and a.address like concat('%', #{address}, '%')</if>
@@ -53,8 +58,8 @@
             <if test="landUseMode != null  and landUseMode != ''">and a.land_use_mode = #{landUseMode}</if>
             <if test="leaseTerm != null  and leaseTerm != ''">and a.lease_term = #{leaseTerm}</if>
             <if test="membersNum != null  and membersNum != ''">and a.members_num = #{membersNum}</if>
-            <if test="createDate != null ">and a.create_date = #{createDate}</if>
-            <if test="updateDate != null ">and a.update_date = #{updateDate}</if>
+            <if test="createTime != null ">and a.create_date = #{createTime}</if>
+            <if test="updateTime != null ">and a.update_date = #{updateTime}</if>
             <if test="remarks != null  and remarks != ''">and a.remarks = #{remarks}</if>
             <if test="deptId != null  and deptId != ''">and a.deptId = #{deptId}</if>
             ${params.dataScope}

src/main/resources/mapper/other/CenterdataTForestCheckpointMapper.xml

@@ -19,6 +19,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="dataStatus" column="data_status"/>
     </resultMap>
 
@@ -30,15 +32,18 @@
             resultMap="CenterdataTForestCheckpointResult">
         select a.id, a.name, a.checkpoint_person, a.checkpoint_tel, a.checkpoint_address,
         a.checkpoint_remarks, a.longitude, a.latitude, a.dept_id, a.dept_name, a.create_by, a.create_time, a.update_by,
-        a.update_time, a.data_status from centerdata_t_forest_checkpoint a
+        a.update_time, u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status from centerdata_t_forest_checkpoint a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="name != null  and name != ''">and a.name like concat('%',
                 #{name}, '%')
             </if>
             <if test="checkpointPerson != null  and checkpointPerson != ''">and a.checkpoint_person like concat('%',#{checkpointPerson},'%')
             </if>
-            <if test="checkpointTel != null  and checkpointTel != ''">and a.checkpoint_tel = #{checkpointTel}</if>
+            <if test="checkpointTel != null  and checkpointTel != ''">and a.checkpoint_tel like concat('%',#{checkpointTel},'%')</if>
             <if test="checkpointAddress != null  and checkpointAddress != ''">and a.checkpoint_address =
                 #{checkpointAddress}
             </if>

src/main/resources/mapper/other/CenterdataTForestDeviceMapper.xml

@@ -10,6 +10,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="dataStatus" column="data_status"/>
         <result property="licenseNum" column="license_num"/>
         <result property="forestBrand" column="forest_brand"/>
@@ -28,10 +30,13 @@
 
     <select id="selectCenterdataTForestDeviceList" parameterType="ForestDevice"
             resultMap="CenterdataTForestDeviceResult">
-        select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.data_status, a.license_num,
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status, a.license_num,
         a.forest_brand, a.forest_type, a.purchase_date, a.maintenance, a.next_maintenance, a.dept_id, a.dept_name,
         a.device_status from centerdata_t_forest_device a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="dataStatus != null  and dataStatus != ''">and data_status = #{dataStatus}</if>
             <if test="licenseNum != null  and licenseNum != ''">and license_num like concat('%',#{licenseNum},'%') </if>

src/main/resources/mapper/other/CenterdataTForestDevicerepairMapper.xml

@@ -10,6 +10,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
         <result property="dataStatus" column="data_status"/>
         <result property="deviceId" column="device_id"/>
         <result property="deviceNum" column="device_num"/>
@@ -27,8 +29,11 @@
 
     <select id="selectCenterdataTForestDevicerepairList" parameterType="CenterdataTForestDevicerepair"
             resultMap="CenterdataTForestDevicerepairResult">
-        select a.* from centerdata_t_forest_devicerepair a
+        select a.id, a.create_by, a.create_time, a.update_by, a.update_time,u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status, a.device_id, a.device_num, a.repair_time, a.cost, a.charger, a.remarks, a.dept_id, a.dept_name from centerdata_t_forest_devicerepair a
         LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="dataStatus != null  and dataStatus != ''">and data_status = #{dataStatus}</if>
             <if test="deviceId != null  and deviceId != ''">and device_id = #{deviceId}</if>

src/main/resources/mapper/other/CenterdataTForestWeatherstationMapper.xml

@@ -20,6 +20,8 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="dataStatus" column="data_status"/>
+        <result property="updateName" column="update_name"/>
+        <result property="createName" column="create_name"/>
     </resultMap>
     <resultMap type="ForestCloudEventTypeBO" id="VisuForestCloudEventTypeBOResult">
         <result property="name" column="name"/>
@@ -34,8 +36,11 @@
             resultMap="CenterdataTForestWeatherstationResult">
         select a.id, a.name, a.longitude, a.latitude, a.weatherstation_address, a.weatherstation_person,
         a.weatherstation_tel, a.weatherstation_remarks, a.dept_id, a.dept_name, a.create_by, a.create_time, a.update_by,
-        a.update_time, a.data_status from centerdata_t_forest_weatherstation a
+        a.update_time,	u.nick_name as create_name,
+        su.nick_name as update_name, a.data_status from centerdata_t_forest_weatherstation a
         left join ${database_system}.sys_dept d on a.dept_id=d.dept_id
+        LEFT JOIN ${database_system}.sys_user u ON a.create_by = u.user_id
+        LEFT JOIN ${database_system}.sys_user su ON a.update_by = su.user_id
         <where>
             <if test="name != null  and name != ''">and a.name like
                 concat('%', #{name}, '%')
@@ -141,4 +146,5 @@
         where 1=1 ${params.dataScope}
         group by a.dept_id,a.dept_name
     </select>
+
 </mapper>