yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

认证等级

This commit is contained in:
曹磊 2024-08-14 22:22:47 +08:00
parent 9b1d4e8103
commit 215d514284
10 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
View File

@ -93,11 +93,10 @@ public class ArtificerController {
return Result.success();
}
@GetMapping("/selectMassageTypePage")
@ApiOperation("查询按摩分类（分页）")
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,Integer sort,String city,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){
return massageTypeService.selectMassageTypePage(page, limit, status, city, sort,authentication,by,title,artificerId,userId,parentId,classifyId);
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,String classifyId,Long classifyIdT){
return massageTypeService.selectMassageTypePage(page, limit, status, city, sort,authentication,by,title,artificerId,userId,parentId,classifyId,classifyIdT);
}
@GetMapping("/selectMassageTypeChildrenPage")
@ApiOperation("查询按摩分类子项目（分页）")
@ -120,7 +119,7 @@ public class ArtificerController {
@ApiOperation("查询技师列表")
public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
String longitude,String latitude,Integer sort,Integer authentication,
Integer by,Integer status,String city,Long classifyId,String phone,Integer isStart,Integer technicianType,String isBack){
Integer by,Integer status,String city,String classifyId,String phone,Integer isStart,Integer technicianType,String isBack){
return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude,
sort,authentication,by,status,city,classifyId,phone,null,isStart,technicianType,isBack);
}
@ -143,8 +142,8 @@ public class ArtificerController {
@GetMapping("/selectArtificerMassageList")
@ApiOperation("查询技师服务列表")
public Result selectArtificerMassageList(Long artificerId,Integer status){
return massageTypeService.selectArtificerMassageList(artificerId,status);
public Result selectArtificerMassageList(Long artificerId,Integer status,String classifyId,String title){
return massageTypeService.selectArtificerMassageList(artificerId,status,classifyId,title);
}
@GetMapping("/selectArtificerById")

12
src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
View File

@ -95,12 +95,10 @@ public class AppArtificerController {
@GetMapping("/selectMassageTypePage")
@ApiOperation("查询按摩分类（分页）")
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,Integer sort,String city,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){
return massageTypeService.selectMassageTypePage(page, limit, status, city, sort,authentication,by,title,artificerId,userId,parentId,classifyId);
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,Integer sort,String city,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,String classifyId,Long classifyIdT){
return massageTypeService.selectMassageTypePage(page, limit, status, city, sort,authentication,by,title,artificerId,userId,parentId,classifyId,classifyIdT);
}
@GetMapping("/selectMassageTypeQyPage")
@ApiOperation("查询按摩分类（分页）")
public Result selectMassageTypeQyPage(Integer page,Integer limit,String city,String title){
@ -137,7 +135,7 @@ public class AppArtificerController {
@ApiOperation("查询技师列表")
public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
String longitude,String latitude,Integer sort,Integer authentication,
Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status){
Integer by,String city,String classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status){
if(status == null){
status = -1;
}
@ -148,8 +146,8 @@ public class AppArtificerController {
@GetMapping("/selectArtificerMassageList")
@ApiOperation("查询技师服务列表")
public Result selectArtificerMassageList(Long artificerId,Integer status){
return massageTypeService.selectArtificerMassageList(artificerId,status);
public Result selectArtificerMassageList(Long artificerId,Integer status,String classifyId,String title){
return massageTypeService.selectArtificerMassageList(artificerId,status,classifyId,title);
}

2
src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java
View File

@ -21,7 +21,7 @@ public interface ArtificerDao extends BaseMapper<Artificer> {
@Param("latitude")String latitude,@Param("sort") Integer sort,
@Param("authentication") Integer authentication,@Param("by") Integer by,
@Param("status") Integer status,@Param("city") String city,
@Param("classifyId") Long classifyId,@Param("phone") String phone,
@Param("classifyId") String classifyId,@Param("phone") String phone,
Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType,@Param("isBack")String isBack);
Artificer selectArtificerById(@Param("userId") Long userId,@Param("artificerId") Long artificerId,@Param("longitude") String longitude,@Param("latitude") String latitude);

6
src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java
View File

@ -15,13 +15,13 @@ import java.util.List;
@Mapper
public interface MassageTypeDao extends BaseMapper<MassageType> {
List<MassageType> selectArtificerMassageList(@Param("artificerId") Long artificerId,@Param("status") Integer status);
List<MassageType> selectArtificerMassageList(@Param("artificerId") Long artificerId,@Param("status") Integer status,@Param("classifyId") String classifyId,@Param("title") String title);
IPage<MassageType> selectMassageTypePage(Page<MassageType> page,@Param("status") Integer status,@Param("city") String city,@Param("sort") Integer sort,@Param("authentication") Integer authentication,@Param("by")Integer by,@Param("title") String title,@Param("artificerId") Long artificerId,@Param("parentId") Long parentId,@Param("classifyId") Long classifyId);
IPage<MassageType> selectMassageTypePage(Page<MassageType> page,@Param("status") Integer status,@Param("city") String city,@Param("sort") Integer sort,@Param("authentication") Integer authentication,@Param("by")Integer by,@Param("title") String title,@Param("artificerId") Long artificerId,@Param("parentId") Long parentId,@Param("classifyId") String classifyId,@Param("classifyIdT") Long classifyIdT);
List<MassageType> selectMassageTypeList(@Param("status") Integer status,@Param("city") String city,@Param("sort") Integer sort,@Param("authentication") Integer authentication,@Param("by")Integer by,@Param("title") String title,@Param("artificerId") Long artificerId,@Param("parentId") Long parentId,@Param("classifyId") Long classifyId);
IPage<MassageType> selectMassageTypeChildrenPage(Page<MassageType> pages, Integer status, String city, Integer sort, Integer authentication, Integer by, String title, Long artificerId, Long parentId, Long classifyId);
IPage<?> selectMassageTypeQyPage(Page<MassageType> pages, @Param("city")String city, @Param("title")String title);
IPage<MassageType> selectMassageTypeQyPage(Page<MassageType> pages, @Param("city")String city, @Param("title")String title);
}

2
src/main/java/com/sqx/modules/artificer/service/ArtificerService.java
View File

@ -14,7 +14,7 @@ public interface ArtificerService extends IService<Artificer> {
Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName,
String longitude,String latitude,Integer sort,Integer authentication,
Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack);
Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack);
Artificer selectArtificerById(Long userId,Long artificerId,String longitude,String latitude);

4
src/main/java/com/sqx/modules/artificer/service/MassageTypeService.java
View File

@ -8,9 +8,9 @@ import com.sqx.modules.artificer.entity.MassageType;
public interface MassageTypeService extends IService<MassageType> {
Result selectArtificerMassageList(Long artificerId,Integer status);
Result selectArtificerMassageList(Long artificerId,Integer status,String classifyId,String title);
Result selectMassageTypePage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId);
Result selectMassageTypePage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,String classifyId,Long classifyIdT);
Result selectMassageTypeList(Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId);

2
src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
View File

@ -78,7 +78,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
@Override
public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId,String artificerName,
String longitude,String latitude,Integer sort,Integer authentication,
Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack){
Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack){
Page<Artificer> pages=new Page<>(page,limit);
if(StringUtils.isEmpty(longitude)){

8
src/main/java/com/sqx/modules/artificer/service/impl/MassageTypeServiceImpl.java
View File

@ -30,18 +30,18 @@ public class MassageTypeServiceImpl extends ServiceImpl<MassageTypeDao, MassageT
SysDictService sysDictService;
@Override
public Result selectArtificerMassageList(Long artificerId,Integer status){
List<MassageType> massageTypes = baseMapper.selectArtificerMassageList(artificerId, status);
public Result selectArtificerMassageList(Long artificerId,Integer status,String classifyId,String title){
List<MassageType> massageTypes = baseMapper.selectArtificerMassageList(artificerId, status,classifyId,title);
return Result.success().put("data",massageTypes);
}
@Override
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,String classifyId,Long classifyIdT){
if(StringUtils.isNotEmpty(title) && userId!=null){
appSearchService.insetAppSearch(title, userId);
}
Page<MassageType> pages=new Page<>(page,limit);
return Result.success().put("data",new PageUtils(baseMapper.selectMassageTypePage(pages,status,city,sort,authentication,by,title,artificerId,parentId,classifyId)));
return Result.success().put("data",new PageUtils(baseMapper.selectMassageTypePage(pages,status,city,sort,authentication,by,title,artificerId,parentId,classifyId,classifyIdT)));
}
@Override
public Result selectMassageTypeChildrenPage(Integer page,Integer limit,Integer status,String city,Integer sort,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){

4
src/main/resources/mapper/artificer/ArtificerDao.xml
View File

@ -23,8 +23,8 @@
<if test="isStart!=null and isStart!=0">
and a.is_start=#{isStart}
</if>
<if test="classifyId!=null and classifyId!=0">
and classify_id=#{classifyId}
<if test="classifyId!=null and classifyId!=''">
and FIND_IN_SET(#{classifyId},a.classify_id) > 0
</if>
<if test="technicianType!=null and technicianType!=0">
and a.technician_type=#{technicianType}

18
src/main/resources/mapper/artificer/MassageTypeDao.xml
View File

@ -4,13 +4,20 @@
<mapper namespace="com.sqx.modules.artificer.dao.MassageTypeDao">
<select id="selectArtificerMassageList" resultType="com.sqx.modules.artificer.entity.MassageType">
select t.*,m.artificer_massage_id as artificerMassageId,m.status as artificerMassageStatus
select t.*,m.artificer_massage_id as artificerMassageId,m.status as artificerMassageStatus,s.code as classifyName
from artificer_massage m
left join massage_type t on t.massage_type_id=m.massage_type_id
left join sys_dict s on s.id=t.classify_id
where m.artificer_id=#{artificerId} and t.status=1 and t.parent_id = "0"
<if test="status!=null and status!=-1">
and m.status=#{status}
</if>
<if test="classifyId!=null and classifyId!=''">
and t.classify_id=#{classifyId}
</if>
<if test="title!=null and title!=''">
and t.title like concat('%',#{title},'%')
</if>
order by m.create_time desc
</select>
@ -26,7 +33,7 @@
where 1=1
and ifnull(qy_type,0) = 0
<if test="artificerId!=null">
and m.massage_type_id not in (select massage_type_id from artificer_massage where artificer_id=#{artificerId})
and m.massage_type_id not in (select massage_type_id from artificer_massage where artificer_id=#{artificerId})
</if>
<if test="status!=null and status!=0">
and m.status=#{status}
@ -37,8 +44,11 @@
<if test="parentId!=null and parentId!=0">
and m.parent_id=#{parentId}
</if>
<if test="classifyId!=null and classifyId!=0">
and m.classify_id=#{classifyId}
<if test="classifyId!=null and classifyId!=''">
and FIND_IN_SET(m.classify_id,#{classifyId}) > 0
</if>
<if test="classifyIdT!=null and classifyIdT!=0">
and m.classify_id=#{classifyIdT}
</if>
<if test="city!=null and city!=''">
and (m.city like concat('%',#{city},'%') or m.city='不限')