代码提交

liusheng

2024-09-18 722fa40345f1fc650eaeae4a721c3ae4106d92a8

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,106 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.TemplateDept;
import com.smartor.service.ITemplateDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.util.List;

/**
 * æ¨¡æ¿ç§‘室关联Controller
 *
 * @author lihu
 * @date 2024-09-18
 */
@Api("模板科室关联")
@RestController
@RequestMapping("/smartor/td")
public class TemplateDeptController extends BaseController
{
    @Autowired
    private ITemplateDeptService templateDeptService;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("查询模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:dept:list')")
    @GetMapping("/list")
    public TableDataInfo list(TemplateDept templateDept)
    {
        startPage();
        List<TemplateDept> list = templateDeptService.selectTemplateDeptList(templateDept);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("导出模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:dept:export')")
    @Log(title = "模板科室关联", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, TemplateDept templateDept)
    {
        List<TemplateDept> list = templateDeptService.selectTemplateDeptList(templateDept);
        ExcelUtil<TemplateDept> util = new ExcelUtil<TemplateDept>(TemplateDept.class);
        util.exportExcel(response, list, "模板科室关联数据");
    }

    /**
     * èŽ·å–模板科室关联详细信息
     */
    @ApiOperation("获取模板科室关联详细信息")
    //@PreAuthorize("@ss.hasPermi('smartor:dept:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(templateDeptService.selectTemplateDeptById(id));
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     */
    //@PreAuthorize("@ss.hasPermi('smartor:dept:add')")
    @ApiOperation("新增模板科室关联")
    @Log(title = "模板科室关联", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody List<TemplateDept> templateDepts)
    {
        return toAjax(templateDeptService.insertTemplateDept(templateDepts));
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("修改模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:dept:edit')")
    @Log(title = "模板科室关联", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody TemplateDept templateDept)
    {
        return toAjax(templateDeptService.updateTemplateDept(templateDept));
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("删除模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:dept:remove')")
    @Log(title = "模板科室关联", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(templateDeptService.deleteTemplateDeptByIds(ids));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
@@ -16,6 +17,7 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.smartor.mapper.SysUserDeptMapper;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -46,6 +48,9 @@

    @Autowired
    private ISysPostService postService;

    @Autowired
    private SysUserDeptMapper sysUserDeptMapper;

    /**
     * èŽ·å–用户列表
@@ -101,6 +106,18 @@
            ajax.put("postIds", postService.selectPostListByUserId(userId));
            ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
        }
        List<SysUserDept> sysUserDeptKSs = null;
        List<SysUserDept> sysUserDeptBQs = null;
        SysUserDept sysUserDept = new SysUserDept();
        sysUserDept.setUserId(userId);
        sysUserDept.setDeptType("1");
        sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongDepts",sysUserDeptKSs);

        sysUserDept.setDeptType("2");
        sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
        ajax.put("belongWards",sysUserDeptBQs);

        return ajax;
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java

@@ -78,6 +78,7 @@
    @PostMapping("/add")
    public AjaxResult add(@RequestBody SysUserDept sysUserDept)
    {

        return toAjax(sysUserDeptService.insertSysUserDept(sysUserDept));
    }


 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -49,6 +49,12 @@
    private String deptName;

    /**
     * éƒ¨é—¨ç±»åž‹ï¼š0全部  1科室  2病区
     */
    @ApiModelProperty("部门类型：0全部  1科室  2病区")
    private String deptType;

    /**
     * æ˜¾ç¤ºé¡ºåº
     */
    @ApiModelProperty("显示顺序")

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.validation.constraints.*;

import io.swagger.annotations.ApiModel;
@@ -177,34 +178,34 @@
    /**
     * ç—…区编码
     */
    @ApiModelProperty("病区编码")
    private List<String> leavehospitaldistrictcodes = new ArrayList<String>();
    @ApiModelProperty("病区集合")
    private List<Map<String, Object>> belongWards = new ArrayList();

    /**
     * ç§‘室编码
     */
    @ApiModelProperty("科室编码")
    private List<String> leaveldeptcodes = new ArrayList<String>();
    @ApiModelProperty("科室集合")
    private List<Map<String, Object>> belongDepts = new ArrayList();


    public SysUser() {

    }

    public List<String> getLeavehospitaldistrictcodes() {
        return leavehospitaldistrictcodes;
    public List<Map<String, Object>> getBelongWards() {
        return belongWards;
    }

    public void setLeavehospitaldistrictcodes(List<String> leavehospitaldistrictcodes) {
        this.leavehospitaldistrictcodes = leavehospitaldistrictcodes;
    public void setBelongWards(List<Map<String, Object>> belongWards) {
        this.belongWards = belongWards;
    }

    public List<String> getLeaveldeptcodes() {
        return leaveldeptcodes;
    public List<Map<String, Object>> getBelongDepts() {
        return belongDepts;
    }

    public void setLeaveldeptcodes(List<String> leaveldeptcodes) {
        this.leaveldeptcodes = leaveldeptcodes;
    public void setBelongDepts(List<Map<String, Object>> belongDepts) {
        this.belongDepts = belongDepts;
    }

    public String getSearchscope() {

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java

@@ -35,7 +35,7 @@
     * éƒ¨é—¨ç±»åž‹
     */
    @ApiModelProperty("部门类型")
    @Excel(name = "部门类型")
    @Excel(name = "部门类型   1:科室   2:病区")
    private String deptType;

    /**
@@ -44,6 +44,12 @@
    @ApiModelProperty("部门编码")
    @Excel(name = "部门编码")
    private String deptCode;
    /**
     * éƒ¨é—¨ç¼–码
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String deptName;

    /**
     * éƒ¨é—¨ID

 ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -89,6 +89,7 @@
    /**
     * æ–°å¢ž${functionName}
     */
    @ApiOperation("新增${functionName}")
    //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
    @PostMapping("/add")

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java

@@ -1,8 +1,11 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUserDept;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysUserDeptService;
import com.smartor.mapper.SysUserDeptMapper;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -19,6 +22,9 @@
public class SysUserDeptServiceImpl implements ISysUserDeptService {
    @Autowired
    private SysUserDeptMapper sysUserDeptMapper;

    @Autowired
    private SysDeptMapper sysDeptMapper;

    /**
     * æŸ¥è¯¢ã€è¯·å¡«å†™åŠŸèƒ½åç§°ã€‘
@@ -52,6 +58,12 @@
    public int insertSysUserDept(SysUserDept sysUserDept) {
        sysUserDept.setCreateTime(new Date());
        sysUserDept.setUpdateTime(new Date());
        //根据code查询deptName
        SysDept dept = new SysDept();
        dept.setDeptCode(sysUserDept.getDeptCode());
        List<SysDept> sysDepts = sysDeptMapper.selectDeptList(dept);
        if (CollectionUtils.isNotEmpty(sysDepts))
            sysUserDept.setDeptName(sysDepts.get(0).getDeptName());
        return sysUserDeptMapper.insertSysUserDept(sysUserDept);
    }


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -26,9 +26,7 @@
import org.springframework.util.CollectionUtils;

import javax.validation.Validator;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -132,11 +130,30 @@
        }

        sysUser.setDepts(deptIds);
        if (!CollectionUtils.isEmpty(sysUserDeptBQs))
            sysUser.setLeavehospitaldistrictcodes(sysUserDeptBQs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));
        if (!CollectionUtils.isEmpty(sysUserDeptKSs))
            sysUser.setLeaveldeptcodes(sysUserDeptKSs.stream().map(SysUserDept::getDeptCode).collect(Collectors.toList()));

        if (!CollectionUtils.isEmpty(sysUserDeptBQs)) {
            List<Map<String, Object>> list = new ArrayList<>();
            for (SysUserDept sud : sysUserDeptBQs) {
                Map<String, Object> map = new HashMap<>();
                map.put("districtCode", "");
                if (StringUtils.isNotEmpty(sud.getDeptCode())) map.put("districtCode", sud.getDeptCode());
                map.put("districtName", "");
                if (StringUtils.isNotEmpty(sud.getDeptName())) map.put("districtName", sud.getDeptName());
                list.add(map);
            }
            sysUser.setBelongWards(list);
        }
        if (!CollectionUtils.isEmpty(sysUserDeptKSs)) {
            List<Map<String, Object>> list = new ArrayList<>();
            for (SysUserDept sud : sysUserDeptKSs) {
                Map<String, Object> map = new HashMap<>();
                map.put("deptCode", "");
                if (StringUtils.isNotEmpty(sud.getDeptCode())) map.put("deptCode", sud.getDeptCode());
                map.put("deptName", "");
                if (StringUtils.isNotEmpty(sud.getDeptName())) map.put("deptName", sud.getDeptName());
                list.add(map);
            }
            sysUser.setBelongDepts(list);
        }
        return sysUser;
    }


 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -21,6 +21,7 @@
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="deptCode" column="dept_code"/>
        <result property="deptType" column="dept_type"/>
    </resultMap>

    <sql id="selectDeptVo">
@@ -32,6 +33,7 @@
               d.order_num,
               d.leader,
               d.phone,
               d.dept_type,
               d.email,
               d.status,
               d.del_flag,
@@ -58,6 +60,9 @@
        <if test="deptCode != null and deptCode != ''">
            AND dept_code = #{deptCode}
        </if>
          <if test="deptType != null and deptType != ''">
            AND dept_type = #{deptType}
        </if>
        <!-- æ•°æ®èŒƒå›´è¿‡æ»¤ -->
        ${params.dataScope}
        order by d.parent_id, d.order_num
@@ -79,6 +84,7 @@
        select d.dept_id,
               d.parent_id,
               d.dept_code,
               d.dept_type,
               d.ancestors,
               d.dept_name,
               d.order_num,
@@ -136,6 +142,7 @@
        <if test="email != null and email != ''">email,</if>
        <if test="status != null">status,</if>
        <if test="deptCode != null">dept_code,</if>
        <if test="deptType != null">dept_type,</if>
        <if test="createBy != null and createBy != ''">create_by,</if>
        create_time
        )values(
@@ -149,6 +156,7 @@
        <if test="email != null and email != ''">#{email},</if>
        <if test="status != null">#{status},</if>
        <if test="deptCode != null">#{deptCode},</if>
        <if test="deptType != null">#{deptType},</if>
        <if test="createBy != null and createBy != ''">#{createBy},</if>
        sysdate()
        )
@@ -166,6 +174,7 @@
            <if test="email != null">email = #{email},</if>
            <if test="status != null and status != ''">status = #{status},</if>
            <if test="deptCode != null">dept_code=#{deptCode},</if>
            <if test="deptType != null">dept_type=#{deptType},</if>
            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
            update_time = sysdate()
        </set>

 smartor/src/main/java/com/smartor/domain/HeLibraryVO.java

@@ -215,7 +215,7 @@
    private List<HeLibraryTag> heLibraryTagList = new ArrayList<>();

    @ApiModelProperty("模板科室关联表")
    private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
    private List<TemplateDept> tempDetpRelevances = new ArrayList<>();

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除

 smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java

@@ -352,6 +352,6 @@
    private List<IvrLibaTemplateTag> ivrLibaTemplateTagList = new ArrayList<>();

    @ApiModelProperty(value = "模板科室关联表集合")
    private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
    private List<TemplateDept> tempDetpRelevances = new ArrayList<>();

}

 smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java

@@ -163,7 +163,7 @@
     * æ¨¡æ¿ç§‘室关联集合
     */
    @ApiModelProperty(value = "模板科室关联集合")
    private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
    private List<TemplateDept> tempDetpRelevances = new ArrayList<>();

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除

 smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java

@@ -162,7 +162,7 @@
     * æ¨¡æ¿ç§‘室关联集合
     */
    @ApiModelProperty(value = "模板科室关联集合")
    private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
    private List<TemplateDept> tempDetpRelevances = new ArrayList<>();

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除

 smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/domain/TemplateDept.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
package com.smartor.domain;

import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æ¨¡æ¿ç§‘室关联对象 template_dept
 *
 * @author lihu
 * @date 2024-09-18
 */
@Data
@ApiModel("模板科室关联")
public class TemplateDept extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * æ¨¡æ¿åº“和科室关联id
     */
    @ApiModelProperty("模板库和科室关联id")
    //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 1 : é—®å·æ¨¡æ¿åº“id、11：问卷任务模板库id；2 :语音问卷库id、21：语音任务模板库id，3 : å®£æ•™æ¨¡æ¿åº“id，33：宣教任务模板库id
     */
    @ApiModelProperty("1 : é—®å·æ¨¡æ¿åº“id、11：问卷任务模板库id；2 :语音问卷库id、21：语音任务模板库id，3 : å®£æ•™æ¨¡æ¿åº“id，33：宣教任务模板库id")
    @Excel(name = "1 : é—®å·æ¨¡æ¿åº“id、11：问卷任务模板库id；2 :语音问卷库id、21：语音任务模板库id，3 : å®£æ•™æ¨¡æ¿åº“id，33：宣教任务模板库id")
    private Long type;

    /**
     * æ¨¡æ¿id
     */
    @ApiModelProperty("模板id")
    @Excel(name = "模板id")
    private Long tempid;

    /**
     * ä»»åŠ¡id
     */
    @ApiModelProperty("任务id")
    @Excel(name = "任务id")
    private Long taskId;

    /**
     * ç§‘室id
     */
    @ApiModelProperty("科室id")
    @Excel(name = "科室id")
    private Long deptId;

    /**
     * éƒ¨é—¨ç¼–码
     */
    @ApiModelProperty("部门编码")
    @Excel(name = "部门编码")
    private String deptCode;

    /**
     * éƒ¨é—¨ç±»åž‹ï¼š1科室，2病区
     */
    @ApiModelProperty("部门类型：1科室，2病区")
    @Excel(name = "部门类型：1科室，2病区")
    private String deptType;

    /**
     * åˆ é™¤æ ‡å¿—（0：未删除 1：已删除）
     */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private Integer delFlag;

    @ApiModelProperty(value = "是否是长期模板：  0：不是    1：是")
    private Integer longTemp;


}


 smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/mapper/TemplateDeptMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.smartor.mapper;

import com.smartor.domain.TemplateDept;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æ¨¡æ¿ç§‘室关联Mapper接口
 *
 * @author lihu
 * @date 2024-09-18
 */
@Mapper
public interface TemplateDeptMapper
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public TemplateDept selectTemplateDeptById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<TemplateDept> selectTemplateDeptList(TemplateDept templateDept);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertTemplateDept(TemplateDept templateDept);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateTemplateDept(TemplateDept templateDept);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteTemplateDeptById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteTemplateDeptByIds(Long[] ids);
}

 smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/ITemplateDeptService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.smartor.service;

import java.util.List;
import com.smartor.domain.TemplateDept;

/**
 * æ¨¡æ¿ç§‘室关联Service接口
 *
 * @author lihu
 * @date 2024-09-18
 */
public interface ITemplateDeptService
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public TemplateDept selectTemplateDeptById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<TemplateDept> selectTemplateDeptList(TemplateDept templateDept);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertTemplateDept(List<TemplateDept> templateDepts);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateTemplateDept(TemplateDept templateDept);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键集合
     * @return ç»“æžœ
     */
    public int deleteTemplateDeptByIds(Long[] ids);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteTemplateDeptById(Long id);
}

 smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java

@@ -1,22 +1,20 @@
package com.smartor.service.impl;

import java.util.List;

import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.smartor.domain.HeLibrary;
import com.smartor.domain.HeLibraryTag;
import com.smartor.domain.HeLibraryVO;
import com.smartor.domain.TempDetpRelevance;
import com.smartor.mapper.HeLibraryMapper;
import com.smartor.mapper.HeLibraryTagMapper;
import com.smartor.mapper.TempDetpRelevanceMapper;
import com.smartor.service.IHeLibraryService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * å®£æ•™èµ„料库Service业务层处理
@@ -32,9 +30,6 @@

    @Autowired
    private HeLibraryTagMapper heLibraryTagMapper;

    @Autowired
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;

    /**
     * æŸ¥è¯¢å®£æ•™èµ„料库

 smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java

@@ -40,7 +40,7 @@
    private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;

    @Autowired
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;
    private TemplateDeptMapper tempDetpRelevanceMapper;

    /**
     * æŸ¥è¯¢æ¨¡æ¿åº“
@@ -176,16 +176,16 @@
        }

        //对科室进行处理
        for (TempDetpRelevance tempDetpRelevance : ivrLibaTemplateVO.getTempDetpRelevances()) {
        for (TemplateDept tempDetpRelevance : ivrLibaTemplateVO.getTempDetpRelevances()) {
            if (tempDetpRelevance.getId() == null) {
                //新增
                tempDetpRelevance.setTempid(ivrLibaTemplate.getId());
                tempDetpRelevance.setType(2L);
                tempDetpRelevance.setCreateTime(new Date());
                tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
                tempDetpRelevanceMapper.insertTemplateDept(tempDetpRelevance);
            } else {
                tempDetpRelevance.setUpdateTime(new Date());
                tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
                tempDetpRelevanceMapper.updateTemplateDept(tempDetpRelevance);
            }
        }


 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java

@@ -15,6 +15,7 @@
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@
    private PatArchiveMapper patArchiveMapper;

    @Autowired
    private IvrLibaTemplateMapper ivrLibaTemplateMapper;
    private TemplateDeptMapper templateDeptMapper;

    @Autowired
    private IvrTaskTemplateMapper ivrTaskTemplateMapper;
@@ -195,10 +196,20 @@
        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
            //根据患者所在科室，获取该科室的长期任务模板
            Long taskid = null;
            SvyTaskTemplate svyTaskTemplate = new SvyTaskTemplate();
            svyTaskTemplate.setDeptCode(patMedInhosp1.getLeaveldeptcode());
            svyTaskTemplate.setLongTemp(1);
            List<SvyTaskTemplate> svyTaskTemplates = svyTaskTemplateMapper.selectSvyTaskTemplateList(svyTaskTemplate);
            //通过deptCode获取关联的长期任务模板
            TemplateDept templateDept = new TemplateDept();
            templateDept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
            templateDept.setLongTemp(1);
            templateDept.setType(11L);
            List<TemplateDept> templateDepts = templateDeptMapper.selectTemplateDeptList(templateDept);
            //根据获取的长期任务模板ID，获取任务模板详情
            List<SvyTaskTemplate> svyTaskTemplates = new ArrayList<>();
            if (CollectionUtils.isNotEmpty(templateDepts)) {
                for (TemplateDept templateDept1 : templateDepts) {
                    SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(templateDept1.getTempid());
                    if (ObjectUtils.isNotEmpty(svyTaskTemplate)) svyTaskTemplates.add(svyTaskTemplate);
                }
            }
            //如果部门模板为空（暂定，将出入院表的check_flag设置为2  ï¼Œlong_task_reason è®°å½•åŽŸå› ï¼‰
            if (CollectionUtils.isEmpty(svyTaskTemplates) || svyTaskTemplates.size() == 0) {
                patMedInhosp1.setCheckFlag("2");

 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java

@@ -33,7 +33,7 @@
    @Autowired
    private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
    @Autowired
    private TempDetpRelevanceMapper tempDetpRelevanceMapper;
    private TemplateDeptMapper templateDeptMapper;
    @Autowired
    private SvyLibTemplateTagMapper svyLibTemplateTagMapper;
    @Autowired
@@ -63,7 +63,7 @@
            List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
            for (SvyLibTemplateScript svyLibTemplateScript1 : svyLibTemplateScripts) {
                if (svyLibTemplateScript1.getScriptType().equals("1") || svyLibTemplateScript1.getScriptType().equals("2")) {
                    SvyLibTemplateTargetoption svyLibTemplateTargetoption=new SvyLibTemplateTargetoption();
                    SvyLibTemplateTargetoption svyLibTemplateTargetoption = new SvyLibTemplateTargetoption();
                    svyLibTemplateTargetoption.setScriptid(svyLibTemplateScript1.getId());
                    List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(svyLibTemplateTargetoption);
                    svyLibTemplateScript1.setSvyLibTemplateTargetoptions(svyLibTemplateTargetoptions);
@@ -109,9 +109,9 @@
            svyLibTemplateVOS.get(i).setSvyTemplateLibScripts(svyLibTemplateScripts);

            //获取每个问卷对应的科室
            TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
            tempDetpRelevance.setTempid(svyLibTemplateVOS.get(i).getSvyid());
            List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
            TemplateDept templateDept = new TemplateDept();
            templateDept.setTempid(svyLibTemplateVOS.get(i).getSvyid());
            List<TemplateDept> tempDetpRelevances = templateDeptMapper.selectTemplateDeptList(templateDept);
            svyLibTemplateVOS.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());

            //获取标签
@@ -209,14 +209,14 @@
        }

        if (CollectionUtils.isNotEmpty(svyLibTemplate.getTempDetpRelevances())) {
            for (TempDetpRelevance tempDetpRelevance : svyLibTemplate.getTempDetpRelevances()) {
            for (TemplateDept tempDetpRelevance : svyLibTemplate.getTempDetpRelevances()) {
                if (tempDetpRelevance.getId() == null) {
                    //新增
                    tempDetpRelevance.setTempid(svyLibTemplate.getSvyid());
                    tempDetpRelevance.setType(1L);
                    tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
                    templateDeptMapper.insertTemplateDept(tempDetpRelevance);
                } else {
                    tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
                    templateDeptMapper.updateTemplateDept(tempDetpRelevance);
                }
            }


 smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/impl/TemplateDeptServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.TemplateDept;
import com.smartor.mapper.TemplateDeptMapper;
import com.smartor.service.ITemplateDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ¨¡æ¿ç§‘室关联Service业务层处理
 *
 * @author lihu
 * @date 2024-09-18
 */
@Service
public class TemplateDeptServiceImpl implements ITemplateDeptService {
    @Autowired
    private TemplateDeptMapper templateDeptMapper;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public TemplateDept selectTemplateDeptById(Long id) {
        return templateDeptMapper.selectTemplateDeptById(id);
    }

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public List<TemplateDept> selectTemplateDeptList(TemplateDept templateDept) {
        return templateDeptMapper.selectTemplateDeptList(templateDept);
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int insertTemplateDept(List<TemplateDept> templateDepts) {
        for (TemplateDept templateDept : templateDepts) {
            templateDept.setCreateTime(DateUtils.getNowDate());
            templateDeptMapper.insertTemplateDept(templateDept);
        }
        return 1;
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     *
     * @param templateDept æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int updateTemplateDept(TemplateDept templateDept) {
        templateDept.setUpdateTime(DateUtils.getNowDate());
        return templateDeptMapper.updateTemplateDept(templateDept);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteTemplateDeptByIds(Long[] ids) {
        return templateDeptMapper.deleteTemplateDeptByIds(ids);
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteTemplateDeptById(Long id) {
        return templateDeptMapper.deleteTemplateDeptById(id);
    }
}

 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml

@@ -495,14 +495,26 @@
            <if test="deptname != null and deptname != ''">
                AND d.deptname LIKE concat('%',#{deptname}, '%')
            </if>
            <if test="leavehospitaldistrictcodes != null">
            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
                AND d.leavehospitaldistrictcode IN
                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{leavehospitaldistrictcode}
                </foreach>
                OR d.leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">
                    #{leaveldeptcode}
                </foreach>
            </if>
            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
                AND d.leavehospitaldistrictcode IN
                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                         close=")">
                    #{leavehospitaldistrictcode}
                </foreach>
            </if>
            <if test="leaveldeptcodes != null">
            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
                AND d.leaveldeptcode IN
                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                         close=")">

 smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml

@@ -10,6 +10,7 @@
        <result property="deptId" column="dept_id"/>
        <result property="delFlag" column="del_flag"/>
        <result property="deptCode" column="dept_code"/>
        <result property="deptName" column="dept_name"/>
        <result property="deptType" column="dept_type"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
@@ -33,6 +34,7 @@
               create_time,
               update_time,
               dept_code,
               dept_name,
               dept_type
        from sys_user_dept
    </sql>
@@ -55,6 +57,8 @@
            </if>
            <if test="updateTime != null ">
                and update_time = #{updateTime}
            </if> <if test="deptType != null ">
                and dept_type = #{deptType}
            </if>
        </where>
    </select>
@@ -88,6 +92,9 @@
            <if test="deptCode != null ">
                dept_code,
            </if>
            <if test="deptName != null ">
                dept_name,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="userId != null">#{userId},
@@ -108,6 +115,9 @@
            </if>
            <if test="deptCode != null ">
                #{deptCode},
            </if>
            <if test="deptName != null ">
                #{deptName},
            </if>
        </trim>
    </insert>
@@ -136,6 +146,9 @@
            <if test="deptCode != null ">
                dept_code = #{deptCode},
            </if>
            <if test="deptName != null ">
                dept_name = #{deptName},
            </if>
        </trim>
        where id = #{id}
    </update>
@@ -149,7 +162,14 @@
    </update>

    <select id="selectDeptListByUserId" resultMap="deptResult">
        select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status
        select d.dept_id,
               d.dept_name,
               d.parent_id,
               d.ancestors,
               d.dept_name,
               d.order_num,
               d.leader,
               d.status as dept_status
        from sys_dept d
                 left join sys_user_dept ud on d.dept_id = ud.dept_id
        where ud.user_id = #{userId}

 smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml

ÎļþÒÑɾ³ý

 smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,178 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.TemplateDeptMapper">

    <resultMap type="com.smartor.domain.TemplateDept" id="TemplateDeptResult">
        <result property="id" column="id"/>
        <result property="type" column="type"/>
        <result property="tempid" column="tempid"/>
        <result property="taskId" column="task_id"/>
        <result property="deptId" column="dept_id"/>
        <result property="deptCode" column="dept_code"/>
        <result property="deptType" column="dept_type"/>
        <result property="longTemp" column="long_temp"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <sql id="selectTemplateDeptVo">
        select id,
               type,
               tempid,
               task_id,
               long_temp,
               dept_id,
               dept_code,
               dept_type,
               del_flag,
               create_time,
               update_time
        from template_dept
    </sql>

    <select id="selectTemplateDeptList" parameterType="com.smartor.domain.TemplateDept"
            resultMap="TemplateDeptResult">
        <include refid="selectTemplateDeptVo"/>
        <where>
            <if test="type != null ">
                and type = #{type}
            </if>
            <if test="tempid != null ">
                and tempid = #{tempid}
            </if>
            <if test="taskId != null ">
                and task_id = #{taskId}
            </if>
            <if test="deptId != null ">
                and dept_id = #{deptId}
            </if>
            <if test="deptCode != null  and deptCode != ''">
                and dept_code = #{deptCode}
            </if>
            <if test="deptType != null  and deptType != ''">
                and dept_type = #{deptType}
            </if>
            <if test="longTemp != null  and longTemp != ''">
                and long_temp = #{longTemp}
            </if>
        </where>
    </select>

    <select id="selectTemplateDeptById" parameterType="Long"
            resultMap="TemplateDeptResult">
        <include refid="selectTemplateDeptVo"/>
        where id = #{id}
    </select>

    <insert id="insertTemplateDept" parameterType="com.smartor.domain.TemplateDept" useGeneratedKeys="true"
            keyProperty="id">
        insert into template_dept
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="type != null">type,
            </if>
            <if test="tempid != null">tempid,
            </if>
            <if test="taskId != null">task_id,
            </if>
            <if test="deptId != null">dept_id,
            </if>
            <if test="deptCode != null">dept_code,
            </if>
            <if test="deptType != null">dept_type,
            </if>
            <if test="delFlag != null">del_flag,
            </if>
            <if test="createTime != null">create_time,
            </if>
            <if test="updateTime != null">update_time,
            </if>
            <if test="longTemp != null  and longTemp != ''">
                long_temp,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="type != null">#{type},
            </if>
            <if test="tempid != null">#{tempid},
            </if>
            <if test="taskId != null">#{taskId},
            </if>
            <if test="deptId != null">#{deptId},
            </if>
            <if test="deptCode != null">#{deptCode},
            </if>
            <if test="deptType != null">#{deptType},
            </if>
            <if test="delFlag != null">#{delFlag},
            </if>
            <if test="createTime != null">#{createTime},
            </if>
            <if test="updateTime != null">#{updateTime},
            </if>
            <if test="longTemp != null  and longTemp != ''">
                #{longTemp},
            </if>
        </trim>
    </insert>

    <update id="updateTemplateDept" parameterType="com.smartor.domain.TemplateDept">
        update template_dept
        <trim prefix="SET" suffixOverrides=",">
            <if test="type != null">type =
                #{type},
            </if>
            <if test="tempid != null">tempid =
                #{tempid},
            </if>
            <if test="taskId != null">task_id =
                #{taskId},
            </if>
            <if test="deptId != null">dept_id =
                #{deptId},
            </if>
            <if test="deptCode != null">dept_code =
                #{deptCode},
            </if>
            <if test="deptType != null">dept_type =
                #{deptType},
            </if>
            <if test="delFlag != null">del_flag =
                #{delFlag},
            </if>
            <if test="createTime != null">create_time =
                #{createTime},
            </if>
            <if test="updateTime != null">update_time =
                #{updateTime},
            </if>
            <if test="longTemp != null  and longTemp != ''">
                long_temp = #{longTemp},
            </if>
        </trim>
        where id = #{id}
    </update>

    <update id="deleteTemplateDeptById" parameterType="Long">
        update template_dept
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id = #{id}
    </update>

    <update id="deleteTemplateDeptByIds" parameterType="String">
        update template_dept
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>


</mapper>