From fbf1e21fc51b461ff659faf5827434f24ea1e4ef Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 15 Jul 2022 09:56:48 +0800 Subject: [PATCH] zh --- .../controller/manage/TaskController.java | 2 +- .../controller/manage/UserController.java | 19 ++++++--- .../mapper/CustomerActionNoteMapper.java | 37 ++++++++-------- .../com/zh/project0512/mapper/UserMapper.java | 2 +- .../mapper/CustomerActionNoteMapper.xml | 42 +++++++++++++++++++ 5 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/mapper/CustomerActionNoteMapper.xml diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index af72020..d551556 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -720,7 +720,7 @@ public class TaskController { qw.like(param.getTel() != null, "t1.tel", param.getTel()); qw.like(param.getBrand() != null, "t1.brandList", param.getBrand()); qw.like(param.getProviderName() != null, "t2.name", param.getProviderName()); - qw.eq(param.getDepartmentId() != null, "t4.departmentId", param.getDepartmentId()); + qw.inSql(param.getDepartmentId() != null,"t2.openid","SELECT openid from qywxDepartmentUserLink WHERE qywxDepartmentUserLink.departmentId = "+param.getDepartmentId()); IPage iPage = customerActionNoteService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), null, qw); List records = iPage.getRecords(); for (Map m : records) { diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java index 9942184..678aa4e 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java @@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +34,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -96,9 +98,9 @@ public class UserController { public void excel(HttpServletResponse response, @Validated @RequestBody UParam param) throws IOException { //这是表头及格式 String[][] array = { - {"员工", "部门", "上级部门", "手机号", "积分", "历史积分", "创建时间", "上次登录"}, - {"name", "main_departmentName", "sub_departmentName", "tel", "points", "historyPoints", "creatAt", "lastLoginAt"}, - {"String", "String", "String", "String", "int", "int", "LocalDateTime", "LocalDateTime"} + {"员工", "部门", "上级部门","部门列表", "手机号", "积分", "历史积分", "创建时间", "上次登录"}, + {"name", "main_departmentName", "sub_departmentName", "departmentList","tel", "points", "historyPoints", "creatAt", "lastLoginAt"}, + {"String", "String", "String", "String","String", "int", "int", "LocalDateTime", "LocalDateTime"} }; QueryWrapper qw = new QueryWrapper<>(); qw @@ -106,8 +108,15 @@ public class UserController { .or(o -> o.like("t3.name", param.getDepartment()))) .like(param.getName() != null, "t1.name", param.getName()); IPage iPage = userService.userDpList(MybatisPlusUtil.SetNumPage(1, 10000), qw); - - Workbook wb = ExcelUtil.writeToExcelByList(array, iPage.getRecords()); + List records = iPage.getRecords(); + for (Map map:records){ + List departmentList = (List) map.get("departmentList"); + StringBuffer s = new StringBuffer(); + departmentList.forEach(v->s.append(v.get("departmentName")+"，")); + String s1 = s.toString(); + map.replace("departmentList", StringUtils.isBlank(s)?"":(s1.substring(0, s1.length()-1))); + } + Workbook wb = ExcelUtil.writeToExcelByList(array,records ); OutputStream output = response.getOutputStream(); String fileName = "成员导出.xlsx"; try { diff --git a/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java b/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java index de30904..0cc9d9a 100644 --- a/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java +++ b/src/main/java/com/zh/project0512/mapper/CustomerActionNoteMapper.java @@ -25,23 +25,24 @@ public interface CustomerActionNoteMapper extends BaseMapper "select ( #{provideId}, #{area}, #{creatAt}, #{brandList}, #{tel}, #{taskId}, #{remarks}, #{customerName} ) " + "WHERE not EXISTS (SELECT 1 FROM user WHERE tel =#{tel}) ") void add(CustomerActionNote customerActionNote); - @Select("") +// @Select("") IPage pageList(IPage page,String openid, @Param("ew") Wrapper queryWrapper); } diff --git a/src/main/java/com/zh/project0512/mapper/UserMapper.java b/src/main/java/com/zh/project0512/mapper/UserMapper.java index f9b1951..64c7425 100644 --- a/src/main/java/com/zh/project0512/mapper/UserMapper.java +++ b/src/main/java/com/zh/project0512/mapper/UserMapper.java @@ -32,7 +32,7 @@ public interface UserMapper extends BaseMapper { void updByOpenid(String openid, String token, LocalDateTime time); // @Select("SELECT t1.id,t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.points,t1.historyPoints,t1.creatAt,t1.updateAt,t1.lastLoginAt" + -// ",t2.name as main_departmentName,t3.name as sub_departmentName,t4.department " + +// ",t2.name as main_departmentName,t3.name as sub_departmentName,t4.departmentId as dpId,t4.department " + // "from user as t1 " + // "left join qywxDepartment as t2 on t1.main_department = t2.departmentId " + // "left join qywxDepartment as t3 on t1.sub_department = t3.departmentId " + diff --git a/src/main/resources/mapper/CustomerActionNoteMapper.xml b/src/main/resources/mapper/CustomerActionNoteMapper.xml new file mode 100644 index 0000000..705744c --- /dev/null +++ b/src/main/resources/mapper/CustomerActionNoteMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + +