代码提交:

1.客户信息列表修改

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

@@ -1,7 +1,12 @@
 package com.jeeplus.test.workClientInfo.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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);
+
 }

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

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jeeplus.test.workClientInfo.mapper.WorkClientInfoMapper">
+
+	<select id="findPageList" resultType="com.jeeplus.test.workClientInfo.domain.WorkClientInfo">
+		SELECT
+			a.id,
+			a.create_by,
+			a.create_date,
+			a.update_by,
+			a.update_date,
+			a.del_flag,
+			a.name,
+			a.lawer_presint,
+			a.or_unicode,
+			a.company_type,
+			a.company_industry,
+			a.client_type,
+			a.credit_rank,
+			b.`name` AS area_id,
+			a.zip_code,
+			a.fax,
+			a.tax_id,
+			a.email,
+			a.address,
+			a.register_address,
+			a.company_url,
+			a.remarks,
+			a.company_id,
+			a.office_id,
+			a.area_parent_ids,
+			a.telephone,
+			a.has_uscc,
+			a.usc_code,
+			a.number,
+			(SELECT GROUP_CONCAT(d.label SEPARATOR ',' )
+				FROM
+					work_client_job_type_info c,
+					sys_dict_value d,
+					sys_dict_type e
+				WHERE
+					c.job_type_id = d.VALUE
+					AND e.id = d.dict_type_id
+					AND e.type = 'representative'
+					AND c.work_client_id = a.id) AS deputy
+		FROM
+			work_client_info a
+		LEFT JOIN sys_area b ON a.area_id = b.`code`
+		where 1 = 1
+		<if test="name != null and name != ''">
+			AND a.name LIKE CONCAT ('%', #{name}, '%')
+		</if>
+		<if test="areaId != null and areaId != ''">
+			AND a.areaId = #{areaId}
+		</if>
+		ORDER BY
+			update_date DESC
+	</select>
+
+</mapper>

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

@@ -57,38 +57,17 @@ public class WorkClientService {
      * @param pageInfoDto
      * @return
      */
-    public Page<WorkClientInfo> list(PageInfoDto pageInfoDto, Page page) {
-        LambdaQueryWrapper<WorkClientInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotEmpty(pageInfoDto.getName())) {
-            lambdaQueryWrapper.eq(WorkClientInfo::getName, pageInfoDto.getName());
-        }
-        if (StringUtils.isNotEmpty(pageInfoDto.getAreaId())) {
-            lambdaQueryWrapper.eq(WorkClientInfo::getAreaId, pageInfoDto.getAreaId());
-        }
-        lambdaQueryWrapper.orderByDesc(WorkClientInfo::getUpdateDate);
-        Page<WorkClientInfo> infoPage = workClientInfoMapper.selectPage(page, lambdaQueryWrapper);
-        List<WorkClientInfo> records = infoPage.getRecords();
+    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());
-                //客户行业
-                LambdaQueryWrapper<WorkClientJobTypeInfo> wrapper3 = new LambdaQueryWrapper<>();
-                wrapper3.eq(WorkClientJobTypeInfo::getWorkClientId, i.getId());
-                List<WorkClientJobTypeInfo> infos = workClientJobTypeInfoMapper.selectList(wrapper3);
-                if (CollectionUtils.isNotEmpty(infos)) {
-                    String s = new String();
-                    for (WorkClientJobTypeInfo info : infos) {
-                        String jobTypeId = info.getJobTypeId();
-                        s = s + "," + jobTypeId;
-                    }
-                    String substring = s.substring(1, s.length());
-                    i.setDeputy(substring);
-                }
             });
-            infoPage.setRecords(records);
+            pageList.setRecords(records);
         }
-        return infoPage;
+        return pageList;
     }
 
     /**