修改企业信息新增处理逻辑

data-ui/src/api/data/housingconstruction/enterprise.js

@@ -50,3 +50,11 @@ export function getListAll() {
     method: 'get'
   })
 }
+
+export function getEnterpriseList(data){
+  return request({
+    url: '/system/dept/getDeptsByDeptType',
+    method: 'post',
+    data: data
+  })
+}

data-ui/src/api/data/housingconstruction/storagetank.js

@@ -42,3 +42,13 @@ export function delStoragetank(id) {
     method: 'delete'
   })
 }
+
+
+// 查询储罐存储数据列表
+export function getStoragetankList(query) {
+  return request({
+    url: '/sooka-sponest-center-data/storagetank/getStoragetankList',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -130,9 +130,20 @@
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body class="form-style">
       <el-form ref="form" :model="form" :rules="rules" label-width="135px">
         <el-row :gutter="24">
+<!--          this.title === "修改企业信息"-->
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="enterpriseName">
-              <el-input v-model="form.enterpriseName" placeholder="请输入企业名称"/>
+            <el-form-item label="企业" prop="id" v-if="title === '添加企业信息'">
+              <el-select v-model="form.id" placeholder="请选择企业" @change="handleEnterpriseChange">
+                <el-option
+                  v-for="data in enterprisesList"
+                  :key="data.deptId"
+                  :label="data.deptName"
+                  :value="data.deptId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="企业名称" prop="enterpriseName" v-if="title === '修改企业信息'">
+              <el-input v-model="form.enterpriseName" placeholder="请输入企业名称" :readonly="true"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -189,18 +200,6 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
-            <el-form-item label="经度" prop="longitude" @dblclick.native="showMap">
-              <el-input v-model="form.longitude" placeholder="鼠标双击选择经纬度"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="latitude" @dblclick.native="showMap">
-              <el-input v-model="form.latitude" placeholder="鼠标双击选择经纬度"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
             <el-form-item label="所属部门" prop="deptId">
               <treeselect v-model="form.deptId" :options="deptOptions" multiple:false :show-count="true"
                           placeholder="请选择部门" @select="hx" :noResultsText="'空'" :noOptionsText="'空'"/>
@@ -209,20 +208,6 @@
         </el-row>
         <el-row :gutter="24">
           <el-col :span="24">
-            <el-form-item label="绑定设备" prop="deviceList">
-              <el-select v-model="form.deviceList" filterable placeholder="请选择设备" multiple>
-                <el-option
-                  v-for="dict in cameraList"
-                  :key="dict.id"
-                  :label="dict.cameraName"
-                  :value="dict.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="24">
             <el-form-item label="经营类别" prop="businessCategory">
               <el-input v-model="form.businessCategory" type="textarea" placeholder="请输入内容"/>
             </el-form-item>
@@ -255,6 +240,7 @@ import {
   addEnterprise,
   delEnterprise,
   getEnterprise,
+  getEnterpriseList,
   listEnterprise,
   updateEnterprise
 } from "@/api/data/housingconstruction/enterprise";
@@ -262,11 +248,9 @@ import deptselector from "@/views/components/deptselector.vue";
 import {treeselect} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {checkLat, checkLon} from "@/api/rules/rules";
 import ISuperMap from "@/views/data/common/ISuperMap.vue";
 import supermap from "@/views/components/supermap.vue";
 import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
-import {selectCenterMonitorlList} from "@/api/data/digitalforest/animal/animal";
 
 export default {
   name: "Enterprise",
@@ -293,8 +277,11 @@ export default {
       enterpriseList: [],
       // 部门树选项
       deptOptions: [],
+      //企业列表
+      enterprisesList:[],
       //设备集合
       cameraList: [],
+      //企业列表
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -305,13 +292,17 @@ export default {
         pageSize: 10,
         enterpriseName: null,
         legalRepresentative: null,
+
+      },
+      deptType:{
+        deptType: 'sys_dept_type_32'
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         enterpriseName: [
-          {required: true, message: "企业名称不能为空", trigger: "blur"}
+          {required: true, message: "企业不能为空", trigger: "blur"}
         ],
         enterpriseAdministrativeArea: [
           {required: true, message: "企业行政区域不能为空", trigger: "blur"}
@@ -340,25 +331,30 @@ export default {
         issuingAuthority: [
           {required: true, message: "发证机关不能为空", trigger: "blur"}
         ],
-        longitude: [
-          {required: true, message: '经度不能为空', trigger: ['change', 'blur']},
-          {validator: checkLon, trigger: 'blur'}
-        ],
-        latitude: [
-          {required: true, message: '纬度不能为空', trigger: ['change', 'blur']},
-          {validator: checkLat, trigger: 'blur'}
-        ],
       }
     };
   },
   created() {
     this.getList();
     this.getTreeselect();
-    selectCenterMonitorlList(this.queryParams).then(response => {
-      this.cameraList = response.data;
-    });
+    this.getEnterpriseList();
   },
   methods: {
+    handleEnterpriseChange(newId) {
+      const selectedEnterprise = this.enterprisesList.find(item => item.deptId === newId);
+      if (selectedEnterprise) {
+        this.form.enterpriseName = selectedEnterprise.deptName;
+        this.form.longitude = selectedEnterprise.deptLongitude;
+        this.form.latitude = selectedEnterprise.deptLatitude;
+      } else {
+        this.form.enterpriseName = '';
+      }
+    },
+    getEnterpriseList(){
+      getEnterpriseList(this.deptType).then(res=>{
+        this.enterprisesList = res.data
+      })
+    },
     formatLicensePeriod(start, end) {
       return `${start} 至 ${end}`;
     },
@@ -479,13 +475,14 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.title === "修改企业信息") {
             updateEnterprise(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
-          } else {
+          }
+          if(this.title === "添加企业信息"){
             addEnterprise(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

data-ui/src/views/data/housingconstruction/storagetank/index.vue

@@ -187,19 +187,19 @@
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="液体液位上限" prop="levelCeiling">
-              <el-input v-model="form.levelCeiling" placeholder="请输入液体液位上限(单位为: L)"/>
+              <el-input v-model="form.levelCeiling" placeholder="请输入液体液位上限(单位为: m)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="液体液位下限" prop="levelFloor">
-              <el-input v-model="form.levelFloor" placeholder="请输入液体液位下限(单位为: L)"/>
+              <el-input v-model="form.levelFloor" placeholder="请输入液体液位下限(单位为: m)"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="内部气压" prop="pressure">
-              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位为: Pa)"/>
+              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位为: Ma)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -457,16 +457,16 @@ export default {
       return `${cellValue.storageCapacity} t`;
     },
     formatLevelCeiling(cellValue) {
-      return `${cellValue.levelCeiling} L`;
+      return `${cellValue.levelCeiling} m`;
     },
     formatLevelFloor(cellValue) {
-      return `${cellValue.levelFloor} L`;
+      return `${cellValue.levelFloor} m`;
     },
     formatHeat(cellValue) {
       return `${cellValue.heat} ℃`;
     },
     formatPressure(cellValue) {
-      return `${cellValue.pressure} Pa`;
+      return `${cellValue.pressure} Ma`;
     }
   }
 };

src/main/java/com/sooka/sponest/data/housingconstruction/controller/CenterdataTHousingconstructionEnterpriseController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterprise;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionEnterpriseService;
+import com.sooka.sponest.data.utils.DataConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -66,6 +67,12 @@ public class CenterdataTHousingconstructionEnterpriseController extends BaseCont
     @Log(title = "住建-企业信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CenterdataTHousingconstructionEnterprise centerdataTHousingconstructionEnterprise) {
+        String tableName = "centerdata_t_housingconstruction_enterprise";
+        String[] keys = {"enterprise_name"};
+        String[] values = {centerdataTHousingconstructionEnterprise.getEnterpriseName()};
+        if(!centerdataTHousingconstructionEnterpriseService.uniqueCheck(tableName, keys, values)){
+            return AjaxResult.error(DataConstants.ERROR_MSG);
+        }
         return toAjax(centerdataTHousingconstructionEnterpriseService.insertCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise));
     }
 

src/main/java/com/sooka/sponest/data/housingconstruction/controller/CenterdataTHousingconstructionStoragetankController.java

@@ -88,4 +88,10 @@ public class CenterdataTHousingconstructionStoragetankController extends BaseCon
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(centerdataTHousingconstructionStoragetankService.deleteCenterdataTHousingconstructionStoragetankByIds(ids));
     }
+
+
+    @GetMapping("/getStoragetankList")
+    public AjaxResult getStoragetankList(CenterdataTHousingconstructionStoragetank storagetank){
+        return AjaxResult.success(centerdataTHousingconstructionStoragetankService.getStoragetankList(storagetank));
+    }
 }

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionEnterprise.java

@@ -114,7 +114,7 @@ public class CenterdataTHousingconstructionEnterprise extends BaseBusinessEntity
     /**
      * 设备中间表主键
      */
-    private List<String> deviceList;
+//    private List<String> deviceList;
 
 
     @Override

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetankLog.java

@@ -0,0 +1,107 @@
+package com.sooka.sponest.data.housingconstruction.domain;
+
+import com.ruoyi.common.core.annotation.Excel;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 储罐存储数据日志对象 centerdata_t_housingconstruction_storagetank_log
+ *
+ * @author LG
+ * @date 2024-08-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+
+public class CenterdataTHousingconstructionStoragetankLog extends BaseBusinessEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 储罐id
+     */
+    @Excel(name = "储罐id")
+    private String storagetankId;
+
+    /**
+     * 储罐名称
+     */
+    @Excel(name = "储罐名称")
+    private String storagetankName;
+
+    /**
+     * 液体液位
+     */
+    @Excel(name = "液体液位")
+    private Integer level;
+
+    /**
+     * 温度
+     */
+    @Excel(name = "温度")
+    private Integer heat;
+
+    /**
+     * 内部气压
+     */
+    @Excel(name = "内部气压")
+    private Integer pressure;
+
+    /**
+     * 周边可燃性气体泄漏
+     */
+    @Excel(name = "周边可燃性气体泄漏")
+    private Integer gasLeak;
+
+    /**
+     * 安全状态
+     */
+    @Excel(name = "安全状态")
+    private String securityState;
+
+    /**
+     * 运行状态
+     */
+    @Excel(name = "运行状态")
+    private String runState;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("createBy", getCreateBy())
+                .append("createName", getCreateName())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateName", getUpdateName())
+                .append("updateTime", getUpdateTime())
+                .append("deptId", getDeptId())
+                .append("deptName", getDeptName())
+                .append("storagetankId", getStoragetankId())
+                .append("storagetankName", getStoragetankName())
+                .append("level", getLevel())
+                .append("heat", getHeat())
+                .append("pressure", getPressure())
+                .append("gasLeak", getGasLeak())
+                .append("securityState", getSecurityState())
+                .append("runState", getRunState())
+                .toString();
+    }
+}

