Skip to content

P
peizhen-java
Commit e7831e0a by sdif
Options

添加机构端订单查看权限

parent 0c84405c
Showing with 74 additions and 15 deletions
pz-admin/src/main/java/com/pz/web/controller/system/DbghOrderController.java
...@@ -43,6 +43,10 @@ public class DbghOrderController extends BaseController { ...@@ -43,6 +43,10 @@ public class DbghOrderController extends BaseController {
@SaCheckPermission("system:dbghOrder:list") @SaCheckPermission("system:dbghOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DbghOrderVo> list(DbghOrderBo bo, PageQuery pageQuery) { public TableDataInfo<DbghOrderVo> list(DbghOrderBo bo, PageQuery pageQuery) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUserId(getUserId());
}
return iDbghOrderService.queryPageList(bo, pageQuery); return iDbghOrderService.queryPageList(bo, pageQuery);
} }
......
pz-admin/src/main/java/com/pz/web/controller/system/DbmyOrderController.java
...@@ -43,6 +43,10 @@ public class DbmyOrderController extends BaseController { ...@@ -43,6 +43,10 @@ public class DbmyOrderController extends BaseController {
@SaCheckPermission("system:dbmyOrder:list") @SaCheckPermission("system:dbmyOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DbmyOrderVo> list(DbmyOrderBo bo, PageQuery pageQuery) { public TableDataInfo<DbmyOrderVo> list(DbmyOrderBo bo, PageQuery pageQuery) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUserId(getUserId());
}
return iDbmyOrderService.queryPageList(bo, pageQuery); return iDbmyOrderService.queryPageList(bo, pageQuery);
} }
......
pz-admin/src/main/java/com/pz/web/controller/system/DbwzOrderController.java
...@@ -43,6 +43,10 @@ public class DbwzOrderController extends BaseController { ...@@ -43,6 +43,10 @@ public class DbwzOrderController extends BaseController {
@SaCheckPermission("system:dbwzOrder:list") @SaCheckPermission("system:dbwzOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<DbwzOrderVo> list(DbwzOrderBo bo, PageQuery pageQuery) { public TableDataInfo<DbwzOrderVo> list(DbwzOrderBo bo, PageQuery pageQuery) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUserId(getUserId());
}
return iDbwzOrderService.queryPageList(bo, pageQuery); return iDbwzOrderService.queryPageList(bo, pageQuery);
} }
......
pz-admin/src/main/java/com/pz/web/controller/system/YypzOrderController.java
...@@ -3,6 +3,8 @@ package com.pz.web.controller.system; ...@@ -3,6 +3,8 @@ package com.pz.web.controller.system;
import java.util.List; import java.util.List;
import java.util.Arrays; import java.util.Arrays;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.pz.common.core.domain.dto.RoleDTO;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*; import javax.validation.constraints.*;
...@@ -43,6 +45,10 @@ public class YypzOrderController extends BaseController { ...@@ -43,6 +45,10 @@ public class YypzOrderController extends BaseController {
@SaCheckPermission("system:yypzOrder:list") @SaCheckPermission("system:yypzOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<YypzOrderVo> list(YypzOrderBo bo, PageQuery pageQuery) { public TableDataInfo<YypzOrderVo> list(YypzOrderBo bo, PageQuery pageQuery) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUserId(getUserId());
}
TableDataInfo<YypzOrderVo> yypzOrderVoTableDataInfo = iYypzOrderService.queryPageList(bo, pageQuery); TableDataInfo<YypzOrderVo> yypzOrderVoTableDataInfo = iYypzOrderService.queryPageList(bo, pageQuery);
return yypzOrderVoTableDataInfo; return yypzOrderVoTableDataInfo;
} }
......
pz-admin/src/main/java/com/pz/web/controller/system/ZyphOrderController.java
...@@ -43,6 +43,10 @@ public class ZyphOrderController extends BaseController { ...@@ -43,6 +43,10 @@ public class ZyphOrderController extends BaseController {
@SaCheckPermission("system:zyphOrder:list") @SaCheckPermission("system:zyphOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<ZyphOrderVo> list(ZyphOrderBo bo, PageQuery pageQuery) { public TableDataInfo<ZyphOrderVo> list(ZyphOrderBo bo, PageQuery pageQuery) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUserId(getUserId());
}
return iZyphOrderService.queryPageList(bo, pageQuery); return iZyphOrderService.queryPageList(bo, pageQuery);
} }
......
pz-merchant/src/main/java/com/pz/merchant/controller/pc/CompanyController.java
...@@ -50,6 +50,11 @@ public class CompanyController extends BaseController { ...@@ -50,6 +50,11 @@ public class CompanyController extends BaseController {
*/ */
@GetMapping("/Plist") @GetMapping("/Plist")
public R<List<CompanyVo>> Plist(CompanyBo bo) { public R<List<CompanyVo>> Plist(CompanyBo bo) {
Long roleId = getLoginUser().getRoleId();
if(null != roleId && roleId == 2){
bo.setUid(getUserId().intValue());
}
bo.setStatus(1);
return R.ok(iCompanyService.queryListP(bo)); return R.ok(iCompanyService.queryListP(bo));
} }
......
pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java
...@@ -110,7 +110,8 @@ public class CompanyServiceImpl implements ICompanyService { ...@@ -110,7 +110,8 @@ public class CompanyServiceImpl implements ICompanyService {
private LambdaQueryWrapper<Company> buildQueryWrapper(CompanyBo bo) { private LambdaQueryWrapper<Company> buildQueryWrapper(CompanyBo bo) {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
lqw.eq(Company::getStatus,1); lqw.eq(null != bo.getStatus(), Company::getStatus,1);
lqw.eq(null != bo.getUid(), Company::getUid,bo.getUid());
lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName()); lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName());
return lqw; return lqw;
} }
...@@ -142,7 +143,7 @@ public class CompanyServiceImpl implements ICompanyService { ...@@ -142,7 +143,7 @@ public class CompanyServiceImpl implements ICompanyService {
sysUser.setUserType(UserType.XCX_USER.getUserType()); sysUser.setUserType(UserType.XCX_USER.getUserType());
sysUserMapper.updateById(sysUser); sysUserMapper.updateById(sysUser);
}else if(update.getStatus() == 1){ }else if(update.getStatus() == 1){
sysUser.setUserType(UserType.APP_USER.getUserType()); sysUser.setUserType(UserType.AMERCHANT_USER.getUserType());
sysUserMapper.updateById(sysUser); sysUserMapper.updateById(sysUser);
} }
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
......
pz-system/src/main/java/com/pz/system/domain/bo/DbghOrderBo.java
...@@ -73,4 +73,6 @@ public class DbghOrderBo extends BaseEntity { ...@@ -73,4 +73,6 @@ public class DbghOrderBo extends BaseEntity {
private String orderSn; private String orderSn;
private Long userId;
} }
pz-system/src/main/java/com/pz/system/domain/bo/DbmyOrderBo.java
...@@ -120,4 +120,6 @@ public class DbmyOrderBo extends BaseEntity { ...@@ -120,4 +120,6 @@ public class DbmyOrderBo extends BaseEntity {
private String remark; private String remark;
private String orderSn; private String orderSn;
private Long userId;
} }
pz-system/src/main/java/com/pz/system/domain/bo/DbwzOrderBo.java
...@@ -105,4 +105,6 @@ public class DbwzOrderBo extends BaseEntity { ...@@ -105,4 +105,6 @@ public class DbwzOrderBo extends BaseEntity {
private String remark; private String remark;
private String orderSn; private String orderSn;
private Long userId;
} }
pz-system/src/main/java/com/pz/system/domain/bo/ZqghOrderBo.java
...@@ -77,7 +77,7 @@ public class ZqghOrderBo extends BaseEntity { ...@@ -77,7 +77,7 @@ public class ZqghOrderBo extends BaseEntity {
private String remark; private String remark;
private String orderSn; private String orderSn;
private Long userId;
/** /**
* 预约时间段 * 预约时间段
......
pz-system/src/main/java/com/pz/system/domain/bo/ZyphOrderBo.java
...@@ -85,4 +85,5 @@ public class ZyphOrderBo extends BaseEntity { ...@@ -85,4 +85,5 @@ public class ZyphOrderBo extends BaseEntity {
private String remark; private String remark;
private String orderSn; private String orderSn;
private Long userId;
} }
pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
...@@ -46,9 +46,15 @@ ...@@ -46,9 +46,15 @@
LEFT JOIN department AS d ON d.id = yyod.did LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> LEFT JOIN company AS co ON co.id = e.company_id
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') <where>
</if> <if test="bo.orderSn != null and bo.orderSn != ''">
and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
<if test="bo.userId != null">
and co.uid = #{bo.userId}
</if>
</where>
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
......
pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml
...@@ -50,9 +50,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -50,9 +50,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN city AS c ON c.id = tlo.city_id LEFT JOIN city AS c ON c.id = tlo.city_id
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> LEFT JOIN company AS co ON co.id = e.company_id
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') <where>
</if> <if test="bo.orderSn != null and bo.orderSn != ''">
and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
<if test="bo.userId != null">
and co.uid = #{bo.userId}
</if>
</where>
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
......
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
...@@ -51,9 +51,15 @@ ...@@ -51,9 +51,15 @@
LEFT JOIN department AS d ON d.id = yyod.did LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> LEFT JOIN company AS co ON co.id = e.company_id
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') <where>
</if> <if test="bo.orderSn != null and bo.orderSn != ''">
and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
<if test="bo.userId != null">
and co.uid = #{bo.userId}
</if>
</where>
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
......
pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
...@@ -52,9 +52,15 @@ ...@@ -52,9 +52,15 @@
LEFT JOIN department AS d ON d.id = yyod.did LEFT JOIN department AS d ON d.id = yyod.did
LEFT JOIN services AS s ON s.id = tlo.service_id LEFT JOIN services AS s ON s.id = tlo.service_id
LEFT JOIN employees AS e ON e.id = tlo.em_id LEFT JOIN employees AS e ON e.id = tlo.em_id
<if test="bo.orderSn != null and bo.orderSn != ''"> LEFT JOIN company AS co ON co.id = e.company_id
where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%') <where>
</if> <if test="bo.orderSn != null and bo.orderSn != ''">
and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
</if>
<if test="bo.userId != null">
and co.uid = #{bo.userId}
</if>
</where>
</select> </select>
<select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo"> <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment