业务新增字段，及数据导入

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

@@ -21,6 +21,8 @@ public class Tdhyhs extends BaseId {
     // 新增字段
     private String jsdw;                // 建设单位
     private String gljsgcghxkh;         // 关联建设工程规划许可号
+    // 新增字段
+    private String hyyj;                // 审核意见
 
     private Boolean hasOnchain;         // 是否上链
     private String creatorId;           // 创建人ID

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/TdhyhsVo.java

@@ -14,4 +14,6 @@ public class TdhyhsVo {
     private String fzDate;              // 发证日期
     private String jsdw;                // 建设单位
     private String gljsgcghxkh;         // 关联建设工程规划许可号
+    private String hyyj;                // 核验意见
+
 }

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

@@ -93,12 +93,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (int i = 0; i < ds.GetLayerCount(); i++) {
                 Layer layer = ds.GetLayer(i);
                 String layerName = layer.GetName();
-                //todo 相关代码
-                if (!layerName.equalsIgnoreCase("T_CGZJ_CWTC_M")
-                        && !layerName.equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                ) {
-                    continue;
-                }
+
                 boolean haveGeom = false;
                 //获取字段信息
                 List<String> dbFieldNameList = cadastreFileMapper.selectTableCollum(layerName.toLowerCase(Locale.ROOT));
@@ -253,12 +248,7 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (int i = 0; i < ds.GetLayerCount(); i++) {
                 Layer layer = ds.GetLayer(i);
                 String layerName = layer.GetName();
-                //todo 相关代码
-                if (!layerName.equalsIgnoreCase("T_CGZJ_CWTC_M")
-                        && !layerName.equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                ) {
-                    continue;
-                }
+
                 CompareGemoVo compareGemoVo = new CompareGemoVo();
                 compareGemoVo.setLayerName(layerName);
                 List<String> layerGeom = getLayerGeom(layer);
@@ -420,13 +410,6 @@ public class CadastreManageServiceImpl implements CadastreManageService {
                 //这里进行遍历每个图层
                 for (int i = 0; i < ds.GetLayerCount(); i++) {
                     Layer layer = ds.GetLayer(i);
-                    //todo 相关代码
-                    if (
-                            !layer.GetName().equalsIgnoreCase("T_CGZJ_CWTC_M") &&
-                                    !layer.GetName().equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                    ) {
-                        continue;
-                    }
                     //todo 测试代码
                     //这里做质量检查
                     CheckInfoVo checkRes = checkLayerInfo(layer, allTableList, uploadFile.getId());
@@ -1048,13 +1031,6 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             }
 
             for (String layerName : fileTableNameList) {
-                if (!layerName.equalsIgnoreCase("T_CGZJ_CWTC_M")
-                        && !layerName.equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                        && !layerName.equalsIgnoreCase("City")
-                        && !layerName.equalsIgnoreCase("XZQ")
-                ) {
-                    continue;
-                }
                 //校验是否都有历史版本
                 Integer count = cadastreFileMapper.countByValidFlag("1", layerName.toLowerCase(Locale.ROOT));
                 if (count == 0) {
@@ -1063,14 +1039,6 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             }
 
             for (String layerName : fileTableNameList) {
-                if (
-                        !layerName.equalsIgnoreCase("T_CGZJ_CWTC_M")
-                                && !layerName.equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                                && !layerName.equalsIgnoreCase("City")
-                                && !layerName.equalsIgnoreCase("XZQ")
-                ) {
-                    continue;
-                }
 
                 cadastreFileMapper.deleteByValidFlag("0", layerName.toLowerCase(Locale.ROOT));
                 cadastreFileMapper.updateValidFlag("0", "1", layerName.toLowerCase(Locale.ROOT));
@@ -1157,12 +1125,6 @@ public class CadastreManageServiceImpl implements CadastreManageService {
             for (int i = 0; i < ds.GetLayerCount(); i++) {
                 Layer layer = ds.GetLayer(i);
                 String layerName = layer.GetName();
-                //todo 相关代码
-                if (!layerName.equalsIgnoreCase("T_CGZJ_CWTC_M")
-                        && !layerName.equalsIgnoreCase("T_FZSS_FXRW_GIS")
-                ) {
-                    continue;
-                }
                 LayerAndDbData layerAndDbData = new LayerAndDbData();
                 layerAndDbData.setCurrentTableName(layerName);
 

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

@@ -29,11 +29,11 @@
     <!-- 添加记录 -->
     <insert id="add" parameterType="com.siwei.apply.domain.Tdhyhs">
         INSERT INTO t_tdhyhs (id, project_id, ydwz, hgzh, fzjg, fz_date,
-                               jsdw, gljsgcghxkh,
+                               jsdw, gljsgcghxkh,hyyj,
                                has_onchain, creator_id,
                                created_at, updated_at)
         VALUES (#{id}, #{projectId}, #{ydwz}, #{hgzh}, #{fzjg}, #{fzDate},
-                #{jsdw}, #{gljsgcghxkh},
+                #{jsdw}, #{gljsgcghxkh},#{hyyj},
                 false, #{creatorId},
                 now(), now())
     </insert>