获取右侧item接口

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

@@ -3,7 +3,6 @@ package com.epmet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 
 /**
@@ -52,34 +51,4 @@ public class IcExportTemplateDTO implements Serializable {
      */
 	private Integer sort;
 
-    /**
-     * 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/IcExportTemplateFormDTO.java → epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcExportTemplateQueryFormDTO.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * @since v1.0.0 2022-04-21
  */
 @Data
-public class IcExportTemplateFormDTO implements Serializable {
+public class IcExportTemplateQueryFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -0,0 +1,65 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 自定义表单导出模板
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-04-21
+ */
+@Data
+public class IcExportTemplateSaveFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+    private String formCode;
+
+    /**
+     * 模板名称
+     */
+    @NotBlank(message = "模板名称不能为空",groups = AddGroup.class)
+	private String name;
+
+    /**
+     * 0:动态；1:文件
+     */
+    private Integer type;
+
+    /**
+     * 父id
+     */
+    private String pid;
+
+    /**
+     * ic_form_item.id
+     */
+    @NotBlank(message = "itemId不能为空",groups = AddGroup.class)
+    private String itemId;
+
+    /**
+     * 表头宽度
+     */
+    private Integer width;
+
+    /**
+     * 项标签
+     */
+    @NotBlank(message = "名称不能为空",groups = AddGroup.class)
+    private String label;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}

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

@@ -16,7 +16,7 @@ public class FormItemResult implements Serializable {
     private static final long serialVersionUID = 7443085469505238040L;
 
     /**
-     * 父项ID
+     * ID
      */
     private String itemId;
 

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

@@ -168,5 +168,5 @@ public interface OperCustomizeOpenFeignClient {
      * @return
      */
     @PostMapping("/oper/customize/icExportTemplate/getExcelHeaderAndSqlColumnForExport")
-    Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param);
+    Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param);
 }

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

@@ -126,7 +126,7 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 	}
 
     @Override
-    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(IcExportTemplateFormDTO param) {
+    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(IcExportTemplateQueryFormDTO param) {
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getExcelHeaderAndSqlColumnForExport", param);
     }
 }

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

@@ -6,10 +6,10 @@ 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.DefaultGroup;
 import com.epmet.commons.tools.validator.group.ExportGroup;
 import com.epmet.dto.IcExportTemplateDTO;
-import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
+import com.epmet.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.service.IcExportTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +45,9 @@ public class IcExportTemplateController {
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody IcExportTemplateDTO dto) {
+    public Result save(@RequestBody IcExportTemplateSaveFormDTO dto) {
         //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(dto, AddGroup.class);
         icExportTemplateService.save(dto);
         return new Result();
     }
@@ -68,7 +68,7 @@ public class IcExportTemplateController {
      * @return
      */
     @PostMapping("getExcelHeaderAndSqlColumnForExport")
-    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateFormDTO param) {
+    public Result<IcCustomExportResultDTO> getExcelHeaderAndSqlColumnForExport(@RequestBody IcExportTemplateQueryFormDTO param) {
         ValidatorUtils.validateEntity(param, ExportGroup.class);
         return new Result().ok(icExportTemplateService.getTemplateConfigForExport(param));
     }

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

@@ -21,6 +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.ResiCategoryItemResultDTO;
 import com.epmet.service.IcFormItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,4 +89,14 @@ public class IcFormItemController {
         icFormItemService.initQueryBuilder(customerId);
         return new Result();
     }
+
+    /**
+     * 根据分组id 获取分组下的item
+     * @return
+     */
+    @PostMapping("getItemList/{groupId}")
+    public Result<List<FormItemResult>> getItemListByGroupId(@RequestHeader String customerId, @PathVariable("groupId") String groupId){
+        List<FormItemResult> list = icFormItemService.getItemListByGroupId(customerId,groupId);
+        return new Result().ok(list);
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
 import com.epmet.dto.result.IcExportTemplateForExportResultDTO;
 import com.epmet.entity.IcExportTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,5 +17,5 @@ import java.util.List;
 @Mapper
 public interface IcExportTemplateDao extends BaseDao<IcExportTemplateEntity> {
 
-    List<IcExportTemplateForExportResultDTO> getTemplateConfigForExport(IcExportTemplateFormDTO param);
+    List<IcExportTemplateForExportResultDTO> getTemplateConfigForExport(IcExportTemplateQueryFormDTO param);
 }

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

@@ -91,8 +91,18 @@ public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
 
     /**
      * desc:根据Id获取item对应的表名和item属性
+     *
      * @param itemId
      * @return
      */
     ConditionResultDTO getConditionItem(@Param("itemId") String itemId);
+
+    /**
+     * desc:根据客户Id 和groupId 获取item配置项
+     *
+     * @param customerId
+     * @param groupId
+     * @return
+     */
+    List<FormItemResult> getItemListByGroupId(@Param("customerId") String customerId, @Param("groupId") String groupId);
 }

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

@@ -41,7 +41,7 @@ public class IcExportTemplateConfigEntity extends BaseEpmetEntity {
     /**
      * ic_form_item.id
      */
-	private String formItemId;
+	private String itemId;
 
     /**
      * 表头宽度

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

@@ -3,7 +3,8 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcExportTemplateDTO;
-import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
+import com.epmet.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.entity.IcExportTemplateEntity;
 
@@ -56,17 +57,7 @@ public interface IcExportTemplateService extends BaseService<IcExportTemplateEnt
      * @author generator
      * @date 2022-04-21
      */
-    void save(IcExportTemplateDTO dto);
+    void save(IcExportTemplateSaveFormDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-04-21
-     */
-    void update(IcExportTemplateDTO dto);
 
     /**
      * 批量删除
@@ -86,5 +77,5 @@ public interface IcExportTemplateService extends BaseService<IcExportTemplateEnt
      * @author LiuJanJun
      * @date 2022/4/22 3:55 下午
      */
-    IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateFormDTO param);
+    IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateQueryFormDTO param);
 }

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

@@ -83,4 +83,12 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
      * @param customerId
      */
     void initQueryBuilder(String customerId);
+
+    /**
+     * desc:根据groupId 获取itemlist
+     * @param customerId
+     * @param groupId
+     * @return
+     */
+    List<FormItemResult> getItemListByGroupId(String customerId, String groupId);
 }

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

