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

添加查询语句

This commit is contained in:
yangjun 2025-04-02 11:32:37 +08:00
parent f11bb84856
commit d726610bd5
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java
View File

@ -8,6 +8,7 @@ import com.nu.modules.servicetag.service.IServiceTagService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
@ -22,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -192,10 +194,21 @@ public class ServiceTagController extends JeecgController<ServiceTag, IServiceTa
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap);
if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
return Result.error("员工id不能为空");
}
Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
IPage<ServiceTag> pageList = serviceTagService.getEmployeesList(page, queryWrapper);
IPage<ServiceTag> pageList = serviceTagService.getEmployeesList(page, serviceTag);
return Result.OK(pageList);
}
@GetMapping(value = "/getEmployessServiceTags")
public Result<List<ServiceTag>> getEmployessServiceTags(ServiceTag serviceTag) {
if(StringUtils.isEmpty(serviceTag.getEmployeesId())){
return Result.error("员工id不能为空");
}
List<ServiceTag> pageList = serviceTagService.getEmployessServiceTags(serviceTag);
return Result.OK(pageList);
}
}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java
View File

@ -26,5 +26,7 @@ public interface ServiceTagMapper extends BaseMapper<ServiceTag> {
Long queryTotal(@Param("serviceTag") ServiceTag serviceTag);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, @Param(Constants.WRAPPER) QueryWrapper<ServiceTag> queryWrapper);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag serviceTag);
List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
View File

@ -149,12 +149,20 @@
<select id="getEmployeesList" resultType="com.nu.modules.servicetag.entity.ServiceTag">
select * from (
select nst.id ,nst.tag_name ,nst.description ,nst.sort,ifnull(est.id,'0') as employeesTagsId,nst.iz_enabled,nst.del_flag,nst.create_time,est.employees_id from nu_service_tag nst
LEFT JOIN nu_biz_employees_servcie_tags est on nst.id = est.tags_id
) a
${ew.customSqlSegment}
select nst.id ,nst.tag_name ,nst.description ,nst.sort,ifnull(est.id,'0') as employeesTagsId,nst.iz_enabled,nst.del_flag,nst.create_time,est.employees_id
from nu_service_tag nst
LEFT JOIN nu_biz_employees_servcie_tags est on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
where nst.del_flag = '0' and nst.iz_enabled = '0'
</select>
<select id="getEmployessServiceTags" resultType="com.nu.modules.servicetag.entity.ServiceTag">
select a.id,b.tag_name,b.description,a.create_time,b.id as employeesTagsId
from nu_biz_employees_servcie_tags a
LEFT JOIN nu_service_tag b on a.tags_id = b.id
where a.employees_id = #{employeesId}
</select>
</mapper>

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java
View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.servicetag.entity.ServiceTag;
import java.util.List;
/**
* @Description: 服务标签
* @Author: 张明远
@ -24,5 +26,7 @@ public interface IServiceTagService extends IService<ServiceTag> {
ServiceTag queryById(String id);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, QueryWrapper<ServiceTag> queryWrapper);
IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper);
List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag);
}

9
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.nu.modules.servicetag.mapper.ServiceTagMapper;
import com.nu.modules.servicetag.service.IServiceTagService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
@ -43,9 +44,13 @@ public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, Service
}
@Override
public IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, QueryWrapper<ServiceTag> queryWrapper) {
queryWrapper.eq("iz_enabled","0");
public IPage<ServiceTag> getEmployeesList(Page<ServiceTag> page, ServiceTag queryWrapper) {
return baseMapper.getEmployeesList(page,queryWrapper);
}
@Override
public List<ServiceTag> getEmployessServiceTags(ServiceTag serviceTag) {
return baseMapper.getEmployessServiceTags(serviceTag);
}
}