花名册-bug修复、页面优化

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/controller/JobPositionController.java

@@ -16,6 +16,7 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.service.OfficeService;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.JobPosition;
 import com.jeeplus.test.jobPosion.domain.Position;
 import com.jeeplus.test.jobPosion.domain.PositionLog;
@@ -138,18 +139,18 @@ public class JobPositionController {
             }
             oldPosition = jobPositionService.getById(jobPosition.getId());
             if(ObjectUtil.isNotEmpty(oldPosition)){
-                if(StrUtil.isNotEmpty(oldPosition.getPositionId())){
+                if(StringUtils.isNotBlank(oldPosition.getPositionId())){
                     Position byId = positionService.getById(oldPosition.getPositionId());
                     if (ObjectUtil.isNotEmpty(byId)) {
-                        if(StrUtil.isNotEmpty(byId.getName())){
+                        if(StringUtils.isNotBlank(byId.getName())){
                             oldPosition.setPositionId(byId.getName());
                         }
                     }
                 }
-                if(StrUtil.isNotEmpty(oldPosition.getOfficeId())){
+                if(StringUtils.isNotBlank(oldPosition.getOfficeId())){
                     Office office = officeService.getById(oldPosition.getOfficeId());
                     if (ObjectUtil.isNotEmpty(office)) {
-                        if(StrUtil.isNotEmpty(office.getName())){
+                        if(StringUtils.isNotBlank(office.getName())){
                             oldPosition.setOfficeId(office.getName());
                         }
                     }
@@ -161,7 +162,7 @@ public class JobPositionController {
         try{
             jobPositionService.saveOrUpdate(jobPosition);
         }catch (Exception e){
-            if (StrUtil.isNotEmpty(jobPosition.getId())){
+            if (StringUtils.isNotBlank(jobPosition.getId())){
                 String changedFields = BeanUtils.getChangedFields(jobPosition, new JobPosition());
                 positionLogDTO.setOperationContent(changedFields);
             }
@@ -170,21 +171,21 @@ public class JobPositionController {
             return ResponseEntity.badRequest().body  ("职位保存失败");
         }
 
-        if (StrUtil.isNotEmpty(jobPositionDTO.getId())){
+        if (StringUtils.isNotBlank(jobPositionDTO.getId())){
             JobPosition byId = jobPositionService.getById(jobPosition.getId());
             if(ObjectUtil.isNotEmpty(byId)){
-                if(StrUtil.isNotEmpty(byId.getPositionId())){
+                if(StringUtils.isNotBlank(byId.getPositionId())){
                     Position byId1 = positionService.getById(byId.getPositionId());
                     if (ObjectUtil.isNotEmpty(byId1)) {
-                        if(StrUtil.isNotEmpty(byId1.getName())){
+                        if(StringUtils.isNotBlank(byId1.getName())){
                             byId.setPositionId(byId1.getName());
                         }
                     }
                 }
-                if(StrUtil.isNotEmpty(byId.getOfficeId())){
+                if(StringUtils.isNotBlank(byId.getOfficeId())){
                     Office office = officeService.getById(byId.getOfficeId());
                     if (ObjectUtil.isNotEmpty(office)) {
-                        if(StrUtil.isNotEmpty(office.getName())){
+                        if(StringUtils.isNotBlank(office.getName())){
                             byId.setOfficeId(office.getName());
                         }
                     }
@@ -359,7 +360,7 @@ public class JobPositionController {
         listA = getExcelList(listA);
         //导入前检测数据
         String resultA = importDecide(listA, arrayList, hashMap);
-        if(StrUtil.isNotEmpty(resultA)){
+        if(StringUtils.isNotBlank(resultA)){
             //有返回值，说明导入的数据不正确。向用户抛提示
             return ResponseEntity.badRequest().body  (resultA);
         }
@@ -395,19 +396,19 @@ public class JobPositionController {
             if(StrUtil.isEmpty(jobPositionDTO.getName())){
                 return "文件中有职位为空，请重新填写";
             }
-            if(StrUtil.isNotEmpty(jobPositionDTO.getName())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getName())){
                 JobPosition jobPosition = jobPositionService.getOne(new QueryWrapper<JobPosition>().eq("name", jobPositionDTO.getName()));
                 if(ObjectUtil.isNotEmpty(jobPosition)){
                     return "文件中有职位已在系统中存在，请重新填写";
                 }
             }
-            if(StrUtil.isNotEmpty(jobPositionDTO.getName())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getName())){
                 JobPosition jobPosition = jobPositionService.getOne(new QueryWrapper<JobPosition>().eq("no", jobPositionDTO.getNo()));
                 if(ObjectUtil.isNotEmpty(jobPosition)){
                     return "文件中有职位编码已在系统中存在，请重新填写";
                 }
             }
-            if(StrUtil.isNotEmpty(jobPositionDTO.getOfficeId())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getOfficeId())){
                 Office office = officeService.getOne(new QueryWrapper<Office>().eq("name", jobPositionDTO.getOfficeId()));
                 if(ObjectUtil.isNotEmpty(office)){
                     jobPositionDTO.setOfficeId(office.getId());
@@ -415,7 +416,7 @@ public class JobPositionController {
                     return "文件中有部门在系统中不存在，请重新填写";
                 }
             }
-            if(StrUtil.isNotEmpty(jobPositionDTO.getPositionId())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getPositionId())){
                 Position position = positionService.getOne(new QueryWrapper<Position>().eq("name", jobPositionDTO.getPositionId()));
                 if(ObjectUtil.isNotEmpty(position)){
                     jobPositionDTO.setPositionId(position.getId());
@@ -423,7 +424,7 @@ public class JobPositionController {
                     return "文件中有对应职务在系统中不存在，请重新填写";
                 }
             }
-            if(StrUtil.isNotEmpty(jobPositionDTO.getStaffNums())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getStaffNums())){
                 if(isNumeric(jobPositionDTO.getStaffNums())==false){
                     return "文件中有编制人数的格式填写不正确，请填写正整数或者不填写";
                 }else{
@@ -432,7 +433,7 @@ public class JobPositionController {
                 }
             }
 
-            if(StrUtil.isNotEmpty(jobPositionDTO.getNo())){
+            if(StringUtils.isNotBlank(jobPositionDTO.getNo())){
                 noMap.put(jobPositionDTO.getNo(),null);
                 lists.add(jobPositionDTO.getNo());
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/controller/PositionCategoryController.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.PositionCategory;
 import com.jeeplus.test.jobPosion.enums.PositionTypeEnum;
 import com.jeeplus.test.jobPosion.service.PositionCategoryService;
@@ -82,7 +83,7 @@ public class PositionCategoryController {
     public ResponseEntity save(@Valid @RequestBody PositionCategoryDTO positionCategoryDTO, HttpServletRequest request) {
         PositionLogDTO positionLogDTO = new PositionLogDTO();
         PositionCategory positionCategory = PositionCategoryWrapper.INSTANCE.toEntity(positionCategoryDTO);
-        if(StrUtil.isNotEmpty(positionCategoryDTO.getId())){
+        if(StringUtils.isNotBlank(positionCategoryDTO.getId())){
             List<PositionCategory> positionCategories = positionCategoryService.list(new QueryWrapper<PositionCategory>()
                     .ne("id",positionCategoryDTO.getId()).eq("name", positionCategoryDTO.getName()));
             if(CollectionUtil.isNotEmpty(positionCategories)){

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/controller/PositionController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.JobPosition;
 import com.jeeplus.test.jobPosion.domain.Position;
 import com.jeeplus.test.jobPosion.domain.PositionCategory;
@@ -99,7 +100,7 @@ public class PositionController {
         PositionLogDTO positionLogDTO = new PositionLogDTO();
         Position position = PositionWrapper.INSTANCE.toEntity(positionDTO);
         Position oldPosition = null;
-        if(StrUtil.isNotEmpty(positionDTO.getId())){
+        if(StringUtils.isNotBlank(positionDTO.getId())){
             List<Position> positions = positionService.list(new QueryWrapper<Position>()
                     .ne("id",positionDTO.getId()).eq("name", positionDTO.getName()));
             if(CollectionUtil.isNotEmpty(positions)){
@@ -107,10 +108,10 @@ public class PositionController {
             }
             oldPosition = positionService.getById(positionDTO.getId());
             if(ObjectUtil.isNotEmpty(oldPosition)){
-                if(StrUtil.isNotEmpty(oldPosition.getCategoryId())){
+                if(StringUtils.isNotBlank(oldPosition.getCategoryId())){
                     PositionCategory byId = positionCategoryService.getById(oldPosition.getCategoryId());
                     if(ObjectUtil.isNotEmpty(byId)){
-                        if(StrUtil.isNotEmpty(byId.getName())){
+                        if(StringUtils.isNotBlank(byId.getName())){
                             oldPosition.setCategoryId(byId.getName());
                         }
                     }
@@ -132,7 +133,7 @@ public class PositionController {
         try{
             positionService.saveOrUpdate(position);
         }catch (Exception e){
-            if(StrUtil.isNotEmpty(positionDTO.getId())){
+            if(StringUtils.isNotBlank(positionDTO.getId())){
                 String changedFields = BeanUtils.getChangedFields(position, new Position());
                 positionLogDTO.setOperationContent(changedFields);
             }
@@ -141,10 +142,10 @@ public class PositionController {
             return ResponseEntity.badRequest().body  ("职务保存失败");
         }
 
-        if (StrUtil.isNotEmpty(positionDTO.getId())){
+        if (StringUtils.isNotBlank(positionDTO.getId())){
             Position byId = positionService.getById(positionDTO.getId());
             if(ObjectUtil.isNotEmpty(byId)){
-                if(StrUtil.isNotEmpty(byId.getCategoryId())){
+                if(StringUtils.isNotBlank(byId.getCategoryId())){
                     PositionCategory byId1 = positionCategoryService.getById(byId.getCategoryId());
                     if(ObjectUtil.isNotEmpty(byId1)){
                         byId.setCategoryId(byId1.getName());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/controller/PositionLogController.java

@@ -16,6 +16,7 @@ import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.jobPosion.domain.JobPosition;
 import com.jeeplus.test.jobPosion.domain.Position;
@@ -67,7 +68,7 @@ public class PositionLogController {
     public ResponseEntity<IPage<PositionLog>> data(PositionLogDTO positionLogDTO, Page<PositionLog> page) throws Exception {
         PositionLog positionLog = PositionLogWrapper.INSTANCE.toEntity(positionLogDTO);
         QueryWrapper<PositionLog> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( positionLog, PositionLog.class );
-        queryWrapper.like(StrUtil.isNotEmpty(positionLog.getCreateBy()),"su.login_name",positionLog.getCreateBy());
+        queryWrapper.like(StringUtils.isNotBlank(positionLog.getCreateBy()),"su.login_name",positionLog.getCreateBy());
         if(ObjectUtil.isNotEmpty(positionLogDTO.getCreateDateStart())&&ObjectUtil.isNotEmpty(positionLogDTO.getCreateDateEnd())){
             queryWrapper.ge("pl.create_date",positionLogDTO.getCreateDateStart()).le("pl.create_date",positionLogDTO.getCreateDateEnd());
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/service/PositionCategoryService.java

@@ -3,6 +3,7 @@ package com.jeeplus.test.jobPosion.service;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.PositionCategory;
 import com.jeeplus.test.jobPosion.mapper.PositionCategoryMapper;
 import com.jeeplus.test.jobPosion.service.dto.PositionCategoryDTO;
@@ -25,7 +26,7 @@ public class PositionCategoryService extends ServiceImpl<PositionCategoryMapper,
         List<PositionCategoryDTO> list = new ArrayList<>();
         positionCategoryDTOList.stream().forEach(item->{
             if(ObjectUtil.isNotEmpty(item)){
-                if(StrUtil.isNotEmpty(item.getId())&&ObjectUtil.isNotEmpty(item.getSort())){
+                if(StringUtils.isNotBlank(item.getId())&&ObjectUtil.isNotEmpty(item.getSort())){
                     list.add(item);
                 }
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/jobPosion/service/PositionService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.Position;
 import com.jeeplus.test.jobPosion.mapper.PositionMapper;
 import com.jeeplus.test.jobPosion.service.dto.PositionCategoryDTO;
@@ -36,7 +37,7 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
         List<PositionDTO> list = new ArrayList<>();
         positionDTOList.stream().forEach(item->{
             if(ObjectUtil.isNotEmpty(item)){
-                if(StrUtil.isNotEmpty(item.getId())&&ObjectUtil.isNotEmpty(item.getSort())){
+                if(StringUtils.isNotBlank(item.getId())&&ObjectUtil.isNotEmpty(item.getSort())){
                     list.add(item);
                 }
             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/oss/service/OssService.java

@@ -55,9 +55,8 @@ public class OssService {
     @Resource
     private OssServiceMapper ossServiceMapper;
 
-    private static final String DIRECTORY = "attachment-file/assess";
-
-    private static final String ALIYUNURL = "http://oss.gangwaninfo.com";
+    @Value("${aliyun_directory}")
+    private String directory = "attachment-file/assess";
 
     @Resource
     private OSSClientService ossClientService;
@@ -239,13 +238,13 @@ public class OssService {
     public FileUrlDto webUpload(MultipartFile file, String dir) throws IOException {
         FileUrlDto dto = new FileUrlDto();
         // 文件保存路径
-        String fileDir =DIRECTORY+"/"+dir+ossClientService.datePath()+"/"+ System.currentTimeMillis();
+        String fileDir =directory+"/"+dir+ossClientService.datePath()+"/"+ System.currentTimeMillis();
         // 判断文件是否为空
         if (!file.isEmpty()) {
             String name = file.getOriginalFilename ();
             ossClientService.uploadFile2OSS(file.getInputStream(), fileDir, name);
             String url = fileDir +name;
-            String lsUrl = this.getFileTemporaryLookUrl(ALIYUNURL + "/" + fileDir +name);
+            String lsUrl = this.getFileTemporaryLookUrl(aliyunUrl + "/" + fileDir +name);
             dto.setUrl(url);
             dto.setLsUrl(lsUrl);
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/controller/ProjectController.java

@@ -155,7 +155,7 @@ public class ProjectController {
         if(StrUtil.isEmpty(projectDTO.getId())){
 
             //判断一下文号是否存在
-            if(StrUtil.isNotEmpty(projectDTO.getDocumentNum())){
+            if(StringUtils.isNotBlank(projectDTO.getDocumentNum())){
                 if(ObjectUtil.isNotEmpty(projectService.selectByDocumentNum(projectDTO.getDocumentNum()))){
                     return ResponseEntity.badRequest().body("不可使用已存在的文号");
                 }
@@ -165,7 +165,7 @@ public class ProjectController {
         }else{
 
             //判断一下文号是否存在
-            if(StrUtil.isNotEmpty(projectDTO.getDocumentNum())){
+            if(StringUtils.isNotBlank(projectDTO.getDocumentNum())){
                 Project userProjects = projectService.selectByDocumentNum(projectDTO.getDocumentNum());
                 if(ObjectUtil.isNotEmpty(userProjects)){
                     if(!projectDTO.getId().equals(userProjects.getId())){
@@ -234,7 +234,7 @@ public class ProjectController {
             listA = getExcelList(listA);
             //导入前检测数据
             String resultA = importDecide(listA, sdf, arrayList, hashMap, successNum, ProjectTypeEnum.ASSESS.getValue());
-            if(StrUtil.isNotEmpty(resultA)){
+            if(StringUtils.isNotBlank(resultA)){
                 //有返回值，说明导入的数据不正确。向用户抛提示
                 return ResponseEntity.badRequest().body  (resultA);
             }
@@ -248,7 +248,7 @@ public class ProjectController {
             listB = getExcelList(listB);
             //导入前检测数据
             String resultB = importDecide(listB, sdf, arrayList, hashMap, successNum, ProjectTypeEnum.CONSULTATION.getValue());
-            if(StrUtil.isNotEmpty(resultB)){
+            if(StringUtils.isNotBlank(resultB)){
                 //有返回值，说明导入的数据不正确。向用户抛提示
                 return ResponseEntity.badRequest().body  (resultB);
             }
@@ -273,7 +273,7 @@ public class ProjectController {
                 continue;
             }
             try {
-                if(StrUtil.isNotEmpty(project.getEvaluationReportDateUi())){
+                if(StringUtils.isNotBlank(project.getEvaluationReportDateUi())){
                     //EvaluationReportDateUi字段接到的数据符合"yyyy/MM/dd"时间格式的话，正常执行。
                     //不符合的话，就会有异常，进到catch
                     String format = sdf.format(DateUtils.parseDate(project.getEvaluationReportDateUi(), new String[]{"yyyy/MM/dd"}));
@@ -282,7 +282,7 @@ public class ProjectController {
                     project.setStatus(ProjectStatusEnum.FINISH.getValue());
                 }
             }catch (Exception e){
-                if(StrUtil.isNotEmpty(project.getEvaluationReportDateUi())){
+                if(StringUtils.isNotBlank(project.getEvaluationReportDateUi())){
                     if(project.getEvaluationReportDateUi().contains("报告已作废")){
                         //当EvaluationReportDateUi字段接收到的值包含”报告已作废“时，项目状态为”作废“，并且将值放到AssessReportMessage字段中
                         project.setStatus(ProjectStatusEnum.INVALID.getValue());
@@ -299,31 +299,31 @@ public class ProjectController {
             }
 
             try {
-                if(StrUtil.isNotEmpty(project.getEvaluationBaseDateUi())){
+                if(StringUtils.isNotBlank(project.getEvaluationBaseDateUi())){
                     String format = sdf.format(DateUtils.parseDate(project.getEvaluationBaseDateUi(), new String[]{"yyyy/MM/dd"}));
                     project.setEvaluationBaseDate(sdf.parse(format));
                 }
             }catch (Exception e){
-                if(StrUtil.isNotEmpty(project.getEvaluationBaseDateUi())){
+                if(StringUtils.isNotBlank(project.getEvaluationBaseDateUi())){
                     project.setAssessBaseMessage(project.getEvaluationBaseDateUi());
                 }
 
             }
 
             try {
-                if(StrUtil.isNotEmpty(project.getInvoiceDateUi())){
+                if(StringUtils.isNotBlank(project.getInvoiceDateUi())){
                     String format = sdf.format(DateUtils.parseDate(project.getInvoiceDateUi(), new String[]{"yyyy/MM/dd"}));
                     project.setInvoiceDate(sdf.parse(format));
                 }
             }catch (Exception e){
-                if(StrUtil.isNotEmpty(project.getInvoiceDateUi())){
+                if(StringUtils.isNotBlank(project.getInvoiceDateUi())){
                     project.setInvoiceMessage(project.getInvoiceDateUi());
                 }
 
             }
 
             try {
-                if(StrUtil.isNotEmpty(project.getReimbursementDateUi())){
+                if(StringUtils.isNotBlank(project.getReimbursementDateUi())){
                     String format = sdf.format(DateUtils.parseDate(project.getReimbursementDateUi(), new String[]{"yyyy/MM/dd"}));
                     project.setReimbursementDate(sdf.parse(format));
                 }
@@ -332,9 +332,9 @@ public class ProjectController {
             }
 
             //项目负责人、签字评估师1、签字评估师2 关联user表的id
-            if(StrUtil.isNotEmpty(project.getProjectHead())){
+            if(StringUtils.isNotBlank(project.getProjectHead())){
                 String id = userService.getUserIdByName(project.getProjectHead());
-                if(StrUtil.isNotEmpty(id)){
+                if(StringUtils.isNotBlank(id)){
                     project.setProjectHead(id);
                 }else{
                     return "文件中有项目负责人无法找到，请修改为在档人员，或者不填写";
@@ -343,7 +343,7 @@ public class ProjectController {
                 return "文件中有项目负责人为空，请重新填写";
             }
 
-            /*if(StrUtil.isNotEmpty(project.getEvaluationPersonOne())){
+            /*if(StringUtils.isNotBlank(project.getEvaluationPersonOne())){
                 String id = userService.getUserIdByName(project.getEvaluationPersonOne());
                 if(ObjectUtil.isNotEmpty(id)){
                     project.setEvaluationPersonOne(id);
@@ -352,7 +352,7 @@ public class ProjectController {
                 }
             }*/
 
-            /*if(StrUtil.isNotEmpty(project.getEvaluationPersonTwo())){
+            /*if(StringUtils.isNotBlank(project.getEvaluationPersonTwo())){
                 String id = userService.getUserIdByName(project.getEvaluationPersonTwo());
                 if(ObjectUtil.isNotEmpty(id)){
                     project.setEvaluationPersonTwo(id);
@@ -362,7 +362,7 @@ public class ProjectController {
             }*/
 
             //文号的问题
-            if(StrUtil.isNotEmpty(project.getDocumentNum())) {
+            if(StringUtils.isNotBlank(project.getDocumentNum())) {
                 Project userProject = projectService.selectByDocumentNum(project.getDocumentNum());
                 if(ObjectUtil.isNotEmpty(userProject)){
                     return "文件中存在已在档的文号";
@@ -517,7 +517,7 @@ public class ProjectController {
 
     public ProjectDTO isChange(ProjectDTO userProjectDTO, SimpleDateFormat formatter){
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsInvoice())){
+        if(StringUtils.isNotBlank(userProjectDTO.getIsInvoice())){
             //是否开票
             if(YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsInvoice())){
                 userProjectDTO.setIsInvoice(YesOrNoEnum.YES.getLabel());
@@ -527,7 +527,7 @@ public class ProjectController {
         }
 
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsContractArchive())) {
+        if(StringUtils.isNotBlank(userProjectDTO.getIsContractArchive())) {
             //合同是否存档
             if (YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsContractArchive())) {
                 userProjectDTO.setIsContractArchive(YesOrNoEnum.YES.getLabel());
@@ -536,7 +536,7 @@ public class ProjectController {
             }
         }
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsPapersIntact())) {
+        if(StringUtils.isNotBlank(userProjectDTO.getIsPapersIntact())) {
             //底稿是否完好
             if (YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsPapersIntact())) {
                 userProjectDTO.setIsPapersIntact(YesOrNoEnum.YES.getLabel());
@@ -545,7 +545,7 @@ public class ProjectController {
             }
         }
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsPapersArchive())) {
+        if(StringUtils.isNotBlank(userProjectDTO.getIsPapersArchive())) {
             //底稿是否归档
             if (YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsPapersArchive())) {
                 userProjectDTO.setIsPapersArchive(YesOrNoEnum.YES.getLabel());
@@ -554,7 +554,7 @@ public class ProjectController {
             }
         }
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsOpsReimbursement())) {
+        if(StringUtils.isNotBlank(userProjectDTO.getIsOpsReimbursement())) {
             //外勤是否已经报销
             if (YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsOpsReimbursement())) {
                 userProjectDTO.setIsOpsReimbursement(YesOrNoEnum.YES.getLabel());
@@ -563,7 +563,7 @@ public class ProjectController {
             }
         }
 
-        if(StrUtil.isNotEmpty(userProjectDTO.getIsCommissionReimbursement())) {
+        if(StringUtils.isNotBlank(userProjectDTO.getIsCommissionReimbursement())) {
             //是否已经报销提成
             if (YesOrNoEnum.YES.getValue().equals(userProjectDTO.getIsCommissionReimbursement())) {
                 userProjectDTO.setIsCommissionReimbursement(YesOrNoEnum.YES.getLabel());
@@ -578,7 +578,7 @@ public class ProjectController {
             String time=formatter.format(userProjectDTO.getEvaluationReportDate());
             userProjectDTO.setEvaluationReportDateUi(time);
         }else{
-            if(StrUtil.isNotEmpty(userProjectDTO.getAssessReportMessage())){
+            if(StringUtils.isNotBlank(userProjectDTO.getAssessReportMessage())){
                 userProjectDTO.setEvaluationReportDateUi(userProjectDTO.getAssessReportMessage());
             }
         }
@@ -587,7 +587,7 @@ public class ProjectController {
             String time=formatter.format(userProjectDTO.getEvaluationBaseDate());
             userProjectDTO.setEvaluationBaseDateUi(time);
         }else{
-            if(StrUtil.isNotEmpty(userProjectDTO.getAssessBaseMessage())){
+            if(StringUtils.isNotBlank(userProjectDTO.getAssessBaseMessage())){
                 userProjectDTO.setEvaluationBaseDateUi(userProjectDTO.getAssessBaseMessage());
             }
         }
@@ -596,7 +596,7 @@ public class ProjectController {
             String time=formatter.format(userProjectDTO.getInvoiceDate());
             userProjectDTO.setInvoiceDateUi(time);
         }else{
-            if(StrUtil.isNotEmpty(userProjectDTO.getInvoiceMessage())){
+            if(StringUtils.isNotBlank(userProjectDTO.getInvoiceMessage())){
                 userProjectDTO.setInvoiceDateUi(userProjectDTO.getInvoiceMessage());
             }
         }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/projectRecords/service/ProjectService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.projectRecords.domain.Project;
 import com.jeeplus.test.projectRecords.mapper.ProjectMapper;
@@ -52,19 +53,19 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     public Project projectDtoToDate(Project project, ProjectDTO projectDTO){
         SimpleDateFormat sdf = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" );
         try {
-            if(StrUtil.isNotEmpty(projectDTO.getEvaluationBaseDateUi())){
+            if(StringUtils.isNotBlank(projectDTO.getEvaluationBaseDateUi())){
                 project.setEvaluationBaseDate(sdf.parse(projectDTO.getEvaluationBaseDateUi()));
             }
 
-            if(StrUtil.isNotEmpty(projectDTO.getEvaluationReportDateUi())){
+            if(StringUtils.isNotBlank(projectDTO.getEvaluationReportDateUi())){
                 project.setEvaluationReportDate(sdf.parse(projectDTO.getEvaluationReportDateUi()));
             }
 
-            if(StrUtil.isNotEmpty(projectDTO.getInvoiceDateUi())){
+            if(StringUtils.isNotBlank(projectDTO.getInvoiceDateUi())){
                 project.setInvoiceDate(sdf.parse(projectDTO.getInvoiceDateUi()));
             }
 
-            if(StrUtil.isNotEmpty(projectDTO.getReimbursementDateUi())){
+            if(StringUtils.isNotBlank(projectDTO.getReimbursementDateUi())){
                 project.setReimbursementDate(sdf.parse(projectDTO.getReimbursementDateUi()));
             }
 
@@ -83,7 +84,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     public LambdaUpdateWrapper getLambdaUpdateWrapper(ProjectDTO project){
         LambdaUpdateWrapper<Project> wrapper = new LambdaUpdateWrapper<Project>();
 
-        if(StrUtil.isNotEmpty(project.getId())){
+        if(StringUtils.isNotBlank(project.getId())){
             wrapper.eq(Project::getId,project.getId());
         }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/controller/RankSystemTableController.java

@@ -13,6 +13,7 @@ import com.jeeplus.sys.domain.Post;
 import com.jeeplus.sys.service.PostService;
 import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.mapstruct.PostWrapper;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.domain.Position;
 import com.jeeplus.test.jobPosion.service.PositionService;
 import com.jeeplus.test.jobPosion.service.dto.PositionDTO;
@@ -75,7 +76,7 @@ public class RankSystemTableController {
         RankSystemTable rankSystemTable = RankSystemTableWrapper.INSTANCE.toEntity(rankSystemTableDTO);
         QueryWrapper<RankSystemTable> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( rankSystemTable, RankSystemTable.class );
         if(ObjectUtil.isNotEmpty(rankSystemTableDTO)){
-            if(StrUtil.isNotEmpty(rankSystemTableDTO.getLevelId())){
+            if(StringUtils.isNotBlank(rankSystemTableDTO.getLevelId())){
                 List<RankRstLevel> rankRstLevels = rankRstLevelService.list(new QueryWrapper<RankRstLevel>().in("level_id", rankSystemTableDTO.getLevelId()));
                 if(CollectionUtil.isEmpty(rankRstLevels)){
                     return ResponseEntity.ok (null);
@@ -105,7 +106,7 @@ public class RankSystemTableController {
 
             }
         }
-        if(StrUtil.isNotEmpty(rankSystemTableDTO.getRsId())){
+        if(StringUtils.isNotBlank(rankSystemTableDTO.getRsId())){
             queryWrapper.eq("rs_p.id",rankSystemTableDTO.getRsId());
         }
         IPage<RankSystemTableDTO> result = this.rankSystemTableService.findList (page,queryWrapper);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/service/RankSequenceService.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.rank.domain.RankRsOffice;
 import com.jeeplus.test.rank.domain.RankRstPosition;
@@ -66,19 +67,19 @@ public class RankSequenceService extends ServiceImpl<RankSequenceMapper,RankSequ
         List<String> ids = new ArrayList<>();
         if(CollectionUtil.isNotEmpty(rankSequenceDTOList)){
             rankSequenceDTOList.stream().forEach(item->{
-                if(StrUtil.isNotEmpty(item.getId())){
+                if(StringUtils.isNotBlank(item.getId())){
                     ids.add(item.getId());
                 }
-                if(StrUtil.isNotEmpty(item.getName())){
+                if(StringUtils.isNotBlank(item.getName())){
                     hashMap.put(item.getName(),null);
                 }
                 if(CollectionUtil.isNotEmpty(item.getRankSequenceDTOList())){
                     listSize.set(listSize.get()+item.getRankSequenceDTOList().size());
                     item.getRankSequenceDTOList().stream().forEach(item2->{
-                        if(StrUtil.isNotEmpty(item2.getId())){
+                        if(StringUtils.isNotBlank(item2.getId())){
                             ids.add(item2.getId());
                         }
-                        if(StrUtil.isNotEmpty(item2.getName())){
+                        if(StringUtils.isNotBlank(item2.getName())){
                             hashMap.put(item2.getName(),null);
                         }
                     });
@@ -104,7 +105,7 @@ public class RankSequenceService extends ServiceImpl<RankSequenceMapper,RankSequ
                     });
                 }
                 if(ObjectUtil.isNotEmpty(item)){
-                    if(StrUtil.isNotEmpty(item.getId())){
+                    if(StringUtils.isNotBlank(item.getId())){
                         rankRsOfficeMapper.delete(new QueryWrapper<RankRsOffice>().eq("rs_id",item.getId()));
                         if(CollectionUtil.isNotEmpty(item.getOfficeIdList())){
                             rankRsOfficeMapper.insertListById(item.getId(),item, UserUtils.getCurrentUserDTO().getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/service/RankService.java

@@ -7,6 +7,7 @@ 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.rank.domain.*;
 import com.jeeplus.test.rank.mapper.RankChildrenMapper;
@@ -54,7 +55,7 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
     public ResponseEntity saveRank(RankDTO rankDTO){
         Rank rank = RankWrapper.INSTANCE.toEntity(rankDTO);
         if(ObjectUtil.isNotEmpty(rank)){
-            if(StrUtil.isNotEmpty(rank.getId())){
+            if(StringUtils.isNotBlank(rank.getId())){
                 if("2".equals(rank.getUseFlag())){
                     List<RankSystemTable> rank_id = rankSystemTableService.list(new QueryWrapper<RankSystemTable>().eq("rank_id", rank.getId()));
                     if(CollectionUtil.isNotEmpty(rank_id)){
@@ -62,13 +63,13 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
                     }
                 }
             }
-            if(StrUtil.isNotEmpty(rank.getId())&&StrUtil.isNotEmpty(rank.getGroupName())){
+            if(StringUtils.isNotBlank(rank.getId())&&StringUtils.isNotBlank(rank.getGroupName())){
                 List<Rank> rank1 = rankMapper.selectList(new QueryWrapper<Rank>().ne("id", rank.getId()).eq("group_name", rank.getGroupName()));
                 if(CollectionUtil.isNotEmpty(rank1)){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return ResponseEntity.badRequest().body("分组名称已存在");
                 }
-            }else if(StrUtil.isEmpty(rank.getId())&&StrUtil.isNotEmpty(rank.getGroupName())){
+            }else if(StrUtil.isEmpty(rank.getId())&&StringUtils.isNotBlank(rank.getGroupName())){
                 List<Rank> rank2 = rankMapper.selectList(new QueryWrapper<Rank>().eq("group_name", rank.getGroupName()));
                 if(CollectionUtil.isNotEmpty(rank2)){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -79,7 +80,7 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
             return ResponseEntity.badRequest().body("要保存的数据不正确");
         }
         this.saveOrUpdate(rank);
-        if(StrUtil.isNotEmpty(rank.getUseFlag())){
+        if(StringUtils.isNotBlank(rank.getUseFlag())){
             if("1".equals(rank.getUseFlag())){
                 List<RankSystemTable> rank_id = rankSystemTableService.list(new QueryWrapper<RankSystemTable>().eq("rank_id", rank.getId()));
                 if(CollectionUtil.isEmpty(rank_id)){
@@ -91,7 +92,7 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
             }
         }
         if(ObjectUtil.isNotEmpty(rankDTO)){
-            if(StrUtil.isNotEmpty(rankDTO.getId())){
+            if(StringUtils.isNotBlank(rankDTO.getId())){
                 rankChildrenMapper.delete(new QueryWrapper<RankChildren>().eq("rank_id",rankDTO.getId()));
                 rankRRsMapper.delete(new QueryWrapper<RankRRs>().eq("rank_id",rankDTO.getId()));
                 if(CollectionUtil.isNotEmpty(rankDTO.getSequenceIdList())){
@@ -117,7 +118,7 @@ public class RankService extends ServiceImpl<RankMapper, Rank> {
                         }
                     }
                 });
-                if(StrUtil.isNotEmpty(err.get())){
+                if(StringUtils.isNotBlank(err.get())){
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return ResponseEntity.badRequest().body(err.get());
                 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/rank/service/RankSystemTableService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jeeplus.sys.service.dto.PostDTO;
+import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.test.jobPosion.service.dto.PositionDTO;
 import com.jeeplus.test.rank.domain.*;
 import com.jeeplus.test.rank.mapper.*;
@@ -64,7 +65,7 @@ public class RankSystemTableService extends ServiceImpl<RankSystemTableMapper, R
         rankRstLevelMapper.delete(new QueryWrapper<RankRstLevel>().eq("rst_id",rankSystemTable.getId()).eq("rc_id",rankSystemTableDTO.getRcId()).eq("rs_id",rankSystemTableDTO.getRsId()));
 
         if(ObjectUtil.isNotEmpty(rankSystemTableDTO.getRankRstLevelDTO())){
-            if(StrUtil.isNotEmpty(rankSystemTableDTO.getRankRstLevelDTO().getId())){
+            if(StringUtils.isNotBlank(rankSystemTableDTO.getRankRstLevelDTO().getId())){
                 RankRstLevel rankRstLevel = new RankRstLevel();
                 rankRstLevel.setLevelId(rankSystemTableDTO.getRankRstLevelDTO().getId());
                 rankRstLevel.setRstId(rankSystemTable.getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/controller/RosterBaseController.java

@@ -9,6 +9,10 @@ import com.google.common.collect.Lists;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.constant.enums.LogTypeEnum;
+import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.service.UserService;
+import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.mapstruct.UserWrapper;
 import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.rank.domain.Rank;
 import com.jeeplus.test.rank.domain.RankRRs;
@@ -49,6 +53,9 @@ public class RosterBaseController {
     private RosterBaseService rosterBaseService;
 
     @Autowired
+    private UserService userService;
+
+    @Autowired
     private OssService ossService;
 
     /**
@@ -120,4 +127,20 @@ public class RosterBaseController {
         return ResponseEntity.ok(dto);
     }
 
+    /**
+     * 查询所有用户
+     * @return
+     */
+    @ApiLog("查询所有用户")
+    @GetMapping("queryAllSupervisor")
+    public ResponseEntity queryAllSupervisor() {
+        List<UserDTO> userDTOList = new ArrayList<>();
+        List<User> list = userService.list();
+        list.stream().forEach(item->{
+            UserDTO userDTO = UserWrapper.INSTANCE.toDTO (item);
+            userDTOList.add(userDTO);
+        });
+        return ResponseEntity.ok (userDTOList);
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/domain/RosterLeadership.java

@@ -0,0 +1,42 @@
+package com.jeeplus.test.roster.domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.domain.BaseEntity;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 花名册-直属领导
+ * @TableName roster_leadership
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("roster_leadership")
+public class RosterLeadership extends BaseEntity {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 汇报类型
+     */
+    private String debriefType;
+
+    /**
+     * 汇报对象
+     */
+    private String supervisorId;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/RosterLeadershipMapper.java

@@ -0,0 +1,14 @@
+package com.jeeplus.test.roster.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jeeplus.test.roster.domain.RosterLeadership;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @Entity com.jeeplus.test.roster.domain.RosterLeadership
+*/
+@Mapper
+public interface RosterLeadershipMapper extends BaseMapper<RosterLeadership> {
+
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterBaseMapper.xml

@@ -49,6 +49,7 @@
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="headshot" jdbcType="VARCHAR" property="headshot" />
     <association property="rosterContractDTO" javaType="com.jeeplus.test.roster.service.dto.RosterContractDTO" column="id" select="getContractDTO"></association>
+    <association property="rosterLeadershipDTO" javaType="com.jeeplus.test.roster.service.dto.RosterLeadershipDTO" column="id" select="getLeadershipDTO"></association>
     <collection property="rosterBankCardsDTOList" ofType="com.jeeplus.test.roster.service.dto.RosterBankCardsDTO" column="id" select="getBankCardsList"></collection>
     <collection property="rosterEducateDTOList" ofType="com.jeeplus.test.roster.service.dto.RosterEducateDTO" column="id" select="getEducateList"></collection>
     <collection property="rosterWorkDTOList" ofType="com.jeeplus.test.roster.service.dto.RosterWorkDTO" column="id" select="getWorkList"></collection>
@@ -121,6 +122,18 @@
     rc.probation_period_month,
     rc.del_flag
   </sql>
+  <sql id="Leadership_Column_List">
+        rl.id,
+        rl.create_by,
+        rl.create_date,
+        rl.update_by,
+        rl.update_date,
+        rl.remarks,
+        rl.del_flag,
+        rl.base_id,
+        rl.debrief_type,
+        rl.supervisor_id
+    </sql>
   <sql id="BankCards_Column_List">
     rbc.id,
         rbc.create_by,
@@ -224,6 +237,12 @@
     from roster_contract rc
     where rc.del_flag = '0' and rc.base_id = #{id}
   </select>
+  <select id="getLeadershipDTO" resultType="com.jeeplus.test.roster.service.dto.RosterLeadershipDTO">
+    select
+    <include refid="Leadership_Column_List"></include>
+    from roster_leadership rl
+    where rl.del_flag = '0' and rl.base_id = #{id}
+  </select>
   <select id="getBankCardsList" resultType="com.jeeplus.test.roster.service.dto.RosterBankCardsDTO">
     select
     <include refid="BankCards_Column_List"></include>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/mapper/xml/RosterLeadershipMapper.xml

@@ -0,0 +1,32 @@
+<?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.roster.mapper.RosterLeadershipMapper">
+
+    <resultMap id="BaseResultMap" type="com.jeeplus.test.roster.service.dto.RosterLeadershipDTO">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="createBy.id" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createDate" column="create_date" jdbcType="TIMESTAMP"/>
+            <result property="updateBy.id" column="update_by" jdbcType="VARCHAR"/>
+            <result property="updateDate" column="update_date" jdbcType="TIMESTAMP"/>
+            <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+            <result property="delFlag" column="del_flag" jdbcType="INTEGER"/>
+            <result property="baseId" column="base_id" jdbcType="VARCHAR"/>
+            <result property="debriefType" column="debrief_type" jdbcType="VARCHAR"/>
+            <result property="supervisorId" column="supervisor_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        rl.id,
+        rl.create_by,
+        rl.create_date,
+        rl.update_by,
+        rl.update_date,
+        rl.remarks,
+        rl.del_flag,
+        rl.base_id,
+        rl.debrief_type,
+        rl.supervisor_id
+    </sql>
+</mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/RosterBaseService.java

@@ -52,6 +52,9 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
     private RosterCertificateService rosterCertificateService;
 
     @Autowired
+    private RosterLeadershipService rosterLeadershipService;
+
+    @Autowired
     private OssService ossService;
 
     public IPage<RosterBaseDTO> findList(Page<RosterBaseDTO> page, QueryWrapper<RosterBase> queryWrapper){
@@ -62,21 +65,21 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
     public RosterBaseDTO queryById(String id){
         RosterBaseDTO rosterBaseDTO = rosterBaseMapper.queryById(id);
         if(ObjectUtil.isNotEmpty(rosterBaseDTO)){
-            if(StrUtil.isNotEmpty(rosterBaseDTO.getCertificatesFront())){
+            if(StringUtils.isNotBlank(rosterBaseDTO.getCertificatesFront())){
                 String front = ossService.getFileTemporaryLookUrl(rosterBaseDTO.getCertificatesFront());
                 rosterBaseDTO.setCertificatesFrontLsUrl(front);
             }
-            if(StrUtil.isNotEmpty(rosterBaseDTO.getHeadshot())){
+            if(StringUtils.isNotBlank(rosterBaseDTO.getHeadshot())){
                 String headshot = ossService.getFileTemporaryLookUrl(rosterBaseDTO.getHeadshot());
                 rosterBaseDTO.setHeadshotLsUrl(headshot);
             }
-            if(StrUtil.isNotEmpty(rosterBaseDTO.getCertificatesBack())){
+            if(StringUtils.isNotBlank(rosterBaseDTO.getCertificatesBack())){
                 String back = ossService.getFileTemporaryLookUrl(rosterBaseDTO.getCertificatesBack());
                 rosterBaseDTO.setCertificatesBackLsUrl(back);
             }
             if(CollectionUtil.isNotEmpty(rosterBaseDTO.getRosterBankCardsDTOList())){
                 rosterBaseDTO.getRosterBankCardsDTOList().stream().forEach(item->{
-                    if(StrUtil.isNotEmpty(item.getPayrollCardPic())){
+                    if(StringUtils.isNotBlank(item.getPayrollCardPic())){
                         String cardPic = ossService.getFileTemporaryLookUrl(item.getPayrollCardPic());
                         item.setPayrollCardPicLsUrl(cardPic);
                     }
@@ -84,11 +87,11 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
             }
             if(CollectionUtil.isNotEmpty(rosterBaseDTO.getRosterEducateDTOList())){
                 rosterBaseDTO.getRosterEducateDTOList().stream().forEach(item->{
-                    if(StrUtil.isNotEmpty(item.getEducationCertFirst())){
+                    if(StringUtils.isNotBlank(item.getEducationCertFirst())){
                         String certFirst = ossService.getFileTemporaryLookUrl(item.getEducationCertFirst());
                         item.setEducationCertFirstLsUrl(certFirst);
                     }
-                    if(StrUtil.isNotEmpty(item.getEducationCertFirst())){
+                    if(StringUtils.isNotBlank(item.getEducationCertFirst())){
                         String certSecond = ossService.getFileTemporaryLookUrl(item.getEducationCertSecond());
                         item.setEducationCertSecondLsUrl(certSecond);
                     }
@@ -96,7 +99,7 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
             }
             if(CollectionUtil.isNotEmpty(rosterBaseDTO.getRosterFamilyDTOList())){
                 rosterBaseDTO.getRosterFamilyDTOList().stream().forEach(item->{
-                    if(StrUtil.isNotEmpty(item.getBirthCertificate())){
+                    if(StringUtils.isNotBlank(item.getBirthCertificate())){
                         String birth = ossService.getFileTemporaryLookUrl(item.getBirthCertificate());
                         item.setBirthCertificateLsUrl(birth);
                     }
@@ -109,27 +112,27 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
     public ResponseEntity saveRoster(RosterBaseDTO rosterBaseDTO){
 
         if(ObjectUtil.isNotEmpty(rosterBaseDTO)){
-            if(StrUtil.isNotEmpty(rosterBaseDTO.getId())){
-                if(StrUtil.isNotEmpty(rosterBaseDTO.getIdCard())){
+            if(StringUtils.isNotBlank(rosterBaseDTO.getId())){
+                if(StringUtils.isNotBlank(rosterBaseDTO.getIdCard())){
                     List<RosterBase> rosterBaseList = this.list(new QueryWrapper<RosterBase>().eq("id_card", rosterBaseDTO.getIdCard()).ne("id",rosterBaseDTO.getId()));
                     if(CollectionUtil.isNotEmpty(rosterBaseList)){
                         return ResponseEntity.badRequest().body("基础信息-身份证号 已存在，保存失败");
                     }
                 }
-                if(StrUtil.isNotEmpty(rosterBaseDTO.getMobile())){
+                if(StringUtils.isNotBlank(rosterBaseDTO.getMobile())){
                     List<RosterBase> rosterBaseList = this.list(new QueryWrapper<RosterBase>().eq("mobile", rosterBaseDTO.getMobile()).ne("id",rosterBaseDTO.getId()));
                     if(CollectionUtil.isNotEmpty(rosterBaseList)){
                         return ResponseEntity.badRequest().body("基础信息-手机号码 已存在，保存失败");
                     }
                 }
             }else{
-                if(StrUtil.isNotEmpty(rosterBaseDTO.getIdCard())){
+                if(StringUtils.isNotBlank(rosterBaseDTO.getIdCard())){
                     List<RosterBase> rosterBaseList = this.list(new QueryWrapper<RosterBase>().eq("id_card", rosterBaseDTO.getIdCard()));
                     if(CollectionUtil.isNotEmpty(rosterBaseList)){
                         return ResponseEntity.badRequest().body("基础信息-身份证号 已存在，保存失败");
                     }
                 }
-                if(StrUtil.isNotEmpty(rosterBaseDTO.getMobile())){
+                if(StringUtils.isNotBlank(rosterBaseDTO.getMobile())){
                     List<RosterBase> rosterBaseList = this.list(new QueryWrapper<RosterBase>().eq("mobile", rosterBaseDTO.getMobile()));
                     if(CollectionUtil.isNotEmpty(rosterBaseList)){
                         return ResponseEntity.badRequest().body("基础信息-手机号码 已存在，保存失败");
@@ -238,6 +241,15 @@ public class RosterBaseService extends ServiceImpl<RosterBaseMapper, RosterBase>
             }else{
                 rosterFilesService.remove(new QueryWrapper<RosterFiles>().eq("base_id",rosterBase.getId()));
             }
+            //保存直属领导
+            if(ObjectUtil.isNotEmpty(rosterBaseDTO.getRosterLeadershipDTO())){
+                RosterLeadership rosterLeadership = RosterLeadershipWrapper.INSTANCE.toEntity(rosterBaseDTO.getRosterLeadershipDTO());
+                rosterLeadership.setBaseId(rosterBase.getId());
+                rosterLeadershipService.remove(new QueryWrapper<RosterLeadership>().eq("base_id",rosterBase.getId()));
+                rosterLeadershipService.saveOrUpdate(rosterLeadership);
+            }else{
+                rosterLeadershipService.remove(new QueryWrapper<RosterLeadership>().eq("base_id",rosterBase.getId()));
+            }
         }
         return ResponseEntity.ok("花名册保存成功");
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/RosterLeadershipService.java

@@ -0,0 +1,20 @@
+package com.jeeplus.test.roster.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.test.roster.domain.RosterLeadership;
+import com.jeeplus.test.roster.domain.RosterWork;
+import com.jeeplus.test.roster.mapper.RosterLeadershipMapper;
+import com.jeeplus.test.roster.mapper.RosterWorkMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class RosterLeadershipService extends ServiceImpl<RosterLeadershipMapper, RosterLeadership> {
+
+    @Autowired
+    private RosterLeadershipMapper rosterLeadershipMapper;
+
+
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterBaseDTO.java

@@ -267,5 +267,10 @@ public class RosterBaseDTO extends BaseDTO {
      */
     private String headshotLsUrl;
 
+    /**
+     * 直属领导
+     */
+    private RosterLeadershipDTO rosterLeadershipDTO;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/dto/RosterLeadershipDTO.java

@@ -0,0 +1,37 @@
+package com.jeeplus.test.roster.service.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 花名册-直属领导
+ * @TableName roster_leadership
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RosterLeadershipDTO extends BaseDTO {
+
+    /**
+     * 备注信息
+     */
+    private String remarks;
+
+    /**
+     * 基础信息id
+     */
+    private String baseId;
+
+    /**
+     * 汇报类型
+     */
+    private String debriefType;
+
+    /**
+     * 汇报对象
+     */
+    private String supervisorId;
+
+    private static final long serialVersionUID = 1L;
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/roster/service/mapstruct/RosterLeadershipWrapper.java

@@ -0,0 +1,17 @@
+package com.jeeplus.test.roster.service.mapstruct;
+
+import com.jeeplus.core.mapstruct.EntityWrapper;
+import com.jeeplus.test.roster.domain.RosterBankCards;
+import com.jeeplus.test.roster.domain.RosterLeadership;
+import com.jeeplus.test.roster.service.dto.RosterBankCardsDTO;
+import com.jeeplus.test.roster.service.dto.RosterLeadershipDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE, uses = {})
+public interface RosterLeadershipWrapper extends EntityWrapper<RosterLeadershipDTO, RosterLeadership> {
+
+    RosterLeadershipWrapper INSTANCE = Mappers.getMapper(RosterLeadershipWrapper.class);
+
+}

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

@@ -50,7 +50,7 @@ public class WorkClientController {
     public ResponseEntity save(@RequestBody WorkClientInfosDto workClientInfosDto) {
         if(ObjectUtil.isNotEmpty(workClientInfosDto)){
             if(ObjectUtil.isNotEmpty(workClientInfosDto.getWorkClientInfo())){
-                if(StrUtil.isNotEmpty(workClientInfosDto.getWorkClientInfo().getId())){
+                if(StringUtils.isNotBlank(workClientInfosDto.getWorkClientInfo().getId())){
                     return ResponseEntity.ok(workClientService.update(workClientInfosDto));
                 }else{
                     return ResponseEntity.ok(workClientService.save(workClientInfosDto));

jeeplus-web/src/main/resources/application-development.yml

@@ -208,4 +208,7 @@ yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpris
 yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
 
 
+#阿里云文件夹路径
+aliyun_directory: attachment-file/assess
+