@@ -11,7 +11,8 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcExportTemplateDao;
 import com.epmet.dao.IcFormItemDao;
 import com.epmet.dto.IcExportTemplateDTO;
-import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
+import com.epmet.dto.form.IcExportTemplateSaveFormDTO;
 import com.epmet.dto.result.ConditionResultDTO;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.dto.result.IcExportTemplateForExportResultDTO;
@@ -75,18 +76,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(IcExportTemplateDTO dto) {
+    public void save(IcExportTemplateSaveFormDTO dto) {
-        IcExportTemplateEntity entity = ConvertUtils.sourceToTarget(dto, IcExportTemplateEntity.class);
+        //TODO
-        insert(entity);
-    }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IcExportTemplateDTO dto) {
-        IcExportTemplateEntity entity = ConvertUtils.sourceToTarget(dto, IcExportTemplateEntity.class);
-        updateById(entity);
     }
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -95,7 +90,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
     }
 
     @Override
-    public IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateFormDTO param) {
+    public IcCustomExportResultDTO getTemplateConfigForExport(IcExportTemplateQueryFormDTO param) {
         List<IcExportTemplateForExportResultDTO> list = icExportTemplateDao.getTemplateConfigForExport(param);
         if (CollectionUtils.isEmpty(list)) {
             return null;

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

@@ -256,6 +256,11 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         }
     }
 
+    @Override
+    public List<FormItemResult> getItemListByGroupId(String customerId, String groupId) {
+        return baseDao.getItemListByGroupId(customerId,groupId);
+    }
+
 
     private String queryType(String itemType) {
         String queryType;

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

@@ -8,7 +8,7 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="tempId" column="TEMP_ID"/>
         <result property="pid" column="PID"/>
-        <result property="formItemId" column="FORM_ITEM_ID"/>
+        <result property="itemId" column="FORM_ITEM_ID"/>
         <result property="width" column="WIDTH"/>
         <result property="label" column="LABEL"/>
         <result property="sort" column="SORT"/>
@@ -21,4 +21,4 @@
     </resultMap>
 
 
-</mapper>
+</mapper>

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

@@ -252,4 +252,15 @@
             and ifi.DEL_FLAG = '0'
             AND ifig.DEL_FLAG = '0'
     </select>
+    <select id="getItemListByGroupId" resultType="com.epmet.dto.result.FormItemResult">
+        SELECT
+            ifi.ID itemId,
+            ifi.CUSTOMER_ID,
+            ifi.ITEM_GROUP_ID,
+            ifi.LABEL,
+            ifi.SORT
+        FROM  ic_form_item ifi WHERE ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
+        AND LENGTH(ifi.COLUMN_NAME)>0
+    </select>
+
 </mapper>

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

@@ -12,7 +12,7 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter;
 import com.epmet.constant.IcResiUserConstant;
-import com.epmet.dto.form.IcExportTemplateFormDTO;
+import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
 import com.epmet.dto.form.IcResiUserPageFormDTO;
 import com.epmet.dto.result.IcCustomExportResultDTO;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -62,7 +62,7 @@ public class IcResiUserExportServiceImpl implements IcResiUserExportService {
         ExcelWriter excelWriter = null;
         try {
             //获取模板条件
-            IcExportTemplateFormDTO param = new IcExportTemplateFormDTO();
+            IcExportTemplateQueryFormDTO param = new IcExportTemplateQueryFormDTO();
             param.setCustomerId(loginUserUtil.getLoginUserCustomerId());
             param.setCustomerId("default");
             param.setTempId(pageFormDTO.getTemplateId());