fix

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisCjqyController.java

@@ -90,11 +90,9 @@ public class TGisCjqyController extends BaseController
     @GetMapping(value = "/{CJQYDM}")
     public AjaxResult getInfo(@PathVariable("CJQYDM") String CJQYDM)
     {
-        TGisCjqy detail = tGisCjqyService.selectTGisCjqyByCJQYDM(CJQYDM);
-        return success(detail);
+        return success(tGisCjqyService.selectTGisCjqyByCJQYDM(CJQYDM));
     }
 
-
     /**
      * 获取村级区域详细信息,翻译字典
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjqyController.java

@@ -90,10 +90,12 @@ public class TGisXjqyController extends BaseController
     @GetMapping(value = "/{XJQYDM}")
     public AjaxResult getInfo(@PathVariable("XJQYDM") String XJQYDM)
     {
-        TGisXjqy detail = tGisXjqyService.selectTGisXjqyByXJQYDM(XJQYDM);
-        return success(detail);
+        return success(tGisXjqyService.selectTGisXjqyByXJQYDM(XJQYDM));
     }
 
+    /**
+     * 获取乡级区域详细信息,翻译字典
+     */
     @PreAuthorize("@ss.hasPermi('business:xjqy:query')")
     @GetMapping(value = "/detail/{XJQYDM}")
     public AjaxResult detail(@PathVariable("XJQYDM") String XJQYDM)
@@ -151,7 +153,6 @@ public class TGisXjqyController extends BaseController
         pdf.setTitle("乡级区域");
         //pdf.setRowHeight(20f);
 
-
         ShoulderItem shoulder = new ShoulderItem();
         shoulder.setLeftItem("编制单位：");
         shoulder.setCenterItem("日期：" );

ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjxzqController.java

@@ -90,10 +90,12 @@ public class TGisXjxzqController extends BaseController
     @GetMapping(value = "/{XZQDM}")
     public AjaxResult getInfo(@PathVariable("XZQDM") String XZQDM)
     {
-        TGisXjxzq detail = tGisXjxzqService.selectTGisXjxzqByXZQDM(XZQDM);
-        return success(detail);
+        return success(tGisXjxzqService.selectTGisXjxzqByXZQDM(XZQDM));
     }
 
+    /**
+     * 获取县级区域详细信息,翻译字典
+     */
     @PreAuthorize("@ss.hasPermi('business:xjxzq:query')")
     @GetMapping(value = "/detail/{XZQDM}")
     public AjaxResult detail(@PathVariable("XZQDM") String XZQDM)

ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisCjqy.java

@@ -23,9 +23,6 @@ public class TGisCjqy extends BaseEntity
     @Excel(name = "区划名称")
     private String CJQYMC;
 
-    /** 空间矢量 */
-    private String theGeom;
-
     /** 标识码 */
     @Excel(name = "标识码")
     private Long BSM;
@@ -34,13 +31,17 @@ public class TGisCjqy extends BaseEntity
     @Excel(name = "要素代码")
     private String YSDM;
 
-    /** fid */
-    private Long fid;
+    /** 空间矢量 */
+    private String theGeom;
 
-    /** 部门级联代码 */
-    @Excel(name = "部门级联代码")
+    /** 级联代码 */
+    @Excel(name = "级联代码")
     private String importCode;
 
+    /** fid */
+    @Excel(name = "fid")
+    private Long fid;
+
     public void setCJQYDM(String CJQYDM) 
     {
         this.CJQYDM = CJQYDM;
@@ -61,16 +62,6 @@ public class TGisCjqy extends BaseEntity
         return CJQYMC;
     }
 
-    public void setTheGeom(String theGeom) 
-    {
-        this.theGeom = theGeom;
-    }
-
-    public String getTheGeom() 
-    {
-        return theGeom;
-    }
-
     public void setBSM(Long BSM) 
     {
         this.BSM = BSM;
@@ -91,14 +82,14 @@ public class TGisCjqy extends BaseEntity
         return YSDM;
     }
 
-    public void setFid(Long fid) 
+    public void setTheGeom(String theGeom) 
     {
-        this.fid = fid;
+        this.theGeom = theGeom;
     }
 
-    public Long getFid() 
+    public String getTheGeom() 
     {
-        return fid;
+        return theGeom;
     }
 
     public void setImportCode(String importCode) 
@@ -111,16 +102,26 @@ public class TGisCjqy extends BaseEntity
         return importCode;
     }
 
