接口修改

jsjp-admin/src/main/java/com/miaxis/app/controller/coach/CoachManySchoolController.java

@@ -0,0 +1,109 @@
+package com.miaxis.app.controller.coach;
+
+import com.miaxis.coach.domain.CoachManySchool;
+import com.miaxis.coach.service.ICoachManySchoolService;
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【教练员驾校关系】Controller
+ *
+ * @author zhangbin
+ * @date 2023-07-25
+ */
+@RestController
+@RequestMapping("/coach/info")
+@Api(tags={"【小程序-教练员驾校关系】"})
+public class CoachManySchoolController extends BaseController{
+    @Autowired
+    private ICoachManySchoolService coachManySchoolService;
+
+    /**
+     * 查询教练员驾校关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询教练员驾校关系列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<CoachManySchool> list(@ModelAttribute CoachManySchool coachManySchool){
+        startPage();
+        List<CoachManySchool> list = coachManySchoolService.selectCoachManySchoolList(coachManySchool);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出教练员驾校关系列表
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:export')")
+    @Log(title = "教练员驾校关系", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出教练员驾校关系列表Excel")
+    public Response<String> export(@ModelAttribute CoachManySchool coachManySchool){
+        List<CoachManySchool> list = coachManySchoolService.selectCoachManySchoolList(coachManySchool);
+        ExcelUtil<CoachManySchool> util = new ExcelUtil<CoachManySchool>(CoachManySchool.class);
+        return util.exportExcel(list, "coach");
+    }
+
+    /**
+     * 获取教练员驾校关系详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:query')")
+    @GetMapping(value = "/{coachId}")
+    @ApiOperation("获取教练员驾校关系详细信息")
+    public Response<CoachManySchool> getInfo(
+            @ApiParam(name = "coachId", value = "教练员驾校关系参数", required = true)
+            @PathVariable("coachId") Long coachId
+    ){
+        return Response.success(coachManySchoolService.getById(coachId));
+    }
+
+    /**
+     * 新增教练员驾校关系
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:add')")
+    @Log(title = "教练员驾校关系", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增教练员驾校关系")
+    public Response<Integer> add(@RequestBody CoachManySchool coachManySchool){
+        return toResponse(coachManySchoolService.save(coachManySchool) ? 1 : 0);
+    }
+
+    /**
+     * 修改教练员驾校关系
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:edit')")
+    @Log(title = "教练员驾校关系", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改教练员驾校关系")
+    public Response<Integer> edit(@RequestBody CoachManySchool coachManySchool){
+        return toResponse(coachManySchoolService.updateById(coachManySchool) ? 1 : 0);
+    }
+
+    /**
+     * 删除教练员驾校关系
+     */
+    @PreAuthorize("@ss.hasPermi('coach:coach:remove')")
+    @Log(title = "教练员驾校关系", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{coachIds}")
+    @ApiOperation("删除教练员驾校关系")
+    public  Response<Integer> remove(
+            @ApiParam(name = "coachIds", value = "教练员驾校关系ids参数", required = true)
+            @PathVariable Long[] coachIds
+    ){
+        return toResponse(coachManySchoolService.removeByIds(Arrays.asList(coachIds)) ? 1 : 0);
+    }
+}

jsjp-admin/src/main/java/com/miaxis/app/controller/tms/TmsStudentInfoController.java

@@ -1,6 +1,8 @@
 package com.miaxis.app.controller.tms;
 
 
+import com.miaxis.coach.domain.CoachManySchool;
+import com.miaxis.coach.service.ICoachManySchoolService;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
@@ -38,14 +40,15 @@ public class TmsStudentInfoController extends BaseController {
     @Autowired
     private ITmsStudentInfoService studentInfoService;
 
-
+    @Autowired
+    private ICoachManySchoolService coachManySchoolService;
 
 
     /**
-     * 查询全部学员信息列表(预报名和正式学员一起查)
+     * 查询我的学员信息列表(查询用)
      */
     @GetMapping("/allStudentInfoList")
-    @ApiOperation("查询全部学员信息列表(预报名和正式学员一起查)")
+    @ApiOperation("查询我的学员信息列表(查询用)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
@@ -57,6 +60,30 @@ public class TmsStudentInfoController extends BaseController {
     }
 
 
+    /**
+     * 查询在校学员信息列表(查询用)
+     */
+    @GetMapping("/allSchoolStudentInfoList")
+    @ApiOperation("查询在校学员信息列表(查询用)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "当前页码", dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize", value = "每页数据量", dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<TmsStudentInfoVo> allSchoolStudentInfoList(@ModelAttribute TmsAllStudentInfoDTO allStudentInfoDTO) {
+        startPage();
+        if(allStudentInfoDTO.getCoachId()!=null) {
+            CoachManySchool coachManySchool = coachManySchoolService.getById(allStudentInfoDTO.getCoachId());
+            if(coachManySchool!=null) {
+                allStudentInfoDTO.setSchoolId(coachManySchool.getSchoolIds());
+            }
+        }
+        allStudentInfoDTO.setCoachId(null);
+        List<TmsStudentInfoVo> stuInfoList = studentInfoService.getTmsAllStudentInfoList(allStudentInfoDTO);
+        return toResponsePageInfo(stuInfoList);
+    }
+
+
+
     /**
      * 查询学员信息列表
      */

jsjp-service/src/main/java/com/miaxis/coach/domain/CoachManySchool.java

@@ -0,0 +1,41 @@
+package com.miaxis.coach.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+/**
+ * 教练员驾校关系对象 coach_many_school
+ *
+ * @author zhangbin
+ * @date 2023-07-25
+ */
+@Data
+@TableName("coach_many_school")
+@ApiModel(value = "CoachManySchool", description = "教练员驾校关系对象 coach_many_school")
+public class CoachManySchool extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 教练员ID */
+    @TableId(value = "coach_id")
+    @ApiModelProperty(value = "教练员ID")
+    private Long coachId;
+
+    /** 教练员名称 */
+    @Excel(name = "教练员名称")
+    @TableField("coach_name")
+    @ApiModelProperty(value = "教练员名称")
+    private String coachName;
+
+    /** 多驾校ID ","隔开 */
+    @Excel(name = "多驾校ID")
+    @TableField("school_ids")
+    @ApiModelProperty(value = "多驾校ID")
+    private String schoolIds;
+
+
+}

jsjp-service/src/main/java/com/miaxis/coach/mapper/CoachManySchoolMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.coach.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.coach.domain.CoachManySchool;
+
+/**
+ * 教练员驾校关系Mapper接口
+ *
+ * @author zhangbin
+ * @date 2023-07-25
+ */
+public interface CoachManySchoolMapper extends BaseMapper<CoachManySchool> {
+    /**
+     * 查询教练员驾校关系列表
+     *
+     * @param coachManySchool 教练员驾校关系
+     * @return 教练员驾校关系集合
+     */
+    public List<CoachManySchool> selectCoachManySchoolList(CoachManySchool coachManySchool);
+
+}

jsjp-service/src/main/java/com/miaxis/coach/service/ICoachManySchoolService.java

@@ -0,0 +1,21 @@
+package com.miaxis.coach.service;
+
+import java.util.List;
+import com.miaxis.coach.domain.CoachManySchool;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 教练员驾校关系Service接口
+ *
+ * @author zhangbin
+ * @date 2023-07-25
+ */
+public interface ICoachManySchoolService extends IService<CoachManySchool>{
+    /**
+     * 查询教练员驾校关系列表
+     *
+     * @param coachManySchool 教练员驾校关系
+     * @return 教练员驾校关系集合
+     */
+    public List<CoachManySchool> selectCoachManySchoolList(CoachManySchool coachManySchool);
+}

jsjp-service/src/main/java/com/miaxis/coach/service/impl/CoachManySchoolServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.coach.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.coach.mapper.CoachManySchoolMapper;
+import com.miaxis.coach.domain.CoachManySchool;
+import com.miaxis.coach.service.ICoachManySchoolService;
+
+/**
+ * 教练员驾校关系Service业务层处理
+ *
+ * @author zhangbin
+ * @date 2023-07-25
+ */
+@Service
+public class CoachManySchoolServiceImpl extends ServiceImpl<CoachManySchoolMapper, CoachManySchool> implements ICoachManySchoolService {
+    @Autowired
+    private CoachManySchoolMapper coachManySchoolMapper;
+
+    /**
+     * 查询教练员驾校关系列表
+     *
+     * @param coachManySchool 教练员驾校关系
+     * @return 教练员驾校关系
+     */
+    @Override
+    public List<CoachManySchool> selectCoachManySchoolList(CoachManySchool coachManySchool){
+        return coachManySchoolMapper.selectCoachManySchoolList(coachManySchool);
+    }
+}

jsjp-service/src/main/java/com/miaxis/tms/dto/TmsAllStudentInfoDTO.java

@@ -14,7 +14,7 @@ public class TmsAllStudentInfoDTO implements Serializable {
     private String field;
 
     @ApiModelProperty(value = "驾校ID")
-    private Long schoolId;
+    private String schoolId;
 
     @ApiModelProperty(value = "教练员ID")
     private Long coachId;

jsjp-service/src/main/java/com/miaxis/tms/service/impl/TmsStudentInfoServiceImpl.java

@@ -1,6 +1,8 @@
 package com.miaxis.tms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.miaxis.coach.domain.CoachManySchool;
+import com.miaxis.coach.service.ICoachManySchoolService;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.common.utils.bean.BeanUtils;
@@ -31,6 +33,7 @@ public class TmsStudentInfoServiceImpl extends ServiceImpl<TmsStudentInfoMapper,
     TmsStudentInfoMapper mapper;
 
 
+
     @Override
     public List<TmsStudentInfoVo> getTmsAllStudentInfoList(TmsAllStudentInfoDTO aLLStudentInfoDTO) {
         return mapper.getTmsAllStudentInfoList(aLLStudentInfoDTO);

jsjp-service/src/main/resources/mapper/tms/TmsStudentInfoMapper.xml

@@ -106,7 +106,6 @@
                  left join tms_student_train_info@tms${city} t2
                            on t1.tso_id = t2.sri_student_id
         <where>
-            AND t1.TSO_HISTORY = '0'
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
             <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId,jdbcType=NUMERIC } </if>
@@ -123,7 +122,6 @@
         select t1.TSO_ID, t1.TSO_IDCARD, t1.TSO_NAME,t1.TSO_SEX,t1.Tso_Phone,t1.TSO_APPLYDATE, t1.TSO_STATE , t1.TSO_TRAINTYPE, t1.tso_photo_path, t1.TSO_REMARK,'1' as bm_type
         from tms_student_info_temp@tms${city} t1
         <where>
-            AND t1.TSO_HISTORY = '0'
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
             <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId,jdbcType=NUMERIC } </if>
@@ -147,11 +145,14 @@
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
         <where>
-            AND t1.TSO_HISTORY = '0'
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
             <if test="field != null  and field != ''"> AND (t1.Tso_Name like '%' || #{field,jdbcType=VARCHAR} || '%' or t1.TSO_IDCARD like '%' || #{field,jdbcType=VARCHAR} || '%' or t1.Tso_Phone like '%' || #{field,jdbcType=VARCHAR} || '%') </if>
-            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID = #{schoolId,jdbcType=NUMERIC} </if>
+            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID in
+                <foreach item="sid" index="index" collection="schoolId.split(',')" open="(" separator="," close=")">
+                    #{sid}
+                </foreach>
+            </if>
             <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId,jdbcType=NUMERIC } </if>
         </where>
         union
@@ -163,11 +164,14 @@
         left join tms_student_train_info@tms${city} t2
         on t1.tso_id = t2.sri_student_id
         <where>
-            AND t1.TSO_HISTORY = '0'
             AND t1.TSO_BUSITYPE in ('0', '1')
             AND t1.TSO_LOGOUT = 0
             <if test="field != null  and field != ''"> AND (t1.Tso_Name like '%' || #{field,jdbcType=VARCHAR} || '%' or t1.TSO_IDCARD like '%' || #{field,jdbcType=VARCHAR} || '%' or t1.Tso_Phone like '%' || #{field,jdbcType=VARCHAR} || '%') </if>
-            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID = #{schoolId,jdbcType=NUMERIC} </if>
+            <if test="schoolId != null "> and t1.TSO_SCHOOL_ID in
+                <foreach item="sid" index="index" collection="schoolId.split(',')" open="(" separator="," close=")">
+                    #{sid}
+                </foreach>
+            </if>
             <if test="coachId!=null" > AND t1.TSO_COACHID = #{coachId,jdbcType=NUMERIC } </if>
         </where>
         )