update

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/ManagementTeacherController.java

@@ -1,8 +1,11 @@
 package com.ruoyi.web.controller.info;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -27,6 +30,7 @@ import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.FilePathSplicingType;
 import com.ruoyi.common.filepathsplicing.FilePathSplicing;
+import com.ruoyi.common.filepathsplicing.FilePathSplicingUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.info.management.domain.bo.ManagementTeacherBo;
 import com.ruoyi.info.management.domain.bo.ManagementTeacherPageReqBo;
@@ -35,6 +39,7 @@ import com.ruoyi.info.management.service.IManagementTeacherService;
 import com.ruoyi.info.nursing.domain.bo.EnableStatusBo;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,6 +60,8 @@ public class ManagementTeacherController extends BaseController {
 
     private final IManagementTeacherService iManagementTeacherService;
 
+    private final FilePathSplicingUtil filePathSplicingUtil;
+
     /**
      * 分页查询管理老师信息列表
      */
@@ -62,7 +69,7 @@ public class ManagementTeacherController extends BaseController {
     @ApiOperation("查询管理老师信息列表")
     @SaCheckPermission("info:managementTeacher:list")
     @GetMapping("/page")
-    public TableDataInfo<ManagementTeacherVo> page(@Validated(QueryGroup.class) ManagementTeacherPageReqBo bo, PageQuery pageQuery) {
+    public TableDataInfo<ManagementTeacherVo> page(ManagementTeacherPageReqBo bo, PageQuery pageQuery) {
         return iManagementTeacherService.queryPageList(bo, pageQuery);
     }
 
@@ -138,8 +145,17 @@ public class ManagementTeacherController extends BaseController {
     @SaCheckPermission("info:managementTeacher:export")
     @Log(title = "管理老师信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(@Validated ManagementTeacherBo bo, HttpServletResponse response) {
+    public void export(ManagementTeacherPageReqBo bo, HttpServletResponse response) throws MalformedURLException {
         List<ManagementTeacherVo> list = iManagementTeacherService.queryList(bo);
+        // 处理图片
+        for (ManagementTeacherVo managementTeacherVo : list) {
+            String url = managementTeacherVo.getPhotographUrl();
+            if (StrUtil.isEmpty(url)) {
+                continue;
+            }
+            managementTeacherVo.setPhotograph(new URL(filePathSplicingUtil.getPrefix() + url));
+        }
+
         ExcelUtil.exportExcel(list, "管理老师信息", ManagementTeacherVo.class, response);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/NursingWorkerController.java

@@ -155,7 +155,7 @@ public class NursingWorkerController extends BaseController {
     @Log(title = "护工信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated NursingWorkerBo bo, HttpServletResponse response) {
-        // TODO 列表信息导出
+        //  列表信息导出
         List<NursingWorkerVo> list = iNursingWorkerService.queryList(bo);
         ExcelUtil.exportExcel(list, "护工信息", NursingWorkerVo.class, response);
     }

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/bo/ManagementTeacherPageReqBo.java

@@ -26,29 +26,25 @@ public class ManagementTeacherPageReqBo {
     /**
      * 姓名
      */
-    @ApiModelProperty(value = "姓名", required = true)
-    @NotBlank(message = "姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    @ApiModelProperty(value = "姓名")
     private String name;
 
     /**
      * 手机号
      */
-    @ApiModelProperty(value = "手机号", required = true)
-    @NotBlank(message = "手机号不能为空", groups = { AddGroup.class, EditGroup.class })
+    @ApiModelProperty(value = "手机号")
     private String phoneNumber;
 
     /**
      * 性别
      */
     @ExcelProperty(value = "性别")
-    @NotBlank(message = "性别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sex;
 
     /**
      * 状态 0-启用 1-禁用
      */
-    @ApiModelProperty(value = "状态 0-启用 1-禁用", required = true)
-    @NotBlank(message = "状态 0-启用 1-禁用不能为空", groups = { AddGroup.class, EditGroup.class })
+    @ApiModelProperty(value = "状态 0-启用 1-禁用")
     private String enableStatus;
 
     /**

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/vo/ManagementTeacherVo.java

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.net.URL;
 import java.util.Date;
 
 
@@ -30,7 +31,6 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * id
      */
-    @ExcelProperty(value = "id")
     @ApiModelProperty("id")
     private Long id;
 
@@ -51,7 +51,8 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 性别 1-男 2-女
      */
-    @ExcelProperty(value = "性别")
+    @ExcelProperty(value = "性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
     @ApiModelProperty("性别")
     private String sex;
 
@@ -79,7 +80,8 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 状态 0-启用 1-禁用
      */
-    @ExcelProperty(value = "状态 0-启用 1-禁用")
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=启用,1=禁用")
     @ApiModelProperty("状态 0-启用 1-禁用")
     private String enableStatus;
 
@@ -94,14 +96,18 @@ public class ManagementTeacherVo implements Serializable {
      * 形象照片url
      */
     @FilePathValue
-    @ExcelProperty(value = "形象照片url")
     @ApiModelProperty("形象照片url")
     private String photographUrl;
 
+
+    @ExcelProperty(value = "形象照片")
+    private URL photograph;
+
     /**
      * 是否开启管理护工权限 N-否 Y-是
      */
-    @ExcelProperty(value = "是否开启管理护工权限 N-否 Y-是")
+    @ExcelProperty(value = "是否开启管理护工权限", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
     @ApiModelProperty("是否开启管理护工权限 N-否 Y-是")
     private String manageNursingFlag;
 

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/mapper/ManagementTeacherMapper.java

@@ -1,5 +1,7 @@
 package com.ruoyi.info.management.mapper;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,5 +20,7 @@ public interface ManagementTeacherMapper extends BaseMapperPlus<ManagementTeache
 
     Page<ManagementTeacherVo> selectVoListPage(@Param("bo") ManagementTeacherPageReqBo bo, Page<ManagementTeacher> page);
 
+    List<ManagementTeacherVo> selectVoAllList(@Param("bo") ManagementTeacherPageReqBo bo);
+
     ManagementTeacherVo queryDelById(Long id);
 }

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/service/IManagementTeacherService.java

@@ -33,7 +33,7 @@ public interface IManagementTeacherService {
      * @param bo 管理老师信息
      * @return 管理老师信息集合
      */
-    List<ManagementTeacherVo> queryList(ManagementTeacherBo bo);
+    List<ManagementTeacherVo> queryList(ManagementTeacherPageReqBo bo);
 
     /**
      * 查询管理老师信息

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/service/impl/ManagementTeacherServiceImpl.java

@@ -98,9 +98,8 @@ public class ManagementTeacherServiceImpl implements IManagementTeacherService {
      * @return 管理老师信息
      */
     @Override
-    public List<ManagementTeacherVo> queryList(ManagementTeacherBo bo) {
-        LambdaQueryWrapper<ManagementTeacher> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+    public List<ManagementTeacherVo> queryList(ManagementTeacherPageReqBo bo) {
+        return baseMapper.selectVoAllList(bo);
     }
 
     private LambdaQueryWrapper<ManagementTeacher> buildQueryWrapper(ManagementTeacherBo bo) {

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingWorkerVo.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.net.URL;
 import java.util.Date;
 import java.util.List;
 
@@ -33,7 +34,6 @@ public class NursingWorkerVo implements Serializable {
     /**
      * id
      */
-    @ExcelProperty(value = "id")
     @ApiModelProperty("id")
     private Long id;
 
@@ -54,7 +54,8 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 性别
      */
-    @ExcelProperty(value = "性别")
+    @ExcelProperty(value = "性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
     @ApiModelProperty("性别 1-男 2-女")
     private String sex;
 
@@ -95,14 +96,16 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 接单状态 0-正常 1-关闭
      */
-    @ExcelProperty(value = "接单状态 0-正常 1-关闭")
+    @ExcelProperty(value = "接单状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=关闭")
     @ApiModelProperty("接单状态 0-正常 1-关闭")
     private String orderReceivingStatus;
 
     /**
      * 用户状态 0-启用 1-禁用
      */
-    @ExcelProperty(value = "用户状态 0-启用 1-禁用")
+    @ExcelProperty(value = "用户状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=禁用")
     @ApiModelProperty("用户状态 0-启用 1-禁用")
     private String enableStatus;
 
@@ -121,6 +124,10 @@ public class NursingWorkerVo implements Serializable {
     @ApiModelProperty("形象照片url")
     private String photographUrl;
 
+    @ExcelProperty(value = "形象照片")
+    @ApiModelProperty("形象照片")
+    private URL photograph;
+
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/service/impl/NursingCertificateServiceImpl.java

@@ -24,6 +24,7 @@ import com.ruoyi.info.nursing.mapper.NursingCertificateMapper;
 import com.ruoyi.info.nursing.service.INursingCertificateService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 
@@ -162,7 +163,10 @@ public class NursingCertificateServiceImpl implements INursingCertificateService
     @Override
     public void deleteByWorkerId(Long workerId) {
         List<NursingCertificate> list = this.queryListByWorkerId(workerId);
-        baseMapper.deleteBatchIds(CollectionUtils.convertList(list, NursingCertificate::getId));
+        if (CollUtil.isNotEmpty(list)) {
+            baseMapper.deleteBatchIds(CollectionUtils.convertList(list, NursingCertificate::getId));
+        }
+
     }
 
 }

ruoyi-info/ruoyi-info-biz/src/main/resources/mapper/management/ManagementTeacherMapper.xml

@@ -28,9 +28,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectVoListPage" resultType="com.ruoyi.info.management.domain.vo.ManagementTeacherVo">
-        select mt.* from tb_management_teacher mt
-            right join tb_teacher_department td
-            on mt.id = td.teacher_id
+        <include refid="queryList"/>
+    </select>
+
+    <select id="selectVoAllList" resultType="com.ruoyi.info.management.domain.vo.ManagementTeacherVo">
+        <include refid="queryList"/>
+    </select>
+
+    <sql id="queryList">
+        select
+            mt.*
+        from tb_management_teacher mt
         <where>
             <if test="bo.name != null and bo.name != ''">
                 and mt.name like concat('%', #{bo.name}, '%')
@@ -41,12 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.sex != null and bo.sex != ''">
                  and mt.name = #{bo.sex}
             </if>
-            <if test="bo.hospitalId != null">
-                and td.hospitalId = #{bo.hospitalId}
-            </if>
-            <if test="bo.departmentId != null">
-                and td.departmentId = #{bo.departmentId}
-            </if>
             <if test="bo.enableStatus != null and bo.enableStatus != ''">
                 and mt.enable_status = #{bo.enableStatus}
             </if>
@@ -56,9 +58,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.createTimeEnd != null">
                 and <![CDATA[ mt.create_time <= #{bo.createTimeEnd} ]]>
             </if>
+            and mt.del_flag = 0
+            <if test="bo.hospitalId != null or bo.departmentId != null">
+                AND EXISTS (
+                    SELECT 1
+                    FROM tb_teacher_department_rel ttdr
+                    WHERE ttdr.teacher_id = mt.id
+                    <if test="bo.hospitalId != null">
+                        and ttdr.hospital_id = #{bo.hospitalId}
+                    </if>
+                    <if test="bo.departmentId != null">
+                        and ttdr.department_id = #{bo.departmentId}
+                    </if>
+                    and ttdr.del_flag = 0
+                   )
+            </if>
         </where>
-
-    </select>
-
+    </sql>
 
 </mapper>