志愿者相关搜索

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -18,6 +18,10 @@
                             <label>用户名称：</label>
                             <input type="text" name="name"/>
                         </li>
+                        <li>
+                            <label>职责组：</label>
+                            <input type="text" name="team"/>
+                        </li>
                         <li>
                             <label>手机号：</label>
                             <input type="text" name="phone"/>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileVSParam.java

@@ -19,6 +19,8 @@ public class SmileVSParam {
     private String phone;
     @ApiModelProperty(value = "审核状态", example = "")
     private Integer status;
+    @ApiModelProperty(value = "职责组名称", example = "")
+    private String team;
 
     @ApiModelProperty(value = "页数", example = "1")
     @NotNull(message = "页数不能为空")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -39,12 +40,21 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
     @Override
     public List<SmileVolunteers> list(SmileVSParam param) {
         try {
-            TableDataInfo rspData = new TableDataInfo();
             LambdaQueryWrapper<SmileVolunteers> wrappers = Wrappers.lambdaQuery(SmileVolunteers.class);
             if (param.getTitle() != null && !param.getTitle().equals("")) {
                 List<String> projectIdArray = volunteersProjectMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersProject.class).like(SmileVolunteersProject::getTitle, param.getTitle())).stream().map(SmileVolunteersProject::getProjectId).collect(Collectors.toList());
                 wrappers.in(SmileVolunteers::getProjectId, projectIdArray);
             }
+            if (param.getTeam() != null && !param.getTeam().equals("")) {
+                SmileVolunteersTeam smileVolunteersTeam = volunteersTeamMapper.selectOne(Wrappers.lambdaQuery(SmileVolunteersTeam.class).eq(SmileVolunteersTeam::getName, param.getTeam()));
+                if (smileVolunteersTeam != null) {
+                    wrappers.and(
+                            i -> i.eq(SmileVolunteers::getTeamId1, smileVolunteersTeam.getTeamId())
+                                    .or().eq(SmileVolunteers::getTeamId2, smileVolunteersTeam.getTeamId())
+                                    .or().eq(SmileVolunteers::getTeamId3, smileVolunteersTeam.getTeamId())
+                    );
+                }
+            }
             if (param.getName() != null && !param.getName().equals("")) {
                 wrappers.eq(SmileVolunteers::getName, param.getName());
             }
@@ -54,6 +64,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
             if (param.getStatus() != null && !param.getStatus().equals(-1)) {
                 wrappers.eq(SmileVolunteers::getStatus, param.getStatus());
             }
+
             List<SmileVolunteers> data = volunteersMapper.selectList(wrappers.orderByDesc(SmileVolunteers::getCreatedAt));
             return data;
         } catch (Exception e) {