政策招人，人员信息组件下拉框

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

@@ -81,4 +81,10 @@ public class IcFormItemGroupLisFormDTO extends PageFormDTO {
      * 1展示，0不展示，默认1
      */
 	private Boolean display;
+
+    /**
+     * 1：政策招人
+     * 0：居民信息导出
+     */
+    private String policyFlag;
 }

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

@@ -0,0 +1,27 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 查询分组下的组件；前端再政策招人那个界面，传入分组id，policyFlag查询
+ * @Author yzm
+ * @Date 2022/7/19 9:24
+ */
+@Data
+public class IcFormItemQueryDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    @NotBlank(message = "客户Id不能为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    private String groupId;
+    /**
+     * 政策人员信息组件;1:展示；0：不展示；默认0
+     */
+    private String policyFlag;
+}
+

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

@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 基础表单项
@@ -59,6 +60,12 @@ public class FormItemBaseResult implements Serializable {
      * 是否支持添加（即多对一，eg：需求列表）
      */
     private boolean supportAdd;
+    /**
+     * 控件类型,EG:INPUT;从字典获取
+     */
+    private String itemType;
+    private String customerId;
+    private List<OptionDTO> options;
 
 }
 

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

@@ -20,6 +20,7 @@ package com.epmet.controller;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.EditIFormItemFormDTO;
+import com.epmet.dto.form.IcFormItemQueryDTO;
 import com.epmet.dto.result.ColumnTableNameResultDTO;
 import com.epmet.dto.result.FormItemBaseResult;
 import com.epmet.dto.result.ResiCategoryItemResultDTO;
@@ -99,4 +100,16 @@ public class IcFormItemController {
         List<FormItemBaseResult> list = icFormItemService.getItemListByGroupId(customerId,groupId);
         return new Result().ok(list);
     }
+
+    /**
+     * 根据分组id 获取分组下的item
+     * @return
+     */
+    @PostMapping("getItemListV2")
+    public Result<List<FormItemBaseResult>> getItemListByGroupId(@RequestHeader String customerId, @RequestBody IcFormItemQueryDTO formDto){
+        formDto.setCustomerId(customerId);
+        ValidatorUtils.validateEntity(formDto,IcFormItemQueryDTO.AddUserInternalGroup.class);
+        List<FormItemBaseResult> list = icFormItemService.getItemListByGroupIdV2(customerId,formDto.getGroupId(),formDto.getPolicyFlag());
+        return new Result().ok(list);
+    }
 }

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

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

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

@@ -75,4 +75,8 @@ public class IcFormItemGroupEntity extends BaseEpmetEntity {
      */
 	private Boolean display;
 
+	/**
+	 * 政策人员信息组件;1:展示；0：不展示；默认0
+	 */
+	private String policyFlag;
 }

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

@@ -91,4 +91,5 @@ public interface IcFormItemService extends BaseService<IcFormItemEntity> {
      * @return
      */
     List<FormItemBaseResult> getItemListByGroupId(String customerId, String groupId);
+    List<FormItemBaseResult> getItemListByGroupIdV2(String customerId, String groupId,String policyFlag);
 }

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

@@ -25,6 +25,7 @@ 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;
 
@@ -45,7 +46,8 @@ public class IcFormItemGroupServiceImpl extends BaseServiceImpl<IcFormItemGroupD
     public List<IcFormItemGroupDTO> list(IcFormItemGroupLisFormDTO params) {
         LambdaQueryWrapper<IcFormItemGroupEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcFormItemGroupEntity::getCustomerId, params.getCustomerId())
-        .orderByAsc(IcFormItemGroupEntity::getSort);
+                .eq(StringUtils.isNotBlank(params.getPolicyFlag()), IcFormItemGroupEntity::getPolicyFlag, params.getPolicyFlag())
+                .orderByAsc(IcFormItemGroupEntity::getSort);
 
         List<IcFormItemGroupEntity> entityList = baseDao.selectList(wrapper);
         return ConvertUtils.sourceToTarget(entityList, IcFormItemGroupDTO.class);

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

@@ -269,6 +269,10 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         return baseDao.getItemListByGroupId(customerId,groupId);
     }
 
+    @Override
+    public List<FormItemBaseResult> getItemListByGroupIdV2(String customerId, String groupId,String policyFlag) {
+        return baseDao.getItemListByGroupIdV2(customerId,groupId,policyFlag);
+    }
 
     private String queryType(String itemType) {
         /*switch (itemType) {

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

@@ -257,9 +257,58 @@
             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
+                LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID
         WHERE
             ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId}
+            and ifi.del_flag='0'
+          AND LENGTH(ifi.COLUMN_NAME)>0
+        ORDER BY ifi.SORT
+    </select>
+
+    <resultMap id="FormItemBaseResultMap" type="com.epmet.dto.result.FormItemBaseResult">
+        <id property="itemId" column="item_id" ></id>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="itemGroupId" column="ITEM_GROUP_ID"/>
+        <result property="label" column="LABEL"/>
+        <result property="sort" column="SORT"/>
+        <result property="optionSourceValue" column="OPTION_SOURCE_VALUE"/>
+        <result property="optionSourceType" column="OPTION_SOURCE_TYPE"/>
+        <result property="tableName" column="TABLE_NAME"/>
+        <result property="supportAdd" column="SUPPORT_ADD"/>
+        <result property="columnName" column="columnName"/>
+        <result property="itemType" column="item_type"/>
+        <collection property="options" ofType="com.epmet.dto.result.OptionDTO"
+                    column="item_id"  select="com.epmet.dao.IcFormDao.selectListOption">
+            <result property="label" column="label"/>
+            <result property="value" column="value"/>
+        </collection>
+    </resultMap>
+
+    <select id="getItemListByGroupIdV2" resultMap="FormItemBaseResultMap">
+        SELECT
+            ifi.ID item_id,
+            ifi.CUSTOMER_ID,
+            ifi.ITEM_GROUP_ID,
+            ifi.LABEL,
+            ifi.SORT,
+            ifi.OPTION_SOURCE_VALUE,
+            ifi.OPTION_SOURCE_TYPE,
+            ifig.TABLE_NAME,
+            ifig.SUPPORT_ADD,
+            CONCAT(ifi.COLUMN_NAME, if(ifi.COLUMN_NUM = 0, '', ifi.COLUMN_NUM)) columnName,
+            ifi.item_type
+        FROM
+            ic_form_item ifi
+            LEFT JOIN ic_form_item_group ifig ON ifi.ITEM_GROUP_ID = ifig.ID
+        WHERE
+            ifi.del_flag='0'
+            and ifi.CUSTOMER_ID = #{customerId}
+            <if test="groupId != null and groupId != ''">
+                and ITEM_GROUP_ID = #{groupId}
+            </if>
+            <if test="policyFlag != null and policyFlag != ''">
+                and ifi.POLICY_FLAG = #{policyFlag}
+            </if>
             AND LENGTH(ifi.COLUMN_NAME)>0
         ORDER BY ifi.SORT
     </select>