cloud-server-account/src/main/java/com/dsh/account/model/query/coachQuery/CoachQuery.java
@@ -2,6 +2,8 @@ import lombok.Data; import java.util.List; @Data public class CoachQuery { private String province; @@ -10,4 +12,5 @@ private String phone; // 编辑页面回显使用 private Integer id; private List<Integer> storeIds; } cloud-server-account/src/main/resources/mapper/CoachMapper.xml
@@ -35,6 +35,7 @@ <if test="query.id!=null and query.id!= ''"> and t1.id LIKE concat('%',#{query.id},'%') </if> and t1.state != 3 </where> </select> cloud-server-course/src/main/resources/mapper/CoursePackagePaymentConfigMapper.xml
@@ -45,8 +45,11 @@ <if test="query.coursePackageTypeName!=null and query.coursePackageTypeName!= ''"> and t2.name like concat('%',#{query.coursePackageTypeName},'%') </if> <if test="query.payStatus!=null and query.payStatus!= ''"> and t1.payStatus = #{query.payStatus} <if test="query.storesIds != null and query.storesIds.size()>0"> AND t2.storeId IN <foreach collection="query.storesIds" separator="," item="id" open="(" close=")"> #{id} </foreach> </if> <if test="query.payStatus!=null and query.payStatus!= ''"> and t1.payStatus = #{query.payStatus} cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java
@@ -1,6 +1,7 @@ package com.dsh.guns.modular.system.controller.code; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.feignClient.account.CityManagerClient; import com.dsh.course.feignClient.account.CoachClient; import com.dsh.course.feignClient.account.CoachTypeClient; @@ -13,6 +14,8 @@ import com.dsh.guns.modular.system.model.CoachChangeStateVO; import com.dsh.guns.modular.system.model.CoachQuery; import com.dsh.guns.modular.system.model.Store; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.util.ResultUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -21,6 +24,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; /** @@ -126,7 +130,6 @@ coach.setCity(cityManager.getCity()); coach.setCityCode(cityManager.getCityCode()); coach.setCityManagerId(objectId); } if (coach.getDiploma().equals("")) { coach.setDiploma(null); @@ -245,6 +248,8 @@ /** * 获取教练列表 */ @Autowired private IStoreService storeService; @RequestMapping(value = "/list") @ResponseBody public List<CoachSerchVO> list(String province, String city, String name, String phone) { @@ -253,6 +258,19 @@ coachQuery.setCity(city); coachQuery.setName(name); coachQuery.setPhone(phone); Integer objectType = UserExt.getUser().getObjectType(); if (objectType == 2){ Integer objectId = UserExt.getUser().getObjectId(); List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)) .stream().map(TStore::getId).collect(Collectors.toList()); coachQuery.setStoreIds(operatorId); } if (objectType == 3){ Integer objectId = UserExt.getUser().getObjectId(); List<Integer> list = new ArrayList<>(); list.add(objectId); coachQuery.setStoreIds(list); } return coachClient.listAll(coachQuery); } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -1,6 +1,7 @@ package com.dsh.guns.modular.system.controller.code; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.course.feignClient.account.AppUserClient; import com.dsh.course.feignClient.account.CityManagerClient; import com.dsh.course.feignClient.account.model.CityManager; @@ -27,9 +28,10 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; /** * 广告管理控制器 * 购课记录控制器 * */ @Controller @@ -120,6 +122,19 @@ @RequestMapping(value = "/listAll") @ResponseBody public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) { Integer objectType = UserExt.getUser().getObjectType(); if (objectType == 2){ Integer objectId = UserExt.getUser().getObjectId(); List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId)) .stream().map(TStore::getId).collect(Collectors.toList()); query.setStoreIds(operatorId); } if (objectType == 3){ Integer objectId = UserExt.getUser().getObjectId(); List<Integer> list = new ArrayList<>(); list.add(objectId); query.setStoreIds(list); } return coursePackagePaymentClient.listAll(query); }
@@ -63,6 +63,8 @@ public String index(Model model) { List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); model.addAttribute("list",list); Integer objectType = UserExt.getUser().getObjectType(); model.addAttribute("type",objectType); return PREFIX + "TCompetition.html"; } @@ -79,6 +81,8 @@ List<TOperator> list1 = tOperatorService.list(); model.addAttribute("yysList",list1); Integer objectType = UserExt.getUser().getObjectType(); model.addAttribute("type",objectType); return PREFIX + "TCompetition_add.html"; } @@ -88,6 +92,8 @@ */ @RequestMapping("/tCompetition_update/{id}") public String tCarUpdate(@PathVariable Integer id, Model model) { Integer objectType = UserExt.getUser().getObjectType(); model.addAttribute("objectType",objectType); Competition competition = competitionClient.queryById(id); System.out.println("======competition======"+competition); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -114,6 +120,8 @@ } @RequestMapping("/tCompetition_info/{id}") public String tCarInfo(@PathVariable Integer id, Model model) { Integer objectType = UserExt.getUser().getObjectType(); model.addAttribute("objectType",objectType); Competition competition = competitionClient.queryById(id); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String startTime = formatter.format(competition.getStartTime()); cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -3,7 +3,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.feignClient.account.CityManagerClient; @@ -15,12 +14,12 @@ import com.dsh.guns.config.UserExt; import com.dsh.guns.core.base.controller.BaseController; import com.dsh.guns.core.util.ToolUtil; import com.dsh.guns.modular.system.model.TCity; import com.dsh.guns.modular.system.model.TOperator; import com.dsh.guns.modular.system.model.TSite; import com.dsh.guns.modular.system.model.TStore; import com.dsh.guns.modular.system.model.dto.SelectDto; import com.dsh.guns.modular.system.service.*; import com.dsh.guns.modular.system.service.ICoursePackageService; import com.dsh.guns.modular.system.service.IStoreService; import com.dsh.guns.modular.system.service.ITSiteService; import com.dsh.guns.modular.system.util.ResultUtil; import io.swagger.models.auth.In; import org.aspectj.weaver.ast.Var; @@ -71,8 +70,7 @@ @Resource private CoursePackageClient coursePackageClient; @Autowired private ICityService cityService; @@ -102,16 +100,20 @@ * @param model * @return */ @Autowired private TOperatorService operatorService; @GetMapping("/openCoursePackageListPage") public String openCoursePackageListPage(Model model){ Integer objectType = UserExt.getUser().getObjectType(); Integer objectId = UserExt.getUser().getObjectId(); List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType(); model.addAttribute("coursePackageType", tCoursePackageTypes); List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); String cityCode = null; if(objectType == 2){//城市管理员 CityManager cityManager = cityManagerClient.queryCityManagerById(objectId); if (cityManager!=null){ cityCode = cityManager.getCityCode(); } } List<Map<String, Object>> list = storeService.queryProvince(cityCode); model.addAttribute("province", list); model.addAttribute("objectType", objectType); return PREFIX + "coursePackage.html"; @@ -132,7 +134,9 @@ String cityCode = null; if(objectType == 2){//城市管理员 CityManager cityManager = cityManagerClient.queryCityManagerById(objectId); cityCode = cityManager.getCityCode(); if (cityManager!=null){ cityCode = cityManager.getCityCode(); } } List<Map<String, Object>> list = storeService.queryProvince(cityCode); model.addAttribute("province", list); @@ -150,6 +154,7 @@ model.addAttribute("type",type); model.addAttribute("objectType",objectType); System.out.println("========type========"+type); // if (type ==1){ // return PREFIX + "coursePackage_edit.html"; cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoachQuery.java
@@ -2,6 +2,8 @@ import lombok.Data; import java.util.List; @Data public class CoachQuery { private String province; @@ -10,4 +12,5 @@ private String phone; // 编辑页面回显使用 private Integer id; private List<Integer> storeIds; } cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/CoursePackagePaymentQuery.java
@@ -27,4 +27,5 @@ private String payUser; // 购买学员 private String payStudent; } cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage.html
@@ -12,6 +12,8 @@ <div class="row"> <div class="col-lg-10 col-sm-9"> <div class="row"> @if(objectType==1){ <div class="col-lg-4 col-sm-12" ${objectType == 3 ? 'style="display: none;"' : ''}> <#SelectCon id="provinceCode" name="所在省"> <option value="">全部</option> @@ -25,6 +27,7 @@ <option value="">全部</option> </#SelectCon> </div> @} <div class="col-lg-4 col-sm-12"> <#SelectCon id="coursePackageTypeId" name="课包类型"> <option value="">全部</option> cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_add.html
@@ -49,6 +49,7 @@ <div class="row"> <div class="form-group"> <input type="hidden" value="${type}" id="type" name="type"> @if(objectType==1){ <label class="col-sm-3 control-label">*所在省：</label> <div class="col-sm-4"> <select class="form-control" id="provinceCode" name="provinceCode"> @@ -68,6 +69,7 @@ </select> </div> </div> @} <div class="form-group"> <label class="col-sm-3 control-label">*所属门店：</label> <div class="col-sm-4"> cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_edit.html
@@ -47,6 +47,7 @@ <div class="row"> <input type="hidden" id="id" value="${item.id}"> <input type="hidden" id="type" name="type" value="${type}"> @if(type==1){ <div class="form-group"> <label class="col-sm-3 control-label">*所在省：</label> <div class="col-sm-4"> @@ -67,6 +68,7 @@ </select> </div> </div> @} <div class="form-group"> <label class="col-sm-3 control-label">*所属门店：</label> <div class="col-sm-4"> cloud-server-management/src/main/webapp/WEB-INF/view/system/coursePackage/coursePackage_info.html
@@ -5,6 +5,7 @@ <div class="row"> <input type="hidden" id="id" value="${item.id}"> <input type="hidden" id="type" name="type" value="${type}"> @if(type==1){ <div class="form-group"> <label class="col-sm-3 control-label">*所在省：</label> <div class="col-sm-4"> @@ -25,6 +26,7 @@ </select> </div> </div> @} <div class="form-group"> <label class="col-sm-3 control-label">*所属门店：</label> <div class="col-sm-4"> cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition.html
@@ -11,6 +11,7 @@ <div class="row row-lg"> <div class="col-sm-12"> <div class="row"> @if(type==1){ <div class="col-sm-3"> <div class="input-group"> <div class="input-group-btn open"> @@ -37,6 +38,7 @@ </select> </div> </div> @} <div class="col-sm-3"> <#NameCon id="shopName" name="门店名称" /> </div> cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_add.html
@@ -48,7 +48,7 @@ <div class="form-horizontal" id="carInfoForm"> @if(type==1){ <div class="form-group" > <label class="col-sm-3 control-label">所属运营商：</label> <div class="col-sm-9"> @@ -61,8 +61,6 @@ <input type="checkbox" value="0" name="pt" onchange="TCarInfoDlg.oneChangeYys(this)">平台</input> </div> </div> <div class="form-group" id="provinceCode"> <label class="col-sm-3 control-label">所在省：</label> <div class="col-sm-9"> @@ -70,10 +68,6 @@ </select> </div> </div> <div class="form-group" id="cityCode"> <label class="col-sm-3 control-label">举办市：</label> <div class="col-sm-9"> @@ -82,6 +76,7 @@ </select> </div> </div> @} <div class="form-group" id="shop"> <label class="col-sm-3 control-label">举办门店：</label> <div class="col-sm-9"> cloud-server-management/src/main/webapp/WEB-INF/view/system/tCompetition/TCompetition_edit.html
@@ -53,7 +53,7 @@ <input hidden id="q3" value="${item.classPrice}"> <input hidden id="rname" value="${item.realName}"> <input hidden id="type" value="${item.status}"> @if(type==2){ @if(objectType==1){ <#label id="types" name="当前状态" type="text" /> <div class="form-group" id="provinceCode"> <label class="col-sm-3 control-label">举办省：</label> cloud-server-management/src/main/webapp/static/modular/system/tCoach/tCoach.js
@@ -26,7 +26,7 @@ }, {title: '所在市', field: 'city', visible: objectType==1?true:false, align: 'center', valign: 'middle', }, {title: '所属账号', field: 'nameAndPhone', visible: true, align: 'center', valign: 'middle'}, {title: '所属账号', field: 'nameAndPhone', visible: objectType==1?true:false, align: 'center', valign: 'middle'}, {title: '教练类型', field: 'coachTypeName', visible: true, align: 'center', valign: 'middle', }, {title: '姓名', field: 'name', visible: true, align: 'center', valign: 'middle',
