Merge remote-tracking branch 'origin/dev' into dev

pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java

@@ -70,7 +70,7 @@ public class AppletSysUserController extends BaseController {
      */
     @GetMapping("/getIdentity")
     public R<UserIdentityVo> getIdentity() {
-       return R.ok(userService.checkUserIdentity(1));
+       return R.ok(userService.checkUserIdentity(3));
     }
 
     /**

pz-applet/src/main/java/com/pz/applet/AppletUserAddressController.java

@@ -41,7 +41,6 @@ public class AppletUserAddressController extends BaseController {
     /**
      * 查询用户收货地址列表
      */
-    @SaCheckPermission("system:address:list")
     @GetMapping("/list")
     public TableDataInfo<UserAddressVo> list(UserAddressBo bo, PageQuery pageQuery) {
         return iUserAddressService.queryPageList(bo, pageQuery);
@@ -54,7 +53,6 @@ public class AppletUserAddressController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:address:query")
     @GetMapping("/{id}")
     public R<UserAddressVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
@@ -64,8 +62,6 @@ public class AppletUserAddressController extends BaseController {
     /**
      * 新增用户收货地址
      */
-    @SaCheckPermission("system:address:add")
-    @Log(title = "用户收货地址", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAddressBo bo) {
@@ -76,8 +72,6 @@ public class AppletUserAddressController extends BaseController {
     /**
      * 修改用户收货地址
      */
-    @SaCheckPermission("system:address:edit")
-    @Log(title = "用户收货地址", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserAddressBo bo) {
@@ -87,13 +81,11 @@ public class AppletUserAddressController extends BaseController {
     /**
      * 删除用户收货地址
      *
-     * @param ids 主键串
      */
-    @SaCheckPermission("system:address:remove")
-    @Log(title = "用户收货地址", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Integer[] ids) {
+    @DeleteMapping()
+    public R<Void> remove(@RequestBody UserAddressBo bo) {
+        Integer[] ids = new Integer[1];
+        ids[0] = bo.getId();
         return toAjax(iUserAddressService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

pz-applet/src/main/java/com/pz/applet/AppletUserVsitorController.java

@@ -18,6 +18,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotEmpty;
+import java.util.Arrays;
+
 /**
  * 就诊人
  *
@@ -55,4 +58,15 @@ public class AppletUserVsitorController extends BaseController {
     public R<Void> update(@Validated(AddGroup.class) @RequestBody UserVsitorBo bo) {
         return toAjax(iUserVsitorService.updateByBo(bo));
     }
+
+    /**
+     * 删除就诊人
+     *
+     */
+    @DeleteMapping()
+    public R<Void> remove(@RequestBody UserVsitorBo bo) {
+        Integer[] ids = new Integer[1];
+        ids[0] = bo.getId();
+        return toAjax(iUserVsitorService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
 }

pz-system/src/main/java/com/pz/merchant/domain/vo/CompanyVo.java

@@ -124,5 +124,7 @@ public class CompanyVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    private Integer value;
 
+    private String text;
 }

pz-system/src/main/java/com/pz/merchant/mapper/EmployeesMapper.java

 package com.pz.merchant.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.merchant.domain.Employees;
@@ -14,6 +13,7 @@ import com.pz.merchant.domain.vo.EmployeesVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import com.pz.merchant.domain.vo.OrderInfoVO;
 import com.pz.merchant.domain.vo.TodayOrderListVo;
+import com.pz.system.domain.DbmyOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,7 +49,7 @@ public interface EmployeesMapper extends BaseMapperPlus<EmployeesMapper, Employe
      */
     IPage<OrderInfoVO> selectOrder(IPage<EmployeesListBo> page, @Param(Constants.WRAPPER) Wrapper<Employees> queryWrapper);
 
-    Page<EmployeesVo> selectEmployees(EmployeesBo bo, PageQuery pageQuery);
+    Page<EmployeesVo> selectEmployees(@Param("bo") EmployeesBo bo, IPage<EmployeesVo> iPage);
 
     EmployeesVo selectEmployeesById(Integer id);
 }

pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java

@@ -68,6 +68,8 @@ public class CompanyServiceImpl implements ICompanyService {
         Optional.ofNullable(result.getRecords()).ifPresent(
             companyVos -> {
                 companyVos.forEach(companyVo -> {
+                    companyVo.setValue(companyVo.getId());
+                    companyVo.setText(companyVo.getName());
                     Optional.ofNullable(cityMapper.selectVoById(companyVo.getCityId()))
                         .ifPresent(cityVo -> {
                             companyVo.setCityName(cityVo.getName());

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -190,7 +190,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
      */
     @Override
     public TableDataInfo<EmployeesVo> queryPageAppNeed(EmployeesBo bo, PageQuery pageQuery) {
-        Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery);
+        Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery.build());
         Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
             EmployeesVo.forEach(t -> {
                 List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery()
@@ -213,7 +213,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
      */
     @Override
     public TableDataInfo<EmployeesVo> queryPageAppRanking(EmployeesBo bo, PageQuery pageQuery) {
-        Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery);
+        Page<EmployeesVo> result = baseMapper.selectEmployees(bo, pageQuery.build());
         Optional.ofNullable(result.getRecords()).ifPresent(EmployeesVo -> {
             EmployeesVo.forEach(t -> {
                 List<TotalOrder> totalOrder = totalOrderMapper.selectList(Wrappers.<TotalOrder>lambdaQuery()

pz-system/src/main/java/com/pz/system/domain/bo/ArticleBo.java

@@ -51,7 +51,7 @@ public class ArticleBo extends BaseEntity {
     /**
      * 是否显示用户收藏(true收藏false非收藏)
      */
-    private boolean isCollect;
+    private Integer isCollect;
 
     /**
      * 文章列表id

pz-system/src/main/java/com/pz/system/domain/bo/HospitalBo.java

@@ -73,5 +73,5 @@ public class HospitalBo extends BaseEntity {
      */
     private Integer status;
 
-
+    private List<Integer> hisId;
 }

pz-system/src/main/java/com/pz/system/domain/bo/UserAddressBo.java

@@ -27,19 +27,16 @@ public class UserAddressBo extends BaseEntity {
     /**
      * 所属用户
      */
-    @NotNull(message = "所属用户不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer uid;
 
     /**
      * 收货人名字
      */
-    @NotBlank(message = "收货人名字不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 收货人电话
      */
-    @NotBlank(message = "收货人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String phone;
 
     /**

pz-system/src/main/java/com/pz/system/domain/vo/HospitalVo.java

@@ -111,4 +111,8 @@ public class HospitalVo {
      * 关联科室集ids
      */
     private List<Integer> ids;
+
+    private Integer value;
+
+    private String text;
 }

pz-system/src/main/java/com/pz/system/domain/vo/ServicesVo.java

@@ -2,11 +2,15 @@ package com.pz.system.domain.vo;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.pz.common.annotation.ExcelDictFormat;
 import com.pz.common.convert.ExcelDictConvert;
+import com.pz.system.domain.Notice;
+import com.pz.system.mapper.NoticeMapper;
 import lombok.Data;
 
 
@@ -91,5 +95,5 @@ public class ServicesVo {
     @ExcelProperty(value = "介绍")
     private String info;
 
-
+    private String notice;
 }

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -141,7 +141,7 @@ public class ArticleServiceImpl implements IArticleService {
         int userId = 1;
         Page<ArticleVo> result = new Page<>();
         //判断是否展示收藏文章
-        if(bo.isCollect()){
+        if(bo.getIsCollect() == 1){
             List<UserCollect> Collect = userCollectMapper.selectList(Wrappers.<UserCollect>lambdaQuery().eq(UserCollect::getUid, userId).eq(UserCollect::getDelFlag,0));
 
             // 获取所有文章id集合
@@ -153,7 +153,7 @@ public class ArticleServiceImpl implements IArticleService {
             bo.setArticleId(articleIds);
             lqw = buildQueryWrapper(bo);
             result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        }else {
+        }else if(bo.getIsCollect() == 0){
             result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         }
         Optional.ofNullable(result.getRecords()).ifPresent(articleVos -> {

pz-system/src/main/java/com/pz/system/service/impl/HospitalServiceImpl.java

 package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.TypeReference;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,7 +13,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.common.enums.HospitalLevel;
 import com.pz.common.enums.HospitalType;
 import com.pz.common.utils.JsonUtils;
+import com.pz.system.domain.Business;
 import com.pz.system.domain.Department;
+import com.pz.system.mapper.BusinessMapper;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.DepartmentMapper;
 import lombok.RequiredArgsConstructor;
@@ -22,10 +26,7 @@ import com.pz.system.domain.Hospital;
 import com.pz.system.mapper.HospitalMapper;
 import com.pz.system.service.IHospitalService;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * 医院Service业务层处理
@@ -43,6 +44,8 @@ public class HospitalServiceImpl implements IHospitalService {
 
     private final CityMapper cityMapper;
 
+    private final BusinessMapper businessMapper;
+
     /**
      * 查询医院
      */
@@ -70,8 +73,21 @@ public class HospitalServiceImpl implements IHospitalService {
      */
     @Override
     public TableDataInfo<HospitalVo> queryPageList(HospitalBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<Hospital> lqw = buildQueryWrapper(bo);
-        Page<HospitalVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        LambdaQueryWrapper<Hospital> lqw = new LambdaQueryWrapper<>();
+        Page<HospitalVo> result = new Page<>();
+        if(null == bo.getId()){
+            lqw = buildQueryWrapper(bo);
+            result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        }else {
+            Business business = businessMapper.selectById(bo.getId());
+            if (StringUtils.isNotBlank(business.getHospitals())) {
+                List<Integer> ids = JsonUtils.parseArray(business.getHospitals(), Integer.class);
+                bo.setHisId(ids);
+            }
+            lqw = buildQueryWrapper(bo);
+            result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        }
+
         Optional.ofNullable(result.getRecords()).ifPresent(hospitalVos -> {
             hospitalVos.forEach(hospitalVo -> {
                 //获取医院类型名称
@@ -86,7 +102,8 @@ public class HospitalServiceImpl implements IHospitalService {
                         hospitalVo.setCityName(cityVo.getName());
                     }
                 );
-
+                hospitalVo.setValue(hospitalVo.getId());
+                hospitalVo.setText(hospitalVo.getText());
                 //获取医院科室
                 if (StringUtils.isNotBlank(hospitalVo.getDepartments())) {
                     //关联科室编号
@@ -123,6 +140,7 @@ public class HospitalServiceImpl implements IHospitalService {
         lqw.eq(bo.getCategory() != null, Hospital::getCategory, bo.getCategory());
         lqw.eq(StringUtils.isNotBlank(bo.getIntroduce()), Hospital::getIntroduce, bo.getIntroduce());
         lqw.eq(bo.getStatus() != null, Hospital::getStatus, bo.getStatus());
+        lqw.in(bo.getHisId() != null, Hospital::getId, bo.getHisId());
         return lqw;
     }
 

pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.system.domain.Notice;
+import com.pz.system.mapper.NoticeMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.ServicesBo;
@@ -18,6 +20,7 @@ import com.pz.system.service.IServicesService;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.Optional;
 
 /**
  * 服务Service业务层处理
@@ -31,6 +34,8 @@ public class ServicesServiceImpl implements IServicesService {
 
     private final ServicesMapper baseMapper;
 
+    private final NoticeMapper noticeMapper;
+
     /**
      * 查询服务
      */
@@ -46,6 +51,12 @@ public class ServicesServiceImpl implements IServicesService {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Optional.ofNullable(result.getRecords()).ifPresent(records -> {
+        List<Notice> notices = noticeMapper.selectList();
+        if(null != notices && notices.size() != 0){
+            records.get(0).setNotice(notices.get(0).getInfo());
+        }
+        });
         return TableDataInfo.build(result);
     }
 

pz-system/src/main/java/com/pz/system/service/impl/UserAddressServiceImpl.java

 package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
@@ -77,6 +78,12 @@ public class UserAddressServiceImpl implements IUserAddressService {
     public Boolean insertByBo(UserAddressBo bo) {
         UserAddress add = BeanUtil.toBean(bo, UserAddress.class);
         validEntityBeforeSave(add);
+        if(null != add.getIsDefult() && add.getIsDefult() == 1){
+            LambdaUpdateWrapper<UserAddress> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.eq(UserAddress::getUid,bo.getUid())
+                .set(UserAddress::getIsDefult,0);
+            baseMapper.update(null,lambdaUpdateWrapper);
+        }
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
@@ -91,6 +98,12 @@ public class UserAddressServiceImpl implements IUserAddressService {
     public Boolean updateByBo(UserAddressBo bo) {
         UserAddress update = BeanUtil.toBean(bo, UserAddress.class);
         validEntityBeforeSave(update);
+        if(null != update.getIsDefult() && update.getIsDefult() == 1){
+            LambdaUpdateWrapper<UserAddress> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            lambdaUpdateWrapper.eq(UserAddress::getUid,bo.getUid())
+                .set(UserAddress::getIsDefult,0);
+            baseMapper.update(null,lambdaUpdateWrapper);
+        }
         return baseMapper.updateById(update) > 0;
     }
 

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -66,19 +66,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmployees" resultType="com.pz.merchant.domain.vo.EmployeesVo">
         SELECT  e.id, s.avatar ,e.name,e.working_hours,(SUM(CASE WHEN o.is_satisfaction = 1 THEN 1 ELSE 0 END) / NULLIF(COUNT(o.is_satisfaction), 0)) * 100 AS satisfaction_rate
         FROM employees e
-        INNER join total_order o on o.em_id = e.id
+        left join total_order o on o.em_id = e.id
         left join company c on c.id = e.company_id
         left join sys_user s on s.user_id = e.uid
         WHERE e.`status` = 1 and e.now_type= 1 and e.del_flag= 0
-        <if test="companyId != null and companyId != 0">
-            e.company_id = #{companyId}
+        <if test="bo.companyId != null and bo.companyId != 0">
+            e.company_id = #{bo.companyId}
         </if>
         GROUP BY
         e.id,
         e.`name`
-        <if test="favorableRate != null">
+        <if test="bo.favorableRate != null">
             HAVING
-            satisfaction_rate >= #{favorableRate};
+            satisfaction_rate >= #{bo.favorableRate};
         </if>
         ORDER BY satisfaction_rate desc
     </select>