自定义模板导出代码 暂存

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

@@ -20,7 +20,6 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -79,34 +78,4 @@ public class IcFormItemGroupDTO implements Serializable {
      */
 	private Boolean display;
 
-    /**
-     * 0未删除，1已删除
-     */
-	private Integer delFlag;
-
-    /**
-     * 乐观锁
-     */
-	private Integer revision;
-
-    /**
-     * 创建人
-     */
-	private String createdBy;
-
-    /**
-     * 创建时间
-     */
-	private Date createdTime;
-
-    /**
-     * 更新人
-     */
-	private String updatedBy;
-
-    /**
-     * 更新时间
-     */
-	private Date updatedTime;
-
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormItemGroupLisFormDTO.java

@@ -0,0 +1,84 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.validator.group.QueryGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+
+/**
+ * 表单项分组查询条件
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemGroupLisFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分组id
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+    @NotBlank(message = "客户Id不能为空", groups = QueryGroup.class)
+	private String customerId;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单编码
+     */
+    @NotBlank(message = "表单编码不能为空", groups = QueryGroup.class)
+	private String formCode;
+
+    /**
+     * 对应的子表名称
+     */
+	private String tableName;
+
+    /**
+     * 是否支持添加一行，1支持，默认0不支持
+     */
+	private Boolean supportAdd;
+
+    /**
+     * 名称
+     */
+	private String label;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 1展示，0不展示，默认1
+     */
+	private Boolean display;
+}

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

@@ -17,23 +17,20 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.QueryGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcFormItemGroupDTO;
-import com.epmet.excel.IcFormItemGroupExcel;
+import com.epmet.dto.form.IcFormItemGroupLisFormDTO;
 import com.epmet.service.IcFormItemGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -49,10 +46,12 @@ public class IcFormItemGroupController {
     @Autowired
     private IcFormItemGroupService icFormItemGroupService;
 
-    @GetMapping("page")
+    @PostMapping("list")
-    public Result<PageData<IcFormItemGroupDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<List<IcFormItemGroupDTO>> page(@RequestHeader String customerId, @RequestBody IcFormItemGroupLisFormDTO param){
-        PageData<IcFormItemGroupDTO> page = icFormItemGroupService.page(params);
+        param.setCustomerId(customerId);
-        return new Result<PageData<IcFormItemGroupDTO>>().ok(page);
+        ValidatorUtils.validateEntity(param, QueryGroup.class);
+        List<IcFormItemGroupDTO> page = icFormItemGroupService.list(param);
+        return new Result<List<IcFormItemGroupDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
@@ -85,10 +84,5 @@ public class IcFormItemGroupController {
         return new Result();
     }
 
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IcFormItemGroupDTO> list = icFormItemGroupService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemGroupExcel.class);
-    }
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcExportTemplateConfigEntity.java

@@ -28,6 +28,11 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity {
      */
 	private String tempId;
 
+	/**
+	 * 项标签
+	 */
+	private String label;
+
     /**
      * 父id
      */
@@ -43,11 +48,6 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity {
      */
 	private Integer width;
 
-    /**
-     * 项标签
-     */
-	private String label;
-
     /**
      * 排序
      */

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

@@ -18,12 +18,11 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcFormItemGroupDTO;
+import com.epmet.dto.form.IcFormItemGroupLisFormDTO;
 import com.epmet.entity.IcFormItemGroupEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 表单项分组
@@ -33,16 +32,6 @@ import java.util.Map;
  */
 public interface IcFormItemGroupService extends BaseService<IcFormItemGroupEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IcFormItemGroupDTO>
-     * @author generator
-     * @date 2021-10-26
-     */
-    PageData<IcFormItemGroupDTO> page(Map<String, Object> params);
-
     /**
      * 默认查询
      *
@@ -51,7 +40,7 @@ public interface IcFormItemGroupService extends BaseService<IcFormItemGroupEntit
      * @author generator
      * @date 2021-10-26
      */
-    List<IcFormItemGroupDTO> list(Map<String, Object> params);
+    List<IcFormItemGroupDTO> list(IcFormItemGroupLisFormDTO params);
 
     /**
      * 单条查询

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

@@ -17,23 +17,19 @@
 
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcFormItemGroupDao;
 import com.epmet.dto.IcFormItemGroupDTO;
+import com.epmet.dto.form.IcFormItemGroupLisFormDTO;
 import com.epmet.entity.IcFormItemGroupEntity;
 import com.epmet.service.IcFormItemGroupService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 表单项分组
@@ -46,29 +42,15 @@ public class IcFormItemGroupServiceImpl extends BaseServiceImpl<IcFormItemGroupD
 
 
     @Override
-    public PageData<IcFormItemGroupDTO> page(Map<String, Object> params) {
+    public List<IcFormItemGroupDTO> list(IcFormItemGroupLisFormDTO params) {
-        IPage<IcFormItemGroupEntity> page = baseDao.selectPage(
+        LambdaQueryWrapper<IcFormItemGroupEntity> wrapper = new LambdaQueryWrapper<>();
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        wrapper.eq(IcFormItemGroupEntity::getCustomerId, params.getCustomerId())
-                getWrapper(params)
+        .orderByAsc(IcFormItemGroupEntity::getSort);
-        );
-        return getPageData(page, IcFormItemGroupDTO.class);
-    }
-
-    @Override
-    public List<IcFormItemGroupDTO> list(Map<String, Object> params) {
-        List<IcFormItemGroupEntity> entityList = baseDao.selectList(getWrapper(params));
 
+        List<IcFormItemGroupEntity> entityList = baseDao.selectList(wrapper);
         return ConvertUtils.sourceToTarget(entityList, IcFormItemGroupDTO.class);
     }
 
-    private QueryWrapper<IcFormItemGroupEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IcFormItemGroupEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
 
     @Override
     public IcFormItemGroupDTO get(String id) {