添加动态条件

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

@@ -19,5 +19,10 @@ public class CustomerFormQueryDTO implements Serializable {
 
     @NotBlank(message = "tokenDto获取customerId不能为空",groups =AddUserInternalGroup.class )
     private String customerId;
+
+    /**
+     * 是否动态
+     */
+    private Boolean dynamic;
 }
 

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

@@ -114,6 +114,9 @@ public class IcFormController {
         if (StringUtils.isBlank(formDto.getCustomerId())){
             formDto.setCustomerId(customerId);
         }
+        if (formDto.getDynamic() == null){
+            formDto.setDynamic(true);
+        }
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<CustomerFormResultDTO>().ok(icFormService.getCustomerForm(formDto));
     }
@@ -131,6 +134,9 @@ public class IcFormController {
     @PostMapping("conditionlist")
     public Result<List<ConditionResultDTO>> queryConditionList(@LoginUser TokenDto tokenDto, @RequestBody CustomerFormQueryDTO formDto){
         formDto.setCustomerId(tokenDto.getCustomerId());
+        if (formDto.getDynamic() == null){
+            formDto.setDynamic(true);
+        }
         ValidatorUtils.validateEntity(formDto,CustomerFormQueryDTO.AddUserInternalGroup.class);
         return new Result<List<ConditionResultDTO>>().ok(icFormItemService.queryConditionList(formDto));
     }

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

@@ -47,7 +47,7 @@ public interface IcFormDao extends BaseDao<IcFormEntity> {
      */
     CustomerFormResultDTO selectByCode(@Param("customerId") String customerId, @Param("formCode") String formCode);
 
-    List<FormItem> selectItemList(String formId);
+    List<FormItem> selectItemList(String formId, Boolean dynamic);
 
     List<FormItem> selectItemListByGroupId(String groupId);
     List<OptionDTO> selectListOption(String itemId);
@@ -55,4 +55,4 @@ public interface IcFormDao extends BaseDao<IcFormEntity> {
     List<FormGroupDTO> selectListGroup(String formId);
 
     FormGroupDTO selectChildGroup(String itemId);
-}
+}

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

@@ -118,7 +118,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         if (null == resultDTO) {
             throw new RenException(EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getCode(),EpmetErrorCode.CUSTOMER_FORM_NOT_EXITS.getMsg());
         }
-        List<FormItem> itemList=baseDao.selectItemList(resultDTO.getFormId());
+        List<FormItem> itemList=baseDao.selectItemList(resultDTO.getFormId(),formDto.getDynamic());
         List<FormGroupDTO> groupList=baseDao.selectListGroup(resultDTO.getFormId());
 
         resultDTO.setItemList(itemList);
@@ -126,4 +126,4 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         return resultDTO;
     }
 
-}
+}

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

@@ -106,6 +106,9 @@
         WHERE
             fi.DEL_FLAG = '0'
           AND fi.FORM_ID = #{formId}
+          <if test="dynamic != null">
+            fi.DYNAMIC = #{dynamic}
+          </if>
           AND fi.ITEM_GROUP_ID = '0'
         ORDER BY
             fi.SORT ASC
@@ -196,4 +199,4 @@
             g.SORT ASC
     </select>
 
-</mapper>
+</mapper>