Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FormItemBaseResult.java

@@ -0,0 +1,59 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 基础表单项
+ * @Author yinzuomei
+ * @Date 2021/10/26 2:15 下午
+ */
+@Data
+public class FormItemBaseResult implements Serializable {
+
+    private static final long serialVersionUID = 5946318248252730101L;
+    /**
+     * ID
+     */
+    private String itemId;
+
+
+
+    /**
+     * 项标签
+     */
+    private String label;
+
+    /**
+     * 分组ID,'默认，NONE'
+     */
+    private String itemGroupId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 默认：ic_resi_user
+     */
+    private String tableName;
+
+    /**
+     * 拼好的列名
+     */
+    private String columnName;
+
+    /**
+     * 选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取
+     */
+    private String optionSourceType;
+
+    /**
+     * 来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取
+     */
+    private String optionSourceValue;
+
+}
+

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java

@@ -21,7 +21,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.EditIFormItemFormDTO;
 import com.epmet.dto.result.ColumnTableNameResultDTO;
-import com.epmet.dto.result.FormItemResult;
+import com.epmet.dto.result.FormItemBaseResult;
 import com.epmet.dto.result.ResiCategoryItemResultDTO;
 import com.epmet.service.IcFormItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -95,8 +95,8 @@ public class IcFormItemController {
      * @return
      */
     @PostMapping("getItemList/{groupId}")
-    public Result<List<FormItemResult>> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){
-        List<FormItemResult> list = icFormItemService.getItemListByGroupId(customerId,groupId);
+    public Result<List<FormItemBaseResult>> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){
+        List<FormItemBaseResult> list = icFormItemService.getItemListByGroupId(customerId,groupId);
         return new Result().ok(list);
     }
 }

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

@@ -104,5 +104,5 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
      * @param groupId
      * @return
      */
-    List<FormItemResult> getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId);
+    List<FormItemBaseResult> getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId);
 }

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

@@ -90,5 +90,5 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
      * @param groupId
      * @return
      */
-    List<FormItemResult> getItemListByGroupId(String customerId, String groupId);
+    List<FormItemBaseResult> getItemListByGroupId(String customerId, String groupId);
 }

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

@@ -265,7 +265,7 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
     }
 
     @Override
-    public List<FormItemResult> getItemListByGroupId(String customerId, String groupId) {
+    public List<FormItemBaseResult> getItemListByGroupId(String customerId, String groupId) {
         return baseDao.getItemListByGroupId(customerId,groupId);
     }
 

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

@@ -256,7 +256,7 @@
             and ifi.DEL_FLAG = '0'
             AND ifig.DEL_FLAG = '0'
     </select>
-    <select id="getItemListByGroupId" resultType="com.epmet.dto.result.FormItemResult">
+    <select id="getItemListByGroupId" resultType="com.epmet.dto.result.FormItemBaseResult">
         SELECT
             ifi.ID itemId,
             ifi.CUSTOMER_ID,

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserExportServiceImpl.java

@@ -91,7 +91,6 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
         String templateId = exportResiUserFormDTO.getTemplateId();
 
-
         ExcelWriter excelWriter = null;
         try {
             //获取用户配置的导出条件
@@ -160,11 +159,13 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
 
                 List<List<Object>> resultData = new ArrayList<>();
 
+                List<IcCustomExportResultDTO.SqlColumn> showSqlColumns = exportConfigData.getShowSqlColumns();
+                Set<String> hiddenColumnSet = exportConfigData.getHiddenSqlColumns().stream().map(IcCustomExportResultDTO.SqlColumn::getColumnName).collect(Collectors.toSet());
                 result.forEach(o -> {
                     List<Object> singleResult = new ArrayList<>();
                     Map<String, Object> originalConditionMap = new ConcurrentHashMap<>();
                     o.forEach((key, value) -> {
-                        List<IcCustomExportResultDTO.SqlColumn> showSqlColumns = exportConfigData.getShowSqlColumns();
+
                         Map<String, IcCustomExportResultDTO.SqlColumn> itemMap = showSqlColumns.stream().collect(Collectors.toMap(IcCustomExportResultDTO.SqlColumn::getColumnName, item -> item));
 
                         IcCustomExportResultDTO.SqlColumn columnDTO = itemMap.get(key);
@@ -173,7 +174,9 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
                             String tableName = sqlColumn.getTableName();
                             String itemId = sqlColumn.getItemId();
                             String columnName = columnDTO.getColumnName();
-
+                            if (hiddenColumnSet.contains(columnName)){
+                                return;
+                            }
                             String vauleStr = value == null ? StrConstant.EPMETY_STR : value.toString();
                             //保留原始值 便于remote条件获取
                             originalConditionMap.putIfAbsent(columnName, vauleStr);