src/main/java/com/sooka/sponest/data/housingconstruction/service/ICenterdataTHousingconstructionEnterpriseService.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.housingconstruction.service;
 
+import com.sooka.sponest.data.base.service.IBaseService;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterprise;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author LG
  * @date 2024-07-29
  */
-public interface ICenterdataTHousingconstructionEnterpriseService {
+public interface ICenterdataTHousingconstructionEnterpriseService extends IBaseService {
     /**
      * 查询住建-企业信息
      *

src/main/java/com/sooka/sponest/data/housingconstruction/service/ICenterdataTHousingconstructionStoragetankService.java

@@ -58,4 +58,6 @@ public interface ICenterdataTHousingconstructionStoragetankService {
      * @return 结果
      */
     public int deleteCenterdataTHousingconstructionStoragetankById(String id);
+
+    List<CenterdataTHousingconstructionStoragetank> getStoragetankList(CenterdataTHousingconstructionStoragetank storagetank);
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionEnterpriseServiceImpl.java

@@ -3,7 +3,9 @@ package com.sooka.sponest.data.housingconstruction.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.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.common.security.utils.SecurityUtils;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionEnterprise;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseMapper;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionEnterpriseService;
@@ -21,7 +23,7 @@ import java.util.List;
  * @date 2024-07-29
  */
 @Service
-public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICenterdataTHousingconstructionEnterpriseService {
+public class CenterdataTHousingconstructionEnterpriseServiceImpl extends BaseServiceImpl implements ICenterdataTHousingconstructionEnterpriseService {
     @Autowired
     private CenterdataTHousingconstructionEnterpriseMapper centerdataTHousingconstructionEnterpriseMapper;
 
@@ -37,7 +39,7 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
     @Override
     public CenterdataTHousingconstructionEnterprise selectCenterdataTHousingconstructionEnterpriseById(String id) {
         CenterdataTHousingconstructionEnterprise data = centerdataTHousingconstructionEnterpriseMapper.selectCenterdataTHousingconstructionEnterpriseById(id);
-        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
+//        data.setDeviceList(centerdataTEquipmentCameraService.selectCenterdataTEquipmentCameraByBusinessId(id));
         return data;
     }
 
@@ -48,7 +50,9 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
      * @return 住建-企业信息
      */
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTHousingconstructionEnterprise> selectCenterdataTHousingconstructionEnterpriseList(CenterdataTHousingconstructionEnterprise centerdataTHousingconstructionEnterprise) {
+        setSookaDataBase(centerdataTHousingconstructionEnterprise);
         return centerdataTHousingconstructionEnterpriseMapper.selectCenterdataTHousingconstructionEnterpriseList(centerdataTHousingconstructionEnterprise);
     }
 
@@ -60,11 +64,11 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
      */
     @Override
     public int insertCenterdataTHousingconstructionEnterprise(CenterdataTHousingconstructionEnterprise centerdataTHousingconstructionEnterprise) {
-        centerdataTHousingconstructionEnterprise.setId(IdUtils.fastSimpleUUID());
+//        centerdataTHousingconstructionEnterprise.setId(IdUtils.fastSimpleUUID());
         centerdataTHousingconstructionEnterprise.setCreateTime(DateUtils.getNowDate());
         centerdataTHousingconstructionEnterprise.setCreateBy(SecurityUtils.getUserId().toString());
         centerdataTHousingconstructionEnterprise.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
-        addDriviceList(centerdataTHousingconstructionEnterprise.getDeviceList(), centerdataTHousingconstructionEnterprise.getId());
+//        addDriviceList(centerdataTHousingconstructionEnterprise.getDeviceList(), centerdataTHousingconstructionEnterprise.getId());
         return centerdataTHousingconstructionEnterpriseMapper.insertCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
     }
 
@@ -79,8 +83,8 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
         centerdataTHousingconstructionEnterprise.setUpdateTime(DateUtils.getNowDate());
         centerdataTHousingconstructionEnterprise.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionEnterprise.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
-        centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTHousingconstructionEnterprise.getId());
-        addDriviceList(centerdataTHousingconstructionEnterprise.getDeviceList(), centerdataTHousingconstructionEnterprise.getId());
+//        centerdataTEquipmentCameraService.deleteCenterdataTEquipmentCameraByBusinessId(centerdataTHousingconstructionEnterprise.getId());
+//        addDriviceList(centerdataTHousingconstructionEnterprise.getDeviceList(), centerdataTHousingconstructionEnterprise.getId());
         return centerdataTHousingconstructionEnterpriseMapper.updateCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
     }
 
@@ -107,7 +111,7 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
     }
 
 
-    private void addDriviceList(List<String> driviceList, String id){
+    /*private void addDriviceList(List<String> driviceList, String id){
         if (StringUtils.isNotEmpty(driviceList)) {
             driviceList.forEach(item -> {
                 CenterdataTEquipmentCamera camera = new CenterdataTEquipmentCamera();
@@ -118,5 +122,5 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
                 centerdataTEquipmentCameraService.insertCenterdataTEquipmentCamera(camera);
             });
         }
-    }
+    }*/
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionStoragetankServiceImpl.java

@@ -2,7 +2,9 @@ package com.sooka.sponest.data.housingconstruction.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.housingconstruction.domain.CenterdataTHousingconstructionStoragetank;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionStoragetankMapper;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionStoragetankService;
@@ -18,7 +20,7 @@ import java.util.List;
  * @date 2024-08-01
  */
 @Service
-public class CenterdataTHousingconstructionStoragetankServiceImpl implements ICenterdataTHousingconstructionStoragetankService {
+public class CenterdataTHousingconstructionStoragetankServiceImpl extends BaseServiceImpl implements ICenterdataTHousingconstructionStoragetankService {
     @Autowired
     private CenterdataTHousingconstructionStoragetankMapper centerdataTHousingconstructionStoragetankMapper;
 
@@ -40,7 +42,9 @@ public class CenterdataTHousingconstructionStoragetankServiceImpl implements ICe
      * @return 储罐存储数据
      */
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTHousingconstructionStoragetank> selectCenterdataTHousingconstructionStoragetankList(CenterdataTHousingconstructionStoragetank centerdataTHousingconstructionStoragetank) {
+        setSookaDataBase(centerdataTHousingconstructionStoragetank);
         return centerdataTHousingconstructionStoragetankMapper.selectCenterdataTHousingconstructionStoragetankList(centerdataTHousingconstructionStoragetank);
     }
 
@@ -94,4 +98,9 @@ public class CenterdataTHousingconstructionStoragetankServiceImpl implements ICe
     public int deleteCenterdataTHousingconstructionStoragetankById(String id) {
         return centerdataTHousingconstructionStoragetankMapper.deleteCenterdataTHousingconstructionStoragetankById(id);
     }
+
+    @Override
+    public List<CenterdataTHousingconstructionStoragetank> getStoragetankList(CenterdataTHousingconstructionStoragetank storagetank) {
+        return null;
+    }
 }

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionEnterpriseMapper.xml

@@ -29,11 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCenterdataTHousingconstructionEnterpriseVo">
-        select id, enterprise_name, enterprise_administrative_area, legal_representative, registered_address, business_category, operating_area, issuing_time, license_period_start, license_period_end, issuing_authority, longitude, latitude, create_time, create_by, create_name, update_time, update_by, update_name, dept_id, dept_name from centerdata_t_housingconstruction_enterprise
+        select a.id, a.enterprise_name, a.enterprise_administrative_area, a.legal_representative, a.registered_address, a.business_category, a.operating_area, a.issuing_time, a.license_period_start, a.license_period_end, a.issuing_authority, a.longitude, a.latitude, a.create_time, a.create_by, a.create_name, a.update_time, a.update_by, a.update_name, a.dept_id, a.dept_name from centerdata_t_housingconstruction_enterprise a
     </sql>
 
     <select id="selectCenterdataTHousingconstructionEnterpriseList" parameterType="CenterdataTHousingconstructionEnterprise" resultMap="CenterdataTHousingconstructionEnterpriseResult">
         <include refid="selectCenterdataTHousingconstructionEnterpriseVo"/>
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>  
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="enterpriseAdministrativeArea != null  and enterpriseAdministrativeArea != ''"> and enterprise_administrative_area = #{enterpriseAdministrativeArea}</if>
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="issuingAuthority != null  and issuingAuthority != ''"> and issuing_authority = #{issuingAuthority}</if>
             <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            ${params.dataScope}
         </where>
     </select>
     

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionStoragetankMapper.xml

@@ -26,31 +26,32 @@
     </resultMap>
 
     <sql id="selectCenterdataTHousingconstructionStoragetankVo">
-        select id,
-               create_by,
-               create_name,
-               create_time,
-               update_by,
-               update_name,
-               update_time,
-               dept_id,
-               dept_name,
-               name,
-               enterprise_id,
-               enterprise_name,
-               storage_capacity,
-               level_ceiling,
-               level_floor,
-               heat,
-               pressure,
-               gas_leak
-        from centerdata_t_housingconstruction_storagetank
+        select a.id,
+               a.create_by,
+               a.create_name,
+               a.create_time,
+               a.update_by,
+               a.update_name,
+               a.update_time,
+               a.dept_id,
+               a.dept_name,
+               a.name,
+               a.enterprise_id,
+               a.enterprise_name,
+               a.storage_capacity,
+               a.level_ceiling,
+               a.level_floor,
+               a.heat,
+               a.pressure,
+               a.gas_leak
+        from centerdata_t_housingconstruction_storagetank a
     </sql>
 
     <select id="selectCenterdataTHousingconstructionStoragetankList"
             parameterType="CenterdataTHousingconstructionStoragetank"
             resultMap="CenterdataTHousingconstructionStoragetankResult">
         <include refid="selectCenterdataTHousingconstructionStoragetankVo"/>
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
         <where>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="enterpriseId != null  and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
@@ -63,6 +64,7 @@
             <if test="heat != null ">and heat = #{heat}</if>
             <if test="pressure != null ">and pressure = #{pressure}</if>
             <if test="gasLeak != null ">and gas_leak = #{gasLeak}</if>
+            ${params.dataScope}
         </where>
     </select>