From 722fa40345f1fc650eaeae4a721c3ae4106d92a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 九月 2024 19:03:56 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/HeLibraryVO.java | 2
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java | 16
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java | 12
smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java | 2
smartor/src/main/java/com/smartor/service/ITemplateDeptService.java | 61 ++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java | 8
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 9
smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java | 9
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 21 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 6
smartor/src/main/java/com/smartor/mapper/TemplateDeptMapper.java | 64 ++++
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java | 106 +++++++
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 25
smartor/src/main/java/com/smartor/domain/TemplateDept.java | 80 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 17 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java | 1
/dev/null | 79 -----
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 16
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 33 +
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java | 8
smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java | 2
smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml | 178 +++++++++++
smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml | 22 +
smartor/src/main/java/com/smartor/service/impl/TemplateDeptServiceImpl.java | 93 ++++++
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java | 2
26 files changed, 742 insertions(+), 131 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
deleted file mode 100644
index 5ea77dc..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
+++ /dev/null
@@ -1,98 +0,0 @@
-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.TempDetpRelevance;
-import com.smartor.service.ITempDetpRelevanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 妯℃澘绉戝鍏宠仈Controller
- *
- * @author ruoyi
- * @date 2024-01-04
- */
-@RestController
-@RequestMapping("/system/relevance")
-public class TempDetpRelevanceController extends BaseController
-{
- @Autowired
- private ITempDetpRelevanceService tempDetpRelevanceService;
-
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:list')")
- @GetMapping("/list")
- public TableDataInfo list(TempDetpRelevance tempDetpRelevance)
- {
- startPage();
- List<TempDetpRelevance> list = tempDetpRelevanceService.selectTempDetpRelevanceList(tempDetpRelevance);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭妯℃澘绉戝鍏宠仈鍒楄〃
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:export')")
- @Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, TempDetpRelevance tempDetpRelevance)
- {
- List<TempDetpRelevance> list = tempDetpRelevanceService.selectTempDetpRelevanceList(tempDetpRelevance);
- ExcelUtil<TempDetpRelevance> util = new ExcelUtil<TempDetpRelevance>(TempDetpRelevance.class);
- util.exportExcel(response, list, "妯℃澘绉戝鍏宠仈鏁版嵁");
- }
-
- /**
- * 鑾峰彇妯℃澘绉戝鍏宠仈璇︾粏淇℃伅
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(tempDetpRelevanceService.selectTempDetpRelevanceById(id));
- }
-
- /**
- * 鏂板妯℃澘绉戝鍏宠仈
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:add')")
- @Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody TempDetpRelevance tempDetpRelevance)
- {
- return toAjax(tempDetpRelevanceService.insertTempDetpRelevance(tempDetpRelevance));
- }
-
- /**
- * 淇敼妯℃澘绉戝鍏宠仈
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:edit')")
- @Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TempDetpRelevance tempDetpRelevance)
- {
- return toAjax(tempDetpRelevanceService.updateTempDetpRelevance(tempDetpRelevance));
- }
-
- /**
- * 鍒犻櫎妯℃澘绉戝鍏宠仈
- */
- //@PreAuthorize("@ss.hasPermi('system:relevance:remove')")
- @Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(tempDetpRelevanceService.deleteTempDetpRelevanceByIds(ids));
- }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TemplateDeptController.java
new file mode 100644
index 0000000..d58c81e
--- /dev/null
+++ b/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));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index ae88b63..72eebba 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/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;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java
index 036b1c9..df60b12 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserDeptController.java
+++ b/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));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index c0f36b8..8869e48 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/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("鏄剧ず椤哄簭")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 38d4755..5f7228c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/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() {
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
index 3f5dbdf..10b2ea9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
+++ b/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
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 90a4dec..85d3433 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/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")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java
index 8fdb299..7860f97 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserDeptServiceImpl.java
+++ b/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);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 4d3edcd..6df0f76 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/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;
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 5ef2b50..1e44efb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/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>
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java b/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
index 2eb9961..156652a 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
+++ b/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鍒犻櫎
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
index 70b2ebd..514c89b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
+++ b/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<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
index 3d2077d..d4cb3a0 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java
+++ b/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鍒犻櫎
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
index 44c2f88..d954cad 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTemplateVO.java
+++ b/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鍒犻櫎
diff --git a/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java b/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java
deleted file mode 100644
index 78c5a53..0000000
--- a/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.smartor.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 妯℃澘绉戝鍏宠仈瀵硅薄 temp_detp_relevance
- *
- * @author ruoyi
- * @date 2024-01-04
- */
-@Data
-@ApiModel(value = "TempDetpRelevance", description = "妯℃澘绉戝鍏宠仈瀵硅薄")
-public class TempDetpRelevance extends BaseEntity {
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- @ApiModelProperty(value = "鑷ID")
- private Long id;
-
- /**
- * 妯℃澘id
- */
- @Excel(name = "妯℃澘id")
- @ApiModelProperty(value = "妯℃澘id")
- private Long tempid;
-
- /**
- * 绉戝id
- */
- @Excel(name = "绉戝id")
- @ApiModelProperty(value = "绉戝id")
- private Long deptId;
-
- /**
- * 1 : 闂嵎銆�2 : 闅忚銆�3 : 瀹ｆ暀
- */
- @Excel(name = "1 : 闂嵎銆�2 : 闅忚銆�3 : 瀹ｆ暀")
- @ApiModelProperty(value = "1 : 闂嵎銆�2 : 闅忚銆�3 : 瀹ｆ暀")
- private Long type;
-
- /**
- * 鍒犻櫎锛� 0 鏈垹闄� 1 鍒犻櫎
- */
- @ApiModelProperty(value = "鍒犻櫎锛� 0 鏈垹闄� 1 鍒犻櫎")
- private Long delFlag;
-
-}
diff --git a/smartor/src/main/java/com/smartor/domain/TemplateDept.java b/smartor/src/main/java/com/smartor/domain/TemplateDept.java
new file mode 100644
index 0000000..f468c44
--- /dev/null
+++ b/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 : 闂嵎妯℃澘搴搃d銆�11锛氶棶鍗蜂换鍔℃ā鏉垮簱id锛�2 :璇煶闂嵎搴搃d銆�21锛氳闊充换鍔℃ā鏉垮簱id锛�3 : 瀹ｆ暀妯℃澘搴搃d锛�33锛氬鏁欎换鍔℃ā鏉垮簱id
+ */
+ @ApiModelProperty("1 : 闂嵎妯℃澘搴搃d銆�11锛氶棶鍗蜂换鍔℃ā鏉垮簱id锛�2 :璇煶闂嵎搴搃d銆�21锛氳闊充换鍔℃ā鏉垮簱id锛�3 : 瀹ｆ暀妯℃澘搴搃d锛�33锛氬鏁欎换鍔℃ā鏉垮簱id")
+ @Excel(name = "1 : 闂嵎妯℃澘搴搃d銆�11锛氶棶鍗蜂换鍔℃ā鏉垮簱id锛�2 :璇煶闂嵎搴搃d銆�21锛氳闊充换鍔℃ā鏉垮簱id锛�3 : 瀹ｆ暀妯℃澘搴搃d锛�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;
+
+
+}
+
diff --git a/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java b/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java
deleted file mode 100644
index 8ec33db..0000000
--- a/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.smartor.mapper;
-
-import com.smartor.domain.TempDetpRelevance;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 妯℃澘绉戝鍏宠仈Mapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-01-04
- */
-@Mapper
-public interface TempDetpRelevanceMapper {
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 妯℃澘绉戝鍏宠仈
- */
- public TempDetpRelevance selectTempDetpRelevanceById(Long id);
-
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 妯℃澘绉戝鍏宠仈闆嗗悎
- */
- public List<TempDetpRelevance> selectTempDetpRelevanceList(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 鏂板妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- public int insertTempDetpRelevance(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 淇敼妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- public int updateTempDetpRelevance(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 鍒犻櫎妯℃澘绉戝鍏宠仈
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 缁撴灉
- */
- public int deleteTempDetpRelevanceById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎妯℃澘绉戝鍏宠仈
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTempDetpRelevanceByIds(Long[] ids);
-}
diff --git a/smartor/src/main/java/com/smartor/mapper/TemplateDeptMapper.java b/smartor/src/main/java/com/smartor/mapper/TemplateDeptMapper.java
new file mode 100644
index 0000000..a9e9e6d
--- /dev/null
+++ b/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);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java b/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java
deleted file mode 100644
index b1ab5dd..0000000
--- a/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.smartor.service;
-
-import com.smartor.domain.TempDetpRelevance;
-
-import java.util.List;
-
-/**
- * 妯℃澘绉戝鍏宠仈Service鎺ュ彛
- *
- * @author ruoyi
- * @date 2024-01-04
- */
-public interface ITempDetpRelevanceService
-{
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 妯℃澘绉戝鍏宠仈
- */
- public TempDetpRelevance selectTempDetpRelevanceById(Long id);
-
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 妯℃澘绉戝鍏宠仈闆嗗悎
- */
- public List<TempDetpRelevance> selectTempDetpRelevanceList(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 鏂板妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- public int insertTempDetpRelevance(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 淇敼妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- public int updateTempDetpRelevance(TempDetpRelevance tempDetpRelevance);
-
- /**
- * 鎵归噺鍒犻櫎妯℃澘绉戝鍏宠仈
- *
- * @param ids 闇�瑕佸垹闄ょ殑妯℃澘绉戝鍏宠仈涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deleteTempDetpRelevanceByIds(Long[] ids);
-
- /**
- * 鍒犻櫎妯℃澘绉戝鍏宠仈淇℃伅
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 缁撴灉
- */
- public int deleteTempDetpRelevanceById(Long id);
-}
diff --git a/smartor/src/main/java/com/smartor/service/ITemplateDeptService.java b/smartor/src/main/java/com/smartor/service/ITemplateDeptService.java
new file mode 100644
index 0000000..58d0bcd
--- /dev/null
+++ b/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);
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
index 1595709..41500c4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
+++ b/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;
/**
* 瀹ｆ暀璧勬枡搴揝ervice涓氬姟灞傚鐞�
@@ -32,9 +30,6 @@
@Autowired
private HeLibraryTagMapper heLibraryTagMapper;
-
- @Autowired
- private TempDetpRelevanceMapper tempDetpRelevanceMapper;
/**
* 鏌ヨ瀹ｆ暀璧勬枡搴�
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
index 76c081a..b88cb6e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
+++ b/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);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index 38616f5..41db978 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/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);
+ //鏍规嵁鑾峰彇鐨勯暱鏈熶换鍔℃ā鏉縄D锛岃幏鍙栦换鍔℃ā鏉胯鎯�
+ 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 锛宭ong_task_reason 璁板綍鍘熷洜锛�
if (CollectionUtils.isEmpty(svyTaskTemplates) || svyTaskTemplates.size() == 0) {
patMedInhosp1.setCheckFlag("2");
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
index e0f6288..1d9bdc9 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java
+++ b/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);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java
deleted file mode 100644
index efb0551..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.smartor.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.smartor.domain.TempDetpRelevance;
-import com.smartor.mapper.TempDetpRelevanceMapper;
-import com.smartor.service.ITempDetpRelevanceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 妯℃澘绉戝鍏宠仈Service涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2024-01-04
- */
-@Service
-public class TempDetpRelevanceServiceImpl implements ITempDetpRelevanceService
-{
- @Autowired
- private TempDetpRelevanceMapper tempDetpRelevanceMapper;
-
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 妯℃澘绉戝鍏宠仈
- */
- @Override
- public TempDetpRelevance selectTempDetpRelevanceById(Long id)
- {
- return tempDetpRelevanceMapper.selectTempDetpRelevanceById(id);
- }
-
- /**
- * 鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 妯℃澘绉戝鍏宠仈
- */
- @Override
- public List<TempDetpRelevance> selectTempDetpRelevanceList(TempDetpRelevance tempDetpRelevance)
- {
- return tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
- }
-
- /**
- * 鏂板妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- @Override
- public int insertTempDetpRelevance(TempDetpRelevance tempDetpRelevance)
- {
- tempDetpRelevance.setCreateTime(DateUtils.getNowDate());
- return tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
- }
-
- /**
- * 淇敼妯℃澘绉戝鍏宠仈
- *
- * @param tempDetpRelevance 妯℃澘绉戝鍏宠仈
- * @return 缁撴灉
- */
- @Override
- public int updateTempDetpRelevance(TempDetpRelevance tempDetpRelevance)
- {
- tempDetpRelevance.setUpdateTime(DateUtils.getNowDate());
- return tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
- }
-
- /**
- * 鎵归噺鍒犻櫎妯℃澘绉戝鍏宠仈
- *
- * @param ids 闇�瑕佸垹闄ょ殑妯℃澘绉戝鍏宠仈涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTempDetpRelevanceByIds(Long[] ids)
- {
- return tempDetpRelevanceMapper.deleteTempDetpRelevanceByIds(ids);
- }
-
- /**
- * 鍒犻櫎妯℃澘绉戝鍏宠仈淇℃伅
- *
- * @param id 妯℃澘绉戝鍏宠仈涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteTempDetpRelevanceById(Long id)
- {
- return tempDetpRelevanceMapper.deleteTempDetpRelevanceById(id);
- }
-}
diff --git a/smartor/src/main/java/com/smartor/service/impl/TemplateDeptServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/TemplateDeptServiceImpl.java
new file mode 100644
index 0000000..65f2f71
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 6787df2..d305d95 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/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=")">
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
index 92b8d2f..ab2a740 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserDeptMapper.xml
+++ b/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}
diff --git a/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml b/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml
deleted file mode 100644
index 47f0612..0000000
--- a/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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.TempDetpRelevanceMapper">
-
- <resultMap type="com.smartor.domain.TempDetpRelevance" id="TempDetpRelevanceResult">
- <result property="id" column="id" />
- <result property="tempid" column="tempid" />
- <result property="deptId" column="dept_id" />
- <result property="type" column="type" />
- <result property="delFlag" column="del_flag" />
- <result property="createTime" column="create_time" />
- <result property="updateTime" column="update_time" />
- </resultMap>
-
- <sql id="selectTempDetpRelevanceVo">
- select id, tempid, dept_id, type, del_flag, create_time, update_time from temp_detp_relevance
- </sql>
-
- <select id="selectTempDetpRelevanceList" parameterType="com.smartor.domain.TempDetpRelevance" resultMap="TempDetpRelevanceResult">
- <include refid="selectTempDetpRelevanceVo"/>
- <where>
- del_flag=0
- <if test="tempid != null "> and tempid = #{tempid}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
- <if test="type != null "> and type = #{type}</if>
- </where>
- </select>
-
- <select id="selectTempDetpRelevanceById" parameterType="Long" resultMap="TempDetpRelevanceResult">
- <include refid="selectTempDetpRelevanceVo"/>
- where id = #{id}
- </select>
-
- <insert id="insertTempDetpRelevance" parameterType="com.smartor.domain.TempDetpRelevance" useGeneratedKeys="true" keyProperty="id">
- insert into temp_detp_relevance
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="tempid != null">tempid,</if>
- <if test="deptId != null">dept_id,</if>
- <if test="type != null">type,</if>
- <if test="delFlag != null">del_flag,</if>
- <if test="createTime != null">create_time,</if>
- <if test="updateTime != null">update_time,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="tempid != null">#{tempid},</if>
- <if test="deptId != null">#{deptId},</if>
- <if test="type != null">#{type},</if>
- <if test="delFlag != null">#{delFlag},</if>
- <if test="createTime != null">#{createTime},</if>
- <if test="updateTime != null">#{updateTime},</if>
- </trim>
- </insert>
-
- <update id="updateTempDetpRelevance" parameterType="com.smartor.domain.TempDetpRelevance">
- update temp_detp_relevance
- <trim prefix="SET" suffixOverrides=",">
- <if test="tempid != null">tempid = #{tempid},</if>
- <if test="deptId != null">dept_id = #{deptId},</if>
- <if test="type != null">type = #{type},</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>
- </trim>
- where id = #{id}
- </update>
-
- <delete id="deleteTempDetpRelevanceById" parameterType="Long">
- delete from temp_detp_relevance where id = #{id}
- </delete>
-
- <delete id="deleteTempDetpRelevanceByIds" parameterType="String">
- delete from temp_detp_relevance where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml b/smartor/src/main/resources/mapper/smartor/TemplateDeptMapper.xml
new file mode 100644
index 0000000..c9ecc7b
--- /dev/null
+++ b/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>
--
Gitblit v1.9.3