+    public void setFid(Long fid) 
+    {
+        this.fid = fid;
+    }
+
+    public Long getFid() 
+    {
+        return fid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("CJQYDM", getCJQYDM())
             .append("CJQYMC", getCJQYMC())
-            .append("theGeom", getTheGeom())
             .append("BSM", getBSM())
             .append("YSDM", getYSDM())
-            .append("fid", getFid())
+            .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
+            .append("fid", getFid())
             .toString();
     }
 }

ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjqy.java

@@ -23,9 +23,6 @@ public class TGisXjqy extends BaseEntity
     @Excel(name = "区划名称")
     private String XJQYMC;
 
-    /** 空间矢量 */
-    private String theGeom;
-
     /** 标识码 */
     @Excel(name = "标识码")
     private Long BSM;
@@ -34,13 +31,17 @@ public class TGisXjqy extends BaseEntity
     @Excel(name = "要素代码")
     private String YSDM;
 
-    /** fid */
-    private Long fid;
+    /** 空间矢量 */
+    private String theGeom;
 
     /** 部门级联代码 */
     @Excel(name = "部门级联代码")
     private String importCode;
 
+    /** fid */
+    @Excel(name = "fid")
+    private Long fid;
+
     public void setXJQYDM(String XJQYDM) 
     {
         this.XJQYDM = XJQYDM;
@@ -61,16 +62,6 @@ public class TGisXjqy extends BaseEntity
         return XJQYMC;
     }
 
-    public void setTheGeom(String theGeom) 
-    {
-        this.theGeom = theGeom;
-    }
-
-    public String getTheGeom() 
-    {
-        return theGeom;
-    }
-
     public void setBSM(Long BSM) 
     {
         this.BSM = BSM;
@@ -91,14 +82,14 @@ public class TGisXjqy extends BaseEntity
         return YSDM;
     }
 
-    public void setFid(Long fid) 
+    public void setTheGeom(String theGeom) 
     {
-        this.fid = fid;
+        this.theGeom = theGeom;
     }
 
-    public Long getFid() 
+    public String getTheGeom() 
     {
-        return fid;
+        return theGeom;
     }
 
     public void setImportCode(String importCode) 
@@ -111,16 +102,26 @@ public class TGisXjqy extends BaseEntity
         return importCode;
     }
 
+    public void setFid(Long fid) 
+    {
+        this.fid = fid;
+    }
+
+    public Long getFid() 
+    {
+        return fid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("XJQYDM", getXJQYDM())
             .append("XJQYMC", getXJQYMC())
-            .append("theGeom", getTheGeom())
             .append("BSM", getBSM())
             .append("YSDM", getYSDM())
-            .append("fid", getFid())
+            .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
+            .append("fid", getFid())
             .toString();
     }
 }

ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjxzq.java

@@ -23,9 +23,6 @@ public class TGisXjxzq extends BaseEntity
     @Excel(name = "区划名称")
     private String XZQMC;
 
-    /** 空间矢量 */
-    private String theGeom;
-
     /** 标识码 */
     @Excel(name = "标识码")
     private Long BSM;
@@ -34,13 +31,17 @@ public class TGisXjxzq extends BaseEntity
     @Excel(name = "要素代码")
     private String YSDM;
 
-    /** fid */
-    private Long fid;
+    /** 空间矢量 */
+    private String theGeom;
 
     /** 部门级联代码 */
     @Excel(name = "部门级联代码")
     private String importCode;
 
+    /** fid */
+    @Excel(name = "fid")
+    private Long fid;
+
     public void setXZQDM(String XZQDM) 
     {
         this.XZQDM = XZQDM;
@@ -61,16 +62,6 @@ public class TGisXjxzq extends BaseEntity
         return XZQMC;
     }
 
-    public void setTheGeom(String theGeom) 
-    {
-        this.theGeom = theGeom;
-    }
-
-    public String getTheGeom() 
-    {
-        return theGeom;
-    }
-
     public void setBSM(Long BSM) 
     {
         this.BSM = BSM;
@@ -91,14 +82,14 @@ public class TGisXjxzq extends BaseEntity
         return YSDM;
     }
 
-    public void setFid(Long fid) 
+    public void setTheGeom(String theGeom) 
     {
-        this.fid = fid;
+        this.theGeom = theGeom;
     }
 
-    public Long getFid() 
+    public String getTheGeom() 
     {
-        return fid;
+        return theGeom;
     }
 
     public void setImportCode(String importCode) 
@@ -111,16 +102,26 @@ public class TGisXjxzq extends BaseEntity
         return importCode;
     }
 
