增加模糊匹配条件

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireChemicalController.java

@@ -85,15 +85,15 @@ public class FireChemicalController extends BaseController {
     *@param current 每页大小
     * @return
     */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(needAuth = true,ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "危化品分页查询",  notes = "危化品分页查询")
-	public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
+	public ResponseModel<Page<FireChemicalDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size ,String casNo, String formula, String name)
 	{
 	    Page<FireChemicalDto> page=new Page<FireChemicalDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page));
+	    return ResponseHelper.buildResponse(fireChemicalServiceImpl.queryForFireChemicalPage(page, casNo,  formula,  name));
 	}
 	/**
 	*列表全部数据查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireChemicalServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireChemicalDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.FireChemical;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.FireChemicalMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IFireChemicalService;
 
 import org.springframework.stereotype.Service;
+
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Arrays;
 import java.util.List;
 /**
 * 危化品服务实现类
@@ -21,8 +27,8 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         /**
          * 分页查询
          */
-        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page)   {
-                return this.queryForPage(page, null, false);
+        public Page<FireChemicalDto> queryForFireChemicalPage(Page<FireChemicalDto> page,   @Condition(Operator.like) String casNo, @Condition(Operator.like)String formula, @Condition(Operator.like)String name)   {
+           return this.queryForPage(page, "", false,casNo, formula, name);
         }
 
         /**
@@ -31,4 +37,41 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
         public List<FireChemicalDto> queryForFireChemicalList()   {
                 return this.queryForList("" , false);
         }
+
+
+        /**
+         * * @param null
+         * @return
+         * 构建查询条件
+         * <PRE>
+         * author tw
+         * date 2021/6/30
+         * </PRE>
+         */
+        public QueryWrapper<FireChemicalDto> getQueryWrapper(FireChemicalDto fireChemicalDto){
+
+                QueryWrapper<FireChemicalDto> dataDictionaryQueryWrapper = new QueryWrapper<>();
+                Class<? extends FireChemicalDto> aClass = fireChemicalDto.getClass();
+                Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+                        try {
+                                field.setAccessible(true);
+                                Object o = field.get(fireChemicalDto);
+                                if (o != null) {
+                                        Class<?> type = field.getType();
+                                        String name = NameUtils.camel2Underline(field.getName());
+                                        if (type.equals(String.class)) {
+                                                String fileValue = (String) field.get(fireChemicalDto);
+                                                dataDictionaryQueryWrapper.like(name,fileValue);
+                                        }
+                                }
+                        } catch (Exception e) {
+                                throw  new RuntimeException("系统异常");
+                        }
+                });
+
+                return dataDictionaryQueryWrapper;
+        }
+
+
+
 }