Merge branch 'pre' into 'master'

Pre

See merge request !256

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

@@ -23,9 +23,13 @@
                             <input type="text" name="name"/>
                         </li>
                         <li>
-                            <label>职责组：</label>
+                            <label>申请组：</label>
                             <input type="text" name="team"/>
                         </li>
+                        <li>
+                            <label>分配组：</label>
+                            <input type="text" name="teamAudit"/>
+                        </li>
                         <li>
                             <label>手机号：</label>
                             <input type="text" name="phone"/>
@@ -121,15 +125,19 @@
                 },
                 {
                     field: 'team1',
-                    title: '申请职责1'
+                    title: '申请组1'
                 },
                 {
                     field: 'team2',
-                    title: '申请职责2'
+                    title: '申请组2'
                 },
                 {
                     field: 'team3',
-                    title: '申请职责3'
+                    title: '申请组3'
+                },
+                {
+                    field: 'teamAudit',
+                    title: '分配组'
                 },
                 {
                     field: 'status',

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

@@ -21,8 +21,10 @@ public class SmileVSParam {
     private Integer status;
     @ApiModelProperty(value = "性别[1-男|2-女]", example = "")
     private Integer sex;
-    @ApiModelProperty(value = "职责组名称", example = "")
+    @ApiModelProperty(value = "申请职责组名称", example = "")
     private String team;
+    @ApiModelProperty(value = "分配职责组名称", example = "")
+    private String teamAudit;
     @ApiModelProperty(value = "活动id", example = "")
     private String projectId;
 

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

@@ -78,6 +78,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
             map.put("name", param.getName());
             map.put("phone", param.getPhone());
             map.put("team", param.getTeam());
+            map.put("teamAudit", param.getTeamAudit());
             map.put("title", param.getTitle() == null ? "" : param.getTitle());
             map.put("status", param.getStatus() + "");
             map.put("projectId", param.getProjectId());
@@ -162,6 +163,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
         map.put("title", param.getTitle() == null ? "" : param.getTitle());
         map.put("status", param.getStatus() + "");
         map.put("sex", param.getSex().toString());
+        map.put("teamAudit", param.getTeamAudit());
         map.put("projectId", param.getProjectId());
         List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
         List<VolunteersExportVo> voList = new ArrayList();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/VolunteersExportDto.java

@@ -23,6 +23,7 @@ public class VolunteersExportDto implements Serializable, Cloneable {
     private String team1;
     private String team2;
     private String team3;
+    private String teamAudit;
     private String introduce;
 
     private static final VolunteersExportDto obj = new VolunteersExportDto();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersMapper.xml

@@ -20,6 +20,7 @@
         <result column="team1Name" property="team1"/>
         <result column="team2Name" property="team2"/>
         <result column="team3Name" property="team3"/>
+        <result column="teamAudit" property="teamAudit"/>
         <result column="introduce" property="introduce"/>
     </resultMap>
 
@@ -49,12 +50,15 @@
         svt1.name as 'team1Name',
         svt2.name as 'team2Name',
         svt3.name as 'team3Name',
+        t.name as 'teamAudit',
         sv.introduce
         from smile_volunteers as sv
         inner join smile_volunteers_project as svp on svp.project_id = sv.project_id
         left join smile_volunteers_team as svt1 on svt1.team_id = sv.team_id1
         left join smile_volunteers_team as svt2 on svt2.team_id = sv.team_id2
         left join smile_volunteers_team as svt3 on svt3.team_id = sv.team_id3
+        left join (select a.uid,b.name,a.project_id from smile_volunteers_team_relation as a inner join smile_volunteers_team as b on a.team_id = b.team_id) as t
+        on sv.uid = t.uid and sv.project_id = t.project_id
         <where>
             <if test="title!=''">
                 AND svp.title like concat('%',#{title},'%')
@@ -79,6 +83,9 @@
             <if test="team!=''">
                 AND (svt1.name = #{team} OR svt2.name = #{team} OR svt3.name = #{team})
             </if>
+            <if test="teamAudit!=''">
+                AND t.name = #{teamAudit}
+            </if>
         </where>
         ORDER BY sv.created_at desc
     </select>