1 基础信息管理-用户管理-居住区(村庄) 管理模块开发，并调整左侧导航栏宽度

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TUserManageVillageController.java

+package com.zehong.web.controller.supervise;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TUserManageVillage;
+import com.zehong.system.service.ITUserManageVillageService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 基本信息维护-用户管理-居住区(村庄)Controller
+ * 
+ * @author zehong
+ * @date 2024-08-27
+ */
+@RestController
+@RequestMapping("/system/village")
+public class TUserManageVillageController extends BaseController
+{
+    @Autowired
+    private ITUserManageVillageService tUserManageVillageService;
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TUserManageVillage tUserManageVillage)
+    {
+        startPage();
+        List<TUserManageVillage> list = tUserManageVillageService.selectTUserManageVillageList(tUserManageVillage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出基本信息维护-用户管理-居住区(村庄)列表
+     */
+    @Log(title = "基本信息维护-用户管理-居住区(村庄)", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TUserManageVillage tUserManageVillage)
+    {
+        List<TUserManageVillage> list = tUserManageVillageService.exportTUserManageVillageList(tUserManageVillage);
+        ExcelUtil<TUserManageVillage> util = new ExcelUtil<TUserManageVillage>(TUserManageVillage.class);
+        return util.exportExcel(list, "基本信息维护-用户管理-居住区(村庄)数据");
+    }
+
+    /**
+     * 获取基本信息维护-用户管理-居住区(村庄)详细信息
+     */
+    @GetMapping(value = "/{fVillageId}")
+    public AjaxResult getInfo(@PathVariable("fVillageId") Long fVillageId)
+    {
+        return AjaxResult.success(tUserManageVillageService.selectTUserManageVillageById(fVillageId));
+    }
+
+    /**
+     * 新增基本信息维护-用户管理-居住区(村庄)
+     */
+    @Log(title = "基本信息维护-用户管理-居住区(村庄)", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TUserManageVillage tUserManageVillage)
+    {
+        return toAjax(tUserManageVillageService.insertTUserManageVillage(tUserManageVillage));
+    }
+
+    /**
+     * 修改基本信息维护-用户管理-居住区(村庄)
+     */
+    @Log(title = "基本信息维护-用户管理-居住区(村庄)", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TUserManageVillage tUserManageVillage)
+    {
+        return toAjax(tUserManageVillageService.updateTUserManageVillage(tUserManageVillage));
+    }
+
+    /**
+     * 删除基本信息维护-用户管理-居住区(村庄)
+     */
+    @Log(title = "基本信息维护-用户管理-居住区(村庄)", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fVillageIds}")
+    public AjaxResult remove(@PathVariable Long[] fVillageIds)
+    {
+        return toAjax(tUserManageVillageService.deleteTUserManageVillageByIds(fVillageIds));
+    }
+}

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

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 基本信息维护-用户管理-居住区(村庄)对象 t_user_manage_village
+ * 
+ * @author zehong
+ * @date 2024-08-27
+ */
+public class TUserManageVillage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long fVillageId;
+
+
+    /** 燃气企业 */
+    private String beyondEnterpriseId;
+
+    /**
+     * 燃气企业名称 导出用
+     */
+    @Excel(name = "所属企业")
+    private String beyondEnterpriseName;
+
+    /** 居住区(村庄)名称 */
+    @Excel(name = "居住区(村庄)名称")
+    private String fVillageName;
+
+    /** 所在县（市、区）ID */
+    private Long fRegion;
+
+    /** 所在县（市、区）ID 名称，导出使用 */
+    @Excel(name = "所在县（市、区）")
+    private String fRegionName;
+
+    /** 居民总户数 */
+    @Excel(name = "居民总户数")
+    private Long fTotalNumHouse;
+
+    /** 管道燃气用户数（开通数） */
+    @Excel(name = "管道燃气用户数")
+    private Long fPipeGasUsers;
+
+    /** 瓶装燃气用户数 */
+    @Excel(name = "瓶装燃气用户数")
+    private Long fBottledGasUsers;
+
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 备注 */
+    private String remarks;
+
+    public void setfVillageId(Long fVillageId) 
+    {
+        this.fVillageId = fVillageId;
+    }
+
+    public Long getfVillageId() 
+    {
+        return fVillageId;
+    }
+    public void setfVillageName(String fVillageName) 
+    {
+        this.fVillageName = fVillageName;
+    }
+
+    public String getfVillageName() 
+    {
+        return fVillageName;
+    }
+    public void setfRegion(Long fRegion) 
+    {
+        this.fRegion = fRegion;
+    }
+
+    public Long getfRegion() 
+    {
+        return fRegion;
+    }
+    public void setfTotalNumHouse(Long fTotalNumHouse) 
+    {
+        this.fTotalNumHouse = fTotalNumHouse;
+    }
+
+    public Long getfTotalNumHouse() 
+    {
+        return fTotalNumHouse;
+    }
+    public void setfPipeGasUsers(Long fPipeGasUsers) 
+    {
+        this.fPipeGasUsers = fPipeGasUsers;
+    }
+
+    public Long getfPipeGasUsers() 
+    {
+        return fPipeGasUsers;
+    }
+    public void setfBottledGasUsers(Long fBottledGasUsers) 
+    {
+        this.fBottledGasUsers = fBottledGasUsers;
+    }
+
+    public Long getfBottledGasUsers() 
+    {
+        return fBottledGasUsers;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    public String getfRegionName() {
+        return fRegionName;
+    }
+
+    public void setfRegionName(String fRegionName) {
+        this.fRegionName = fRegionName;
+    }
+
+    public String getBeyondEnterpriseId() {
+        return beyondEnterpriseId;
+    }
+
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
+    public String getBeyondEnterpriseName() {
+        return beyondEnterpriseName;
+    }
+
+    public void setBeyondEnterpriseName(String beyondEnterpriseName) {
+        this.beyondEnterpriseName = beyondEnterpriseName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fVillageId", getfVillageId())
+            .append("fVillageName", getfVillageName())
+            .append("fRegion", getfRegion())
+            .append("fTotalNumHouse", getfTotalNumHouse())
+            .append("fPipeGasUsers", getfPipeGasUsers())
+            .append("fBottledGasUsers", getfBottledGasUsers())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TUserManageVillage;
+
+/**
+ * 基本信息维护-用户管理-居住区(村庄)Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-08-27
+ */
+public interface TUserManageVillageMapper 
+{
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 基本信息维护-用户管理-居住区(村庄)
+     */
+    public TUserManageVillage selectTUserManageVillageById(Long fVillageId);
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 基本信息维护-用户管理-居住区(村庄)集合
+     */
+    public List<TUserManageVillage> selectTUserManageVillageList(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 导出用
+     * @param tUserManageVillage tUserManageVillage
+     * @return list
+     */
+    public List<TUserManageVillage> exportUserManageVillageList(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 新增基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    public int insertTUserManageVillage(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 修改基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    public int updateTUserManageVillage(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 删除基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 结果
+     */
+    public int deleteTUserManageVillageById(Long fVillageId);
+
+    /**
+     * 批量删除基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTUserManageVillageByIds(Long[] fVillageIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TUserManageVillage;
+
+/**
+ * 基本信息维护-用户管理-居住区(村庄)Service接口
+ * 
+ * @author zehong
+ * @date 2024-08-27
+ */
+public interface ITUserManageVillageService 
+{
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 基本信息维护-用户管理-居住区(村庄)
+     */
+    public TUserManageVillage selectTUserManageVillageById(Long fVillageId);
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 基本信息维护-用户管理-居住区(村庄)集合
+     */
+    public List<TUserManageVillage> selectTUserManageVillageList(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表
+     *
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 基本信息维护-用户管理-居住区(村庄)集合
+     */
+    public List<TUserManageVillage> exportTUserManageVillageList(TUserManageVillage tUserManageVillage);
+    /**
+     * 新增基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    public int insertTUserManageVillage(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 修改基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    public int updateTUserManageVillage(TUserManageVillage tUserManageVillage);
+
+    /**
+     * 批量删除基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageIds 需要删除的基本信息维护-用户管理-居住区(村庄)ID
+     * @return 结果
+     */
+    public int deleteTUserManageVillageByIds(Long[] fVillageIds);
+
+    /**
+     * 删除基本信息维护-用户管理-居住区(村庄)信息
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 结果
+     */
+    public int deleteTUserManageVillageById(Long fVillageId);
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TUserManageVillageMapper;
+import com.zehong.system.domain.TUserManageVillage;
+import com.zehong.system.service.ITUserManageVillageService;
+
+/**
+ * 基本信息维护-用户管理-居住区(村庄)Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-08-27
+ */
+@Service
+public class TUserManageVillageServiceImpl implements ITUserManageVillageService 
+{
+    @Autowired
+    private TUserManageVillageMapper tUserManageVillageMapper;
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 基本信息维护-用户管理-居住区(村庄)
+     */
+    @Override
+    public TUserManageVillage selectTUserManageVillageById(Long fVillageId)
+    {
+        return tUserManageVillageMapper.selectTUserManageVillageById(fVillageId);
+    }
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)列表
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 基本信息维护-用户管理-居住区(村庄)
+     */
+    @Override
+    public List<TUserManageVillage> selectTUserManageVillageList(TUserManageVillage tUserManageVillage)
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String deptId = user.getDeptId();
+        tUserManageVillage.setBeyondEnterpriseId(deptId);
+        return tUserManageVillageMapper.selectTUserManageVillageList(tUserManageVillage);
+    }
+
+    /**
+     * 查询基本信息维护-用户管理-居住区(村庄)导出
+     *
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 基本信息维护-用户管理-居住区(村庄)
+     */
+    @Override
+    public List<TUserManageVillage> exportTUserManageVillageList(TUserManageVillage tUserManageVillage) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        String deptId = user.getDeptId();
+        tUserManageVillage.setBeyondEnterpriseId(deptId);
+        return tUserManageVillageMapper.exportUserManageVillageList(tUserManageVillage);
+    }
+
+    /**
+     * 新增基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    @Override
+    public int insertTUserManageVillage(TUserManageVillage tUserManageVillage)
+    {
+        return tUserManageVillageMapper.insertTUserManageVillage(tUserManageVillage);
+    }
+
+    /**
+     * 修改基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param tUserManageVillage 基本信息维护-用户管理-居住区(村庄)
+     * @return 结果
+     */
+    @Override
+    public int updateTUserManageVillage(TUserManageVillage tUserManageVillage)
+    {
+        return tUserManageVillageMapper.updateTUserManageVillage(tUserManageVillage);
+    }
+
+    /**
+     * 批量删除基本信息维护-用户管理-居住区(村庄)
+     * 
+     * @param fVillageIds 需要删除的基本信息维护-用户管理-居住区(村庄)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserManageVillageByIds(Long[] fVillageIds)
+    {
+        return tUserManageVillageMapper.deleteTUserManageVillageByIds(fVillageIds);
+    }
+
+    /**
+     * 删除基本信息维护-用户管理-居住区(村庄)信息
+     * 
+     * @param fVillageId 基本信息维护-用户管理-居住区(村庄)ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTUserManageVillageById(Long fVillageId)
+    {
+        return tUserManageVillageMapper.deleteTUserManageVillageById(fVillageId);
+    }
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TUserManageVillageMapper">
+    
+    <resultMap type="TUserManageVillage" id="TUserManageVillageResult">
+        <result property="fVillageId"    column="f_village_id"    />
+        <result property="fVillageName"    column="f_village_name"    />
+        <result property="fRegion"    column="f_region"    />
+        <result property="fTotalNumHouse"    column="f_total_num_house"    />
+        <result property="fPipeGasUsers"    column="f_pipe_gas_users"    />
+        <result property="fBottledGasUsers"    column="f_bottled_gas_users"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="beyondEnterpriseId"    column="f_beyond_enterprise_id"    />
+        <result property="beyondEnterpriseName"    column="enterprise_name"    />
+    </resultMap>
+
+    <sql id="selectTUserManageVillageVo">
+        select village.f_village_id,
+               village.f_village_name,
+               village.f_region,
+               region.f_name as fRegionName,
+               village.f_total_num_house,
+               village.f_pipe_gas_users,
+               village.f_bottled_gas_users,
+               village.longitude,
+               village.latitude,
+               village.remarks,
+               village.f_beyond_enterprise_id,
+               enterprise.enterprise_name
+        from t_user_manage_village village
+        left join t_enterprise_info enterprise on village.f_beyond_enterprise_id = enterprise.enterprise_id
+        left join t_county_level_region region on village.f_region = region.f_id
+    </sql>
+
+<!--    导出封装-->
+
+    <resultMap type="TUserManageVillage" id="exportTUserManageVillageResult">
+        <result property="fVillageId"    column="f_village_id"    />
+        <result property="fVillageName"    column="f_village_name"    />
+        <result property="fRegion"    column="f_region"    />
+        <result property="fRegionName"    column="fRegionName"    />
+        <result property="fTotalNumHouse"    column="f_total_num_house"    />
+        <result property="fPipeGasUsers"    column="f_pipe_gas_users"    />
+        <result property="fBottledGasUsers"    column="f_bottled_gas_users"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="beyondEnterpriseId"    column="f_beyond_enterprise_id"    />
+        <result property="beyondEnterpriseName"    column="beyondEnterpriseName"    />
+    </resultMap>
+
+    <sql id="exportTUserManageVillageVo">
+        select village.f_village_id,
+               village.f_village_name,
+               village.f_region,
+               region.f_name as fRegionName,
+               village.f_beyond_enterprise_id,
+               enterprise.enterprise_name as beyondEnterpriseName,
+               village.f_total_num_house,
+               village.f_pipe_gas_users,
+               village.f_bottled_gas_users,
+               village.longitude,
+               village.latitude,
+               village.remarks
+        from t_user_manage_village village
+        left join t_enterprise_info enterprise on village.f_beyond_enterprise_id = enterprise.enterprise_id
+        left join t_county_level_region region on village.f_region = region.f_id
+    </sql>
+<!--    导出封装结束-->
+
+    <select id="selectTUserManageVillageList" parameterType="TUserManageVillage" resultMap="TUserManageVillageResult">
+        <include refid="selectTUserManageVillageVo"/>
+        <where>  
+            <if test="fVillageName != null  and fVillageName != ''"> and f_village_name like concat('%', #{fVillageName}, '%')</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != '-2' and beyondEnterpriseId != ''"> and f_beyond_enterprise_id =  #{beyondEnterpriseId} </if>
+        </where>
+    </select>
+
+    <select id="exportUserManageVillageList" parameterType="TUserManageVillage" resultMap="exportTUserManageVillageResult">
+        <include refid="exportTUserManageVillageVo"/>
+        <where>
+            <if test="fVillageName != null  and fVillageName != ''"> and village.f_village_name like concat('%', #{fVillageName}, '%')</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != '-2' and beyondEnterpriseId != ''"> and f_beyond_enterprise_id =  #{beyondEnterpriseId} </if>
+        </where>
+    </select>
+
+    <select id="selectTUserManageVillageById" parameterType="Long" resultMap="TUserManageVillageResult">
+        <include refid="selectTUserManageVillageVo"/>
+        where f_village_id = #{fVillageId}
+    </select>
+        
+    <insert id="insertTUserManageVillage" parameterType="TUserManageVillage" useGeneratedKeys="true" keyProperty="fVillageId">
+        insert into t_user_manage_village
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fVillageName != null">f_village_name,</if>
+            <if test="fRegion != null">f_region,</if>
+            <if test="fTotalNumHouse != null">f_total_num_house,</if>
+            <if test="fPipeGasUsers != null">f_pipe_gas_users,</if>
+            <if test="fBottledGasUsers != null">f_bottled_gas_users,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="beyondEnterpriseId != null">f_beyond_enterprise_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fVillageName != null">#{fVillageName},</if>
+            <if test="fRegion != null">#{fRegion},</if>
+            <if test="fTotalNumHouse != null">#{fTotalNumHouse},</if>
+            <if test="fPipeGasUsers != null">#{fPipeGasUsers},</if>
+            <if test="fBottledGasUsers != null">#{fBottledGasUsers},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTUserManageVillage" parameterType="TUserManageVillage">
+        update t_user_manage_village
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fVillageName != null">f_village_name = #{fVillageName},</if>
+            <if test="fRegion != null">f_region = #{fRegion},</if>
+            <if test="fTotalNumHouse != null">f_total_num_house = #{fTotalNumHouse},</if>
+            <if test="fPipeGasUsers != null">f_pipe_gas_users = #{fPipeGasUsers},</if>
+            <if test="fBottledGasUsers != null">f_bottled_gas_users = #{fBottledGasUsers},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="beyondEnterpriseId != null">f_beyond_enterprise_id = #{beyondEnterpriseId},</if>
+        </trim>
+        where f_village_id = #{fVillageId}
+    </update>
+
+    <delete id="deleteTUserManageVillageById" parameterType="Long">
+        delete from t_user_manage_village where f_village_id = #{fVillageId}
+    </delete>
+
+    <delete id="deleteTUserManageVillageByIds" parameterType="String">
+        delete from t_user_manage_village where f_village_id in 
+        <foreach item="fVillageId" collection="array" open="(" separator="," close=")">
+            #{fVillageId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/regulation/userManagement/village.js

+import request from '@/utils/request'
+
+// 查询基本信息维护-用户管理-居住区(村庄)列表
+export function listVillage(query) {
+  return request({
+    url: '/system/village/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询基本信息维护-用户管理-居住区(村庄)详细
+export function getVillage(fVillageId) {
+  return request({
+    url: '/system/village/' + fVillageId,
+    method: 'get'
+  })
+}
+
+// 新增基本信息维护-用户管理-居住区(村庄)
+export function addVillage(data) {
+  return request({
+    url: '/system/village',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改基本信息维护-用户管理-居住区(村庄)
+export function updateVillage(data) {
+  return request({
+    url: '/system/village',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除基本信息维护-用户管理-居住区(村庄)
+export function delVillage(fVillageId) {
+  return request({
+    url: '/system/village/' + fVillageId,
+    method: 'delete'
+  })
+}
+
+// 导出基本信息维护-用户管理-居住区(村庄)
+export function exportVillage(query) {
+  return request({
+    url: '/system/village/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

zh-baseversion-web/src/assets/styles/variables.scss

@@ -24,7 +24,7 @@ $sidebarLightTitle: #001529;
 $subMenuBg:#1f2d3d;
 $subMenuHover:#001528;
 
-$sideBarWidth: 200px;
+$sideBarWidth: 220px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass