From a0bcee3aa22b79f592c44cdb3dcdbd681490f265 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 15 一月 2024 10:34:31 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/HeLibraryVO.java | 38
smartor/src/main/java/com/smartor/domain/HeTaskVO.java | 217 +++
smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java | 2
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml | 32
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicCategoryController.java | 21
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/DingTalkController.java | 5
smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java | 2
smartor/src/main/java/com/smartor/domain/IvrLibaScript.java | 2
smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml | 139 ++
smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java | 54
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 18
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml | 2
smartor/src/main/java/com/smartor/domain/HeCategoryVO.java | 3
smartor/src/main/java/com/smartor/domain/SvyLibTopicCategoryVO.java | 3
smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java | 16
smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java | 2
smartor/src/main/java/com/smartor/domain/PatArchiveVO.java | 3
smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java | 271 ++++
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml | 3
smartor/src/main/java/com/smartor/mapper/PatHetaskRelevanceMapper.java | 64 +
smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java | 62 +
smartor/src/main/java/com/smartor/common/SendService.java | 60
smartor/src/main/java/com/smartor/service/IHeLibraryService.java | 10
smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetMapper.xml | 40
smartor/src/main/resources/mapper/smartor/SvyLibTitleMapper.xml | 35
smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java | 2
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java | 2
smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java | 3
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java | 21
smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java | 7
smartor/src/main/java/com/smartor/domain/PatHetaskRelevanceVO.java | 109 +
smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml | 8
smartor/src/main/java/com/smartor/domain/HeLibraryTag.java | 7
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java | 3
smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetMapper.java | 6
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 7
smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java | 55
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java | 21
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTarget.java | 6
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetServiceImpl.java | 12
smartor/src/main/java/com/smartor/domain/SvyLibTopic.java | 53
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleCategoryController.java | 23
smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java | 63 +
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java | 24
smartor/src/main/java/com/smartor/domain/SvyLibTitle.java | 44
smartor/src/main/java/com/smartor/domain/PatArchiveReq.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java | 98 +
smartor/src/main/java/com/smartor/service/impl/PatHetaskRelevanceServiceImpl.java | 97 +
smartor/src/main/java/com/smartor/domain/HeLibrary.java | 41
smartor/src/main/java/com/smartor/domain/SvyLibTitleCategoryVO.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetController.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java | 22
smartor/src/main/java/com/smartor/service/impl/SvyLibTitleCategoryServiceImpl.java | 22
smartor/src/main/java/com/smartor/domain/SvyLibTitleReq.java | 6
smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java | 31
smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java | 20
smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java | 8
smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java | 2
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java | 32
smartor/src/main/java/com/smartor/domain/PatArchive.java | 7
smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java | 63 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java | 3
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java | 17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatHetaskRelevanceController.java | 98 +
smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml | 46
smartor/src/main/java/com/smartor/service/impl/SvyLibTopicCategoryServiceImpl.java | 21
smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java | 2
smartor/src/main/java/com/smartor/domain/PatHetaskRelevance.java | 105 +
smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java | 3
smartor/src/main/java/com/smartor/service/IPatHetaskRelevanceService.java | 62 +
smartor/src/main/java/com/smartor/domain/HeTask.java | 208 +++
smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java | 6
ruoyi-common/src/main/java/com/ruoyi/common/enums/SendTypeEnum.java | 53
smartor/src/main/resources/mapper/smartor/SvyLibTopicoptionMapper.xml | 14
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java | 2
smartor/src/main/java/com/smartor/domain/SendMagParam.java | 18
smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java | 97 +
ruoyi-common/pom.xml | 6
smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java | 6
smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml | 12
smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java | 2
smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java | 9
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java | 15
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java | 23
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 18
smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java | 23
smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java | 28
smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml | 30
smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml | 230 +++
smartor/src/main/java/com/smartor/service/IHeTaskService.java | 69 +
smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml | 78 +
smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java | 113 +
smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml | 190 ++-
96 files changed, 3,314 insertions(+), 346 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
index c52ad11..3758096 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeLibraryController.java
@@ -97,9 +97,10 @@
/**
* 鍒犻櫎瀹ｆ暀璧勬枡搴�
*/
+ @ApiOperation("鍒犻櫎瀹ｆ暀璧勬枡搴�")
@PreAuthorize("@ss.hasPermi('system:library:remove')")
@Log(title = "瀹ｆ暀璧勬枡搴�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(heLibraryService.deleteHeLibraryByIds(ids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
new file mode 100644
index 0000000..6d4b85e
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java
@@ -0,0 +1,113 @@
+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.HeTask;
+import com.smartor.domain.HeTaskVO;
+import com.smartor.domain.PatArchiveReq;
+import com.smartor.domain.PatHetaskRelevanceVO;
+import com.smartor.service.IHeTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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-07
+ */
+@Api(description = "瀹ｆ暀浠诲姟")
+@RestController
+@RequestMapping("/smartor/hetask")
+public class HeTaskController extends BaseController {
+ @Autowired
+ private IHeTaskService heTaskService;
+
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呭鏁欎换鍔″垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:task:list')")
+ @PostMapping("/getPatHeTaskList")
+ public TableDataInfo getPatHeTaskList(@RequestBody PatHetaskRelevanceVO patHetaskRelevanceVO) {
+ startPage();
+ List<PatHetaskRelevanceVO> list = heTaskService.selectHeTaskList(patHetaskRelevanceVO);
+ return getDataTable(list);
+ }
+
+// /**
+// * 瀵煎嚭瀹ｆ暀浠诲姟鍒楄〃
+// */
+// @PreAuthorize("@ss.hasPermi('system:task:export')")
+// @Log(title = "瀹ｆ暀浠诲姟", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, HeTask heTask) {
+// List<HeTask> list = heTaskService.selectHeTaskList(heTask);
+// ExcelUtil<HeTask> util = new ExcelUtil<HeTask>(HeTask.class);
+// util.exportExcel(response, list, "瀹ｆ暀浠诲姟鏁版嵁");
+// }
+
+ /**
+ * 鑾峰彇瀹ｆ暀浠诲姟璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇瀹ｆ暀浠诲姟璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('system:task:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(heTaskService.selectHeTaskById(id));
+ }
+
+ /**
+ * 鏂板瀹ｆ暀浠诲姟
+ */
+ @ApiOperation("鏂板瀹ｆ暀浠诲姟(鍙戦�佷换鍔�)")
+ @PreAuthorize("@ss.hasPermi('system:task:add')")
+ @Log(title = "瀹ｆ暀浠诲姟", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody HeTaskVO heTaskVO) {
+ return toAjax(heTaskService.insertHeTask(heTaskVO));
+ }
+
+ /**
+ * 淇敼瀹ｆ暀浠诲姟
+ */
+ @PreAuthorize("@ss.hasPermi('system:task:edit')")
+ @Log(title = "瀹ｆ暀浠诲姟", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody HeTask heTask) {
+ return toAjax(heTaskService.updateHeTask(heTask));
+ }
+
+ /**
+ * 鍒犻櫎瀹ｆ暀浠诲姟
+ */
+ @ApiOperation("鍒犻櫎瀹ｆ暀浠诲姟")
+ @PreAuthorize("@ss.hasPermi('system:task:remove')")
+ @Log(title = "瀹ｆ暀浠诲姟", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(heTaskService.deleteHeTaskByIds(ids));
+ }
+
+
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呬俊鎭�")
+ @PostMapping("/getPatientInfo")
+ public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) {
+ return getDataTable(heTaskService.getPatientInfo(patArchiveReq));
+ }
+
+
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
index c0f7605..41cbb2a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTargetController.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrLibaTarget;
-import com.smartor.domain.IvrLibaTargetAssort;
import com.smartor.domain.IvrLibaTargetVO;
import com.smartor.service.IIvrLibaTargetService;
import io.swagger.annotations.Api;
@@ -61,13 +60,13 @@
}
/**
- * 鑾峰彇鎸囨爣淇℃伅閫氳繃targetID
+ * 鑾峰彇鎸囨爣淇℃伅閫氳繃id
*/
- @ApiOperation("鑾峰彇鎸囨爣淇℃伅閫氳繃targetID")
+ @ApiOperation("鑾峰彇鎸囨爣淇℃伅閫氳繃id")
@PreAuthorize("@ss.hasPermi('system:target:query')")
- @GetMapping(value = "/getInfo/{targetID}")
- public AjaxResult getInfo(@PathVariable("targetID") Long targetID) {
- return success(ivrLibaTargetService.selectIvrLibaTargetByTargetID(targetID));
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(ivrLibaTargetService.selectIvrLibaTargetByTargetID(id));
}
/**
@@ -98,9 +97,9 @@
@ApiOperation("鍒犻櫎鎸囨爣")
@PreAuthorize("@ss.hasPermi('system:target:remove')")
@Log(title = "鎸囨爣閫夐」搴�", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{targetIDs}")
- public AjaxResult remove(@PathVariable Long[] targetIDs) {
- return toAjax(ivrLibaTargetService.deleteIvrLibaTargetByTargetIDs(targetIDs));
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(ivrLibaTargetService.deleteIvrLibaTargetByTargetIDs(ids));
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
index 00e60fb..e37bbad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java
@@ -119,7 +119,7 @@
*/
@ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢")
@PostMapping("/selectInfoByCondition")
- public AjaxResult selectInfoByCondition(IvrLibaTemplateVO ivrLibaTemplateVO) {
+ public AjaxResult selectInfoByCondition(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) {
if (ObjectUtils.isEmpty(ivrLibaTemplateVO)) {
throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetController.java
index 7019856..157d367 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateTargetController.java
@@ -60,9 +60,9 @@
*/
@ApiOperation("鑾峰彇妯＄増闂鎸囨爣搴撹缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('system:target:query')")
- @GetMapping(value = "/getInfo/{ID}")
- public AjaxResult getInfo(@PathVariable("ID") Long ID) {
- return success(ivrLibaTemplateTargetService.selectIvrLibaTemplateTargetByID(ID));
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("ID") Long id) {
+ return success(ivrLibaTemplateTargetService.selectIvrLibaTemplateTargetByID(id));
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatHetaskRelevanceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatHetaskRelevanceController.java
new file mode 100644
index 0000000..98eacb8
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatHetaskRelevanceController.java
@@ -0,0 +1,98 @@
+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.PatHetaskRelevance;
+import com.smartor.service.IPatHetaskRelevanceService;
+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-07
+ */
+@RestController
+@RequestMapping("/smartor/pathetaskrelevance")
+public class PatHetaskRelevanceController extends BaseController
+{
+ @Autowired
+ private IPatHetaskRelevanceService patHetaskRelevanceService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PatHetaskRelevance patHetaskRelevance)
+ {
+ startPage();
+ List<PatHetaskRelevance> list = patHetaskRelevanceService.selectPatHetaskRelevanceList(patHetaskRelevance);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:export')")
+ @Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatHetaskRelevance patHetaskRelevance)
+ {
+ List<PatHetaskRelevance> list = patHetaskRelevanceService.selectPatHetaskRelevanceList(patHetaskRelevance);
+ ExcelUtil<PatHetaskRelevance> util = new ExcelUtil<PatHetaskRelevance>(PatHetaskRelevance.class);
+ util.exportExcel(response, list, "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(patHetaskRelevanceService.selectPatHetaskRelevanceById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:add')")
+ @Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody PatHetaskRelevance patHetaskRelevance)
+ {
+ return toAjax(patHetaskRelevanceService.insertPatHetaskRelevance(patHetaskRelevance));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:edit')")
+ @Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody PatHetaskRelevance patHetaskRelevance)
+ {
+ return toAjax(patHetaskRelevanceService.updatePatHetaskRelevance(patHetaskRelevance));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ @PreAuthorize("@ss.hasPermi('system:relevance:remove')")
+ @Log(title = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(patHetaskRelevanceService.deletePatHetaskRelevanceByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleCategoryController.java
index 0c19e37..f6d457a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleCategoryController.java
@@ -34,6 +34,7 @@
/**
* 鏌ヨ闂嵎妯℃澘鍒嗙被鍒楄〃
*/
+ @ApiOperation("鏌ヨ闂嵎妯℃澘鍒嗙被鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:category:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibTitleCategory svyLibTitleCategory) {
@@ -57,25 +58,28 @@
/**
* 鑾峰彇闂嵎妯℃澘鍒嗙被璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇闂嵎妯℃澘鍒嗙被璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:category:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibTitleCategoryService.selectSvyLibTitleCategoryById(id));
}
- /**
- * 鏂板闂嵎妯℃澘鍒嗙被
- */
- @PreAuthorize("@ss.hasPermi('smartor:category:add')")
- @Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public AjaxResult add(@RequestBody SvyLibTitleCategory svyLibTitleCategory) {
- return toAjax(svyLibTitleCategoryService.insertSvyLibTitleCategory(svyLibTitleCategory));
- }
+// /**
+// * 鏂板闂嵎妯℃澘鍒嗙被
+// */
+// @ApiOperation("鏂板闂嵎妯℃澘鍒嗙被")
+// @PreAuthorize("@ss.hasPermi('smartor:category:add')")
+// @Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.INSERT)
+// @PostMapping("/add")
+// public AjaxResult add(@RequestBody SvyLibTitleCategory svyLibTitleCategory) {
+// return toAjax(svyLibTitleCategoryService.insertSvyLibTitleCategory(svyLibTitleCategory));
+// }
/**
* 淇敼闂嵎妯℃澘鍒嗙被
*/
+ @ApiOperation("淇敼闂嵎妯℃澘鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:category:edit')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@@ -86,6 +90,7 @@
/**
* 鍒犻櫎闂嵎妯℃澘鍒嗙被
*/
+ @ApiOperation("鍒犻櫎闂嵎妯℃澘鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:category:remove')")
@Log(title = "闂嵎妯℃澘鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
index 472dbdb..0b32d96 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTitleController.java
@@ -36,7 +36,7 @@
/**
* 鏌ヨ闂嵎鍒楄〃
*/
- @ApiOperation("鏌ヨ闂嵎鍒楄〃")
+ @ApiOperation("鏌ヨ闂嵎鍒楄〃璇︽儏")
@PostMapping("/selectSvyLibTitlelist")
public TableDataInfo selectSvyLibTitlelist(@RequestBody SvyLibTitleReq svyLibTitleReq) {
startPage();
@@ -44,16 +44,16 @@
return getDataTable(list);
}
-
- /**
- * 鑾峰彇闂嵎璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇闂嵎璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:svytitle:query')")
- @GetMapping(value = "/{svyid}")
- public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
- return success(svyLibTitleService.selectSvyLibTitleBySvyid(svyid));
- }
+//
+// /**
+// * 鑾峰彇闂嵎璇︾粏淇℃伅(鍗曡〃)
+// */
+// @ApiOperation("鑾峰彇闂嵎璇︾粏淇℃伅")
+// @PreAuthorize("@ss.hasPermi('smartor:svytitle:query')")
+// @GetMapping(value = "/{svyid}")
+// public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
+// return success(svyLibTitleService.selectSvyLibTitleBySvyid(svyid));
+// }
/**
* 鏂板闂嵎
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicCategoryController.java
index def7df7..e45d6af 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicCategoryController.java
@@ -34,6 +34,7 @@
/**
* 鏌ヨ闂嵎棰樼洰鍒嗙被鍒楄〃
*/
+ @ApiOperation("鏌ヨ闂嵎棰樼洰鍒嗙被鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:category:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibTopicCategory svyLibTopicCategory) {
@@ -57,21 +58,22 @@
/**
* 鑾峰彇闂嵎棰樼洰鍒嗙被璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇闂嵎棰樼洰鍒嗙被璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:category:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(svyLibTopicCategoryService.selectSvyLibTopicCategoryById(id));
}
- /**
- * 鏂板闂嵎棰樼洰鍒嗙被
- */
- @PreAuthorize("@ss.hasPermi('smartor:category:add')")
- @Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- public AjaxResult add(@RequestBody SvyLibTopicCategory svyLibTopicCategory) {
- return toAjax(svyLibTopicCategoryService.insertSvyLibTopicCategory(svyLibTopicCategory));
- }
+// /**
+// * 鏂板闂嵎棰樼洰鍒嗙被
+// */
+// @PreAuthorize("@ss.hasPermi('smartor:category:add')")
+// @Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.INSERT)
+// @PostMapping("/add")
+// public AjaxResult add(@RequestBody SvyLibTopicCategory svyLibTopicCategory) {
+// return toAjax(svyLibTopicCategoryService.insertSvyLibTopicCategory(svyLibTopicCategory));
+// }
/**
* 淇敼闂嵎棰樼洰鍒嗙被
@@ -86,6 +88,7 @@
/**
* 鍒犻櫎闂嵎棰樼洰鍒嗙被
*/
+ @ApiOperation("鍒犻櫎闂嵎棰樼洰鍒嗙被")
@PreAuthorize("@ss.hasPermi('smartor:category:remove')")
@Log(title = "闂嵎棰樼洰鍒嗙被", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
index 0d3bc93..7a8f5b8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTopicController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
import com.smartor.domain.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -49,7 +50,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svytopic:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody SvyLibTopic svyLibTopic) {
- startPage();
+ PageUtils.startPageByPost(svyLibTopic.getPageNum(), svyLibTopic.getPageSize());
List<SvyLibTopic> list = svyLibTopicService.selectSvyLibTopicList(svyLibTopic);
return getDataTable(list);
}
@@ -67,15 +68,15 @@
util.exportExcel(response, list, "闂嵎棰樼洰鏁版嵁");
}
- /**
- * 鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('smartor:svytopic:query')")
- @GetMapping(value = "/getInfo/{topicid}")
- public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
- return success(svyLibTopicService.selectSvyLibTopicByTopicid(topicid));
- }
+// /**
+// * 鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅
+// */
+// @ApiOperation("鑾峰彇闂嵎棰樼洰璇︾粏淇℃伅")
+// @PreAuthorize("@ss.hasPermi('smartor:svytopic:query')")
+// @GetMapping(value = "/getInfo/{topicid}")
+// public AjaxResult getInfo(@PathVariable("topicid") Long topicid) {
+// return success(svyLibTopicService.selectSvyLibTopicByTopicid(topicid));
+// }
/**
* 鏂板闂嵎棰樼洰
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
new file mode 100644
index 0000000..43719df
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/TempDetpRelevanceController.java
@@ -0,0 +1,98 @@
+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/tools/DingTalkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/DingTalkController.java
index d060ea4..e441f16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/DingTalkController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/DingTalkController.java
@@ -43,8 +43,9 @@
*/
@ApiOperation("鍙戦�侀拤閽夋秷鎭�")
@PostMapping("/sendNotification")
- public void sendNotification(@RequestBody DingTalkReqVo dingTalkReqVo) throws ApiException {
- dingTalkService.sendNotification(dingTalkReqVo);
+ public Boolean sendNotification(@RequestBody DingTalkReqVo dingTalkReqVo) throws ApiException {
+ Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
+ return aBoolean;
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
index a320da7..892587c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
@@ -1,6 +1,9 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,6 +30,7 @@
*
* @author ruoyi
*/
+@Api(description = "閮ㄩ棬淇℃伅")
@RestController
@RequestMapping("/system/dept")
public class SysDeptController extends BaseController
@@ -37,6 +41,7 @@
/**
* 鑾峰彇閮ㄩ棬鍒楄〃
*/
+ @ApiOperation("鑾峰彇閮ㄩ棬鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list")
public AjaxResult list(SysDept dept)
@@ -48,6 +53,7 @@
/**
* 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
*/
+ @ApiOperation("鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級")
@PreAuthorize("@ss.hasPermi('system:dept:list')")
@GetMapping("/list/exclude/{deptId}")
public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
@@ -60,8 +66,9 @@
/**
* 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
*/
+ @ApiOperation("鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:dept:query')")
- @GetMapping(value = "/{deptId}")
+ @GetMapping(value = "/getInfo/{deptId}")
public AjaxResult getInfo(@PathVariable Long deptId)
{
deptService.checkDeptDataScope(deptId);
@@ -71,9 +78,10 @@
/**
* 鏂板閮ㄩ棬
*/
+ @ApiOperation("鏂板閮ㄩ棬")
@PreAuthorize("@ss.hasPermi('system:dept:add')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
public AjaxResult add(@Validated @RequestBody SysDept dept)
{
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
@@ -87,9 +95,10 @@
/**
* 淇敼閮ㄩ棬
*/
+ @ApiOperation("淇敼閮ㄩ棬")
@PreAuthorize("@ss.hasPermi('system:dept:edit')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysDept dept)
{
Long deptId = dept.getDeptId();
@@ -113,9 +122,10 @@
/**
* 鍒犻櫎閮ㄩ棬
*/
+ @ApiOperation("鍒犻櫎閮ㄩ棬")
@PreAuthorize("@ss.hasPermi('system:dept:remove')")
@Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deptId}")
+ @GetMapping("/remove/{deptId}")
public AjaxResult remove(@PathVariable Long deptId)
{
if (deptService.hasChildByDeptId(deptId))
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 3bd1426..9319230 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -156,6 +156,12 @@
<artifactId>UserAgentUtils</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>1.6.2</version>
+ </dependency>
+
<!-- servlet鍖� -->
<dependency>
<groupId>javax.servlet</groupId>
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 fb18c5c..8d7b63b 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
@@ -6,6 +6,10 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+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.core.domain.BaseEntity;
@@ -15,44 +19,58 @@
*
* @author ruoyi
*/
+@Data
+@ApiModel(value = "SysDept", description = "閮ㄩ棬琛�")
public class SysDept extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 閮ㄩ棬ID */
+ @ApiModelProperty("閮ㄩ棬ID")
private Long deptId;
/** 鐖堕儴闂↖D */
+ @ApiModelProperty("鐖堕儴闂↖D")
private Long parentId;
/** 绁栫骇鍒楄〃 */
+ @ApiModelProperty("绁栫骇鍒楄〃")
private String ancestors;
/** 閮ㄩ棬鍚嶇О */
+ @ApiModelProperty("閮ㄩ棬鍚嶇О")
private String deptName;
/** 鏄剧ず椤哄簭 */
+ @ApiModelProperty("鏄剧ず椤哄簭")
private Integer orderNum;
/** 璐熻矗浜� */
+ @ApiModelProperty("璐熻矗浜�")
private String leader;
/** 鑱旂郴鐢佃瘽 */
+ @ApiModelProperty("鑱旂郴鐢佃瘽")
private String phone;
/** 閭 */
+ @ApiModelProperty("閭")
private String email;
/** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
+ @ApiModelProperty("閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ @ApiModelProperty("鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
private String delFlag;
/** 鐖堕儴闂ㄥ悕绉� */
+ @ApiModelProperty("鐖堕儴闂ㄥ悕绉�")
private String parentName;
/** 瀛愰儴闂� */
+ @ApiModelProperty("瀛愰儴闂�")
private List<SysDept> children = new ArrayList<SysDept>();
public Long getDeptId()
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SendTypeEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/SendTypeEnum.java
new file mode 100644
index 0000000..62e3cd4
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/SendTypeEnum.java
@@ -0,0 +1,53 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 鍙戦�佺被鍨嬫灇涓�
+ */
+public enum SendTypeEnum {
+ DMT(1, "澶氬獟浣�"),
+ ZZ(2, "绾歌川"),
+ DH(3, "鐢佃瘽"),
+ DX(4, "鐭俊"),
+ GZH(5, "寰俊鍏紬鍙�"),
+ WXXCH(6, "寰俊灏忕▼搴�"),
+ ZFB(7, "鏀粯瀹�"),
+ ZNXCH(8, "鏅鸿兘灏忕▼搴�"),
+ DD(9, "閽夐拤");
+
+
+ private Integer code;
+ private String desc;
+
+ SendTypeEnum(Integer code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public static String getDescByCode(Integer code) {
+ SendTypeEnum[] organEnums = values();
+ for (int i = 0; i < organEnums.length; i++) {
+ SendTypeEnum organEnum = organEnums[i];
+ if (organEnum.getCode() == code) {
+ return organEnum.getDesc();
+ }
+ }
+ return null;
+ }
+
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index cf439f6..83da4b4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
- <resultMap type="SysDept" id="SysDeptResult">
+ <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="ancestors" column="ancestors" />
@@ -27,7 +27,7 @@
from sys_dept d
</sql>
- <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
+ <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
@@ -87,7 +87,7 @@
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
- <insert id="insertDept" parameterType="SysDept">
+ <insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -115,7 +115,7 @@
)
</insert>
- <update id="updateDept" parameterType="SysDept">
+ <update id="updateDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept">
update sys_dept
<set>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
diff --git a/smartor/src/main/java/com/smartor/common/SendService.java b/smartor/src/main/java/com/smartor/common/SendService.java
new file mode 100644
index 0000000..7645456
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/common/SendService.java
@@ -0,0 +1,60 @@
+package com.smartor.common;
+
+import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody;
+import com.smartor.domain.BaseSmsRequest;
+import com.smartor.domain.DingTalkReqVo;
+import com.smartor.domain.SendMagParam;
+import com.smartor.service.DingTalkService;
+import com.smartor.service.impl.BaseSmsaccountServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 鍙戦�佹湇鍔″伐鍏风被
+ */
+@Component
+public class SendService {
+ @Autowired
+ private BaseSmsaccountServiceImpl baseSmsaccountService;
+
+ @Autowired
+ private DingTalkService dingTalkService;
+
+ public Boolean sendMsg(SendMagParam sendMagParam) {
+ switch (sendMagParam.getType()) {
+ case ("澶氬獟浣�"):
+
+ case ("绾歌川"):
+
+ case ("鐢佃瘽"):
+
+ case ("鐭俊"):
+ BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
+ baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
+ baseSmsRequest.setTemplateCode("SMS_461860582");
+
+ SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
+ if (sendSmsResponseBody.getCode().equals("OK")) {
+ return true;
+ }
+ return false;
+ case ("寰俊鍏紬鍙�"):
+
+ case ("寰俊灏忕▼搴�"):
+
+ case ("鏀粯瀹�"):
+
+ case ("鏅鸿兘灏忕▼搴�"):
+
+ case ("閽夐拤"):
+ DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
+ Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
+ if (aBoolean) {
+ return true;
+ }
+ default:
+ return false;
+ }
+
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
index 643e9e2..6fc5687 100644
--- a/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeCategoryVO.java
@@ -7,6 +7,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -73,7 +74,7 @@
* 瀛愭暟鎹�
*/
@ApiModelProperty(value = "瀛愭暟鎹�")
- private List<HeCategory> heCategoryList;
+ private List<HeCategory> heCategoryList = new ArrayList<>();
@Override
public String toString() {
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibrary.java b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
index 5e3bff8..f9c950a 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibrary.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibrary.java
@@ -1,16 +1,14 @@
package com.smartor.domain;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.fasterxml.jackson.annotation.JsonFormat;
+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;
-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;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 瀹ｆ暀璧勬枡搴撳璞� he_library
@@ -174,7 +172,7 @@
*/
@Excel(name = "鏄惁鍙敤 0鍙敤 1涓嶅彲鐢�")
@ApiModelProperty("鏄惁鍙敤 0鍙敤 1涓嶅彲鐢�")
- private String isavailable;
+ private String isavailable = "0";
/**
* 閫傜敤鐤剧梾
@@ -190,5 +188,32 @@
@ApiModelProperty("閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
private String suitway;
+ /**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty("绉戝鍚嶇О")
+ private String deptNames = "";
+
+ /**
+ * 鏍囩淇℃伅
+ */
+ @Excel(name = "鏍囩淇℃伅")
+ @ApiModelProperty("鏍囩淇℃伅")
+ private String labelInfo = "";
+
+ /**
+ * 闄㈠尯
+ */
+ @Excel(name = "闄㈠尯")
+ @ApiModelProperty("闄㈠尯")
+ private String campus = "";
+
+ /**
+ * 鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級
+ */
+ @Excel(name = "鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ @ApiModelProperty("鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ private String otherdata = "";
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryTag.java b/smartor/src/main/java/com/smartor/domain/HeLibraryTag.java
index 5b7eec0..537bfbc 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryTag.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibraryTag.java
@@ -92,6 +92,13 @@
private String guid;
/**
+ * 鏍囩鍚嶇О
+ */
+ @Excel(name = " 鏍囩鍚嶇О ")
+ @ApiModelProperty(" 鏍囩鍚嶇О ")
+ private String tagname;
+
+ /**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
*/
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
diff --git a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java b/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
index c75bd27..ca832a8 100644
--- a/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/HeLibraryVO.java
@@ -8,17 +8,18 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
- * 瀹ｆ暀璧勬枡搴撳璞� he_library
+ * 瀹ｆ暀璧勬枡搴撹鍥惧璞� he_library
*
* @author ruoyi
* @date 2023-12-24
*/
@Data
-@ApiModel(value = "HeLibrary", description = "瀹ｆ暀璧勬枡搴撳璞�")
+@ApiModel(value = "HeLibraryVO", description = "瀹ｆ暀璧勬枡搴撹鍥惧璞�")
public class HeLibraryVO extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -183,6 +184,27 @@
private String suitdisease;
/**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty("绉戝鍚嶇О")
+ private String deptNames = "";
+
+ /**
+ * 鏍囩淇℃伅
+ */
+ @Excel(name = "鏍囩淇℃伅")
+ @ApiModelProperty("鏍囩淇℃伅")
+ private String labelInfo = "";
+
+ /**
+ * 闄㈠尯
+ */
+ @Excel(name = "闄㈠尯")
+ @ApiModelProperty("闄㈠尯")
+ private String campus = "";
+
+ /**
* 閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3
*/
@Excel(name = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
@@ -190,7 +212,10 @@
private String suitway;
@ApiModelProperty("鎸囨爣鏍囩瀵硅薄闆嗗悎")
- private List<HeLibraryTag> heLibraryTagList;
+ private List<HeLibraryTag> heLibraryTagList = new ArrayList<>();
+
+ @ApiModelProperty("妯℃澘绉戝鍏宠仈琛�")
+ private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
/**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
@@ -198,4 +223,11 @@
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
+ /**
+ * 鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級
+ */
+ @Excel(name = "鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ @ApiModelProperty("鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ private String otherdata = "";
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/HeTask.java b/smartor/src/main/java/com/smartor/domain/HeTask.java
new file mode 100644
index 0000000..952494c
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/HeTask.java
@@ -0,0 +1,208 @@
+package com.smartor.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 瀹ｆ暀浠诲姟瀵硅薄 he_task
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Data
+@ApiModel(value = "HeTask", description = "瀹ｆ暀浠诲姟瀵硅薄")
+public class HeTask extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private Long id;
+
+ /**
+ * 鎮ｈ�呮湇鍔′换鍔d
+ */
+ @Excel(name = "鎮ｈ�呮湇鍔′换鍔d")
+ @ApiModelProperty(value = "鎮ｈ�呮湇鍔′换鍔d")
+ private Long svrtaskid;
+
+ /**
+ * 鐥呬汉id闆嗗悎
+ */
+ @Excel(name = " 鐥呬汉id闆嗗悎")
+ @ApiModelProperty(value = "鐥呬汉id闆嗗悎锛堝瓧绗︿覆浠ラ�楀彿褰㈠紡鍒嗛殧锛�")
+ private String patientid;
+
+ /**
+ * 瀹ｆ暀鍒嗙被
+ */
+ @Excel(name = " 瀹ｆ暀鍒嗙被 ")
+ @ApiModelProperty(value = "瀹ｆ暀鍒嗙被")
+ private String classification;
+
+ /**
+ * 瀹ｆ暀id
+ */
+ @Excel(name = " 瀹ｆ暀id ")
+ @ApiModelProperty(value = "瀹ｆ暀id")
+ private Long preachcategoryid;
+
+ /**
+ * 瀹ｆ暀鍚嶇О
+ */
+ @Excel(name = " 瀹ｆ暀鍚嶇О ")
+ @ApiModelProperty(value = "瀹ｆ暀鍚嶇О")
+ private String preachname;
+
+ /**
+ * 鐗堟湰
+ */
+ @Excel(name = " 鐗堟湰 ")
+ @ApiModelProperty(value = "鐗堟湰")
+ private BigDecimal version;
+
+ /**
+ * 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤
+ */
+ @Excel(name = " 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ @ApiModelProperty(value = " 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ private Long preachform;
+
+ /**
+ * 缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀
+ */
+ @Excel(name = "缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀")
+ @ApiModelProperty(value = " 缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀")
+ private Long orgform;
+
+ /**
+ * 瀹ｆ暀鎻忚堪
+ */
+ @Excel(name = " 瀹ｆ暀鎻忚堪 ")
+ @ApiModelProperty(value = "瀹ｆ暀鎻忚堪")
+ private String preachdescription;
+
+ /**
+ * 瀹ｆ暀鍐呭
+ */
+ @Excel(name = " 瀹ｆ暀鍐呭 ")
+ @ApiModelProperty(value = "瀹ｆ暀鍐呭")
+ private String preachcontent;
+
+ /**
+ * 妯℃澘ID
+ */
+ @Excel(name = " 妯℃澘ID ")
+ @ApiModelProperty(value = "妯℃澘ID")
+ private Long templateid;
+
+ /**
+ * 瀹ｆ暀浠ｇ爜
+ */
+ @Excel(name = " 瀹ｆ暀浠ｇ爜 ")
+ @ApiModelProperty(value = "瀹ｆ暀浠ｇ爜")
+ private String preachcode;
+
+ /**
+ * 涓績搴揑D
+ */
+ @Excel(name = " 涓績搴揑D ")
+ @ApiModelProperty(value = "涓績搴揑D")
+ private Long centerlibraryid;
+
+ /**
+ * 鏄惁鍚敤
+ */
+ @Excel(name = " 鏄惁鍚敤 ")
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private Long isenable;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鏄惁鏈湴
+ */
+ @Excel(name = " 鏄惁鏈湴 ")
+ @ApiModelProperty(value = "鏄惁鏈湴")
+ private Long islocal;
+
+ /**
+ * 涓績搴撲唬鐮�
+ */
+ @Excel(name = " 涓績搴撲唬鐮� ")
+ @ApiModelProperty(value = "涓績搴撲唬鐮�")
+ private String centerlibrarycode;
+
+ /**
+ * 鐖禝D
+ */
+ @Excel(name = "鐖禝D")
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @Excel(name = "GUID")
+ @ApiModelProperty(value = "GUID")
+ private String guid;
+
+ /**
+ * 浠诲姟鍙戦�佹椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浠诲姟鍙戦�佹椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "浠诲姟鍙戦�佹椂闂�")
+ private Date sendTime;
+
+ /**
+ * 鍙戦�佺姸鎬� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��
+ */
+ @Excel(name = "鍙戦�佺姸鎬� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦�� ")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��")
+ private Long isSend;
+
+ /**
+ * 鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛
+ */
+ @Excel(name = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
+ private Long sendState;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/HeTaskVO.java b/smartor/src/main/java/com/smartor/domain/HeTaskVO.java
new file mode 100644
index 0000000..f7dca7e
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/HeTaskVO.java
@@ -0,0 +1,217 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 瀹ｆ暀浠诲姟瀵硅薄 he_task
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Data
+@ApiModel(value = "HeTaskVO", description = "瀹ｆ暀浠诲姟璇︽儏杩斿弬瀵硅薄")
+public class HeTaskVO extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private Long id;
+
+ /**
+ * 鎮ｈ�呮湇鍔′换鍔d
+ */
+ @Excel(name = "鎮ｈ�呮湇鍔′换鍔d")
+ @ApiModelProperty(value = "鎮ｈ�呮湇鍔′换鍔d")
+ private Long svrtaskid;
+
+// /**
+// * 鐥呬汉id闆嗗悎
+// */
+// @Excel(name = " 鐥呬汉id闆嗗悎")
+// @ApiModelProperty(value = "鐥呬汉id闆嗗悎")
+// private String patientids;
+
+ /**
+ * 瀹ｆ暀鍒嗙被
+ */
+ @Excel(name = " 瀹ｆ暀鍒嗙被 ")
+ @ApiModelProperty(value = "瀹ｆ暀鍒嗙被")
+ private String classification;
+
+ /**
+ * 瀹ｆ暀鍒嗙被
+ */
+ @Excel(name = " 瀹ｆ暀鍒嗙被 ")
+ @ApiModelProperty(value = "瀹ｆ暀鍒嗙被id")
+ private Long preachcategoryid;
+
+ /**
+ * 瀹ｆ暀鍚嶇О
+ */
+ @Excel(name = " 瀹ｆ暀鍚嶇О ")
+ @ApiModelProperty(value = "瀹ｆ暀鍚嶇О")
+ private String preachname;
+
+ /**
+ * 鐗堟湰
+ */
+ @Excel(name = " 鐗堟湰 ")
+ @ApiModelProperty(value = "鐗堟湰")
+ private BigDecimal version;
+
+ /**
+ * 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤
+ */
+ @Excel(name = " 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ @ApiModelProperty(value = " 瀹ｆ暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ private Long preachform;
+
+ /**
+ * 缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀
+ */
+ @Excel(name = "缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀")
+ @ApiModelProperty(value = " 缁勭粐褰㈠紡锛�1.鍗曚汉瀹ｆ暀 2.澶氫汉瀹ｆ暀")
+ private Long orgform;
+
+ /**
+ * 瀹ｆ暀鎻忚堪
+ */
+ @Excel(name = " 瀹ｆ暀鎻忚堪 ")
+ @ApiModelProperty(value = "瀹ｆ暀鎻忚堪")
+ private String preachdescription;
+
+ /**
+ * 瀹ｆ暀鍐呭
+ */
+ @Excel(name = " 瀹ｆ暀鍐呭 ")
+ @ApiModelProperty(value = "瀹ｆ暀鍐呭")
+ private String preachcontent;
+
+ /**
+ * 妯℃澘ID
+ */
+ @Excel(name = " 妯℃澘ID ")
+ @ApiModelProperty(value = "妯℃澘ID")
+ private Long templateid;
+
+ /**
+ * 瀹ｆ暀浠ｇ爜
+ */
+ @Excel(name = " 瀹ｆ暀浠ｇ爜 ")
+ @ApiModelProperty(value = "瀹ｆ暀浠ｇ爜")
+ private String preachcode;
+
+ /**
+ * 涓績搴揑D
+ */
+ @Excel(name = " 涓績搴揑D ")
+ @ApiModelProperty(value = "涓績搴揑D")
+ private Long centerlibraryid;
+
+ /**
+ * 鏄惁鍚敤
+ */
+ @Excel(name = " 鏄惁鍚敤 ")
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private Long isenable;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /**
+ * 鏄惁鏈湴
+ */
+ @Excel(name = " 鏄惁鏈湴 ")
+ @ApiModelProperty(value = "鏄惁鏈湴")
+ private Long islocal;
+
+ /**
+ * 涓績搴撲唬鐮�
+ */
+ @Excel(name = " 涓績搴撲唬鐮� ")
+ @ApiModelProperty(value = "涓績搴撲唬鐮�")
+ private String centerlibrarycode;
+
+ /**
+ * 鐖禝D
+ */
+ @Excel(name = "鐖禝D")
+ @ApiModelProperty(value = "鐖禝D")
+ private Long pid;
+
+ /**
+ * GUID
+ */
+ @Excel(name = "GUID")
+ @ApiModelProperty(value = "GUID")
+ private String guid;
+
+ /**
+ * 浠诲姟鍙戦�佹椂闂�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浠诲姟鍙戦�佹椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "浠诲姟鍙戦�佹椂闂�")
+ private Date sendTime;
+
+ /**
+ * 鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��
+ */
+ @Excel(name = "鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦�� ")
+ @ApiModelProperty(value = "鏄惁鍙戦�� 锛� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��")
+ private Long isSend;
+
+ /**
+ * 鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛
+ */
+ @Excel(name = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
+ @ApiModelProperty(value = "鍙戦�佺姸鎬侊細 0 澶辫触 1鎴愬姛")
+ private Long sendState = 0L;
+
+ /**
+ * 鎮ｈ�呭叧鑱斾俊鎭�
+ */
+ private List<PatHetaskRelevance> patHetaskRelevances;
+
+ /**
+ * 瀹ｆ暀璧勬枡搴撲俊鎭�
+ */
+ private HeLibraryVO heLibraryVOs;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java
index e662939..6f05635 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaExtemplate.java
@@ -18,7 +18,7 @@
* @date 2023-12-27
*/
@Data
-@ApiModel(value = "HeLibrary", description = "閫氳繃妯℃澘瀵硅薄")
+@ApiModel(value = "IvrLibaExtemplate", description = "閫氳繃妯℃澘瀵硅薄")
public class IvrLibaExtemplate extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
index dd8ff03..ec51b92 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScript.java
@@ -238,7 +238,7 @@
*/
@ApiModelProperty("鍙傛暟鍙橀噺")
@Excel(name = " 鍙傛暟鍙橀噺 ")
- private String parameter;
+ private String otherdata;
/**
* 鐖禝D
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
index 0dcc174..a100a7b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssort.java
@@ -37,7 +37,7 @@
* 鍒犻櫎
*/
@ApiModelProperty("鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
index 7fdf1d8..d614a7c 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptAssortVO.java
@@ -38,7 +38,7 @@
* 鍒犻櫎
*/
@ApiModelProperty("鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
index 03b56dd..b1c693b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaScriptVO.java
@@ -238,7 +238,7 @@
*/
@ApiModelProperty("鍙傛暟鍙橀噺")
@Excel(name = " 鍙傛暟鍙橀噺 ")
- private String parameter;
+ private String otherdata;
// /**
// * 鎸囨爣闆嗗悎
// */
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
index a615732..de2106a 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTarget.java
@@ -26,7 +26,7 @@
* $column.columnComment
*/
@ApiModelProperty(value = "涓婚敭")
- private Long targetID;
+ private Long id;
/**
* 鍒嗙粍ID
@@ -192,8 +192,5 @@
private Integer pageSize;
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetID", getTargetID()).append("groupid", getGroupid()).append("targettype", getTargettype()).append("targetname", getTargetname()).append("targetdesc", getTargetdesc()).append("language", getLanguage()).append("version", getVersion()).append("isenable", getIsenable()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).append("assortid", getAssortid()).toString();
- }
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
index 7545bd0..b73ca4b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssort.java
@@ -36,7 +36,7 @@
* 鍒犻櫎
*/
@ApiModelProperty(value = "鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
index d4e465b..09c5b8e 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetAssortVO.java
@@ -39,7 +39,7 @@
* 鍒犻櫎
*/
@ApiModelProperty(value = "鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
index 63ad625..be06220 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetTagVO.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -95,6 +96,6 @@
*/
@ApiModelProperty(value = "鏍囩鍚嶇О")
@Excel(name = "鏍囩鍚嶇О")
- private List<BaseTag> tagList;
+ private List<BaseTag> tagList = new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
index cb9f855..d69147d 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTargetVO.java
@@ -28,7 +28,7 @@
* $column.columnComment
*/
@ApiModelProperty(value = "涓婚敭")
- private Long targetID;
+ private Long id;
/**
* 鍒嗙粍ID
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
index 224a2b4..59b208d 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplate.java
@@ -147,7 +147,7 @@
*/
@Excel(name = "鏍囩淇℃伅")
@ApiModelProperty(value = "鏍囩淇℃伅")
- private String labelInfo;
+ private String labelInfo = "";
/**
* 閫氱敤鍖归厤璇濇湳id
@@ -196,7 +196,7 @@
*/
@Excel(name = "閮ㄩ棬鍚嶇О")
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
- private String deptNames;
+ private String deptNames = "";
/**
* F_KSDM
@@ -282,7 +282,7 @@
*/
@Excel(name = "鍖婚櫌闄㈠尯")
@ApiModelProperty(value = "鍖婚櫌闄㈠尯")
- private String campus;
+ private String campus = "";
/**
* 鏍囩
@@ -291,4 +291,18 @@
@ApiModelProperty(value = "鏍囩")
private String tag;
+ /**
+ * 鏍囩
+ */
+ @Excel(name = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ @ApiModelProperty(value = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ private String suitway;
+
+ /**
+ * 鏍囩
+ */
+ @Excel(name = "鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ @ApiModelProperty(value = "鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ private String otherdata;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java
index 881f229..b588574 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssort.java
@@ -36,7 +36,7 @@
* 鍒犻櫎
*/
@ApiModelProperty(value = "鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java
index e9d64cd..2e19623 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateAssortVO.java
@@ -37,7 +37,7 @@
* 鍒犻櫎
*/
@ApiModelProperty(value = "鍒犻櫎")
- private String delFlag;
+ private Long delFlag;
/**
* 鐖秈d
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
index d3f17d1..1dca3c4 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScriptVO.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -230,5 +231,5 @@
* 璇濇湳閫夐」
*/
@ApiModelProperty(value = "璇濇湳閫夐」")
- private List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList;
+ private List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList = new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTarget.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTarget.java
index a415fc7..94c842f 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTarget.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateTarget.java
@@ -26,7 +26,7 @@
* 妯℃澘鎸囨爣ID
*/
@ApiModelProperty(value = "妯℃澘鎸囨爣ID")
- private Long ID;
+ private Long id;
/**
* 妯℃澘璇濇湳ID
@@ -117,14 +117,14 @@
*/
@Excel(name = "鎸囨爣ID")
@ApiModelProperty(value = "鎸囨爣ID")
- private String targetID;
+ private String targetid;
/**
* 璇濇湳鎸囨爣ID
*/
@Excel(name = "璇濇湳鎸囨爣ID")
@ApiModelProperty(value = "璇濇湳鎸囨爣ID")
- private String questionTargetID;
+ private String questionTargetid;
/**
* 鍩虹姝ｅ垯
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
index 0f4ed1c..f838079 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateVO.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -146,7 +147,7 @@
*/
@Excel(name = "鏍囩淇℃伅")
@ApiModelProperty(value = "鏍囩淇℃伅")
- private String labelInfo;
+ private String labelInfo = "";
/**
* 閫氱敤鍖归厤璇濇湳id
@@ -195,7 +196,7 @@
*/
@Excel(name = "閮ㄩ棬鍚嶇О")
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
- private String deptNames;
+ private String deptNames = "";
/**
* F_KSDM
@@ -279,7 +280,7 @@
*/
@Excel(name = "鍖婚櫌闄㈠尯")
@ApiModelProperty(value = "鍖婚櫌闄㈠尯")
- private String campus;
+ private String campus = "";
/**
* 鏍囩
@@ -287,6 +288,13 @@
@Excel(name = "鏍囩")
@ApiModelProperty(value = "鏍囩")
private String tag;
+
+ /**
+ * 閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3
+ */
+ @Excel(name = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ @ApiModelProperty(value = "閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ private String suitway;
/**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
@@ -298,12 +306,12 @@
// private List<IvrLibaTemplateTarget> ivrLibaTemplateTargetList;
@ApiModelProperty(value = "妯℃澘闂闆嗗悎")
- private List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList;
+ private List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = new ArrayList<>();
@ApiModelProperty(value = "妯℃澘鎸囨爣闆嗗悎")
- private List<IvrLibaTemplateTag> ivrLibaTemplateTagList;
-//
-// @ApiModelProperty(value = "妯℃澘閫夐」闆嗗悎")
-// private List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList;
+ private List<IvrLibaTemplateTag> ivrLibaTemplateTagList = new ArrayList<>();
+
+ @ApiModelProperty(value = "妯℃澘绉戝鍏宠仈琛ㄩ泦鍚�")
+ private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 57d1eb9..a0f9302 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -204,6 +204,13 @@
@Excel(name = " 閽夐拤鍙� ")
private String dduserid;
+ /**
+ * 閽夐拤鍙�
+ */
+ @ApiModelProperty("绉戝")
+ @Excel(name = " 绉戝 ")
+ private String dept;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("patid", getPatid()).append("name", getName()).append("sex", getSex()).append("idcardno", getIdcardno()).append("birthdate", getBirthdate()).append("age", getAge()).append("source", getSource()).append("archivetime", getArchivetime()).append("archiveby", getArchiveby()).append("telcode", getTelcode()).append("relativetelcode", getRelativetelcode()).append("idcardtype", getIdcardtype()).append("orgid", getOrgid()).append("openid", getOpenid()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).toString();
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
index dcd5222..2c1eb3c 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveReq.java
@@ -60,7 +60,7 @@
/**
* 鏌ョ湅鍏ㄩ儴 0 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
*/
- @ApiModelProperty(value = "鏌ョ湅鍏ㄩ儴 0 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3")
+ @ApiModelProperty(value = " 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3")
private Long allhosp;
@@ -108,7 +108,6 @@
@ApiModelProperty(value = "pageSize")
@Excel(name = "pageSize")
private Integer pageSize;
-
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
index 2bc1dc0..ce3fbff 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveVO.java
@@ -9,6 +9,7 @@
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -141,7 +142,7 @@
private String tag;
@ApiModelProperty("鏍囩闆嗗悎")
- List<PatArchivetag> tagList;
+ List<PatArchivetag> tagList = new ArrayList<>();
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
diff --git a/smartor/src/main/java/com/smartor/domain/PatHetaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatHetaskRelevance.java
new file mode 100644
index 0000000..e4bb02b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatHetaskRelevance.java
@@ -0,0 +1,105 @@
+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;
+
+/**
+ * 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈瀵硅薄 pat_hetask_relevance
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Data
+@ApiModel(value = "PatHetaskRelevance", description = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈瀵硅薄")
+public class PatHetaskRelevance extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @ApiModelProperty("涓婚敭")
+ private Long id;
+
+ /**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty("鎮ｈ�匢D")
+ private Long patId;
+
+ /**
+ * 瀹ｆ暀浠诲姟ID
+ */
+ @Excel(name = "瀹ｆ暀浠诲姟ID")
+ @ApiModelProperty("瀹ｆ暀浠诲姟ID")
+ private Long heTaskId;
+
+ /**
+ * 鍒犻櫎锛�0涓嶅垹闄� 1鍒犻櫎
+ */
+ @ApiModelProperty("鍒犻櫎锛�0涓嶅垹闄� 1鍒犻櫎")
+ private Long delFlag;
+
+ /**
+ * 濮撳悕
+ */
+ @Excel(name = "濮撳悕")
+ @ApiModelProperty("濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+ @Excel(name = "骞撮緞")
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+ /**
+ * 鎬у埆
+ */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty("鎬у埆")
+ private Long sex;
+
+ /**
+ * 搴婂彿
+ */
+ @Excel(name = "搴婂彿")
+ @ApiModelProperty("搴婂彿")
+ private Long badNo;
+
+ /**
+ * 绉戝
+ */
+ @Excel(name = "绉戝")
+ @ApiModelProperty("绉戝")
+ private String dept;
+
+ /**
+ * 鐤剧梾鍚嶇О
+ */
+ @Excel(name = "鐤剧梾鍚嶇О")
+ @ApiModelProperty("鐤剧梾鍚嶇О")
+ private String icdName;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @Excel(name = "鎵嬫満鍙�")
+ @ApiModelProperty("鎵嬫満鍙�")
+ private String phone;
+
+ /**
+ * 鐥呭巻鍙�
+ */
+ @Excel(name = "鐥呭巻鍙�")
+ @ApiModelProperty("鐥呭巻鍙�")
+ private String medicalRecordNo;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatHetaskRelevanceVO.java b/smartor/src/main/java/com/smartor/domain/PatHetaskRelevanceVO.java
new file mode 100644
index 0000000..a643ae0
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatHetaskRelevanceVO.java
@@ -0,0 +1,109 @@
+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;
+
+/**
+ * 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈瀵硅薄鍙傛暟 pat_hetask_relevance
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Data
+@ApiModel(value = "PatHetaskRelevanceVO", description = "鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈瀵硅薄鍙傛暟")
+public class PatHetaskRelevanceVO extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @ApiModelProperty("涓婚敭")
+ private Long id;
+
+ /**
+ * 鎮ｈ�匢D
+ */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty("鎮ｈ�匢D")
+ private Long patId;
+
+ /**
+ * 瀹ｆ暀浠诲姟ID
+ */
+ @Excel(name = "瀹ｆ暀浠诲姟ID")
+ @ApiModelProperty("瀹ｆ暀浠诲姟ID")
+ private Long heTaskId;
+
+ /**
+ * 鍒犻櫎锛�0涓嶅垹闄� 1鍒犻櫎
+ */
+ @ApiModelProperty("鍒犻櫎锛�0涓嶅垹闄� 1鍒犻櫎")
+ private Long delFlag;
+
+ /**
+ * 濮撳悕
+ */
+ @Excel(name = "濮撳悕")
+ @ApiModelProperty("濮撳悕")
+ private String name;
+
+ /**
+ * 骞撮緞
+ */
+ @Excel(name = "骞撮緞")
+ @ApiModelProperty("骞撮緞")
+ private Long age;
+
+ /**
+ * 鎬у埆
+ */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty("鎬у埆")
+ private Long sex;
+
+ /**
+ * 搴婂彿
+ */
+ @Excel(name = "搴婂彿")
+ @ApiModelProperty("搴婂彿")
+ private Long badNo;
+
+ /**
+ * 绉戝
+ */
+ @Excel(name = "绉戝")
+ @ApiModelProperty("绉戝")
+ private String dept;
+
+ /**
+ * 鐤剧梾鍚嶇О
+ */
+ @Excel(name = "鐤剧梾鍚嶇О")
+ @ApiModelProperty("鐤剧梾鍚嶇О")
+ private String icdName;
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @Excel(name = "鎵嬫満鍙�")
+ @ApiModelProperty("鎵嬫満鍙�")
+ private String phone;
+
+ /**
+ * 鐥呭巻鍙�
+ */
+ @Excel(name = "鐥呭巻鍙�")
+ @ApiModelProperty("鐥呭巻鍙�")
+ private String medicalRecordNo;
+
+ /**
+ * 瀹ｆ暀浠诲姟
+ */
+ @ApiModelProperty("瀹ｆ暀浠诲姟")
+ private HeTask heTask;
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/SendMagParam.java b/smartor/src/main/java/com/smartor/domain/SendMagParam.java
new file mode 100644
index 0000000..cb7d986
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SendMagParam.java
@@ -0,0 +1,18 @@
+package com.smartor.domain;
+
+import lombok.Data;
+
+@Data
+public class SendMagParam {
+ //鍙戦�佺被鍨�
+ private String type;
+
+ //鐢佃瘽鍙风爜
+ private String phone;
+
+ //鍙戦�佸唴瀹�
+ private String content;
+
+ //妯℃澘code 渚嬪 锛� SMS_461860582
+ private String tmpCode;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java b/smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java
index 8c2ee99..1e9e043 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyCategoryVO.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -74,6 +75,6 @@
* 浜岀骇鍒嗙被
*/
@ApiModelProperty(value = "浜岀骇鍒嗙被")
- private List<SvyCategory> svyCategoryList;
+ private List<SvyCategory> svyCategoryList=new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java b/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java
index a55af9a..ba49ad5 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTitle.java
@@ -1,6 +1,7 @@
package com.smartor.domain;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -111,7 +112,7 @@
*/
@ApiModelProperty(value = "鏄惁鍚敤")
@Excel(name = " 鏄惁鍚敤 ")
- private Long isenable;
+ private String isenable = "0";
/**
* 鏈烘瀯ID
@@ -161,10 +162,51 @@
private List<SvyLibTopic> svyLibTopics;
/**
+ * 妯℃澘绉戝鍏宠仈闆嗗悎
+ */
+ @ApiModelProperty(value = "妯℃澘绉戝鍏宠仈闆嗗悎")
+ private List<TempDetpRelevance> tempDetpRelevances = new ArrayList<>();
+
+ /**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
*/
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
+ /**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty("绉戝鍚嶇О")
+ private String deptNames = "";
+
+ /**
+ * 鏍囩淇℃伅
+ */
+ @Excel(name = "鏍囩淇℃伅")
+ @ApiModelProperty("鏍囩淇℃伅")
+ private String labelInfo = "";
+
+ /**
+ * 闄㈠尯
+ */
+ @Excel(name = "闄㈠尯")
+ @ApiModelProperty("闄㈠尯")
+ private String campus = "";
+
+ /**
+ * 閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3
+ */
+ @Excel(name = "闄㈤�傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3鍖�")
+ @ApiModelProperty("閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ private String suitway = "";
+
+
+ /**
+ * 鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級
+ */
+ @ApiModelProperty("鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ private String otherdata = "";
+
public SvyLibTitle() {
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTitleCategoryVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTitleCategoryVO.java
index 3dcc0a8..790799f 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTitleCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTitleCategoryVO.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -60,5 +61,5 @@
private Long orgid;
@ApiModelProperty(value = "鏍戠殑瀛愬璞￠泦鍚�")
- private List<SvyLibTitleCategory> svyLibTitleCategoryList;
+ private List<SvyLibTitleCategory> svyLibTitleCategoryList = new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTitleReq.java b/smartor/src/main/java/com/smartor/domain/SvyLibTitleReq.java
index 4bbe6ed..34208cc 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTitleReq.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTitleReq.java
@@ -28,6 +28,12 @@
@ApiModelProperty(value = "闂嵎鍒嗙被ID")
private Long categoryid;
+ /**
+ * 闂嵎ID
+ */
+ @ApiModelProperty(value = "闂嵎ID")
+ private Long svyid;
+
/**
* 闂嵎鍚嶇О
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
index 13f419b..add6f81 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopic.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -53,7 +54,7 @@
*/
@Excel(name = " 棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖ ")
@ApiModelProperty("棰樼洰绫诲瀷;鏋氫妇 1.鍗曢�� 2澶氶�� 3濉┖")
- private Long topictype;
+ private String topictype = "";
/**
* 棰樼洰Code
@@ -79,7 +80,7 @@
* 鏄惁蹇呭～
*/
@ApiModelProperty("鏄惁蹇呭～")
- private Long ismandatory;
+ private String ismandatory;
/**
* 鏄惁闅愯棌
@@ -111,7 +112,7 @@
* 涓婁紶鏍囪
*/
@ApiModelProperty("鏍囩")
- private String tag;
+ private String tag = "";
/**
* 涓婁紶鏃堕棿
@@ -127,11 +128,55 @@
private Long svyTopicId;
/**
+ * 棰樼洰鍐呭
+ */
+ @ApiModelProperty("棰樼洰鍐呭")
+ private String topicContent;
+
+ /**
+ * 閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3
+ */
+ @ApiModelProperty("閫傜敤鏂瑰紡锛氳皟鏌ヨ〃1锛屾櫤鑳借闊�2銆佷汉宸�3")
+ private String suitway;
+
+ /**
+ * 鏄惁鍙敤 0鍙敤 1涓嶅彲鐢�
+ */
+ @ApiModelProperty("鏄惁鍙敤 0鍙敤 1涓嶅彲鐢�")
+ private String isavailable = "0";
+
+ /**
+ * 璇█
+ */
+ @ApiModelProperty("璇█")
+ private String language = "";
+
+ /**
+ * 鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級
+ */
+ @ApiModelProperty("鍏跺畠鏁版嵁锛堝瓨鍌ㄥ彉閲忥級")
+ private String otherdata = "";
+
+ /**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
*/
@ApiModelProperty(value = "鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎")
private Integer isoperation;
@ApiModelProperty("闂閫夐」")
- private List<SvyLibTopicoption> svyLibTopicoptions;
+ private List<SvyLibTopicoption> svyLibTopicoptions = new ArrayList<>();
+
+ /**
+ * pageNum
+ */
+ @ApiModelProperty(value = "pageNum")
+ @Excel(name = "pageNum")
+ private Integer pageNum;
+
+ /**
+ * pageSize
+ */
+ @ApiModelProperty(value = "pageSize")
+ @Excel(name = "pageSize")
+ private Integer pageSize;
}
diff --git a/smartor/src/main/java/com/smartor/domain/SvyLibTopicCategoryVO.java b/smartor/src/main/java/com/smartor/domain/SvyLibTopicCategoryVO.java
index fc39918..1b51d7b 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyLibTopicCategoryVO.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyLibTopicCategoryVO.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -71,6 +72,6 @@
* 瀛愬璞�
*/
@ApiModelProperty("瀛愬璞￠泦")
- private List<SvyLibTopicCategory> svyLibTopicCategoryList;
+ private List<SvyLibTopicCategory> svyLibTopicCategoryList = new ArrayList<>();
}
diff --git a/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java b/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java
new file mode 100644
index 0000000..78c5a53
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/TempDetpRelevance.java
@@ -0,0 +1,55 @@
+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/mapper/HeTaskMapper.java b/smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java
new file mode 100644
index 0000000..27c4d65
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.HeTask;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 瀹ｆ暀浠诲姟Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Mapper
+public interface HeTaskMapper {
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 瀹ｆ暀浠诲姟
+ */
+ public HeTask selectHeTaskById(Long id);
+
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟鍒楄〃
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 瀹ｆ暀浠诲姟闆嗗悎
+ */
+ public List<HeTask> selectHeTaskList(HeTask heTask);
+
+ /**
+ * 鏂板瀹ｆ暀浠诲姟
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ public int insertHeTask(HeTask heTask);
+
+ /**
+ * 淇敼瀹ｆ暀浠诲姟
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ public int updateHeTask(HeTask heTask);
+
+ /**
+ * 鍒犻櫎瀹ｆ暀浠诲姟
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteHeTaskById(Long id);
+
+// /**
+// * 鎵归噺鍒犻櫎瀹ｆ暀浠诲姟
+// *
+// * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+// * @return 缁撴灉
+// */
+// public int deleteHeTaskByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
index 15268fb..b921ee8 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTargetMapper.java
@@ -21,7 +21,7 @@
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 鎸囨爣閫夐」搴�
*/
- public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID);
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long id);
/**
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
@@ -55,7 +55,7 @@
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetID(Long targetID);
+ public int deleteIvrLibaTargetByTargetID(Long id);
/**
* 鎵归噺鍒犻櫎鎸囨爣閫夐」搴�
@@ -63,5 +63,5 @@
* @param targetIDs 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs);
+ public int deleteIvrLibaTargetByTargetIDs(Long[] ids);
}
diff --git a/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetMapper.java b/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetMapper.java
index 51f9090..27a6eeb 100644
--- a/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/IvrLibaTemplateTargetMapper.java
@@ -20,7 +20,7 @@
* @param ID 妯＄増闂鎸囨爣搴撲富閿�
* @return 妯＄増闂鎸囨爣搴�
*/
- public IvrLibaTemplateTarget selectIvrLibaTemplateTargetByID(Long ID);
+ public IvrLibaTemplateTarget selectIvrLibaTemplateTargetByID(Long id);
/**
* 鏌ヨ妯＄増闂鎸囨爣搴撳垪琛�
@@ -52,7 +52,7 @@
* @param ID 妯＄増闂鎸囨爣搴撲富閿�
* @return 缁撴灉
*/
- public int deleteIvrLibaTemplateTargetByID(Long ID);
+ public int deleteIvrLibaTemplateTargetByID(Long id);
/**
* 鎵归噺鍒犻櫎妯＄増闂鎸囨爣搴�
@@ -60,5 +60,5 @@
* @param IDs 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteIvrLibaTemplateTargetByIDs(Long[] IDs);
+ public int deleteIvrLibaTemplateTargetByIDs(Long[] ids);
}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatHetaskRelevanceMapper.java b/smartor/src/main/java/com/smartor/mapper/PatHetaskRelevanceMapper.java
new file mode 100644
index 0000000..255e137
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatHetaskRelevanceMapper.java
@@ -0,0 +1,64 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatHetaskRelevance;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Mapper
+public interface PatHetaskRelevanceMapper
+{
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ public PatHetaskRelevance selectPatHetaskRelevanceById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈闆嗗悎
+ */
+ public List<PatHetaskRelevance> selectPatHetaskRelevanceList(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 鏂板鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ public int insertPatHetaskRelevance(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 淇敼鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ public int updatePatHetaskRelevance(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ public int deletePatHetaskRelevanceById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatHetaskRelevanceByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java b/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java
new file mode 100644
index 0000000..8ec33db
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/TempDetpRelevanceMapper.java
@@ -0,0 +1,63 @@
+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/service/IHeLibraryService.java b/smartor/src/main/java/com/smartor/service/IHeLibraryService.java
index 3d1fb8e..d485e43 100644
--- a/smartor/src/main/java/com/smartor/service/IHeLibraryService.java
+++ b/smartor/src/main/java/com/smartor/service/IHeLibraryService.java
@@ -53,14 +53,6 @@
public int deleteHeLibraryByIds(Long[] ids);
/**
- * 鍒犻櫎瀹ｆ暀璧勬枡搴撲俊鎭�
- *
- * @param id 瀹ｆ暀璧勬枡搴撲富閿�
- * @return 缁撴灉
- */
- public int deleteHeLibraryById(Long id);
-
- /**
* 鏂板鎴栦慨鏀瑰鏁欒鎯�
*/
public Integer saveOrUpdateScript(HeLibraryVO heLibraryVO);
@@ -68,5 +60,5 @@
/**
* 鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢
*/
- public HeLibraryVO selectInfoByCondition(HeLibrary heLibrary);
+ public List<HeLibraryVO> selectInfoByCondition(HeLibrary heLibrary);
}
diff --git a/smartor/src/main/java/com/smartor/service/IHeTaskService.java b/smartor/src/main/java/com/smartor/service/IHeTaskService.java
new file mode 100644
index 0000000..42d9891
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IHeTaskService.java
@@ -0,0 +1,69 @@
+package com.smartor.service;
+
+import com.smartor.domain.*;
+
+import java.util.List;
+
+/**
+ * 瀹ｆ暀浠诲姟Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+public interface IHeTaskService {
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 瀹ｆ暀浠诲姟
+ */
+ public HeTaskVO selectHeTaskById(Long id);
+
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟鍒楄〃
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 瀹ｆ暀浠诲姟闆嗗悎
+ */
+ public List<PatHetaskRelevanceVO> selectHeTaskList(PatHetaskRelevanceVO patHetaskRelevanceVO);
+
+ /**
+ * 鏂板瀹ｆ暀浠诲姟
+ *
+ * @param heTaskVO 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ public int insertHeTask(HeTaskVO heTaskVO);
+
+ /**
+ * 淇敼瀹ｆ暀浠诲姟
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ public int updateHeTask(HeTask heTask);
+
+ /**
+ * 鎵归噺鍒犻櫎瀹ｆ暀浠诲姟
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑瀹ｆ暀浠诲姟涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteHeTaskByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎瀹ｆ暀浠诲姟淇℃伅
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 缁撴灉
+ */
+ public int deleteHeTaskById(Long id);
+
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ *
+ * @param patArchiveReq
+ * @return PatHetaskRelevance
+ */
+ public List<PatHetaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
index b6313d4..3b40230 100644
--- a/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
+++ b/smartor/src/main/java/com/smartor/service/IIvrLibaTargetService.java
@@ -18,7 +18,7 @@
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 鎸囨爣閫夐」搴�
*/
- public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID);
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long id);
/**
* 鏌ヨ鎸囨爣閫夐」搴撳垪琛�
@@ -59,7 +59,7 @@
* @param targetIDs 闇�瑕佸垹闄ょ殑鎸囨爣閫夐」搴撲富閿泦鍚�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs);
+ public int deleteIvrLibaTargetByTargetIDs(Long[] ids);
/**
* 鍒犻櫎鎸囨爣閫夐」搴撲俊鎭�
@@ -67,5 +67,5 @@
* @param targetID 鎸囨爣閫夐」搴撲富閿�
* @return 缁撴灉
*/
- public int deleteIvrLibaTargetByTargetID(Long targetID);
+ public int deleteIvrLibaTargetByTargetID(Long id);
}
diff --git a/smartor/src/main/java/com/smartor/service/IPatHetaskRelevanceService.java b/smartor/src/main/java/com/smartor/service/IPatHetaskRelevanceService.java
new file mode 100644
index 0000000..fe01019
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatHetaskRelevanceService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatHetaskRelevance;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+public interface IPatHetaskRelevanceService
+{
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ public PatHetaskRelevance selectPatHetaskRelevanceById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈闆嗗悎
+ */
+ public List<PatHetaskRelevance> selectPatHetaskRelevanceList(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 鏂板鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ public int insertPatHetaskRelevance(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 淇敼鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ public int updatePatHetaskRelevance(PatHetaskRelevance patHetaskRelevance);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatHetaskRelevanceByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈淇℃伅
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ public int deletePatHetaskRelevanceById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java b/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java
new file mode 100644
index 0000000..b1ab5dd
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/ITempDetpRelevanceService.java
@@ -0,0 +1,62 @@
+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/impl/HeLibraryAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
index 08e13d9..372fb7d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
@@ -10,6 +10,7 @@
import com.smartor.mapper.HeLibraryAssortMapper;
import com.smartor.service.IHeLibraryAssortService;
import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,7 @@
* @author ruoyi
* @date 2023-12-24
*/
+@Slf4j
@Service
public class HeLibraryAssortServiceImpl implements IHeLibraryAssortService {
@Autowired
@@ -93,9 +95,15 @@
}
HeLibraryAssort heLibraryAssort = DtoConversionUtils.sourceToTarget(heLibraryAssortVO, HeLibraryAssort.class);
- Integer integer = heLibraryAssortMapper.selectSeqMax();
- if (integer != null) {
- heLibraryAssort.setSeqno(integer.longValue() + 1);
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax = null;
+ try {
+ seqMax = heLibraryAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
+ if (seqMax != null) {
+ heLibraryAssort.setSeqno(seqMax.longValue() + 1);
} else {
heLibraryAssort.setSeqno(1L);
}
@@ -108,9 +116,14 @@
if (CollectionUtils.isNotEmpty(heLibraryAssortVO.getHeLibraryAssortList())) {
for (HeLibraryAssort heLibraryAssort1 : heLibraryAssortVO.getHeLibraryAssortList()) {
heLibraryAssort1.setPid(heLibraryAssort.getId());
- Integer seqMax = heLibraryAssortMapper.selectSeqMax();
- if (seqMax != null) {
- heLibraryAssort1.setSeqno(seqMax.longValue() + 1);
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = heLibraryAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
+ if (seqMax1 != null) {
+ heLibraryAssort1.setSeqno(seqMax1.longValue() + 1);
} else {
heLibraryAssort1.setSeqno(1L);
}
@@ -145,6 +158,10 @@
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("瀹ｆ暀鍒嗙被id灏忎簬0锛屼负榛樿鍒嗙被锛屼笉鑳藉垹闄わ紝id锛歿}", id);
+ continue;
+ }
i = heLibraryAssortMapper.deleteHeLibraryAssortById(id);
//鍒犻櫎鎴愬姛鍚庯紝濡傛灉璇ュ垹闄ょ殑ID涓嬫湁瀛愭暟鎹紝鍒欏皢瀛愭暟鎹斁鍒版湭鍒嗛厤涓嬮潰
HeLibraryAssort heLibraryAssort = new HeLibraryAssort();
@@ -153,7 +170,7 @@
if (CollectionUtils.isNotEmpty(heLibraryAssortList1)) {
for (HeLibraryAssort heLibraryAssort1 : heLibraryAssortList1) {
//璁剧疆鏈垎閰岻D
- heLibraryAssort1.setPid(999999999L);
+ heLibraryAssort1.setPid(-1L);
heLibraryAssortMapper.updateHeLibraryAssort(heLibraryAssort1);
}
}
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 df6385a..b04ad51 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
@@ -8,8 +8,10 @@
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;
@@ -30,6 +32,9 @@
@Autowired
private HeLibraryTagMapper heLibraryTagMapper;
+
+ @Autowired
+ private TempDetpRelevanceMapper tempDetpRelevanceMapper;
/**
* 鏌ヨ瀹ｆ暀璧勬枡搴�
@@ -85,19 +90,13 @@
*/
@Override
public int deleteHeLibraryByIds(Long[] ids) {
- return heLibraryMapper.deleteHeLibraryByIds(ids);
+ Integer i = null;
+ for (Long id : ids) {
+ i = heLibraryMapper.deleteHeLibraryById(id);
+ }
+ return i;
}
- /**
- * 鍒犻櫎瀹ｆ暀璧勬枡搴撲俊鎭�
- *
- * @param id 瀹ｆ暀璧勬枡搴撲富閿�
- * @return 缁撴灉
- */
- @Override
- public int deleteHeLibraryById(Long id) {
- return heLibraryMapper.deleteHeLibraryById(id);
- }
/**
* 鏂板鎴栦慨鏀瑰鏁欒鎯�
@@ -135,26 +134,37 @@
}
}
+ //瀵圭瀹よ繘琛屽鐞�
+ for (TempDetpRelevance tempDetpRelevance : heLibraryVO.getTempDetpRelevances()) {
+ if (tempDetpRelevance.getId() == null) {
+ //鏂板
+ tempDetpRelevance.setTempid(heLibrary.getId());
+ tempDetpRelevance.setType(3L);
+ tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
+ } else {
+ tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
+ }
+ }
+
return i;
}
@Override
- public HeLibraryVO selectInfoByCondition(HeLibrary heLibrary) {
+ public List<HeLibraryVO> selectInfoByCondition(HeLibrary heLibrary) {
log.info("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢鐨勫叆鍙備负锛歿}", heLibrary);
List<HeLibrary> heLibraries = selectHeLibraryList(heLibrary);
if (CollectionUtils.isEmpty(heLibraries)) {
log.info("鎻愪緵鐨勬潯浠�,鏌ヨ瀹ｆ暀鏁版嵁涓虹┖锛歿}", heLibraries);
throw new BaseException("鎻愪緵鐨勬潯浠�,鏌ヨ瀹ｆ暀鏁版嵁涓虹┖");
}
-
- //鐢ㄤ簬杩斿弬
- HeLibraryVO heLibraryVO = DtoConversionUtils.sourceToTarget(heLibraries.get(0), HeLibraryVO.class);
- //鏍规嵁瀹ｆ暀ID鏌ヨ瀹ｆ暀鎸囨爣闆嗗悎
- HeLibraryTag heLibraryTag = new HeLibraryTag();
- heLibraryTag.setHeid(heLibraryVO.getId());
- List<HeLibraryTag> heLibraryTags = heLibraryTagMapper.selectHeLibraryTagList(heLibraryTag);
- heLibraryVO.setHeLibraryTagList(heLibraryTags);
-
- return heLibraryVO;
+ List<HeLibraryVO> heLibraryVOS = DtoConversionUtils.sourceToTarget(heLibraries, HeLibraryVO.class);
+ if (CollectionUtils.isNotEmpty(heLibraryVOS) && heLibraryVOS.size() == 1) {
+ //鏍规嵁瀹ｆ暀ID鏌ヨ瀹ｆ暀鎸囨爣闆嗗悎
+ HeLibraryTag heLibraryTag = new HeLibraryTag();
+ heLibraryTag.setHeid(heLibraryVOS.get(0).getId());
+ List<HeLibraryTag> heLibraryTags = heLibraryTagMapper.selectHeLibraryTagList(heLibraryTag);
+ heLibraryVOS.get(0).setHeLibraryTagList(heLibraryTags);
+ }
+ return heLibraryVOS;
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java
new file mode 100644
index 0000000..e0db640
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java
@@ -0,0 +1,271 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.enums.SendTypeEnum;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.common.SendService;
+import com.smartor.domain.*;
+import com.smartor.mapper.HeTaskMapper;
+import com.smartor.mapper.PatArchiveMapper;
+import com.smartor.mapper.PatHetaskRelevanceMapper;
+import com.smartor.service.IHeTaskService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * 瀹ｆ暀浠诲姟Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Service
+public class HeTaskServiceImpl implements IHeTaskService {
+ @Autowired
+ private HeTaskMapper heTaskMapper;
+
+ @Autowired
+ private PatArchiveMapper patArchiveMapper;
+
+ @Autowired
+ private PatArchiveServiceImpl patArchiveService;
+
+ @Autowired
+ private HeLibraryServiceImpl heLibraryService;
+
+ @Autowired
+ private PatHetaskRelevanceMapper patHetaskRelevanceMapper;
+
+ @Autowired
+ private SendService sendService;
+
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 瀹ｆ暀浠诲姟
+ */
+ @Override
+ public HeTaskVO selectHeTaskById(Long id) {
+// HeTask heTask = heTaskMapper.selectHeTaskById(id);
+// HeTaskVO heTaskVO = DtoConversionUtils.sourceToTarget(heTask, HeTaskVO.class);
+//
+// //鑾峰彇鎮ｈ�呬俊鎭�
+// if (StringUtils.isNotEmpty(heTask.getPatientid())) {
+// List<PatArchive> patArchives = new ArrayList<>();
+// String[] patientids = heTask.getPatientid().split(",");
+// for (String patientid : patientids) {
+// PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(Long.valueOf(patientid));
+// patArchives.add(patArchive);
+// }
+// heTaskVO.setPatArchives(patArchives);
+// }
+//
+// //鑾峰彇瀹ｆ暀妯℃澘淇℃伅
+// if (heTask.getPreachcategoryid() != null) {
+// HeLibrary heLibrary = new HeLibrary();
+// heLibrary.setId(heTask.getPreachcategoryid());
+// HeLibraryVO heLibraryVO = heLibraryService.selectInfoByCondition(heLibrary);
+// heTaskVO.setHeLibraryVOs(heLibraryVO);
+// }
+
+ return null;
+ }
+
+ /**
+ * 鏌ヨ瀹ｆ暀浠诲姟鍒楄〃
+ *
+ * @param patHetaskRelevanceVO 瀹ｆ暀浠诲姟
+ * @return 瀹ｆ暀浠诲姟
+ */
+ @Override
+ public List<PatHetaskRelevanceVO> selectHeTaskList(PatHetaskRelevanceVO patHetaskRelevanceVO) {
+ PatHetaskRelevance patHetaskRelevance = new PatHetaskRelevance();
+ List<PatHetaskRelevance> patHetaskRelevances = patHetaskRelevanceMapper.selectPatHetaskRelevanceList(patHetaskRelevance);
+ List<PatHetaskRelevanceVO> patHetaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patHetaskRelevances, PatHetaskRelevanceVO.class);
+ for (PatHetaskRelevanceVO patHetaskRelevanceVO1 : patHetaskRelevanceVOS) {
+ HeTask heTask1 = heTaskMapper.selectHeTaskById(patHetaskRelevanceVO1.getHeTaskId());
+ patHetaskRelevanceVO1.setHeTask(heTask1);
+ }
+ return patHetaskRelevanceVOS;
+ }
+
+ /**
+ * 鏂板瀹ｆ暀浠诲姟
+ *
+ * @param heTaskVO 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public int insertHeTask(HeTaskVO heTaskVO) {
+
+ Integer integer = 0;
+ //鍒ゆ柇鍙戦�佺姸鎬� 0 鏆傚仠鍙戦�� 1 瀹氭椂鍙戦�� 2 绔嬪嵆鍙戦��
+ if (heTaskVO.getIsSend() == 2) {
+ //鍙戦�佹柟寮�
+ String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
+ for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+ //寮�濮嬪彂閫�
+ SendMagParam sendMagParam = new SendMagParam();
+ sendMagParam.setType(sendtype);
+ sendMagParam.setPhone(patHetaskRelevance.getPhone());
+ //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓
+ sendMagParam.setTmpCode("SMS_461860582");
+ sendMagParam.setContent("Test鍙戦�佹暟鎹�");
+ Boolean success = sendService.sendMsg(sendMagParam);
+ if (success) {
+ integer = integer + 1;
+ }
+
+ //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬�
+ if (heTaskVO.getPatHetaskRelevances().size() == integer) {
+ //濡傛灉鍙戦�佹垚鍔�
+ heTaskVO.setSendState(1L);
+ }
+ }
+ //灏嗕换鍔′俊鎭柊澧炲埌瀹ｆ暀浠诲姟琛ㄤ腑
+ HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class);
+ heTask.setCreateTime(DateUtils.getNowDate());
+ heTaskMapper.insertHeTask(heTask);
+
+ //灏嗕换鍔′笌鎮ｈ�呭叧鑱�
+ Integer i = null;
+ if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
+ for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+ patHetaskRelevance.setHeTaskId(heTask.getId());
+ i = patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+ }
+
+ }
+
+ } else if (heTaskVO.getIsSend() == 1) {
+ //瀹氭椂鍙戦��(寮傛)
+ Timer timer = new Timer();
+ timer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Integer integer = 0;
+ for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+ String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
+ SendMagParam sendMagParam = new SendMagParam();
+ sendMagParam.setType(sendtype);
+ sendMagParam.setPhone(patHetaskRelevance.getPhone());
+ //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓
+ sendMagParam.setTmpCode("SMS_461860582");
+ sendMagParam.setContent("Test鍙戦�佹暟鎹�");
+ Boolean success = sendService.sendMsg(sendMagParam);
+ if (success) {
+ integer = integer + 1;
+ }
+ }
+ //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬�
+ if (heTaskVO.getPatHetaskRelevances().size() == integer) {
+ //濡傛灉鍙戦�佹垚鍔�
+ heTaskVO.setSendState(1L);
+ }
+ HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class);
+ heTask.setCreateTime(DateUtils.getNowDate());
+ heTaskMapper.insertHeTask(heTask);
+
+ if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
+ for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+ patHetaskRelevance.setHeTaskId(heTask.getId());
+ patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+ }
+
+ }
+ }
+ }, heTaskVO.getSendTime());
+
+ }
+ return 1;
+ }
+
+ /**
+ * 淇敼瀹ｆ暀浠诲姟
+ *
+ * @param heTask 瀹ｆ暀浠诲姟
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateHeTask(HeTask heTask) {
+ heTask.setUpdateTime(DateUtils.getNowDate());
+ return heTaskMapper.updateHeTask(heTask);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎瀹ｆ暀浠诲姟
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑瀹ｆ暀浠诲姟涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteHeTaskByIds(Long[] ids) {
+ Integer i = null;
+ for (Long id : ids) {
+ i = heTaskMapper.deleteHeTaskById(id);
+ }
+ return i;
+ }
+
+ /**
+ * 鍒犻櫎瀹ｆ暀浠诲姟淇℃伅
+ *
+ * @param id 瀹ｆ暀浠诲姟涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteHeTaskById(Long id) {
+ return heTaskMapper.deleteHeTaskById(id);
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呬俊鎭�
+ *
+ * @param patArchiveReq
+ * @return
+ */
+ @Override
+ public List<PatHetaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
+ List<PatHetaskRelevance> patHetaskRelevances = new ArrayList<>();
+
+ List<PatArchive> patArchiveList = new ArrayList<>();
+ if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives1 = patArchiveMapper.selectPatArchiveInfoByInhosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives1)) {
+ patArchiveList.addAll(patArchives1);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 2) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives2 = patArchiveMapper.selectPatArchiveInfoByOuthosp(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives2)) {
+ patArchiveList.addAll(patArchives2);
+ }
+ } else if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 3) {
+ // 鏌ョ湅浣忛櫌 1 鏌ョ湅闂ㄨ瘖 2 鏌ョ湅浣撴 3
+ List<PatArchive> patArchives3 = patArchiveMapper.selectPatArchiveInfoByPhysical(patArchiveReq);
+ if (CollectionUtils.isNotEmpty(patArchives3)) {
+ patArchiveList.addAll(patArchives3);
+ }
+ }
+ for (PatArchive patArchive : patArchiveList) {
+ PatHetaskRelevance patHetaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatHetaskRelevance.class);
+ patHetaskRelevance.setDept(patArchive.getArchiveby());
+ patHetaskRelevance.setCreateTime(patArchive.getCreateTime());
+ patHetaskRelevance.setCreateBy(patArchive.getCreateBy());
+ patHetaskRelevances.add(patHetaskRelevance);
+ }
+
+ return patHetaskRelevances;
+ }
+
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java
index 77f161a..5861655 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaExtemplateCategoryServiceImpl.java
@@ -5,6 +5,7 @@
import com.smartor.domain.IvrLibaExtemplateCategory;
import com.smartor.mapper.IvrLibaExtemplateCategoryMapper;
import com.smartor.service.IIvrLibaExtemplateCategoryService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -17,6 +18,7 @@
* @author ruoyi
* @date 2023-12-27
*/
+@Slf4j
@Service
public class IvrLibaExtemplateCategoryServiceImpl implements IIvrLibaExtemplateCategoryService {
@Autowired
@@ -85,6 +87,11 @@
public int deleteIvrLibaExtemplateCategoryByIntertcatids(Long[] intertcatids) {
Integer i = null;
for (Long intertcatid : intertcatids) {
+ //璐熸暟鐨処D涓洪粯璁ゅ�硷紝涓嶅彲浠ュ垹闄�
+ if (intertcatid < 0) {
+ log.info("intertcatid鐨勫�间负锛歿}", intertcatid);
+ continue;
+ }
i = ivrLibaExtemplateCategoryMapper.deleteIvrLibaExtemplateCategoryByIntertcatid(intertcatid);
//鍒犻櫎鎴愬姛鍚庯紝濡傛灉璇ュ垹闄ょ殑ID涓嬫湁瀛愭暟鎹紝鍒欏皢瀛愭暟鎹斁鍒版湭鍒嗛厤涓嬮潰
IvrLibaExtemplateCategory ivrLibaExtemplateCategory = new IvrLibaExtemplateCategory();
@@ -93,7 +100,7 @@
if (CollectionUtils.isNotEmpty(ivrLibaExtemplateCategories)) {
for (IvrLibaExtemplateCategory ivrLibaExtemplateCategory1 : ivrLibaExtemplateCategories) {
//璁剧疆鏈垎閰岻D
- ivrLibaExtemplateCategory1.setPid(999999999L);
+ ivrLibaExtemplateCategory1.setPid(-1L);
ivrLibaExtemplateCategoryMapper.updateIvrLibaExtemplateCategory(ivrLibaExtemplateCategory1);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
index 7d1db16..79e38ec 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
@@ -71,7 +71,14 @@
if (ObjectUtils.isEmpty(ivrLibaScriptAssortVO)) {
throw new BaseException("鍏ュ弬涓虹┖,璇锋鏌ュ悗,鍐嶆柊澧�");
}
- Integer seqMax = ivrLibaScriptAssortMapper.selectSeqMax();
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax = null;
+ try {
+ seqMax = ivrLibaScriptAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
+
IvrLibaScriptAssort ivrLibaScriptAssort = DtoConversionUtils.sourceToTarget(ivrLibaScriptAssortVO, IvrLibaScriptAssort.class);
if (seqMax == null) {
ivrLibaScriptAssort.setSeqno(1);
@@ -84,7 +91,13 @@
//鏂板浜岀骇鏍�
if (CollectionUtils.isNotEmpty(ivrLibaScriptAssortVO.getIvrLibaScriptAssortList())) {
for (IvrLibaScriptAssort ivrLibaScriptAssort1 : ivrLibaScriptAssortVO.getIvrLibaScriptAssortList()) {
- Integer seqMax1 = ivrLibaScriptAssortMapper.selectSeqMax();
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = ivrLibaScriptAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
ivrLibaScriptAssort1.setPid(ivrLibaScriptAssort.getId());
if (seqMax == null) {
ivrLibaScriptAssort1.setSeqno(1);
@@ -122,6 +135,10 @@
public Integer deleteIvrLibaScriptAssortByIds(Long[] ids) {
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("璇ラ棶棰樿瘽鏈垎绫籭d涓洪粯璁D锛屼笉鑳藉垹闄�,id:{}", id);
+ continue;
+ }
i = ivrLibaScriptAssortMapper.deleteIvrLibaScriptAssortById(id);
//鏌ヨ鍒犻櫎id鎵�瀵瑰氨鐨勫瓙鏁版嵁
IvrLibaScriptAssort ivrLibaScriptAssort = new IvrLibaScriptAssort();
@@ -130,7 +147,7 @@
if (CollectionUtils.isNotEmpty(ivrLibaScriptAssorts)) {
for (IvrLibaScriptAssort ivrLibaScriptAssort1 : ivrLibaScriptAssorts) {
- ivrLibaScriptAssort1.setPid(999999999L);
+ ivrLibaScriptAssort1.setPid(-1L);
ivrLibaScriptAssortMapper.updateIvrLibaScriptAssort(ivrLibaScriptAssort1);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
index ab5b489..5006975 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
@@ -85,7 +85,14 @@
if (ObjectUtils.isEmpty(ivrLibaTargetAssortVO)) {
throw new BaseException("鍏ュ弬涓虹┖,璇锋鏌ュ悗,鍐嶆柊澧�");
}
- Integer seqMax = ivrLibaTargetAssortMapper.selectSeqMax();
+
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax = null;
+ try {
+ seqMax = ivrLibaTargetAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
IvrLibaTargetAssort ivrLibaTargetAssort = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssortVO, IvrLibaTargetAssort.class);
ivrLibaTargetAssort.setSeqno(1);
if (seqMax != null) {
@@ -97,7 +104,13 @@
//鏂板浜岀骇鏍�
if (CollectionUtils.isNotEmpty(ivrLibaTargetAssortVO.getIvrLibaTargetAssortList())) {
for (IvrLibaTargetAssort ivrLibaTargetAssort1 : ivrLibaTargetAssortVO.getIvrLibaTargetAssortList()) {
- int seqMax1 = ivrLibaTargetAssortMapper.selectSeqMax();
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = ivrLibaTargetAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
ivrLibaTargetAssort1.setPid(ivrLibaTargetAssort.getId());
ivrLibaTargetAssort1.setSeqno(1);
if (seqMax != null) {
@@ -132,6 +145,10 @@
public Integer deleteIvrLibaTargetAssortByIds(Long[] ids) {
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("璇ユ寚鏍囧垎绫籭d涓洪粯璁D锛屼笉鑳藉垹闄わ紝id:{}", id);
+ continue;
+ }
i = ivrLibaTargetAssortMapper.deleteIvrLibaTargetAssortById(id);
IvrLibaTargetAssort ivrLibaTargetAssort = new IvrLibaTargetAssort();
ivrLibaTargetAssort.setPid(id);
@@ -140,7 +157,7 @@
List<IvrLibaTargetAssort> ivrLibaTargetAssorts = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort);
if (CollectionUtils.isNotEmpty(ivrLibaTargetAssorts)) {
for (IvrLibaTargetAssort ivrLibaTargetAssort1 : ivrLibaTargetAssorts) {
- ivrLibaTargetAssort1.setPid(999999999L);
+ ivrLibaTargetAssort1.setPid(-1L);
ivrLibaTargetAssortMapper.updateIvrLibaTargetAssort(ivrLibaTargetAssort1);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
index 53548bc..a5d2db3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetServiceImpl.java
@@ -37,12 +37,12 @@
/**
* 鏌ヨ鎸囨爣閫夐」搴�
*
- * @param targetID 鎸囨爣閫夐」搴撲富閿�
+ * @param id 鎸囨爣閫夐」搴撲富閿�
* @return 鎸囨爣閫夐」搴�
*/
@Override
- public IvrLibaTarget selectIvrLibaTargetByTargetID(Long targetID) {
- return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(targetID);
+ public IvrLibaTarget selectIvrLibaTargetByTargetID(Long id) {
+ return ivrLibaTargetMapper.selectIvrLibaTargetByTargetID(id);
}
/**
@@ -62,14 +62,14 @@
List<IvrLibaTargetVO> ivrLibaTargetVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargets, IvrLibaTargetVO.class);
for (IvrLibaTargetVO ivrLibaTarget1 : ivrLibaTargetVOS) {
IvrLibaTargetoption ivrLibaTargetoption = new IvrLibaTargetoption();
- ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getTargetID());
+ ivrLibaTargetoption.setTargetid(ivrLibaTarget1.getId());
//鑾峰彇璇ユ寚鏍囩殑閫夐」
List<IvrLibaTargetoption> ivrLibaTargetoptions = ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
if (CollectionUtils.isNotEmpty(ivrLibaTargetoptions)) {
ivrLibaTarget1.setTargetoptionList(ivrLibaTargetoptions);
}
//鑾峰彇璇ユ寚鏍囩殑鏍囩
- List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getTargetID());
+ List<BaseTag> baseTags = ivrLibaTargetTagMapper.selectTagName(ivrLibaTarget1.getId());
ivrLibaTarget1.setBaseTagList(baseTags);
}
//涓嬮潰鐢ㄥ乏澶栨劅瑙夋湁鐐归棶棰橈紝where涓殑option鐨刣el浼氬鑷村乏杈圭殑鏌ヨ涓嶅叏锛屽厛涓嶇敤鍚�
@@ -95,7 +95,7 @@
for (BaseTag baseTag : ivrLibaTargetVO.getBaseTagList()) {
IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
- ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+ ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
//鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
@@ -105,12 +105,12 @@
for (IvrLibaTargetoption targetoption : ivrLibaTargetVO.getTargetoptionList()) {
if (ObjectUtils.isEmpty(targetoption)) continue;
log.info("targetoption鐨勬暟鎹负锛歿}", targetoption);
- targetoption.setTargetid(ivrLibaTarget.getTargetID());
+ targetoption.setTargetid(ivrLibaTarget.getId());
ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(targetoption);
}
- log.info("鎸囨爣id涓猴細{}", ivrLibaTarget.getTargetID().intValue());
- return ivrLibaTarget.getTargetID().intValue();
+ log.info("鎸囨爣id涓猴細{}", ivrLibaTarget.getId().intValue());
+ return ivrLibaTarget.getId().intValue();
}
/**
@@ -138,7 +138,7 @@
//鏂板
IvrLibaTargetTag ivrLibaTargetTag = new IvrLibaTargetTag();
ivrLibaTargetTag.setTagcategoryid(baseTag.getTagcategoryid());
- ivrLibaTargetTag.setTargetid(ivrLibaTarget.getTargetID());
+ ivrLibaTargetTag.setTargetid(ivrLibaTarget.getId());
//鍓嶇浼犳潵鐨刡aseTag鐨則agid灏辨槸鎸囨爣鏍囩鐨勪富閿甶d,涓嶆槸baseTag鐨勪富閿�
ivrLibaTargetTag.setTagid(baseTag.getTagid());
ivrLibaTargetTagMapper.insertIvrLibaTargetTag(ivrLibaTargetTag);
@@ -154,7 +154,7 @@
for (IvrLibaTargetoption ivrLibaTargetoption : ivrLibaTargetVO.getTargetoptionList()) {
if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 1) {
//鏂板
- ivrLibaTargetoption.setTargetid(ivrLibaTarget.getTargetID());
+ ivrLibaTargetoption.setTargetid(ivrLibaTarget.getId());
ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(ivrLibaTargetoption);
} else if (ivrLibaTargetoption.getIsoperation() != null && ivrLibaTargetoption.getIsoperation() == 2) {
//淇敼
@@ -167,7 +167,7 @@
}
}
- return ivrLibaTarget.getTargetID().intValue();
+ return ivrLibaTarget.getId().intValue();
}
@@ -178,8 +178,8 @@
* @return 缁撴灉
*/
@Override
- public int deleteIvrLibaTargetByTargetIDs(Long[] targetIDs) {
- return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(targetIDs);
+ public int deleteIvrLibaTargetByTargetIDs(Long[] ids) {
+ return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetIDs(ids);
}
/**
@@ -189,7 +189,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteIvrLibaTargetByTargetID(Long targetID) {
- return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(targetID);
+ public int deleteIvrLibaTargetByTargetID(Long id) {
+ return ivrLibaTargetMapper.deleteIvrLibaTargetByTargetID(id);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
index 96960fe..7d15b80 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
@@ -86,7 +86,13 @@
if (ObjectUtils.isEmpty(ivrLibaTemplateAssortVO)) {
throw new BaseException("鍏ュ弬涓虹┖,璇锋鏌ュ悗,鍐嶆柊澧�");
}
- Integer seqMax = ivrLibaTemplateAssortMapper.selectSeqMax();
+ Integer seqMax = null;
+ try {
+ seqMax = ivrLibaTemplateAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
+
IvrLibaTemplateAssort ivrLibaTemplateAssort = DtoConversionUtils.sourceToTarget(ivrLibaTemplateAssortVO, IvrLibaTemplateAssort.class);
ivrLibaTemplateAssort.setSeqno(1);
if (seqMax != null) {
@@ -98,7 +104,12 @@
//鏂板浜岀骇鏍�
if (CollectionUtils.isNotEmpty(ivrLibaTemplateAssortVO.getIvrLibaTemplateAssortList())) {
for (IvrLibaTemplateAssort ivrLibaTemplateAssort1 : ivrLibaTemplateAssortVO.getIvrLibaTemplateAssortList()) {
- int seqMax1 = ivrLibaTemplateAssortMapper.selectSeqMax();
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = ivrLibaTemplateAssortMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
ivrLibaTemplateAssort1.setPid(ivrLibaTemplateAssort.getId());
ivrLibaTemplateAssort1.setSeqno(seqMax1 + 1);
ivrLibaTemplateAssortMapper.insertIvrLibaTemplateAssort(ivrLibaTemplateAssort1);
@@ -130,13 +141,17 @@
public Integer deleteIvrLibaTemplateAssortByIds(Long[] ids) {
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("璇ユā鏉垮垎绫籭d涓洪粯璁d,涓嶈兘鍒犻櫎锛宨d:{}", id);
+ continue;
+ }
i = ivrLibaTemplateAssortMapper.deleteIvrLibaTemplateAssortById(id);
IvrLibaTemplateAssort ivrLibaTemplateAssort = new IvrLibaTemplateAssort();
ivrLibaTemplateAssort.setPid(id);
List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaTemplateAssort);
if (CollectionUtils.isNotEmpty(ivrLibaTemplateAssorts)) {
for (IvrLibaTemplateAssort ivrLibaTemplateAssort1 : ivrLibaTemplateAssorts) {
- ivrLibaTemplateAssort1.setPid(999999999L);
+ ivrLibaTemplateAssort1.setPid(-1L);
ivrLibaTemplateAssortMapper.updateIvrLibaTemplateAssort(ivrLibaTemplateAssort1);
}
}
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 3487f55..62649a3 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateServiceImpl.java
@@ -37,6 +37,9 @@
@Autowired
private IvrLibaTemplateScriptMapper ivrLibaTemplateScriptMapper;
+ @Autowired
+ private TempDetpRelevanceMapper tempDetpRelevanceMapper;
+
/**
* 鏌ヨ妯℃澘搴�
*
@@ -180,6 +183,18 @@
}
}
+ //瀵圭瀹よ繘琛屽鐞�
+ for (TempDetpRelevance tempDetpRelevance : ivrLibaTemplateVO.getTempDetpRelevances()) {
+ if (tempDetpRelevance.getId() == null) {
+ //鏂板
+ tempDetpRelevance.setTempid(ivrLibaTemplate.getID());
+ tempDetpRelevance.setType(2L);
+ tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
+ } else {
+ tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
+ }
+ }
+
return i;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetServiceImpl.java
index f894cf8..0a4ebfd 100644
--- a/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateTargetServiceImpl.java
@@ -28,8 +28,8 @@
* @return 妯＄増闂鎸囨爣搴�
*/
@Override
- public IvrLibaTemplateTarget selectIvrLibaTemplateTargetByID(Long ID) {
- return ivrLibaTemplateTargetMapper.selectIvrLibaTemplateTargetByID(ID);
+ public IvrLibaTemplateTarget selectIvrLibaTemplateTargetByID(Long id) {
+ return ivrLibaTemplateTargetMapper.selectIvrLibaTemplateTargetByID(id);
}
/**
@@ -75,9 +75,9 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public int deleteIvrLibaTemplateTargetByIDs(Long[] IDs) {
+ public int deleteIvrLibaTemplateTargetByIDs(Long[] ids) {
Integer i = null;
- for (Long id : IDs) {
+ for (Long id : ids) {
i = ivrLibaTemplateTargetMapper.deleteIvrLibaTemplateTargetByID(id);
}
return i;
@@ -90,7 +90,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteIvrLibaTemplateTargetByID(Long ID) {
- return ivrLibaTemplateTargetMapper.deleteIvrLibaTemplateTargetByID(ID);
+ public int deleteIvrLibaTemplateTargetByID(Long id) {
+ return ivrLibaTemplateTargetMapper.deleteIvrLibaTemplateTargetByID(id);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatHetaskRelevanceServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatHetaskRelevanceServiceImpl.java
new file mode 100644
index 0000000..a13284f
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatHetaskRelevanceServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatHetaskRelevance;
+import com.smartor.mapper.PatHetaskRelevanceMapper;
+import com.smartor.service.IPatHetaskRelevanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2024-01-07
+ */
+@Service
+public class PatHetaskRelevanceServiceImpl implements IPatHetaskRelevanceService
+{
+ @Autowired
+ private PatHetaskRelevanceMapper patHetaskRelevanceMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ @Override
+ public PatHetaskRelevance selectPatHetaskRelevanceById(Long id)
+ {
+ return patHetaskRelevanceMapper.selectPatHetaskRelevanceById(id);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈鍒楄〃
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ */
+ @Override
+ public List<PatHetaskRelevance> selectPatHetaskRelevanceList(PatHetaskRelevance patHetaskRelevance)
+ {
+ return patHetaskRelevanceMapper.selectPatHetaskRelevanceList(patHetaskRelevance);
+ }
+
+ /**
+ * 鏂板鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatHetaskRelevance(PatHetaskRelevance patHetaskRelevance)
+ {
+ patHetaskRelevance.setCreateTime(DateUtils.getNowDate());
+ return patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+ }
+
+ /**
+ * 淇敼鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param patHetaskRelevance 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatHetaskRelevance(PatHetaskRelevance patHetaskRelevance)
+ {
+ patHetaskRelevance.setUpdateTime(DateUtils.getNowDate());
+ return patHetaskRelevanceMapper.updatePatHetaskRelevance(patHetaskRelevance);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatHetaskRelevanceByIds(Long[] ids)
+ {
+ return patHetaskRelevanceMapper.deletePatHetaskRelevanceByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈淇℃伅
+ *
+ * @param id 鎮ｈ�呬笌瀹ｆ暀浠诲姟鍏宠仈涓婚敭
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatHetaskRelevanceById(Long id)
+ {
+ return patHetaskRelevanceMapper.deletePatHetaskRelevanceById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java
index 95fab99..9f71763 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PersonVoiceServiceImpl.java
@@ -163,11 +163,11 @@
if (spans.size() != 0) {
Elements radio__type = spans.get(0).getElementsByClass("radio__type");
if (radio__type.size() != 0) {
- svyLibTopic.setTopictype(1L);
+ svyLibTopic.setTopictype("1");
} else {
Elements checkbox__type = spans.get(0).getElementsByClass("checkbox__type");
if (checkbox__type.size() != 0) {
- svyLibTopic.setTopictype(2L);
+ svyLibTopic.setTopictype("2");
}
}
@@ -224,7 +224,7 @@
svyLibTopic2.setTopic(legend);
svyLibTopic2.setDelFlag("0");
svyLibTopic.setIsupload(0L);
- svyLibTopic2.setTopictype(4L);
+ svyLibTopic2.setTopictype("4");
svyLibTopic2.setOrgid(fileName);
try {
svyLibTopicMapper.insertSvyLibTopic(svyLibTopic2);
@@ -259,7 +259,7 @@
svyLibTopic3.setTopic(legend);
svyLibTopic3.setDelFlag("0");
svyLibTopic3.setIsupload(0L);
- svyLibTopic3.setTopictype(3L);
+ svyLibTopic3.setTopictype("3");
svyLibTopic3.setOrgid(fileName);
try {
svyLibTopicMapper.insertSvyLibTopic(svyLibTopic3);
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleCategoryServiceImpl.java
index 24175f3..50ef3b4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleCategoryServiceImpl.java
@@ -102,6 +102,10 @@
public int deleteSvyLibTitleCategoryByIds(Long[] ids) {
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("闂嵎妯℃澘鍒嗙被鐨処D灏忎簬0锛屼负榛樿鍒嗙被锛屼笉鑳藉垹闄�,id:{}", id);
+ continue;
+ }
i = svyLibTitleCategoryMapper.deleteSvyLibTitleCategoryById(id);
SvyLibTitleCategory svyLibTitleCategory = new SvyLibTitleCategory();
svyLibTitleCategory.setPid(id);
@@ -110,7 +114,7 @@
List<SvyLibTitleCategory> svyLibTitleCategoryList = svyLibTitleCategoryMapper.selectSvyLibTitleCategoryList(svyLibTitleCategory);
if (CollectionUtils.isNotEmpty(svyLibTitleCategoryList)) {
for (SvyLibTitleCategory svyLibTitleCategory1 : svyLibTitleCategoryList) {
- svyLibTitleCategory1.setPid(999999999L);
+ svyLibTitleCategory1.setPid(-1L);
svyLibTitleCategoryMapper.updateSvyLibTitleCategory(svyLibTitleCategory1);
}
}
@@ -124,7 +128,14 @@
if (ObjectUtils.isEmpty(svyLibTitleCategoryVO)) {
throw new BaseException("鍏ュ弬涓虹┖,璇锋鏌ュ悗,鍐嶆柊澧�");
}
- Integer seqMax = svyLibTitleCategoryMapper.selectSeqMax();
+
+ //鑾峰彇搴忓彿鏈�澶у��
+ Integer seqMax = null;
+ try {
+ seqMax = svyLibTitleCategoryMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
SvyLibTitleCategory svyLibTitleCategory = DtoConversionUtils.sourceToTarget(svyLibTitleCategoryVO, SvyLibTitleCategory.class);
svyLibTitleCategory.setSeqno(1);
if (seqMax != null) {
@@ -137,7 +148,12 @@
//鏂板浜岀骇鏍�
if (CollectionUtils.isNotEmpty(svyLibTitleCategoryVO.getSvyLibTitleCategoryList())) {
for (SvyLibTitleCategory svyLibTitleCategory1 : svyLibTitleCategoryVO.getSvyLibTitleCategoryList()) {
- Integer seqMax1 = svyLibTitleCategoryMapper.selectSeqMax();
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = svyLibTitleCategoryMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
svyLibTitleCategory1.setPid(svyLibTitleCategory.getId());
svyLibTitleCategory1.setSeqno(1);
if (seqMax1 != null) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
index a0e587a..75cd312 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTitleServiceImpl.java
@@ -1,10 +1,12 @@
package com.smartor.service.impl;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
private SvyLibTopicMapper svyLibTopicMapper;
@Autowired
private SvyLibTopicoptionMapper svyLibTopicoptionMapper;
+ @Autowired
+ private TempDetpRelevanceMapper tempDetpRelevanceMapper;
/**
* 鏌ヨ闂嵎
@@ -63,7 +67,7 @@
a:
for (int j = 0; j < svyLibTopics.size(); j++) {
log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyTopicId());
- if (svyLibTopics.get(j).getTopictype() != null && svyLibTopics.get(j).getTopictype() == 3 || svyLibTopics.get(j).getSvyTopicId() == null) {
+ if (StringUtils.isNotEmpty(svyLibTopics.get(j).getTopictype()) && svyLibTopics.get(j).getTopictype().equals("3") || svyLibTopics.get(j).getSvyTopicId() == null) {
//浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
continue a;
} else {
@@ -76,6 +80,12 @@
}
//灏嗛鐩斁鍒伴棶鍗峰垪琛ㄤ腑
svyLibTitles.get(i).setSvyLibTopics(svyLibTopics);
+
+ //鑾峰彇姣忎釜闂嵎瀵瑰簲鐨勭瀹�
+ TempDetpRelevance tempDetpRelevance = new TempDetpRelevance();
+ tempDetpRelevance.setTempid(svyLibTitles.get(i).getSvyid());
+ List<TempDetpRelevance> tempDetpRelevances = tempDetpRelevanceMapper.selectTempDetpRelevanceList(tempDetpRelevance);
+ svyLibTitles.get(i).setTempDetpRelevances(CollectionUtils.isNotEmpty(tempDetpRelevances) ? tempDetpRelevances : new ArrayList<>());
}
//鍏堝皢鐩稿悓鐨刬d鐨刬cdname,鏁寸悊鍒颁竴鍧�
@@ -152,7 +162,7 @@
svyLibTopic.setSvyid(svyLibTitle.getSvyid());
//棰樼洰鐨勯�夐」鐩紝鐩存帴鐢╯vy_topicoption琛紝鐢╯vyTopicid鍘诲叧鑱�
svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
- } else if (svyLibTitle.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
+ } else if (svyLibTopic.getIsoperation() != null && svyLibTopic.getIsoperation() == 2) {
//淇敼
svyLibTopic.setSvyid(svyLibTitle.getSvyid());
svyLibTopicMapper.updateSvyLibTopic(svyLibTopic);
@@ -176,6 +186,20 @@
}
}
+
+ if (CollectionUtils.isNotEmpty(svyLibTitle.getTempDetpRelevances())) {
+ for (TempDetpRelevance tempDetpRelevance : svyLibTitle.getTempDetpRelevances()) {
+ if (tempDetpRelevance.getId() == null) {
+ //鏂板
+ tempDetpRelevance.setTempid(svyLibTitle.getSvyid());
+ tempDetpRelevance.setType(1L);
+ tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
+ } else {
+ tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
+ }
+ }
+
+ }
return i;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicCategoryServiceImpl.java
index d2792f8..fffe152 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicCategoryServiceImpl.java
@@ -102,13 +102,17 @@
public int deleteSvyLibTopicCategoryByIds(Long[] ids) {
Integer i = null;
for (Long id : ids) {
+ if (id < 0) {
+ log.info("灏忎簬0鐨勫�间负榛樿鍊间笉鑳藉垹闄わ細{}", id);
+ continue;
+ }
i = svyLibTopicCategoryMapper.deleteSvyLibTopicCategoryById(id);
SvyLibTopicCategory svyLibTopicCategory = new SvyLibTopicCategory();
svyLibTopicCategory.setPid(id);
List<SvyLibTopicCategory> svyLibTopicCategories = svyLibTopicCategoryMapper.selectSvyLibTopicCategoryList(svyLibTopicCategory);
if (CollectionUtils.isNotEmpty(svyLibTopicCategories)) {
for (SvyLibTopicCategory svyLibTopicCategory1 : svyLibTopicCategories) {
- svyLibTopicCategory1.setPid(999999999L);
+ svyLibTopicCategory1.setPid(-1L);
svyLibTopicCategoryMapper.updateSvyLibTopicCategory(svyLibTopicCategory1);
}
}
@@ -122,7 +126,13 @@
if (ObjectUtils.isEmpty(svyLibTopicCategoryVO)) {
throw new BaseException("鍏ュ弬涓虹┖,璇锋鏌ュ悗,鍐嶆柊澧�");
}
- Integer seqMax = svyLibTopicCategoryMapper.selectSeqMax();
+ Integer seqMax = null;
+ try {
+ seqMax = svyLibTopicCategoryMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax = 0;
+ }
+
SvyLibTopicCategory svyLibTopicCategory = DtoConversionUtils.sourceToTarget(svyLibTopicCategoryVO, SvyLibTopicCategory.class);
svyLibTopicCategory.setSeqno(1);
if (seqMax != null) {
@@ -134,7 +144,12 @@
//鏂板浜岀骇鏍�
if (CollectionUtils.isNotEmpty(svyLibTopicCategoryVO.getSvyLibTopicCategoryList())) {
for (SvyLibTopicCategory svyLibTopicCategory1 : svyLibTopicCategoryVO.getSvyLibTopicCategoryList()) {
- Integer seqMax1 = svyLibTopicCategoryMapper.selectSeqMax();
+ Integer seqMax1 = null;
+ try {
+ seqMax1 = svyLibTopicCategoryMapper.selectSeqMax();
+ } catch (Exception e) {
+ seqMax1 = 0;
+ }
svyLibTopicCategory1.setPid(svyLibTopicCategory.getId());
svyLibTopicCategory1.setSeqno(1);
if (seqMax1 != null) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
index a9a328e..1c04c30 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
@@ -66,12 +66,12 @@
for (int j = 0; j < svyLibTopics.size(); j++) {
log.info("闂id涓猴細{}", svyLibTopics.get(j).getSvyTopicId());
- if (svyLibTopics.get(j).getTopictype() != null && svyLibTopics.get(j).getTopictype() == 3 || svyLibTopics.get(j).getSvyTopicId() == null) {
+ if (StringUtils.isNotEmpty(svyLibTopics.get(j).getTopictype()) && svyLibTopics.get(j).getTopictype().equals("3") || svyLibTopics.get(j).getTopicid() == null) {
//浣滅瓟棰橈紝涓嶉渶瑕侀�夐」
continue;
} else {
SvyLibTopicoption svyLibTopicoption = new SvyLibTopicoption();
- svyLibTopicoption.setTopicid(svyLibTopics.get(j).getSvyTopicId());
+ svyLibTopicoption.setTopicid(svyLibTopics.get(j).getTopicid());
List<SvyLibTopicoption> svyLibTopicoptions = svyLibTopicoptionMapper.selectSvyLibTopicoptionList(svyLibTopicoption);
//灏嗘煡璇㈠嚭鐨勯�夐」鐩斁鍒伴鐩腑
svyLibTopics.get(j).setSvyLibTopicoptions(svyLibTopicoptions);
@@ -92,6 +92,7 @@
return svyLibTopicMapper.insertSvyLibTopic(svyLibTopic);
}
+ @Transactional(rollbackFor = Exception.class)
@Override
public Integer saveOrUpdateTopic(SvyLibTopic svyLibTopic) {
Integer i = null;
@@ -111,11 +112,16 @@
if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 1) {
//鏂板
svyLibTopicoption.setTopicid(svyLibTopic.getTopicid());
+ svyLibTopicoption.setCreateTime(new Date());
svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
} else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 2) {
//淇敼
svyLibTopicoption.setTopicid(svyLibTopic.getTopicid());
+ svyLibTopicoption.setUpdateTime(new Date());
svyLibTopicoptionMapper.updateSvyLibTopicoption(svyLibTopicoption);
+ } else if (svyLibTopicoption.getIsoperation() != null && svyLibTopicoption.getIsoperation() == 3) {
+ //鍒犻櫎
+ svyLibTopicoptionMapper.deleteSvyLibTopicoptionByOptionid(svyLibTopicoption.getOptionid());
}
}
}
@@ -142,7 +148,11 @@
*/
@Override
public int deleteSvyLibTopicByTopicids(Long[] topicids) {
- return svyLibTopicMapper.deleteSvyLibTopicByTopicids(topicids);
+ Integer i = null;
+ for (Long topicid : topicids) {
+ i = svyLibTopicMapper.deleteSvyLibTopicByTopicid(topicid);
+ }
+ return i;
}
/**
diff --git a/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java
new file mode 100644
index 0000000..efb0551
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/TempDetpRelevanceServiceImpl.java
@@ -0,0 +1,97 @@
+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/resources/mapper/smartor/HeLibraryMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
index 47fb714..afc0e90 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryMapper.xml
@@ -1,78 +1,122 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.HeLibraryMapper">
-
+
<resultMap type="com.smartor.domain.HeLibrary" id="HeLibraryResult">
- <result property="id" column="id" />
- <result property="classification" column="classification" />
- <result property="assortid" column="assortid" />
- <result property="preachname" column="preachname" />
- <result property="version" column="version" />
- <result property="preachform" column="preachform" />
- <result property="preachdescription" column="preachdescription" />
- <result property="preachcontent" column="preachcontent" />
- <result property="templateid" column="templateid" />
- <result property="preachcode" column="preachcode" />
- <result property="centerlibraryid" column="centerlibraryid" />
- <result property="isenable" column="isenable" />
- <result property="orgid" column="orgid" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="delFlag" column="del_flag" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="isupload" column="isupload" />
- <result property="uploadTime" column="upload_time" />
- <result property="islocal" column="islocal" />
- <result property="centerlibrarycode" column="centerlibrarycode" />
- <result property="pid" column="pid" />
- <result property="guid" column="guid" />
- <result property="parameter" column="parameter" />
- <result property="isavailable" column="isavailable" />
- <result property="suitdisease" column="suitdisease" />
- <result property="suitway" column="suitway" />
+ <result property="id" column="id"/>
+ <result property="classification" column="classification"/>
+ <result property="assortid" column="assortid"/>
+ <result property="preachname" column="preachname"/>
+ <result property="version" column="version"/>
+ <result property="preachform" column="preachform"/>
+ <result property="preachdescription" column="preachdescription"/>
+ <result property="preachcontent" column="preachcontent"/>
+ <result property="templateid" column="templateid"/>
+ <result property="preachcode" column="preachcode"/>
+ <result property="centerlibraryid" column="centerlibraryid"/>
+ <result property="isenable" column="isenable"/>
+ <result property="orgid" column="orgid"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="islocal" column="islocal"/>
+ <result property="centerlibrarycode" column="centerlibrarycode"/>
+ <result property="pid" column="pid"/>
+ <result property="guid" column="guid"/>
+ <result property="parameter" column="parameter"/>
+ <result property="isavailable" column="isavailable"/>
+ <result property="suitdisease" column="suitdisease"/>
+ <result property="suitway" column="suitway"/>
+ <result property="deptNames" column="dept_names"/>
+ <result property="labelInfo" column="label_info"/>
+ <result property="campus" column="campus"/>
+ <result property="otherdata" column="otherdata"/>
</resultMap>
<sql id="selectHeLibraryVo">
- select id, classification, assortid, preachname, version, preachform, preachdescription, preachcontent, templateid, preachcode, centerlibraryid, isenable, orgid, update_by, update_time, del_flag, create_by, create_time, isupload, upload_time, islocal, centerlibrarycode, pid, guid, parameter, isavailable, suitdisease, suitway from he_library
+ select id,
+ classification,
+ assortid,
+ preachname,
+ version,
+ preachform,
+ preachdescription,
+ preachcontent,
+ templateid,
+ preachcode,
+ centerlibraryid,
+ isenable,
+ orgid,
+ update_by,
+ update_time,
+ del_flag,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ islocal,
+ centerlibrarycode,
+ pid,
+ guid,
+ parameter,
+ isavailable,
+ suitdisease,
+ suitway,
+ dept_names,
+ label_info,
+ campus,
+ otherdata
+ from he_library
</sql>
<select id="selectHeLibraryList" parameterType="com.smartor.domain.HeLibrary" resultMap="HeLibraryResult">
<include refid="selectHeLibraryVo"/>
- <where>
- <if test="id != null "> and id = #{id}</if>
- <if test="classification != null and classification != ''"> and classification = #{classification}</if>
- <if test="assortid != null "> and assortid = #{assortid}</if>
- <if test="preachname != null and preachname != ''"> and preachname like concat('%', #{preachname}, '%')</if>
- <if test="version != null "> and version = #{version}</if>
- <if test="preachform != null "> and preachform = #{preachform}</if>
- <if test="preachdescription != null and preachdescription != ''"> and preachdescription = #{preachdescription}</if>
- <if test="preachcontent != null and preachcontent != ''"> and preachcontent = #{preachcontent}</if>
- <if test="templateid != null "> and templateid = #{templateid}</if>
- <if test="preachcode != null and preachcode != ''"> and preachcode = #{preachcode}</if>
- <if test="centerlibraryid != null "> and centerlibraryid = #{centerlibraryid}</if>
- <if test="isenable != null "> and isenable = #{isenable}</if>
- <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
- <if test="isupload != null "> and isupload = #{isupload}</if>
- <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
- <if test="islocal != null "> and islocal = #{islocal}</if>
- <if test="centerlibrarycode != null and centerlibrarycode != ''"> and centerlibrarycode = #{centerlibrarycode}</if>
- <if test="pid != null "> and pid = #{pid}</if>
- <if test="guid != null and guid != ''"> and guid = #{guid}</if>
- <if test="parameter != null and parameter != ''"> and parameter = #{parameter}</if>
- <if test="isavailable != null and isavailable != ''"> and isavailable = #{isavailable}</if>
- <if test="suitdisease != null and suitdisease != ''"> and suitdisease = #{suitdisease}</if>
- <if test="suitway != null and suitway != ''"> and suitway = #{suitway}</if>
+ <where>
+ del_flag=0
+ <if test="id != null ">and id = #{id}</if>
+ <if test="classification != null and classification != ''">and classification = #{classification}</if>
+ <if test="assortid != null ">and assortid = #{assortid}</if>
+ <if test="preachname != null and preachname != ''">and preachname like concat('%', #{preachname}, '%')</if>
+ <if test="version != null ">and version = #{version}</if>
+ <if test="preachform != null ">and preachform = #{preachform}</if>
+ <if test="preachdescription != null and preachdescription != ''">and preachdescription =
+ #{preachdescription}
+ </if>
+ <if test="preachcontent != null and preachcontent != ''">and preachcontent = #{preachcontent}</if>
+ <if test="templateid != null ">and templateid = #{templateid}</if>
+ <if test="preachcode != null and preachcode != ''">and preachcode = #{preachcode}</if>
+ <if test="centerlibraryid != null ">and centerlibraryid = #{centerlibraryid}</if>
+ <if test="isenable != null ">and isenable = #{isenable}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="islocal != null ">and islocal = #{islocal}</if>
+ <if test="centerlibrarycode != null and centerlibrarycode != ''">and centerlibrarycode =
+ #{centerlibrarycode}
+ </if>
+ <if test="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
+ <if test="isavailable != null and isavailable != ''">and isavailable = #{isavailable}</if>
+ <if test="suitdisease != null and suitdisease != ''">and suitdisease = #{suitdisease}</if>
+ <if test="suitway != null and suitway != ''">and suitway = #{suitway}</if>
+ <if test="deptNames != null and deptNames != ''">and dept_names = #{deptNames}</if>
+ <if test="labelInfo != null and labelInfo != ''">and label_info = #{labelInfo}</if>
+ <if test="campus != null and campus != ''">and campus = #{campus}</if>
</where>
</select>
-
+
<select id="selectHeLibraryById" parameterType="Long" resultMap="HeLibraryResult">
<include refid="selectHeLibraryVo"/>
- where id = #{id}
+ where del_flag=0 and id = #{id}
</select>
-
+
<insert id="insertHeLibrary" parameterType="com.smartor.domain.HeLibrary" useGeneratedKeys="true" keyProperty="id">
insert into he_library
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -103,7 +147,11 @@
<if test="isavailable != null">isavailable,</if>
<if test="suitdisease != null">suitdisease,</if>
<if test="suitway != null">suitway,</if>
- </trim>
+ <if test="deptNames != null">dept_names,</if>
+ <if test="labelInfo != null">label_info,</if>
+ <if test="campus != null">campus,</if>
+ <if test="otherdata != null">otherdata,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="classification != null">#{classification},</if>
<if test="assortid != null">#{assortid},</if>
@@ -132,7 +180,11 @@
<if test="isavailable != null">#{isavailable},</if>
<if test="suitdisease != null">#{suitdisease},</if>
<if test="suitway != null">#{suitway},</if>
- </trim>
+ <if test="deptNames != null ">#{deptNames},</if>
+ <if test="labelInfo != null">#{labelInfo},</if>
+ <if test="campus != null">#{campus},</if>
+ <if test="otherdata != null">#{otherdata},</if>
+ </trim>
</insert>
<update id="updateHeLibrary" parameterType="com.smartor.domain.HeLibrary">
@@ -165,16 +217,24 @@
<if test="isavailable != null">isavailable = #{isavailable},</if>
<if test="suitdisease != null">suitdisease = #{suitdisease},</if>
<if test="suitway != null">suitway = #{suitway},</if>
+ <if test="deptNames != null">dept_names = #{deptNames},</if>
+ <if test="labelInfo != null ">label_info = #{labelInfo},</if>
+ <if test="campus != null">campus = #{campus},</if>
+ <if test="otherdata != null">otherdata = #{otherdata},</if>
</trim>
where id = #{id}
</update>
- <delete id="deleteHeLibraryById" parameterType="Long">
- delete from he_library where id = #{id}
- </delete>
+ <update id="deleteHeLibraryById" parameterType="Long">
+ update he_library
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="delFlag != null and delFlag != ''">del_flag =1,</if>
+ </trim>
+ where id = #{id}
+ </update>
<delete id="deleteHeLibraryByIds" parameterType="String">
- delete from he_library where id in
+ delete from he_library where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml b/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
index 045ee1c..7c8de6e 100644
--- a/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HeLibraryTagMapper.xml
@@ -19,6 +19,7 @@
<result property="heid" column="heid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
+ <result property="tagname" column="tagname"/>
</resultMap>
<sql id="selectHeLibraryTagVo">
@@ -35,7 +36,8 @@
upload_time,
heid,
pid,
- guid
+ guid,
+ tagname
from he_library_tag
</sql>
@@ -50,6 +52,7 @@
<if test="heid != null ">and heid = #{heid}</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="tagname != null and tagname != ''">and tagname = #{tagname}</if>
</where>
</select>
@@ -75,6 +78,7 @@
<if test="heid != null">heid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
+ <if test="tagname != null">tagname,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tagcategoryid != null">#{tagcategoryid},</if>
@@ -90,6 +94,7 @@
<if test="heid != null">#{heid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
+ <if test="tagname != null">#{tagname},</if>
</trim>
</insert>
@@ -109,6 +114,7 @@
<if test="heid != null">heid = #{heid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
+ <if test="tagname != null">tagname = #{tagname},</if>
</trim>
where id = #{id}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml
new file mode 100644
index 0000000..c1b52af
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml
@@ -0,0 +1,230 @@
+<?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.HeTaskMapper">
+
+ <resultMap type="com.smartor.domain.HeTask" id="HeTaskResult">
+ <result property="id" column="id"/>
+ <result property="svrtaskid" column="svrtaskid"/>
+ <result property="patientid" column="patientid"/>
+ <result property="classification" column="classification"/>
+ <result property="preachcategoryid" column="preachcategoryid"/>
+ <result property="preachname" column="preachname"/>
+ <result property="version" column="version"/>
+ <result property="preachform" column="preachform"/>
+ <result property="orgform" column="orgform"/>
+ <result property="preachdescription" column="preachdescription"/>
+ <result property="preachcontent" column="preachcontent"/>
+ <result property="templateid" column="templateid"/>
+ <result property="preachcode" column="preachcode"/>
+ <result property="centerlibraryid" column="centerlibraryid"/>
+ <result property="isenable" column="isenable"/>
+ <result property="orgid" column="orgid"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="islocal" column="islocal"/>
+ <result property="centerlibrarycode" column="centerlibrarycode"/>
+ <result property="pid" column="pid"/>
+ <result property="guid" column="guid"/>
+ <result property="sendTime" column="send_time"/>
+ <result property="isSend" column="is_send"/>
+ <result property="sendState" column="send_state"/>
+ </resultMap>
+
+ <sql id="selectHeTaskVo">
+ select id,
+ svrtaskid,
+ patientid,
+ classification,
+ preachcategoryid,
+ preachname,
+ version,
+ preachform,
+ orgform,
+ preachdescription,
+ preachcontent,
+ templateid,
+ preachcode,
+ centerlibraryid,
+ isenable,
+ orgid,
+ update_by,
+ update_time,
+ del_flag,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ islocal,
+ centerlibrarycode,
+ pid,
+ guid,
+ send_time,
+ is_send,
+ send_state
+ from he_task
+ </sql>
+
+ <select id="selectHeTaskList" parameterType="com.smartor.domain.HeTask" resultMap="HeTaskResult">
+ <include refid="selectHeTaskVo"/>
+ <where>
+ del_flag=0
+ <if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
+ <if test="patientid != null ">and patientid = #{patientid}</if>
+ <if test="classification != null and classification != ''">and classification = #{classification}</if>
+ <if test="preachcategoryid != null ">and preachcategoryid = #{preachcategoryid}</if>
+ <if test="preachname != null and preachname != ''">and preachname like concat('%', #{preachname}, '%')</if>
+ <if test="version != null ">and version = #{version}</if>
+ <if test="preachform != null ">and preachform = #{preachform}</if>
+ <if test="orgform != null ">and orgform = #{orgform}</if>
+ <if test="preachdescription != null and preachdescription != ''">and preachdescription =
+ #{preachdescription}
+ </if>
+ <if test="preachcontent != null and preachcontent != ''">and preachcontent = #{preachcontent}</if>
+ <if test="templateid != null ">and templateid = #{templateid}</if>
+ <if test="preachcode != null and preachcode != ''">and preachcode = #{preachcode}</if>
+ <if test="centerlibraryid != null ">and centerlibraryid = #{centerlibraryid}</if>
+ <if test="isenable != null ">and isenable = #{isenable}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="islocal != null ">and islocal = #{islocal}</if>
+ <if test="centerlibrarycode != null and centerlibrarycode != ''">and centerlibrarycode =
+ #{centerlibrarycode}
+ </if>
+ <if test="pid != null ">and pid = #{pid}</if>
+ <if test="guid != null and guid != ''">and guid = #{guid}</if>
+ <if test="sendTime != null ">and send_time = #{sendTime}</if>
+ <if test="isSend != null ">and is_send = #{isSend}</if>
+ <if test="sendState != null ">and send_state = #{sendState}</if>
+ </where>
+ </select>
+
+ <select id="selectHeTaskById" parameterType="Long" resultMap="HeTaskResult">
+ <include refid="selectHeTaskVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertHeTask" parameterType="com.smartor.domain.HeTask" useGeneratedKeys="true" keyProperty="id">
+ insert into he_task
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="svrtaskid != null">svrtaskid,</if>
+ <if test="patientid != null">patientid,</if>
+ <if test="classification != null">classification,</if>
+ <if test="preachcategoryid != null">preachcategoryid,</if>
+ <if test="preachname != null">preachname,</if>
+ <if test="version != null">version,</if>
+ <if test="preachform != null">preachform,</if>
+ <if test="orgform != null">orgform,</if>
+ <if test="preachdescription != null">preachdescription,</if>
+ <if test="preachcontent != null">preachcontent,</if>
+ <if test="templateid != null">templateid,</if>
+ <if test="preachcode != null">preachcode,</if>
+ <if test="centerlibraryid != null">centerlibraryid,</if>
+ <if test="isenable != null">isenable,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="islocal != null">islocal,</if>
+ <if test="centerlibrarycode != null">centerlibrarycode,</if>
+ <if test="pid != null">pid,</if>
+ <if test="guid != null">guid,</if>
+ <if test="sendTime != null">send_time,</if>
+ <if test="isSend != null">is_send,</if>
+ <if test="sendState != null">send_state,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="svrtaskid != null">#{svrtaskid},</if>
+ <if test="patientid != null">#{patientid},</if>
+ <if test="classification != null">#{classification},</if>
+ <if test="preachcategoryid != null">#{preachcategoryid},</if>
+ <if test="preachname != null">#{preachname},</if>
+ <if test="version != null">#{version},</if>
+ <if test="preachform != null">#{preachform},</if>
+ <if test="orgform != null">#{orgform},</if>
+ <if test="preachdescription != null">#{preachdescription},</if>
+ <if test="preachcontent != null">#{preachcontent},</if>
+ <if test="templateid != null">#{templateid},</if>
+ <if test="preachcode != null">#{preachcode},</if>
+ <if test="centerlibraryid != null">#{centerlibraryid},</if>
+ <if test="isenable != null">#{isenable},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="islocal != null">#{islocal},</if>
+ <if test="centerlibrarycode != null">#{centerlibrarycode},</if>
+ <if test="pid != null">#{pid},</if>
+ <if test="guid != null">#{guid},</if>
+ <if test="sendTime != null">#{sendTime},</if>
+ <if test="isSend != null">#{isSend},</if>
+ <if test="sendState != null">#{sendState},</if>
+ </trim>
+ </insert>
+
+ <update id="updateHeTask" parameterType="com.smartor.domain.HeTask">
+ update he_task
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="svrtaskid != null">svrtaskid = #{svrtaskid},</if>
+ <if test="patientid != null">patientid = #{patientid},</if>
+ <if test="classification != null">classification = #{classification},</if>
+ <if test="preachcategoryid != null">preachcategoryid = #{preachcategoryid},</if>
+ <if test="preachname != null">preachname = #{preachname},</if>
+ <if test="version != null">version = #{version},</if>
+ <if test="preachform != null">preachform = #{preachform},</if>
+ <if test="orgform != null">orgform = #{orgform},</if>
+ <if test="preachdescription != null">preachdescription = #{preachdescription},</if>
+ <if test="preachcontent != null">preachcontent = #{preachcontent},</if>
+ <if test="templateid != null">templateid = #{templateid},</if>
+ <if test="preachcode != null">preachcode = #{preachcode},</if>
+ <if test="centerlibraryid != null">centerlibraryid = #{centerlibraryid},</if>
+ <if test="isenable != null">isenable = #{isenable},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="islocal != null">islocal = #{islocal},</if>
+ <if test="centerlibrarycode != null">centerlibrarycode = #{centerlibrarycode},</if>
+ <if test="pid != null">pid = #{pid},</if>
+ <if test="guid != null">guid = #{guid},</if>
+ <if test="sendTime != null">send_time = #{sendTime},</if>
+ <if test="isSend != null">is_send = #{isSend},</if>
+ <if test="sendState != null">send_state = #{sendState},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deleteHeTaskById" parameterType="Long">
+ update he_task
+ <trim prefix="SET" suffixOverrides=",">
+ del_flag = 1
+ </trim>
+ where id = #{id}
+ </update>
+
+ <!-- <delete id="deleteHeTaskByIds" parameterType="String">-->
+ <!-- delete from he_task 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/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index 46ab1a4..231ff66 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -40,7 +40,7 @@
<result property="orgid" column="orgid"/>
<result property="pid" column="pid"/>
<result property="guid" column="guid"/>
- <result property="parameter" column="parameter"/>
+ <result property="otherdata" column="otherdata"/>
<result property="suitway" column="suitway"/>
<result property="isAvailable" column="isAvailable"/>
<result property="campus" column="campus"/>
@@ -72,7 +72,7 @@
targetid,
targetname,
tag,
- targetoptions, language, remark, version, usestate, adduserid, addtime, modifyuserid, modifytime, assortid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, parameter
+ targetoptions, language, remark, version, usestate, adduserid, addtime, modifyuserid, modifytime, assortid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, otherdata
from ivr_liba_script
</sql>
@@ -116,7 +116,7 @@
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="pid != null ">and pid = #{pid}</if>
<if test="guid != null and guid != ''">and guid = #{guid}</if>
- <if test="parameter != null and parameter != ''">and parameter = #{parameter}</if>
+ <if test="otherdata != null and otherdata != ''">and otherdata = #{otherdata}</if>
</where>
</select>
@@ -170,7 +170,7 @@
<if test="orgid != null">orgid,</if>
<if test="pid != null">pid,</if>
<if test="guid != null">guid,</if>
- <if test="parameter != null">parameter,</if>
+ <if test="otherdata != null">otherdata,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="questiontitle != null">#{questiontitle},</if>
@@ -214,7 +214,7 @@
<if test="orgid != null">#{orgid},</if>
<if test="pid != null">#{pid},</if>
<if test="guid != null">#{guid},</if>
- <if test="parameter != null">#{parameter},</if>
+ <if test="otherdata != null">#{otherdata},</if>
</trim>
</insert>
@@ -258,7 +258,7 @@
<if test="orgid != null">orgid = #{orgid},</if>
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
- <if test="parameter != null">parameter = #{parameter},</if>
+ <if test="otherdata != null and otherdata != ''">otherdata = #{otherdata},</if>
<if test="deptNames != null">deptNames = #{deptNames},</if>
<if test="deptIds != null">deptIds = #{deptIds},</if>
<if test="campus != null">campus = #{campus},</if>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
index faf1fa8..f1e0ccf 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTargetMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.smartor.mapper.IvrLibaTargetMapper">
<resultMap type="com.smartor.domain.IvrLibaTarget" id="IvrLibaTargetResult">
- <result property="targetID" column="targetID"/>
+ <result property="id" column="id"/>
<result property="groupid" column="groupid"/>
<result property="targettype" column="targettype"/>
<result property="targetname" column="targetname"/>
@@ -34,7 +34,7 @@
</resultMap>
<resultMap type="com.smartor.domain.IvrLibaTargetVO" id="IvrLibaTargetVOResult">
- <result property="targetID" column="targetID"/>
+ <result property="id" column="id"/>
<result property="groupid" column="groupid"/>
<result property="targettype" column="targettype"/>
<result property="targetname" column="targetname"/>
@@ -86,12 +86,12 @@
</resultMap>
<sql id="selectIvrLibaTargetVo">
- select targetID,
+ select id,
groupid,
targettype,
targetname,
targetdesc, language, version, isenable, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid,
- isAvailable, suitDisease, suitWay,parameter
+ isAvailable, suitDisease, suitWay, parameter
from ivr_liba_target
</sql>
@@ -99,8 +99,8 @@
resultMap="IvrLibaTargetResult">
<include refid="selectIvrLibaTargetVo"/>
<where>
- del_flag != 1
- <if test="targetID != null ">and targetID = #{targetID}</if>
+ del_flag =0
+ <if test="id != null ">and id = #{id}</if>
<if test="groupid != null and groupid != ''">and groupid = #{groupid}</if>
<if test="targettype != null and targettype != ''">and targettype = #{targettype}</if>
<if test="targetname != null and targetname != ''">and targetname like concat('%', #{targetname}, '%')</if>
@@ -126,7 +126,7 @@
</select>
<select id="targetInfo" parameterType="com.smartor.domain.IvrLibaTarget" resultMap="IvrLibaTargetVOResult">
- select a.targetID,
+ select a.id,
a.groupid,
a.targettype,
a.targetname,
@@ -153,7 +153,7 @@
b.optiondesc
from ivr_liba_target a
LEFT JOIN ivr_liba_targetoption b
- on a.targetID = b.targetid
+ on a.id = b.targetid
<where>
a.del_flag != 1 and b.del_flag != 1
<if test="groupid != null and groupid != ''">and a.groupid = #{groupid}</if>
@@ -183,11 +183,11 @@
<select id="selectIvrLibaTargetByTargetID" parameterType="Long" resultMap="IvrLibaTargetResult">
<include refid="selectIvrLibaTargetVo"/>
- where targetID = #{targetID}
+ where id = #{id}
</select>
<insert id="insertIvrLibaTarget" parameterType="com.smartor.domain.IvrLibaTarget" useGeneratedKeys="true"
- keyProperty="targetID">
+ keyProperty="id">
insert into ivr_liba_target
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="groupid != null">groupid,</if>
@@ -274,19 +274,19 @@
<if test="isAvailable != null and isAvailable != ''">isAvailable = #{isAvailable},</if>
<if test="parameter != null and parameter != ''">parameter = #{parameter},</if>
</trim>
- where targetID = #{targetID}
+ where id = #{id}
</update>
<delete id="deleteIvrLibaTargetByTargetID" parameterType="Long">
delete
from ivr_liba_target
- where targetID = #{targetID}
+ where id = #{id}
</delete>
<delete id="deleteIvrLibaTargetByTargetIDs" parameterType="String">
- delete from ivr_liba_target where targetID in
- <foreach item="targetID" collection="array" open="(" separator="," close=")">
- #{targetID}
+ delete from ivr_liba_target 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/IvrLibaTemplateAssortMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
index 2ce0354..deca375 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateAssortMapper.xml
@@ -23,6 +23,7 @@
resultMap="IvrLibaTemplateAssortResult">
<include refid="selectIvrLibaTemplateAssortVo"/>
<where>
+ del_flag=0
<if test="indexAssortName != null and indexAssortName != ''">and index_assort_name like concat('%',
#{indexAssortName}, '%')
</if>
@@ -87,7 +88,7 @@
<select id="selectSeqMax" resultType="integer">
select max(seqno) seqno
- from iivr_liba_template_assort
+ from ivr_liba_template_assort
</select>
</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
index e3ff0bc..91aba3e 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateMapper.xml
@@ -22,14 +22,14 @@
<result property="modifyUserID" column="modifyUserID"/>
<result property="modifyTime" column="modifyTime"/>
<result property="groupID" column="groupID"/>
- <result property="labelInfo" column="labelInfo"/>
+ <result property="labelInfo" column="label_info"/>
<result property="submoduleID" column="submoduleID"/>
<result property="playType" column="playType"/>
<result property="icd10code" column="icd10code"/>
<result property="icd10codename" column="icd10codename"/>
<result property="atuoTaskDayOffset" column="atuoTaskDayOffset"/>
<result property="deptIds" column="deptIds"/>
- <result property="deptNames" column="deptNames"/>
+ <result property="deptNames" column="dept_names"/>
<result property="fKsdm" column="F_KSDM"/>
<result property="delFlag" column="del_flag"/>
<result property="updateBy" column="update_by"/>
@@ -47,6 +47,8 @@
<result property="usestate" column="usestate"/>
<result property="campus" column="campus"/>
<result property="tag" column="tag"/>
+ <result property="suitway" column="suitway"/>
+ <result property="otherdata" column="otherdata"/>
</resultMap>
<sql id="selectIvrLibaTemplateVo">
@@ -62,7 +64,9 @@
usestate,
campus,
tag,
- submodule, language, note, isEnable, addUserID, addTime, modifyUserID, modifyTime, groupID, labelInfo, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, deptIds, deptNames, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid, parameter
+ otherdata,
+ suitway,
+ submodule, language, note, isEnable, addUserID, addTime, modifyUserID, modifyTime, groupID, label_info, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, deptIds, dept_names, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid, parameter
from ivr_liba_template
</sql>
@@ -70,10 +74,12 @@
resultMap="IvrLibaTemplateResult">
<include refid="selectIvrLibaTemplateVo"/>
<where>
+ del_flag=0
<if test="templateName != null and templateName != ''">and templateName like concat('%', #{templateName},
'%')
</if>
<if test="targetid != null ">and targetid = #{targetid}</if>
+ <if test="suitway != null ">and suitway = #{suitway}</if>
<if test="targetname != null and targetname !='' ">and targetname = #{targetname}</if>
<if test="version != null and version !='' ">and version = #{version}</if>
<if test="usestate != null and usestate !='' ">and usestate = #{usestate}</if>
@@ -90,7 +96,7 @@
<if test="modifyUserID != null and modifyUserID != ''">and modifyUserID = #{modifyUserID}</if>
<if test="modifyTime != null ">and modifyTime = #{modifyTime}</if>
<if test="groupID != null and groupID != ''">and groupID = #{groupID}</if>
- <if test="labelInfo != null and labelInfo != ''">and labelInfo = #{labelInfo}</if>
+ <if test="labelInfo != null and labelInfo != ''">and label_info = #{labelInfo}</if>
<if test="submoduleID != null and submoduleID != ''">and submoduleID = #{submoduleID}</if>
<if test="playType != null ">and playType = #{playType}</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
@@ -98,7 +104,7 @@
<if test="icd10codename != null and icd10codename != ''">and icd10codename like concat('%',
#{icd10codename}, '%')
</if>
- <if test="deptNames != null and deptNames != ''">and deptNames like concat('%',
+ <if test="deptNames != null and deptNames != ''">and dept_names like concat('%',
#{deptNames}, '%')
</if>
<if test="atuoTaskDayOffset != null ">and atuoTaskDayOffset = #{atuoTaskDayOffset}</if>
@@ -117,7 +123,7 @@
<select id="selectIvrLibaTemplateByID" parameterType="Long" resultMap="IvrLibaTemplateResult">
<include refid="selectIvrLibaTemplateVo"/>
- where ID = #{ID}
+ where ID = #{ID} and del_flag=0
</select>
<insert id="insertIvrLibaTemplate" parameterType="com.smartor.domain.IvrLibaTemplate" useGeneratedKeys="true"
@@ -143,14 +149,14 @@
<if test="modifyUserID != null">modifyUserID,</if>
<if test="modifyTime != null">modifyTime,</if>
<if test="groupID != null">groupID,</if>
- <if test="labelInfo != null">labelInfo,</if>
+ <if test="labelInfo != null">label_info,</if>
<if test="submoduleID != null">submoduleID,</if>
<if test="playType != null">playType,</if>
<if test="icd10code != null">icd10code,</if>
<if test="icd10codename != null">icd10codename,</if>
<if test="atuoTaskDayOffset != null">atuoTaskDayOffset,</if>
<if test="deptIds != null">deptIds,</if>
- <if test="deptNames != null">deptNames,</if>
+ <if test="deptNames != null">dept_names,</if>
<if test="fKsdm != null">F_KSDM,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="updateBy != null">update_by,</if>
@@ -165,6 +171,8 @@
<if test="assortid != null">assortid,</if>
<if test="parameter != null">parameter,</if>
<if test="tag != null">tag,</if>
+ <if test="suitway != null">suitway,</if>
+ <if test="otherdata != null">otherdata,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="templateName != null and templateName != ''">#{templateName},</if>
@@ -208,6 +216,8 @@
<if test="assortid != null">#{assortid},</if>
<if test="parameter != null">#{parameter},</if>
<if test="tag != null">#{tag},</if>
+ <if test="suitway != null">#{suitway},</if>
+ <if test="otherdata != null">#{otherdata},</if>
</trim>
</insert>
@@ -233,14 +243,14 @@
<if test="modifyUserID != null">modifyUserID = #{modifyUserID},</if>
<if test="modifyTime != null">modifyTime = #{modifyTime},</if>
<if test="groupID != null">groupID = #{groupID},</if>
- <if test="labelInfo != null">labelInfo = #{labelInfo},</if>
+ <if test="labelInfo != null">label_info = #{labelInfo},</if>
<if test="submoduleID != null">submoduleID = #{submoduleID},</if>
<if test="playType != null">playType = #{playType},</if>
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="icd10codename != null">icd10codename = #{icd10codename},</if>
<if test="atuoTaskDayOffset != null">atuoTaskDayOffset = #{atuoTaskDayOffset},</if>
<if test="deptIds != null">deptIds = #{deptIds},</if>
- <if test="deptNames != null">deptNames = #{deptNames},</if>
+ <if test="deptNames != null">dept_names = #{deptNames},</if>
<if test="fKsdm != null">F_KSDM = #{fKsdm},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
@@ -255,6 +265,8 @@
<if test="assortid != null">assortid = #{assortid},</if>
<if test="parameter != null">parameter = #{parameter},</if>
<if test="tag != null">tag = #{tag},</if>
+ <if test="suitway != null">suitway = #{suitway},</if>
+ <if test="otherdata != null">otherdata = #{otherdata},</if>
</trim>
where ID = #{ID}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
index a2eeea0..e1c449c 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateScriptMapper.xml
@@ -8,7 +8,7 @@
<result property="ID" column="ID"/>
<result property="templateQuestionNum" column="templateQuestionNum"/>
<result property="templateID" column="templateID"/>
- <result property="scriptID" column="scriptID"/>
+ <result property="scriptid" column="scriptID"/>
<result property="questionPoint" column="questionPoint"/>
<result property="questionText" column="questionText"/>
<result property="questionVoice" column="questionVoice"/>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetMapper.xml
index 38e4fbe..f62c05a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaTemplateTargetMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.smartor.mapper.IvrLibaTemplateTargetMapper">
<resultMap type="com.smartor.domain.IvrLibaTemplateTarget" id="IvrLibaTemplateTargetResult">
- <result property="ID" column="ID"/>
+ <result property="id" column="id"/>
<result property="templateQuestionID" column="templateQuestionID"/>
<result property="templateQuestionNum" column="templateQuestionNum"/>
<result property="nextQuestionNum" column="nextQuestionNum"/>
@@ -18,8 +18,8 @@
<result property="targetType" column="targetType"/>
<result property="categoryName" column="categoryName"/>
<result property="targetValue" column="targetValue"/>
- <result property="targetID" column="targetID"/>
- <result property="questionTargetID" column="questionTargetID"/>
+ <result property="targetid" column="targetid"/>
+ <result property="questionTargetid" column="questionTargetid"/>
<result property="basicRegex" column="basicRegex"/>
<result property="selfRegex" column="selfRegex"/>
<result property="regexUsedType" column="regexUsedType"/>
@@ -39,7 +39,7 @@
</resultMap>
<sql id="selectIvrLibaTemplateTargetVo">
- select ID,
+ select id,
templateQuestionID,
templateQuestionNum,
nextQuestionNum,
@@ -52,8 +52,8 @@
targetType,
categoryName,
targetValue,
- targetID,
- questionTargetID,
+ targetid,
+ questionTargetid,
basicRegex,
selfRegex,
regexUsedType, language, isEnable, playType, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
@@ -80,8 +80,8 @@
'%')
</if>
<if test="targetValue != null and targetValue != ''">and targetValue = #{targetValue}</if>
- <if test="targetID != null and targetID != ''">and targetID = #{targetID}</if>
- <if test="questionTargetID != null and questionTargetID != ''">and questionTargetID = #{questionTargetID}
+ <if test="targetid != null and targetid != ''">and targetid = #{targetid}</if>
+ <if test="questionTargetid != null and questionTargetid != ''">and questionTargetid = #{questionTargetid}
</if>
<if test="basicRegex != null and basicRegex != ''">and basicRegex = #{basicRegex}</if>
<if test="selfRegex != null and selfRegex != ''">and selfRegex = #{selfRegex}</if>
@@ -99,7 +99,7 @@
<select id="selectIvrLibaTemplateTargetByID" parameterType="Long" resultMap="IvrLibaTemplateTargetResult">
<include refid="selectIvrLibaTemplateTargetVo"/>
- where ID = #{ID}
+ where id = #{id}
</select>
<insert id="insertIvrLibaTemplateTarget" parameterType="com.smartor.domain.IvrLibaTemplateTarget">
@@ -117,8 +117,8 @@
<if test="targetType != null">targetType,</if>
<if test="categoryName != null">categoryName,</if>
<if test="targetValue != null">targetValue,</if>
- <if test="targetID != null">targetID,</if>
- <if test="questionTargetID != null">questionTargetID,</if>
+ <if test="targetid != null">targetid,</if>
+ <if test="questionTargetid != null">questionTargetid,</if>
<if test="basicRegex != null">basicRegex,</if>
<if test="selfRegex != null">selfRegex,</if>
<if test="regexUsedType != null">regexUsedType,</if>
@@ -149,8 +149,8 @@
<if test="targetType != null">#{targetType},</if>
<if test="categoryName != null">#{categoryName},</if>
<if test="targetValue != null">#{targetValue},</if>
- <if test="targetID != null">#{targetID},</if>
- <if test="questionTargetID != null">#{questionTargetID},</if>
+ <if test="targetid != null">#{targetid},</if>
+ <if test="questionTargetid != null">#{questionTargetid},</if>
<if test="basicRegex != null">#{basicRegex},</if>
<if test="selfRegex != null">#{selfRegex},</if>
<if test="regexUsedType != null">#{regexUsedType},</if>
@@ -185,8 +185,8 @@
<if test="targetType != null">targetType = #{targetType},</if>
<if test="categoryName != null">categoryName = #{categoryName},</if>
<if test="targetValue != null">targetValue = #{targetValue},</if>
- <if test="targetID != null">targetID = #{targetID},</if>
- <if test="questionTargetID != null">questionTargetID = #{questionTargetID},</if>
+ <if test="targetid != null">targetID = #{targetid},</if>
+ <if test="questionTargetid != null">questionTargetid = #{questionTargetid},</if>
<if test="basicRegex != null">basicRegex = #{basicRegex},</if>
<if test="selfRegex != null">selfRegex = #{selfRegex},</if>
<if test="regexUsedType != null">regexUsedType = #{regexUsedType},</if>
@@ -204,7 +204,7 @@
<if test="pid != null">pid = #{pid},</if>
<if test="guid != null">guid = #{guid},</if>
</trim>
- where ID = #{ID}
+ where id = #{id}
</update>
<update id="deleteIvrLibaTemplateTargetByID" parameterType="Long">
@@ -212,13 +212,13 @@
<trim prefix="SET" suffixOverrides=",">
<if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
</trim>
- where ID = #{ID}
+ where id = #{id}
</update>
<delete id="deleteIvrLibaTemplateTargetByIDs" parameterType="String">
- delete from ivr_liba_template_target where ID in
- <foreach item="ID" collection="array" open="(" separator="," close=")">
- #{ID}
+ delete from ivr_liba_template_target 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/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 60a78b3..0edb96a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -24,6 +24,7 @@
<result property="orgid" column="orgid"/>
<result property="openid" column="openid"/>
<result property="delFlag" column="del_flag"/>
+ <result property="dept" column="deptname"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="createBy" column="create_by"/>
@@ -94,6 +95,7 @@
a.birthdate
from pat_archive a,pat_archivetag b ,base_tag c
<where>
+ a.del_flag=0 and
a.patid = b.patid and b.tagid = c.tagid
<if test="name != null and name != ''">and a.name like concat('%', #{name}, '%')</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
@@ -108,7 +110,7 @@
<select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
<include refid="selectPatArchiveVo"/>
- where patid = #{patid}
+ where patid = #{patid} and del_flag=0
</select>
<insert id="insertPatArchive">
@@ -270,6 +272,7 @@
b.tagid as tagid,
a.patid,
a.name,
+ d.deptname,
a.sex,
a.nation,
a.native_place,
@@ -337,6 +340,7 @@
c.tagname as tag,
b.tagid as tagid,
a.patid,
+ d.deptname,
a.name,
a.sex,
a.nation,
@@ -404,6 +408,7 @@
a.patid,
a.name,
a.sex,
+ d.deptname,
a.nation,
a.native_place,
a.place_of_residence,
diff --git a/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml b/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml
new file mode 100644
index 0000000..16ceac2
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatHetaskRelevanceMapper.xml
@@ -0,0 +1,139 @@
+<?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.PatHetaskRelevanceMapper">
+
+ <resultMap type="com.smartor.domain.PatHetaskRelevance" id="PatHetaskRelevanceResult">
+ <result property="id" column="id"/>
+ <result property="patId" column="pat_id"/>
+ <result property="heTaskId" column="he_task_id"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="remark" column="remark"/>
+ <result property="name" column="name"/>
+ <result property="age" column="age"/>
+ <result property="sex" column="sex"/>
+ <result property="badNo" column="bad_no"/>
+ <result property="dept" column="dept"/>
+ <result property="icdName" column="icd_name"/>
+ <result property="phone" column="phone"/>
+ <result property="medicalRecordNo" column="medical_record_no"/>
+ </resultMap>
+
+ <sql id="selectPatHetaskRelevanceVo">
+ select id,
+ pat_id,
+ he_task_id,
+ del_flag,
+ create_time,
+ update_time,
+ remark,
+ name,
+ age,
+ sex,
+ bad_no,
+ dept,
+ icd_name,
+ phone,
+ medical_record_no
+ from pat_hetask_relevance
+ </sql>
+
+ <select id="selectPatHetaskRelevanceList" parameterType="com.smartor.domain.PatHetaskRelevance"
+ resultMap="PatHetaskRelevanceResult">
+ <include refid="selectPatHetaskRelevanceVo"/>
+ <where>
+ del_flag=0
+ <if test="patId != null ">and pat_id = #{patId}</if>
+ <if test="heTaskId != null ">and he_task_id = #{heTaskId}</if>
+ <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+ <if test="age != null ">and age = #{age}</if>
+ <if test="sex != null ">and sex = #{sex}</if>
+ <if test="badNo != null ">and bad_no = #{badNo}</if>
+ <if test="dept != null and dept != ''">and dept = #{dept}</if>
+ <if test="phone != null and phone != ''">and phone = #{phone}</if>
+ <if test="medicalRecordNo != null and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
+ </if>
+ <if test="icdName != null and icdName != ''">and icd_name like concat('%', #{icdName}, '%')</if>
+ </where>
+ </select>
+
+ <select id="selectPatHetaskRelevanceById" parameterType="Long" resultMap="PatHetaskRelevanceResult">
+ <include refid="selectPatHetaskRelevanceVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertPatHetaskRelevance" parameterType="com.smartor.domain.PatHetaskRelevance">
+ insert into pat_hetask_relevance
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="patId != null">pat_id,</if>
+ <if test="heTaskId != null">he_task_id,</if>
+ <if test="delFlag != null">del_flag,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="remark != null">remark,</if>
+ <if test="name != null">name,</if>
+ <if test="age != null">age,</if>
+ <if test="sex != null">sex,</if>
+ <if test="badNo != null">bad_no,</if>
+ <if test="dept != null">dept,</if>
+ <if test="icdName != null">icd_name,</if>
+ <if test="phone != null">phone,</if>
+ <if test="medicalRecordNo != null">medical_record_no,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="patId != null">#{patId},</if>
+ <if test="heTaskId != null">#{heTaskId},</if>
+ <if test="delFlag != null">#{delFlag},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="remark != null">#{remark},</if>
+ <if test="name != null">#{name},</if>
+ <if test="age != null">#{age},</if>
+ <if test="sex != null">#{sex},</if>
+ <if test="badNo != null">#{badNo},</if>
+ <if test="dept != null">#{dept},</if>
+ <if test="icdName != null">#{icdName},</if>
+ <if test="phone != null">#{phone},</if>
+ <if test="medicalRecordNo != null">#{medicalRecordNo},</if>
+ </trim>
+ </insert>
+
+ <update id="updatePatHetaskRelevance" parameterType="com.smartor.domain.PatHetaskRelevance">
+ update pat_hetask_relevance
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="patId != null">pat_id = #{patId},</if>
+ <if test="heTaskId != null">he_task_id = #{heTaskId},</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="remark != null">remark = #{remark},</if>
+ <if test="name != null">name = #{name},</if>
+ <if test="age != null">age = #{age},</if>
+ <if test="sex != null">sex = #{sex},</if>
+ <if test="badNo != null">bad_no = #{badNo},</if>
+ <if test="dept != null">dept = #{dept},</if>
+ <if test="icdName != null">icd_name = #{icdName},</if>
+ <if test="phone != null">phone = #{phone},</if>
+ <if test="medicalRecordNo != null">medical_record_no = #{medicalRecordNo},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <update id="deletePatHetaskRelevanceById" parameterType="Long">
+ update pat_hetask_relevance
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="delFlag != null">del_flag =1,</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deletePatHetaskRelevanceByIds" parameterType="String">
+ delete from pat_hetask_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/SvyLibTitleMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTitleMapper.xml
index ca6e3e4..9894aa5 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTitleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTitleMapper.xml
@@ -26,6 +26,11 @@
<result property="updateTime" column="update_time"/>
<result property="isupload" column="isupload"/>
<result property="uploadTime" column="upload_time"/>
+ <result property="deptNames" column="dept_names"/>
+ <result property="labelInfo" column="label_info"/>
+ <result property="campus" column="campus"/>
+ <result property="suitway" column="suitway"/>
+ <result property="otherdata" column="otherdata"/>
</resultMap>
<sql id="selectSvyLibTitleVo">
@@ -49,18 +54,27 @@
update_by,
update_time,
isupload,
- upload_time
+ upload_time,
+ dept_names,
+ label_info,
+ campus,
+ suitway,
+ otherdata
from svy_lib_title
</sql>
<select id="selectSvyLibTitleList" parameterType="com.smartor.domain.SvyLibTitleReq" resultMap="SvyLibTitleResult">
select a.svyid, a.categoryid, a.svycode, a.svyname, a.description, a.introduce,a.submitprompt, a.templateid,
a.version,a.centerlibrarycode, a.centerlibraryid, a.islocal, a.isenable, a.orgid, a.del_flag, a.create_by,
- a.create_time, a.update_by, a.update_time, a.isupload, a.upload_time,c.icdname from svy_lib_title
+ a.create_time, a.update_by, a.update_time, a.isupload, a.upload_time,a.dept_names,a.label_info,
+ a.campus,a.suitway,a.otherdata
+ ,c.icdname from svy_lib_title
a,icd10_association b,icd10 c
<where>
+ a.del_flag=0 and
a.svyid=b.SVYID and b.ICD10CODE=c.icdcode
<if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
+ <if test="svyid != null ">and a.svyid = #{svyid}</if>
<if test="svyname != null and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>
<if test="description != null and description != ''">and a.icdname like concat('%', #{description}, '%')
</if>
@@ -69,7 +83,7 @@
<select id="selectSvyLibTitleBySvyid" parameterType="Long" resultMap="SvyLibTitleResult">
<include refid="selectSvyLibTitleVo"/>
- where svyid = #{svyid}
+ where svyid = #{svyid} and del_flag=0
</select>
<insert id="insertSvyLibTitle" parameterType="com.smartor.domain.SvyLibTitle" useGeneratedKeys="true"
@@ -96,6 +110,11 @@
<if test="updateTime != null">update_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
+ <if test="deptNames != null">dept_names,</if>
+ <if test="labelInfo != null">label_info,</if>
+ <if test="campus != null">campus,</if>
+ <if test="suitway != null">suitway,</if>
+ <if test="otherdata != null">otherdata,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="categoryid != null">#{categoryid},</if>
@@ -118,6 +137,11 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
+ <if test="deptNames != null">#{deptNames},</if>
+ <if test="labelInfo != null">#{labelInfo},</if>
+ <if test="campus != null">#{campus},</if>
+ <if test="suitway != null">#{suitway},</if>
+ <if test="otherdata != null">#{otherdata},</if>
</trim>
</insert>
@@ -144,6 +168,11 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="deptNames != null">dept_names=#{deptNames},</if>
+ <if test="labelInfo != null">label_info=#{labelInfo},</if>
+ <if test="campus != null">campus=#{campus},</if>
+ <if test="suitway != null">suitway=#{suitway},</if>
+ <if test="otherdata != null">otherdata=#{otherdata},</if>
</trim>
where svyid = #{svyid}
</update>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
index 1e34aef..01861bd 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicCategoryMapper.xml
@@ -39,7 +39,7 @@
resultMap="SvyLibTopicCategoryResult">
<include refid="selectSvyLibTopicCategoryVo"/>
<where>
- del_flat=0
+ del_flag=0
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="topicid != null ">and topicid = #{topicid}</if>
<if test="pid != null ">and pid = #{pid}</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
index b04633e..edb061a 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicMapper.xml
@@ -24,6 +24,11 @@
<result property="uploadTime" column="upload_time"/>
<result property="tag" column="tag"/>
<result property="categoryid" column="categoryid"/>
+ <result property="topicContent" column="topic_content"/>
+ <result property="suitway" column="suitway"/>
+ <result property="isavailable" column="isavailable"/>
+ <result property="language" column="language"/>
+ <result property="otherdata" column="otherdata"/>
</resultMap>
<sql id="selectSvyLibTopicVo">
@@ -46,20 +51,31 @@
upload_time,
tag,
categoryid,
- svy_topicid as svyTopicId
+ topic_content,
+ suitway,
+ isavailable,
+ otherdata,
+ language,
+ svy_topicid as svyTopicId
from svy_lib_topic
</sql>
<select id="selectSvyLibTopicList" parameterType="com.smartor.domain.SvyLibTopic" resultMap="SvyLibTopicResult">
<include refid="selectSvyLibTopicVo"/>
<where>
+ del_flag=0
+ <if test="topicid != null ">and topicid = #{topicid}</if>
<if test="oldid != null ">and oldid = #{oldid}</if>
- <if test="topictype != null ">and topictype = #{topictype}</if>
+ <if test="topictype != null and topictype != ''">and topictype = #{topictype}</if>
<if test="categoryid != null ">and categoryid = #{categoryid}</if>
<if test="topic != null and topic != ''">and topic = #{topic}</if>
<if test="ishide != null ">and ishide = #{ishide}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="svyid != null and svyid != ''">and svyid = #{svyid}</if>
+ <if test="topicContent != null and topicContent != ''">and topic_content = #{topicContent}</if>
+ <if test="suitway != null and suitway != ''">and suitway = #{suitway}</if>
+ <if test="isavailable != null and isavailable != ''">and isavailable = #{isavailable}</if>
+ <if test="language != null and language != ''">and language = #{language}</if>
</where>
</select>
@@ -91,6 +107,11 @@
<if test="tag != null">tag,</if>
<if test="svyTopicId != null">svy_topicid,</if>
<if test="categoryid != null">categoryid,</if>
+ <if test="topicContent != null">topic_content,</if>
+ <if test="suitway != null">suitway,</if>
+ <if test="isavailable != null">isavailable,</if>
+ <if test="language != null and language!=''">language,</if>
+ <if test="otherdata != null and otherdata!=''">otherdata,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="oldid != null">#{oldid},</if>
@@ -112,6 +133,11 @@
<if test="tag != null">#{tag},</if>
<if test="svyTopicId != null">#{svyTopicId},</if>
<if test="categoryid != null">#{categoryid},</if>
+ <if test="topicContent != null">#{topicContent},</if>
+ <if test="suitway != null">#{suitway},</if>
+ <if test="isavailable != null">#{isavailable},</if>
+ <if test="language != null">#{language},</if>
+ <if test="otherdata != null">#{otherdata},</if>
</trim>
</insert>
@@ -135,15 +161,23 @@
<if test="isupload != null">isupload = #{isupload},</if>
<if test="uploadTime != null">upload_time = #{uploadTime},</if>
<if test="categoryid != null">categoryid = #{categoryid},</if>
+ <if test="topicContent != null">topic_content = #{topicContent},</if>
+ <if test="suitway != null">suitway = #{suitway},</if>
+ <if test="isavailable != null">isavailable = #{isavailable},</if>
+ <if test="tag != null">tag = #{tag},</if>
+ <if test="language != null and language!=''">language = #{language},</if>
+ <if test="otherdata != null and otherdata!=''">otherdata = #{otherdata},</if>
</trim>
where topicid = #{topicid}
</update>
- <delete id="deleteSvyLibTopicByTopicid" parameterType="Long">
- delete
- from svy_lib_topic
+ <update id="deleteSvyLibTopicByTopicid" parameterType="Long">
+ update svy_lib_topic
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="delFlag != null and delFlag != ''">del_flag =1,</if>
+ </trim>
where topicid = #{topicid}
- </delete>
+ </update>
<delete id="deleteSvyLibTopicByTopicids" parameterType="String">
delete from svy_lib_topic where topicid in
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTopicoptionMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTopicoptionMapper.xml
index 7e804b2..9d8b98e 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTopicoptionMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTopicoptionMapper.xml
@@ -73,9 +73,11 @@
from svy_lib_topicoption
</sql>
- <select id="selectSvyLibTopicoptionList" parameterType="com.smartor.domain.SvyLibTopicoption" resultMap="SvyLibTopicoptionResult">
+ <select id="selectSvyLibTopicoptionList" parameterType="com.smartor.domain.SvyLibTopicoption"
+ resultMap="SvyLibTopicoptionResult">
<include refid="selectSvyLibTopicoptionVo"/>
<where>
+ del_flag=0
<if test="topicid != null ">and topicid = #{topicid}</if>
<if test="svyid != null ">and svyid = #{svyid}</if>
<if test="topictype != null ">and topictype = #{topictype}</if>
@@ -215,11 +217,13 @@
where optionid = #{optionid}
</update>
- <delete id="deleteSvyLibTopicoptionByOptionid" parameterType="Long">
- delete
- from svy_lib_topicoption
+ <update id="deleteSvyLibTopicoptionByOptionid" parameterType="Long">
+ update svy_lib_topicoption
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
+ </trim>
where optionid = #{optionid}
- </delete>
+ </update>
<delete id="deleteSvyLibTopicoptionByOptionids" parameterType="String">
delete from svy_lib_topicoption where optionid in
diff --git a/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml b/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml
new file mode 100644
index 0000000..62ee1b2
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/TempDetpRelevanceMapper.xml
@@ -0,0 +1,78 @@
+<?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>
+ <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
--
Gitblit v1.9.3