修改客户信息的list问题

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/controller/WorkClientController.java

@@ -2,8 +2,10 @@ package com.jeeplus.test.workClientInfo.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.TicketQueryUtils;
 import com.jeeplus.test.projectRecords.domain.Project;
@@ -33,9 +35,11 @@ public class WorkClientController {
      * 客户信息列表
      */
     @ApiOperation(value = "客户信息列表")
-    @PostMapping(value = "list")
-    public Page<WorkClientInfo> list(@RequestBody PageInfoDto pageInfoDto, Page<WorkClientInfo> page) {
-        return workClientService.list(pageInfoDto, page);
+    @GetMapping(value = "list")
+    public ResponseEntity<IPage<WorkClientInfo>> list(WorkClientInfo workClientInfo, Page<WorkClientInfo> page) throws Exception {
+        QueryWrapper<WorkClientInfo> workClientInfoQueryWrapper = QueryWrapperGenerator.buildQueryCondition(workClientInfo, WorkClientInfo.class);
+        IPage<WorkClientInfo> list = workClientService.list(page,workClientInfoQueryWrapper);
+        return ResponseEntity.ok (list);
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/domain/WorkClientInfo.java

@@ -3,6 +3,8 @@ package com.jeeplus.test.workClientInfo.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.query.Query;
+import com.jeeplus.core.query.QueryType;
 import lombok.Data;
 
 /**
@@ -17,6 +19,7 @@ public class WorkClientInfo extends BaseEntity {
     /**
      * 客户名称
      */
+    @Query()
     private String name;
 
     /**
@@ -52,6 +55,7 @@ public class WorkClientInfo extends BaseEntity {
     /**
      * 地区Id
      */
+    @Query(type = QueryType.EQ)
     private String areaId;
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/mapper/WorkClientInfoMapper.java

@@ -1,12 +1,15 @@
 package com.jeeplus.test.workClientInfo.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.test.workClientInfo.domain.WorkClientInfo;
 import org.apache.ibatis.annotations.Param;
 
 public interface WorkClientInfoMapper extends BaseMapper<WorkClientInfo> {
 
-    Page<WorkClientInfo> findPageList(Page<WorkClientInfo> page ,@Param("name") String name, @Param("areaId") String areaId);
+    IPage<WorkClientInfo> findPageList(Page<WorkClientInfo> page , @Param(Constants.WRAPPER)QueryWrapper queryWrapper);
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/mapper/xml/WorkClientInfoMapper.xml

@@ -5,7 +5,7 @@
 	<select id="findPageList" resultType="com.jeeplus.test.workClientInfo.domain.WorkClientInfo">
 		SELECT
 			a.id,
-			a.create_by,
+			su.name create_by,
 			a.create_date,
 			a.update_by,
 			a.update_date,
@@ -46,13 +46,8 @@
 		FROM
 			work_client_info a
 		LEFT JOIN sys_area b ON a.area_id = b.`code`
-		where a.del_flag = 0
-		<if test="name != null and name != ''">
-			AND a.name LIKE CONCAT ('%', #{name}, '%')
-		</if>
-		<if test="areaId != null and areaId != ''">
-			AND a.area_id = #{areaId}
-		</if>
+		LEFT JOIN sys_user su ON su.id = a.create_by
+		${ew.customSqlSegment}
 		ORDER BY
 			a.update_date DESC
 	</select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/workClientInfo/service/WorkClientService.java

@@ -1,6 +1,8 @@
 package com.jeeplus.test.workClientInfo.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.DictUtils;
@@ -54,19 +56,12 @@ public class WorkClientService {
 
     /**
      * 客户信息列表
-     * @param pageInfoDto
+     * @param
      * @return
      */
-    public Page<WorkClientInfo> list(PageInfoDto pageInfoDto, Page<WorkClientInfo> page) {
-        Page<WorkClientInfo> pageList = workClientInfoMapper.findPageList(page, pageInfoDto.getName(), pageInfoDto.getAreaId());
-        List<WorkClientInfo> records = pageList.getRecords();
-        if (CollectionUtils.isNotEmpty(records)) {
-            records.stream().forEach(i -> {
-                UserDTO userDTO = UserUtils.get(i.getCreateBy());
-                i.setCreateBy(userDTO.getName());
-            });
-            pageList.setRecords(records);
-        }
+    public IPage<WorkClientInfo> list(Page<WorkClientInfo> page, QueryWrapper<WorkClientInfo> queryWrapper) {
+        queryWrapper.eq("a.del_flag","0");
+        IPage<WorkClientInfo> pageList = workClientInfoMapper.findPageList(page,queryWrapper);
         return pageList;
     }