增加制图单位等

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -174,6 +174,18 @@ public class CadastreManageController extends BaseController {
     }
 
 
+    @RequestMapping("/testRun")
+    public R<Object> testRun() {
+        try {
+            cadastreManageService.testRun();
+            return R.ok(null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
 
 
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/ThematicTask.java

@@ -39,6 +39,13 @@ public class ThematicTask extends BaseId {
      * 制图人员
      */
     private String ztry;
+    
+
+     /**
+     * 制图单位
+     */
+    private String ztdw;
+    
 
     /**
      * 创建时间

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/CadastreManageService.java

@@ -31,5 +31,7 @@ public interface CadastreManageService {
     void batchDelete(List<String> ids);
 
 
+    void testRun();
+
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/impl/CadastreManageServiceImpl.java

@@ -125,8 +125,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         CompareResultVo compareResultVo = new CompareResultVo();
         compareResultVo.setUploadId(uploadId);
         compareResultVo.setResultStatus(true);
-
-        cadastreFileMapper.addValidFlagColumn("t_cgzj_cwtc_m");
+//        cadastreFileMapper.addValidFlagColumn("t_cgzj_cwtc_m");
 //        //todo 这里进行
 //        List<Map<String,String>> collumTypes =  cadastreFileMapper.selectTableCollumAndType("mzdzw");
         if(true){
@@ -576,6 +575,36 @@ public class CadastreManageServiceImpl implements CadastreManageService {
         cadastreFileMapper.batchDelete(ids);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void testRun(){
+        //这里批量增修改表结构增加校验字段：
+        String[] arr = new String[]{
+            "tdgy_jh",
+            "tdjyq",
+            "TB_TDGY_SJ",
+            "t_cgzj_cwtc_m",
+            "t_cgzj_cwtc_m_bak1",
+            "t_cgzj_cwtc_m_copy1",
+            "public_dict",
+            "spatial_ref_sys"
+        };
+
+        //获取库中表名
+        //List<String> allTableList = cadastreFileMapper.selectAllTable();
+        List<String> allTableList = cadastreFileMapper.selectAllTableNoView();
+        allTableList.removeAll(Arrays.asList(arr));
+
+        // 对每个表名执行添加校验字段的操作
+        for (String tableName : allTableList) {
+            System.out.println("正在处理表: " + tableName);
+            cadastreFileMapper.addValidFlagColumn(tableName);
+            System.out.println("正在处理表: " + tableName + " 完成");
+        }
+
+    }
+
+
 
 
 }

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -89,6 +89,9 @@
             <if test="projectType != null and projectType != 0">
                 AND project_type = #{projectType}
             </if>
+            <if test="isOnchain != null and isOnchain==true">
+                AND on_chain_num > 0
+            </if>
         </where>
     </select>
     <update id="update" parameterType="com.siwei.apply.domain.vo.ProjectUpdateVo">

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/CadastreFileMapper.xml

@@ -151,10 +151,12 @@
     </select>
 
     <update id="addValidFlagColumn">
+            COMMENT ON COLUMN vector.${tableName}."valid_flag" IS '有效标识：0-当前版本，1-历史版本';
+    </update>
+    <update id="addValidFlagColumn2">
         ALTER TABLE vector.${tableName} ADD COLUMN IF NOT EXISTS valid_flag int2
     </update>
 
-
     <select id="getListByFilter" parameterType="com.siwei.apply.domain.vo.CadastreFileFilterVo" resultMap="cadastreFileMap">
         SELECT <include refid="Base_Column_List"/>
         FROM t_cadastre_file