字段添加

BJYSYBZ_C/src/views/WlydtbView/components/FourContent.vue

@@ -121,6 +121,25 @@
                       </el-option>
                     </el-select>
                   </td>
+                  <th>是否农转用</th>
+                  <td>
+                    <el-select v-model="query.sfwcnzy" placeholder="请选择" size="medium" style="width: 100%" clearable>
+                      <el-option
+                        label="全部"
+                        value="">
+                      </el-option>
+                      <el-option
+                        label="是"
+                        value="是">
+                      </el-option>
+                      <el-option
+                        label="否"
+                        value="否">
+                      </el-option>
+                    </el-select>
+                  </td>
+                </tr>
+                <tr>
                   <th>是否净地</th>
                   <td>
                     <el-select v-model="query.sfjd" placeholder="请选择" size="medium" style="width: 100%" clearable>
@@ -138,6 +157,8 @@
                       </el-option>
                     </el-select>
                   </td>
+                  <th></th>
+                  <td></td>
                 </tr>
               </table>
             </div>
@@ -223,7 +244,8 @@ export default {
         lx: '',
         zqscqk: '',
         scsj: '',
-        sfjd: ''
+        sfjd: '',
+        sfwcnzy: ''
       },
       foldShow: false,
       crjhs: [ '2023年', '2024年', '2025年','2026年','远期' ],
@@ -321,6 +343,13 @@ export default {
       } else if (this.query.sfjd === '否') {
         refreshP += ` and (sfjd = '${this.query.sfjd}' or sfjd is null)`
       }
+
+      if (this.query.sfwcnzy === '是') {
+        refreshP += ` and sfwcnzy = '${this.query.sfwcnzy}'`
+      } else if (this.query.sfwcnzy === '否') {
+        refreshP += ` and (sfwcnzy = '${this.query.sfwcnzy}' or sfwcnzy is null)`
+      }
+
       if (this.query.zqscqk === '是') {
         refreshP += ` and sfwczq = '${this.query.zqscqk}'`
       } else if (this.query.zqscqk === '否') {

BJYSYBZ_C/src/views/WlydxqView/components/FourContent.vue

@@ -121,6 +121,25 @@
                       </el-option>
                     </el-select>
                   </td>
+                  <th>是否农转用</th>
+                  <td>
+                    <el-select v-model="query.sfwcnzy" placeholder="请选择" size="medium" style="width: 100%" clearable>
+                      <el-option
+                        label="全部"
+                        value="">
+                      </el-option>
+                      <el-option
+                        label="是"
+                        value="是">
+                      </el-option>
+                      <el-option
+                        label="否"
+                        value="否">
+                      </el-option>
+                    </el-select>
+                  </td>
+                </tr>
+                <tr>
                   <th>是否净地</th>
                   <td>
                     <el-select v-model="query.sfjd" placeholder="请选择" size="medium" style="width: 100%" clearable>
@@ -138,6 +157,8 @@
                       </el-option>
                     </el-select>
                   </td>
+                  <th></th>
+                  <td></td>
                 </tr>
               </table>
             </div>
@@ -219,7 +240,8 @@ export default {
         status: '',
         zqscqk: '',
         scsj: '',
-        sfjd: ''
+        sfjd: '',
+        sfwcnzy: ''
       },
       options: [
         {
@@ -391,6 +413,13 @@ export default {
       } else if (this.query.sfjd === '否') {
         refreshP += ` and (sfjd = '${this.query.sfjd}' or sfjd is null)`
       }
+
+      if (this.query.sfwcnzy === '是') {
+        refreshP += ` and sfwcnzy = '${this.query.sfwcnzy}'`
+      } else if (this.query.sfwcnzy === '否') {
+        refreshP += ` and (sfwcnzy = '${this.query.sfwcnzy}' or sfwcnzy is null)`
+      }
+      
       if (this.query.zqscqk === '是') {
         refreshP += ` and sfwczq = '${this.query.zqscqk}'`
       } else if (this.query.zqscqk === '否') {

BJYSYBZ_S/src/main/java/com/zjugis/ysgzybz/domain/dto/CommonDTO.java

@@ -40,6 +40,7 @@ public class CommonDTO extends PageDTO {
     private String zqscqk;
     private String scsj;
     private String sfjd;
+    private String sfwcnzy;
     private String dkmc;
     private String tdqlr;
     private String tzxmmc;

BJYSYBZ_S/src/main/resources/mapper/YbzBJMapper.xml

@@ -167,6 +167,12 @@
         <if test="dto.sfjd == '否'.toString()">
           and (sfjd = #{dto.sfjd} or sfjd is null)
         </if>
+        <if test="dto.sfwcnzy == '是'.toString()">
+            and sfwcnzy = #{dto.sfwcnzy}
+        </if>
+        <if test="dto.sfwcnzy == '否'.toString()">
+            and (sfwcnzy = #{dto.sfwcnzy} or sfwcnzy is null or sfwcnzy = ' ')
+        </if>
         <if test="dto.name != null and dto.name !=''">
           and dkbh like concat('%',concat(#{dto.name}, '%'))
         </if>
@@ -227,6 +233,19 @@
         <if test="zqscqk == '否'.toString()">
             and (sfwczq = #{zqscqk} or sfwczq is null)
         </if>
+
+        <if test="sfjd == '是'.toString()">
+            and sfjd = #{sfjd}
+        </if>
+        <if test="sfjd == '否'.toString()">
+            and (sfjd = #{sfjd} or sfjd is null)
+        </if>
+        <if test="sfwcnzy == '是'.toString()">
+            and sfwcnzy = #{sfwcnzy}
+        </if>
+        <if test="sfwcnzy == '否'.toString()">
+            and (sfwcnzy = #{sfwcnzy} or sfwcnzy is null or sfwcnzy = ' ')
+        </if>
     </select>
 
     <select id="wlydTdytTJ" parameterType="com.zjugis.ysgzybz.domain.dto.CommonDTO" resultType="java.util.Map">