删除多余的方法

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -1,7 +1,6 @@
 package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
 import com.epmet.dto.IcFormItemOptionsDTO;
@@ -171,10 +170,4 @@ public interface OperCustomizeOpenFeignClient {
     @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport")
     Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param);
 
-    /**
-     * @author sun
-     * @Description 居民信息自定义模板导出--保存模板
-     */
-    @PostMapping("/oper/customize/icExportTemplate/save")
-    Result<List<IcExportTemplateForExportResultDTO>> save(@RequestBody IcExportTemplateSaveFormDTO formDTO);
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -1,7 +1,6 @@
 package com.epmet.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.CustomerFootBarDTO;
@@ -131,8 +130,4 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param);
     }
 
-	@Override
-	public Result<List<IcExportTemplateForExportResultDTO>> save(IcExportTemplateSaveFormDTO formDTO) {
-		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "save", formDTO);
-	}
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java

@@ -80,15 +80,6 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
      **/
     List<ColumnTableNameResultDTO> getMustColumn(@Param("customerId") String customerId);
 
-    /**
-     * desc:获取需要远程获取并带有关联item的参数的 item项
-     *
-     * @param customerId
-     * @param formCode
-     * @return
-     */
-    List<ConditionResultDTO> getConditionRemoteItems(@Param("customerId") String customerId, @Param("formCode") String formCode);
-
     /**
      * desc:根据Id获取item对应的表名和item属性
      *

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java

@@ -203,20 +203,17 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
             list = this.save(param.getExportConfig());
         }
 
-
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
-        //todo 删除多余的方法
+
-        // List<ConditionResultDTO> remoteItemList = icFormItemDao.getConditionRemoteItems(param.getCustomerId(), param.getFormCode());
         Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList()));
         List<List<String>> headerList = new ArrayList<>();
         List<IcCustomExportResultDTO.SqlColumn> showSqlColumns = new ArrayList<>();
         List<IcCustomExportResultDTO.SqlColumn> hiddenSqlColumns = new ArrayList<>();
         Set<String> hasExistColumnSet = new HashSet<>();
-        resultTemp.get(NumConstant.ZERO_STR).forEach(root -> {
+        resultTemp.get(NumConstant.ZERO_STR)
-            digui(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet);
+                .forEach(root -> recursionData(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet));
-        });
         //组织 关联item项的
         if (hasExistColumnSet.size() > NumConstant.ZERO) {
             Set<String> configItemIdSet = list.stream().map(IcExportTemplateForExportResultDTO::getItemId).collect(Collectors.toSet());
@@ -297,7 +294,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
         return baseDao.getTemplateDetail(formDTO.getId());
     }
 
-    private void digui(Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp, IcExportTemplateForExportResultDTO root, List<List<String>> headerList, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<IcCustomExportResultDTO.SqlColumn> hiddenSqlColumns, Set<String> hasExistColumnSet) {
+    private void recursionData(Map<String, List<IcExportTemplateForExportResultDTO>> resultTemp, IcExportTemplateForExportResultDTO root, List<List<String>> headerList, List<IcCustomExportResultDTO.SqlColumn> showSqlColumns, List<IcCustomExportResultDTO.SqlColumn> hiddenSqlColumns, Set<String> hasExistColumnSet) {
         if (StringUtils.isNotBlank(root.getColumnName())) {
             showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getItemId(),root.getTableName(),root.isSupportAdd(), root.getColumnName(),root.getOptionSourceType()));
             if (StringUtils.isNotBlank(root.getOptionSourceValue())&&root.getOptionSourceValue().contains(StrConstant.QUESTION_MARK)) {
@@ -315,7 +312,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
             headerGroupList.add(root.getLabel());
             headerGroupList.add(o.getLabel());
             headerList.add(headerGroupList);
-            digui(resultTemp, o, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet);
+            recursionData(resultTemp, o, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet);
         });
     }
 

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml

@@ -226,21 +226,6 @@
             )
             order by g.sort asc
     </select>
-    <select id="getConditionRemoteItems" resultType="com.epmet.dto.result.ConditionResultDTO">
-        SELECT
-            ifi.ID AS itemId,
-            ifi.OPTION_SOURCE_VALUE,
-            ifig.TABLE_NAME,
-            concat(ifi.COLUMN_NAME, if(ifi.COLUMN_NUM = 0, '', ifi.COLUMN_NUM)) columnName
-         FROM  ic_form_item ifi LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID
-         WHERE
-             ifi.OPTION_SOURCE_TYPE = 'remote'
-             AND ifi.OPTION_SOURCE_VALUE like '%?%'
-             AND ifi.CUSTOMER_ID = #{customerId}
-             AND ifi.FORM_CODE = #{formCode}
-             and ifi.DEL_FLAG = '0'
-             AND ifig.DEL_FLAG = '0'
-    </select>
     <select id="getConditionItem" resultType="com.epmet.dto.result.ConditionResultDTO">
          SELECT
             ifi.ID AS itemId,