+    public void setFid(Long fid) 
+    {
+        this.fid = fid;
+    }
+
+    public Long getFid() 
+    {
+        return fid;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
             .append("XZQDM", getXZQDM())
             .append("XZQMC", getXZQMC())
-            .append("theGeom", getTheGeom())
             .append("BSM", getBSM())
             .append("YSDM", getYSDM())
-            .append("fid", getFid())
+            .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
+            .append("fid", getFid())
             .toString();
     }
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisCjqyServiceImpl.java

@@ -92,7 +92,8 @@ public class TGisCjqyServiceImpl implements ITGisCjqyService
         List<TGisCjqy> tGisCjqyList = tGisCjqyMapper.selectTGisCjqyList(tGisCjqy);
 
         for (TGisCjqy item : list) {
-            String code = item.getImportCode();
+
+            String  code = item.getImportCode();
             List<TGisCjqy> filters = tGisCjqyList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -103,7 +104,7 @@ public class TGisCjqyServiceImpl implements ITGisCjqyService
                 if(isUpdateSupport){ //勾选则更新
                     item.setUpdateBy(operName);
                     item.setUpdateTime(DateUtils.getNowDate());
-                    item.setCJQYDM(filters.get(0).getCJQYDM());
+                    item.setFid(filters.get(0).getFid());
                     updateList.add(item);
                     successNum++;
                 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjqyServiceImpl.java

@@ -92,7 +92,9 @@ public class TGisXjqyServiceImpl implements ITGisXjqyService
         List<TGisXjqy> tGisXjqyList = tGisXjqyMapper.selectTGisXjqyList(tGisXjqy);
 
         for (TGisXjqy item : list) {
-            String code = item.getImportCode();
+
+            // 验证是否存在这个乡级区域信息
+            String  code = item.getImportCode();
             List<TGisXjqy> filters = tGisXjqyList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -103,7 +105,7 @@ public class TGisXjqyServiceImpl implements ITGisXjqyService
                 if(isUpdateSupport){ //勾选则更新
                     item.setUpdateBy(operName);
                     item.setUpdateTime(DateUtils.getNowDate());
-                    item.setXJQYDM(filters.get(0).getXJQYDM());
+                    item.setFid(filters.get(0).getFid());
                     updateList.add(item);
                     successNum++;
                 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjxzqServiceImpl.java

@@ -92,9 +92,7 @@ public class TGisXjxzqServiceImpl implements ITGisXjxzqService
         List<TGisXjxzq> tGisXjxzqList = tGisXjxzqMapper.selectTGisXjxzqList(tGisXjxzq);
 
         for (TGisXjxzq item : list) {
-
-            // 验证是否存在这个县级区域信息
-            String code = item.getImportCode();
+            String  code = item.getImportCode();
             List<TGisXjxzq> filters = tGisXjxzqList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -105,7 +103,7 @@ public class TGisXjxzqServiceImpl implements ITGisXjxzqService
                 if(isUpdateSupport){ //勾选则更新
                     item.setUpdateBy(operName);
                     item.setUpdateTime(DateUtils.getNowDate());
-                    item.setXZQDM(filters.get(0).getXZQDM());
+                    item.setFid(filters.get(0).getFid());
                     updateList.add(item);
                     successNum++;
                 }

ruoyi-business/src/main/resources/mapper/business/TGisCjqyMapper.xml

@@ -7,22 +7,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TGisCjqy" id="TGisCjqyResult">
         <result property="CJQYDM"    column="CJQYDM"    />
         <result property="CJQYMC"    column="CJQYMC"    />
-        <result property="theGeom"    column="the_geom"    />
         <result property="BSM"    column="BSM"    />
         <result property="YSDM"    column="YSDM"    />
-        <result property="fid"    column="fid"    />
+        <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
+        <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisCjqyVo">
-        select CJQYDM, CJQYMC, the_geom, BSM, YSDM, fid, import_code from t_gis_cjqy
+        select CJQYDM, CJQYMC, BSM, YSDM, the_geom, import_code, fid from t_gis_cjqy
     </sql>
 
     <select id="selectTGisCjqyList" parameterType="TGisCjqy" resultMap="TGisCjqyResult">
         <include refid="selectTGisCjqyVo"/>
         <where>
             <if test="CJQYDM != null  and CJQYDM != ''"> and CJQYDM = #{CJQYDM}</if>
+            <if test="CJQYMC != null  and CJQYMC != ''"> and CJQYMC = #{CJQYMC}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
+            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
@@ -36,20 +38,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="CJQYDM != null">CJQYDM,</if>
             <if test="CJQYMC != null and CJQYMC != ''">CJQYMC,</if>
-            <if test="theGeom != null and theGeom != ''">the_geom,</if>
             <if test="BSM != null">BSM,</if>
             <if test="YSDM != null">YSDM,</if>
-            <if test="fid != null">fid,</if>
+            <if test="theGeom != null">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
+            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="CJQYDM != null">#{CJQYDM},</if>
             <if test="CJQYMC != null and CJQYMC != ''">#{CJQYMC},</if>
-            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
             <if test="BSM != null">#{BSM},</if>
             <if test="YSDM != null">#{YSDM},</if>
-            <if test="fid != null">#{fid},</if>
+            <if test="theGeom != null">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
+            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
@@ -58,22 +60,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             CJQYDM,
             CJQYMC,
-            the_geom,
             BSM,
             YSDM,
-            fid,
+            the_geom,
             import_code,
+            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 #{item.CJQYDM},
                 #{item.CJQYMC},
-                #{item.theGeom},
                 #{item.BSM},
                 #{item.YSDM},
-                #{item.fid},
+                #{item.theGeom},
                 #{item.importCode},
+                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -82,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_gis_cjqy
         <trim prefix="SET" suffixOverrides=",">
             <if test="CJQYMC != null and CJQYMC != ''">CJQYMC = #{CJQYMC},</if>
-            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
             <if test="BSM != null">BSM = #{BSM},</if>
             <if test="YSDM != null">YSDM = #{YSDM},</if>
-            <if test="fid != null">fid = #{fid},</if>
+            <if test="theGeom != null">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
+            <if test="fid != null">fid = #{fid},</if>
         </trim>
         where CJQYDM = #{CJQYDM}
     </update>
@@ -97,11 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update t_gis_cjqy
             <set>
                 <if test="item.CJQYMC != null and item.CJQYMC != ''">CJQYMC = #{item.CJQYMC},</if>
-                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
                 <if test="item.BSM != null">BSM = #{item.BSM},</if>
                 <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
+                <if test="item.theGeom != null">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
+                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
             where CJQYDM = #{item.CJQYDM}
         </foreach>

ruoyi-business/src/main/resources/mapper/business/TGisXjqyMapper.xml

@@ -7,22 +7,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TGisXjqy" id="TGisXjqyResult">
         <result property="XJQYDM"    column="XJQYDM"    />
         <result property="XJQYMC"    column="XJQYMC"    />
-        <result property="theGeom"    column="the_geom"    />
         <result property="BSM"    column="BSM"    />
         <result property="YSDM"    column="YSDM"    />
-        <result property="fid"    column="fid"    />
+        <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
+        <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisXjqyVo">
-        select XJQYDM, XJQYMC, the_geom, BSM, YSDM, fid, import_code from t_gis_xjqy
+        select XJQYDM, XJQYMC, BSM, YSDM, the_geom, import_code, fid from t_gis_xjqy
     </sql>
 
     <select id="selectTGisXjqyList" parameterType="TGisXjqy" resultMap="TGisXjqyResult">
         <include refid="selectTGisXjqyVo"/>
         <where>
             <if test="XJQYDM != null  and XJQYDM != ''"> and XJQYDM = #{XJQYDM}</if>
+            <if test="XJQYMC != null  and XJQYMC != ''"> and XJQYMC = #{XJQYMC}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
+            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
@@ -36,20 +38,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="XJQYDM != null">XJQYDM,</if>
             <if test="XJQYMC != null and XJQYMC != ''">XJQYMC,</if>
-            <if test="theGeom != null and theGeom != ''">the_geom,</if>
             <if test="BSM != null">BSM,</if>
             <if test="YSDM != null">YSDM,</if>
-            <if test="fid != null">fid,</if>
+            <if test="theGeom != null and theGeom != ''">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
+            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="XJQYDM != null">#{XJQYDM},</if>
             <if test="XJQYMC != null and XJQYMC != ''">#{XJQYMC},</if>
-            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
             <if test="BSM != null">#{BSM},</if>
             <if test="YSDM != null">#{YSDM},</if>
-            <if test="fid != null">#{fid},</if>
+            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
+            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
@@ -58,22 +60,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             XJQYDM,
             XJQYMC,
-            the_geom,
             BSM,
             YSDM,
-            fid,
+            the_geom,
             import_code,
+            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 #{item.XJQYDM},
                 #{item.XJQYMC},
-                #{item.theGeom},
                 #{item.BSM},
                 #{item.YSDM},
-                #{item.fid},
+                #{item.theGeom},
                 #{item.importCode},
+                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -82,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_gis_xjqy
         <trim prefix="SET" suffixOverrides=",">
             <if test="XJQYMC != null and XJQYMC != ''">XJQYMC = #{XJQYMC},</if>
-            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
             <if test="BSM != null">BSM = #{BSM},</if>
             <if test="YSDM != null">YSDM = #{YSDM},</if>
-            <if test="fid != null">fid = #{fid},</if>
+            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
+            <if test="fid != null">fid = #{fid},</if>
         </trim>
         where XJQYDM = #{XJQYDM}
     </update>
@@ -97,11 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update t_gis_xjqy
             <set>
                 <if test="item.XJQYMC != null and item.XJQYMC != ''">XJQYMC = #{item.XJQYMC},</if>
-                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
                 <if test="item.BSM != null">BSM = #{item.BSM},</if>
                 <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
+                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
+                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
             where XJQYDM = #{item.XJQYDM}
         </foreach>

ruoyi-business/src/main/resources/mapper/business/TGisXjxzqMapper.xml

@@ -7,22 +7,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TGisXjxzq" id="TGisXjxzqResult">
         <result property="XZQDM"    column="XZQDM"    />
         <result property="XZQMC"    column="XZQMC"    />
-        <result property="theGeom"    column="the_geom"    />
         <result property="BSM"    column="BSM"    />
         <result property="YSDM"    column="YSDM"    />
-        <result property="fid"    column="fid"    />
+        <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
+        <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisXjxzqVo">
-        select XZQDM, XZQMC, the_geom, BSM, YSDM, fid, import_code from t_gis_xjxzq
+        select XZQDM, XZQMC, BSM, YSDM, the_geom, import_code, fid from t_gis_xjxzq
     </sql>
 
     <select id="selectTGisXjxzqList" parameterType="TGisXjxzq" resultMap="TGisXjxzqResult">
         <include refid="selectTGisXjxzqVo"/>
         <where>
             <if test="XZQDM != null  and XZQDM != ''"> and XZQDM = #{XZQDM}</if>
+            <if test="XZQMC != null  and XZQMC != ''"> and XZQMC = #{XZQMC}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
+            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
@@ -36,20 +38,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="XZQDM != null">XZQDM,</if>
             <if test="XZQMC != null and XZQMC != ''">XZQMC,</if>
-            <if test="theGeom != null and theGeom != ''">the_geom,</if>
             <if test="BSM != null">BSM,</if>
             <if test="YSDM != null">YSDM,</if>
-            <if test="fid != null">fid,</if>
+            <if test="theGeom != null and theGeom != ''">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
+            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="XZQDM != null">#{XZQDM},</if>
             <if test="XZQMC != null and XZQMC != ''">#{XZQMC},</if>
-            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
             <if test="BSM != null">#{BSM},</if>
             <if test="YSDM != null">#{YSDM},</if>
-            <if test="fid != null">#{fid},</if>
+            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
+            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
@@ -58,22 +60,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             XZQDM,
             XZQMC,
-            the_geom,
             BSM,
             YSDM,
-            fid,
+            the_geom,
             import_code,
+            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
                 #{item.XZQDM},
                 #{item.XZQMC},
-                #{item.theGeom},
                 #{item.BSM},
                 #{item.YSDM},
-                #{item.fid},
+                #{item.theGeom},
                 #{item.importCode},
+                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -82,11 +84,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_gis_xjxzq
         <trim prefix="SET" suffixOverrides=",">
             <if test="XZQMC != null and XZQMC != ''">XZQMC = #{XZQMC},</if>
-            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
             <if test="BSM != null">BSM = #{BSM},</if>
             <if test="YSDM != null">YSDM = #{YSDM},</if>
-            <if test="fid != null">fid = #{fid},</if>
+            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
+            <if test="fid != null">fid = #{fid},</if>
         </trim>
         where XZQDM = #{XZQDM}
     </update>
@@ -97,11 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update t_gis_xjxzq
             <set>
                 <if test="item.XZQMC != null and item.XZQMC != ''">XZQMC = #{item.XZQMC},</if>
-                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
                 <if test="item.BSM != null">BSM = #{item.BSM},</if>
                 <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
+                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
+                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
             where XZQDM = #{item.XZQDM}
         </foreach>