From ceb6cdffdd5ed0f2b2d83fd5c2286c50a950e910 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期六, 20 七月 2024 17:00:48 +0800 Subject: [PATCH] 代码提交 --- /dev/null | 378 ------------------------------------------------------ smartor/src/main/java/com/smartor/domain/PatTaskRelevanceVO.java | 5 2 files changed, 0 insertions(+), 383 deletions(-) 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 deleted file mode 100644 index 743d69a..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskController.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.ruoyi.web.controller.smartor; - -import com.github.pagehelper.ISelect; -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.PageUtils; -import com.smartor.domain.*; -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 java.util.List; - -/** - * 瀹f暀浠诲姟Controller - * - * @author ruoyi - * @date 2024-01-07 - */ -@Api(description = "瀹f暀浠诲姟") -@RestController -@RequestMapping("/smartor/hetask") -public class HeTaskController extends BaseController { - @Autowired - private IHeTaskService heTaskService; - - /** - * 鏌ヨ瀹f暀浠诲姟鍒楄〃 - */ - @ApiOperation("鏌ヨ鎮h�呭鏁欎换鍔″垪琛�") - @PreAuthorize("@ss.hasPermi('system:task:list')") - @PostMapping("/getPatHeTaskList") - public TableDataInfo getPatHeTaskList(@RequestBody PatTaskRelevanceVO PatTaskRelevanceVO) { - startPage(); - List<PatTaskRelevanceVO> list = heTaskService.selectHeTaskList(PatTaskRelevanceVO); - return getDataTable(list); - } - -// /** -// * 瀵煎嚭瀹f暀浠诲姟鍒楄〃 -// */ -// @PreAuthorize("@ss.hasPermi('system:task:export')") -// @Log(title = "瀹f暀浠诲姟", 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, "瀹f暀浠诲姟鏁版嵁"); -// } - - /** - * 鑾峰彇瀹f暀浠诲姟璇︾粏淇℃伅 - */ - @ApiOperation("鑾峰彇瀹f暀浠诲姟璇︾粏淇℃伅") - @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 = "瀹f暀浠诲姟", businessType = BusinessType.INSERT) - @PostMapping("/insertOrUpdateHeTask") - public AjaxResult insertOrUpdateHeTask(@RequestBody HeTaskVO heTaskVO) { - return toAjax(heTaskService.insertOrUpdateHeTask(heTaskVO)); - } - - /** - * 淇敼瀹f暀浠诲姟 - */ - @PreAuthorize("@ss.hasPermi('system:task:edit')") - @Log(title = "瀹f暀浠诲姟", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - public AjaxResult edit(@RequestBody HeTask heTask) { - return toAjax(heTaskService.updateHeTask(heTask)); - } - - /** - * 鍒犻櫎瀹f暀浠诲姟 - */ - @ApiOperation("鍒犻櫎瀹f暀浠诲姟") - @PreAuthorize("@ss.hasPermi('system:task:remove')") - @Log(title = "瀹f暀浠诲姟", businessType = BusinessType.DELETE) - @GetMapping("/remove/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(heTaskService.deleteHeTaskByIds(ids)); - } - - - /** - * 鑾峰彇鎮h�呬俊鎭� - */ - @ApiOperation("鑾峰彇鎮h�呬俊鎭�") - @PostMapping("/getPatientInfo") - public TableDataInfo getPatientInfo(@RequestBody PatArchiveReq patArchiveReq) { - PageUtils.startPageByPost(patArchiveReq.getPageNum(), patArchiveReq.getPageSize()); - List<PatTaskRelevance> patientInfo = heTaskService.getPatientInfo(patArchiveReq); - long count = PageUtils.count(new ISelect() { - @Override - public void doSelect() { - heTaskService.getPatientInfo(patArchiveReq); - } - }); - return getDataTable2(count, patientInfo); - } - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskSingleController.java deleted file mode 100644 index 6ffac37..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HeTaskSingleController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.ruoyi.web.controller.smartor; - -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.DtoConversionUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.smartor.domain.*; -import com.smartor.service.IHeTaskService; -import com.smartor.service.IHeTaskSingleService; -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; - -/** - * 瀹f暀鍗曚竴浠诲姟Controller - * - * @author ruoyi - * @date 2024-04-16 - */ -@Api(description = "瀹f暀鍗曚竴浠诲姟") -@RestController -@RequestMapping("/smartor/heTaskSingle") -public class HeTaskSingleController extends BaseController { - @Autowired - private IHeTaskSingleService heTaskSingleService; - -// /** -// * 鏌ヨ瀹f暀鍗曚竴浠诲姟鍒楄〃 -// */ -// @ApiOperation("鏌ヨ瀹f暀鍗曚竴浠诲姟鍒楄〃") -// @PreAuthorize("@ss.hasPermi('system:single:list')") -// @GetMapping("/list") -// public TableDataInfo list(HeTaskSingle heTaskSingle) { -// startPage(); -// List<HeTaskSingle> list = heTaskSingleService.selectHeTaskSingleList(heTaskSingle); -// return getDataTable(list); -// } - - /** - * 瀵煎嚭瀹f暀鍗曚竴浠诲姟鍒楄〃 - */ - @ApiOperation("瀵煎嚭瀹f暀鍗曚竴浠诲姟鍒楄〃") - @PreAuthorize("@ss.hasPermi('system:single:export')") - @Log(title = "瀹f暀鍗曚竴浠诲姟", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, HeTaskSingle heTaskSingle) { - List<HeTaskSingle> list = heTaskSingleService.selectHeTaskSingleList(heTaskSingle); - ExcelUtil<HeTaskSingle> util = new ExcelUtil<HeTaskSingle>(HeTaskSingle.class); - util.exportExcel(response, list, "瀹f暀鍗曚竴浠诲姟鏁版嵁"); - } - - /** - * 鑾峰彇瀹f暀鍗曚竴浠诲姟璇︾粏淇℃伅 - */ - @ApiOperation("鑾峰彇瀹f暀鍗曚竴浠诲姟璇︾粏淇℃伅") - @PreAuthorize("@ss.hasPermi('system:single:query')") - @GetMapping(value = "/getInfo/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(heTaskSingleService.selectHeTaskSingleById(id)); - } - - /** - * 鏂板瀹f暀鍗曚竴浠诲姟 - */ - @ApiOperation("鏂板瀹f暀鍗曚竴浠诲姟") - @PreAuthorize("@ss.hasPermi('system:single:add')") - @Log(title = "瀹f暀鍗曚竴浠诲姟", businessType = BusinessType.INSERT) - @PostMapping("/addOrUpdateHeTaskSinle") - public AjaxResult addOrUpdateHeTaskSinle(@RequestBody HeTaskSingleVO heTaskSingleVO) { - return toAjax(heTaskSingleService.addOrUpdateHeTaskSinle(heTaskSingleVO)); - } - -// /** -// * 淇敼瀹f暀鍗曚竴浠诲姟 -// */ -// @PreAuthorize("@ss.hasPermi('system:single:edit')") -// @Log(title = "瀹f暀鍗曚竴浠诲姟", businessType = BusinessType.UPDATE) -// @PostMapping("/edit") -// public AjaxResult edit(@RequestBody HeTaskSingle heTaskSingle) { -// return toAjax(heTaskSingleService.updateHeTaskSingle(heTaskSingle)); -// } - - /** - * 鍒犻櫎瀹f暀鍗曚竴浠诲姟 - */ - @ApiOperation("鍒犻櫎瀹f暀鍗曚竴浠诲姟") - @PreAuthorize("@ss.hasPermi('system:single:remove')") - @Log(title = "瀹f暀鍗曚竴浠诲姟", businessType = BusinessType.DELETE) - @GetMapping("/remove/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(heTaskSingleService.deleteHeTaskSingleByIds(ids)); - } - - - /** - * 鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅 - */ - @ApiOperation("鏍规嵁鏉′欢鏌ヨ浠诲姟淇℃伅") - @PostMapping("/queryHeTaskByCondition") - public AjaxResult queryHeTaskByCondition(@RequestBody HeTaskSingle heTaskSingle) { - - return success(heTaskSingleService.queryHeTaskByCondition(heTaskSingle)); - } -} diff --git a/smartor/src/main/java/com/smartor/domain/HeTask.java b/smartor/src/main/java/com/smartor/domain/HeTask.java deleted file mode 100644 index 8bdce85..0000000 --- a/smartor/src/main/java/com/smartor/domain/HeTask.java +++ /dev/null @@ -1,226 +0,0 @@ -package com.smartor.domain; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Map; - -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; - -/** - * 瀹f暀浠诲姟瀵硅薄 he_task - * - * @author ruoyi - * @date 2024-01-07 - */ -@Data -@ApiModel(value = "HeTask", description = "瀹f暀浠诲姟瀵硅薄") -public class HeTask extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 鑷ID - */ - @ApiModelProperty(value = "鑷ID") - private Long id; - - /** - * 鎮h�呮湇鍔′换鍔d - */ - @Excel(name = "鎮h�呮湇鍔′换鍔d") - @ApiModelProperty(value = "鎮h�呮湇鍔′换鍔d") - private Long svrtaskid; - - /** - * 鐥呬汉id闆嗗悎 - */ - @Excel(name = " 鐥呬汉id闆嗗悎") - @ApiModelProperty(value = "鐥呬汉id闆嗗悎锛堝瓧绗︿覆浠ラ�楀彿褰㈠紡鍒嗛殧锛�") - private String patientid; - - /** - * 瀹f暀鍒嗙被 - */ - @Excel(name = " 瀹f暀鍒嗙被 ") - @ApiModelProperty(value = "瀹f暀鍒嗙被") - private String classification; - - /** - * 瀹f暀id - */ - @Excel(name = " 瀹f暀id ") - @ApiModelProperty(value = "瀹f暀id") - private Long preachcategoryid; - - /** - * 瀹f暀鍚嶇О - */ - @Excel(name = " 瀹f暀鍚嶇О ") - @ApiModelProperty(value = "瀹f暀鍚嶇О") - private String preachname; - - /** - * 鐗堟湰 - */ - @Excel(name = " 鐗堟湰 ") - @ApiModelProperty(value = "鐗堟湰") - private BigDecimal version; - - /** - * 瀹f暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤 - */ - @Excel(name = " 瀹f暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤") - @ApiModelProperty(value = " 瀹f暀褰㈠紡 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤") - private String preachform; - - /** - * 缁勭粐褰㈠紡锛�1.鍗曚汉瀹f暀 2.澶氫汉瀹f暀 - */ - @Excel(name = "缁勭粐褰㈠紡锛�1.鍗曚汉瀹f暀 2.澶氫汉瀹f暀") - @ApiModelProperty(value = " 缁勭粐褰㈠紡锛�1.鍗曚汉瀹f暀 2.澶氫汉瀹f暀") - private Long orgform; - - /** - * 瀹f暀鎻忚堪 - */ - @Excel(name = " 瀹f暀鎻忚堪 ") - @ApiModelProperty(value = "瀹f暀鎻忚堪") - private String preachdescription; - - /** - * 瀹f暀鍐呭 - */ - @Excel(name = " 瀹f暀鍐呭 ") - @ApiModelProperty(value = "瀹f暀鍐呭") - private String preachcontent; - - /** - * 妯℃澘ID - */ - @Excel(name = " 妯℃澘ID ") - @ApiModelProperty(value = "妯℃澘ID") - private Long templateid; - - /** - * 瀹f暀浠g爜 - */ - @Excel(name = " 瀹f暀浠g爜 ") - @ApiModelProperty(value = "瀹f暀浠g爜") - 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; - - /** - * 瀵屾枃鏈� - */ - @Excel(name = "瀵屾枃鏈�") - @ApiModelProperty(value = "瀵屾枃鏈�") - private String richText; - - /** - * 鏂囨湰鍙橀噺鍙傛暟 - */ - @Excel(name = "鏂囨湰鍙橀噺鍙傛暟") - @ApiModelProperty(value = "鏂囨湰鍙橀噺鍙傛暟") - private String textParam; - - - -} diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevanceVO.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevanceVO.java index f89deb7..6cec83b 100644 --- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevanceVO.java +++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevanceVO.java @@ -131,10 +131,5 @@ @ApiModelProperty("灏辫瘖鏃堕棿") private Date visitTime; - /** - * 瀹f暀浠诲姟 - */ - @ApiModelProperty("瀹f暀浠诲姟") - private HeTask heTask; } diff --git a/smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java b/smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java deleted file mode 100644 index 27c4d65..0000000 --- a/smartor/src/main/java/com/smartor/mapper/HeTaskMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.smartor.mapper; - -import com.smartor.domain.HeTask; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 瀹f暀浠诲姟Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-01-07 - */ -@Mapper -public interface HeTaskMapper { - /** - * 鏌ヨ瀹f暀浠诲姟 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 瀹f暀浠诲姟 - */ - public HeTask selectHeTaskById(Long id); - - /** - * 鏌ヨ瀹f暀浠诲姟鍒楄〃 - * - * @param heTask 瀹f暀浠诲姟 - * @return 瀹f暀浠诲姟闆嗗悎 - */ - public List<HeTask> selectHeTaskList(HeTask heTask); - - /** - * 鏂板瀹f暀浠诲姟 - * - * @param heTask 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - public int insertHeTask(HeTask heTask); - - /** - * 淇敼瀹f暀浠诲姟 - * - * @param heTask 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - public int updateHeTask(HeTask heTask); - - /** - * 鍒犻櫎瀹f暀浠诲姟 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 缁撴灉 - */ - public int deleteHeTaskById(Long id); - -// /** -// * 鎵归噺鍒犻櫎瀹f暀浠诲姟 -// * -// * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 -// * @return 缁撴灉 -// */ -// public int deleteHeTaskByIds(Long[] ids); -} diff --git a/smartor/src/main/java/com/smartor/mapper/HeTaskSingleMapper.java b/smartor/src/main/java/com/smartor/mapper/HeTaskSingleMapper.java deleted file mode 100644 index eec6e02..0000000 --- a/smartor/src/main/java/com/smartor/mapper/HeTaskSingleMapper.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.smartor.mapper; - -import com.smartor.domain.HeTaskSingle; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 瀹f暀鍗曚竴浠诲姟Mapper鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-16 - */ -@Mapper -public interface HeTaskSingleMapper { - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 瀹f暀鍗曚竴浠诲姟 - */ - public HeTaskSingle selectHeTaskSingleById(Long id); - - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟鍒楄〃 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 瀹f暀鍗曚竴浠诲姟闆嗗悎 - */ - public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle); - - /** - * 鏂板瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - public int insertHeTaskSingle(HeTaskSingle heTaskSingle); - - /** - * 淇敼瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - public int updateHeTaskSingle(HeTaskSingle heTaskSingle); - - /** - * 鍒犻櫎瀹f暀鍗曚竴浠诲姟 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 缁撴灉 - */ - public int deleteHeTaskSingleById(Long id); - - /** - * 鎵归噺鍒犻櫎瀹f暀鍗曚竴浠诲姟 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteHeTaskSingleByIds(Long[] ids); -} diff --git a/smartor/src/main/java/com/smartor/service/IHeTaskService.java b/smartor/src/main/java/com/smartor/service/IHeTaskService.java deleted file mode 100644 index 140b425..0000000 --- a/smartor/src/main/java/com/smartor/service/IHeTaskService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.smartor.service; - -import com.smartor.domain.*; - -import java.util.List; - -/** - * 瀹f暀浠诲姟Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-01-07 - */ -public interface IHeTaskService { - /** - * 鏌ヨ瀹f暀浠诲姟 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 瀹f暀浠诲姟 - */ - public HeTaskVO selectHeTaskById(Long id); - - /** - * 鏌ヨ瀹f暀浠诲姟鍒楄〃 - * - * @param heTask 瀹f暀浠诲姟 - * @return 瀹f暀浠诲姟闆嗗悎 - */ - public List<PatTaskRelevanceVO> selectHeTaskList(PatTaskRelevanceVO PatTaskRelevanceVO); - - /** - * 鏂板瀹f暀浠诲姟 - * - * @param heTaskVO 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - public int insertOrUpdateHeTask(HeTaskVO heTaskVO); - - /** - * 淇敼瀹f暀浠诲姟 - * - * @param heTask 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - public int updateHeTask(HeTask heTask); - - /** - * 鎵归噺鍒犻櫎瀹f暀浠诲姟 - * - * @param ids 闇�瑕佸垹闄ょ殑瀹f暀浠诲姟涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteHeTaskByIds(Long[] ids); - - /** - * 鍒犻櫎瀹f暀浠诲姟淇℃伅 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 缁撴灉 - */ - public int deleteHeTaskById(Long id); - - /** - * 鑾峰彇鎮h�呬俊鎭� - * - * @param patArchiveReq - * @return PatTaskRelevance - */ - public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq); -} diff --git a/smartor/src/main/java/com/smartor/service/IHeTaskSingleService.java b/smartor/src/main/java/com/smartor/service/IHeTaskSingleService.java deleted file mode 100644 index c677e88..0000000 --- a/smartor/src/main/java/com/smartor/service/IHeTaskSingleService.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.smartor.service; - -import com.ruoyi.common.core.domain.AjaxResult; -import com.smartor.domain.HeTaskSingle; -import com.smartor.domain.HeTaskSingleVO; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * 瀹f暀鍗曚竴浠诲姟Service鎺ュ彛 - * - * @author ruoyi - * @date 2024-04-16 - */ -public interface IHeTaskSingleService { - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 瀹f暀鍗曚竴浠诲姟 - */ - public HeTaskSingle selectHeTaskSingleById(Long id); - - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟鍒楄〃 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 瀹f暀鍗曚竴浠诲姟闆嗗悎 - */ - public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle); - - /** - * 鏂板瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - public int insertHeTaskSingle(HeTaskSingle heTaskSingle); - - public Integer addOrUpdateHeTaskSinle(HeTaskSingleVO heTaskSingleVO); - - /** - * 淇敼瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - public int updateHeTaskSingle(HeTaskSingle heTaskSingle); - - /** - * 鎵归噺鍒犻櫎瀹f暀鍗曚竴浠诲姟 - * - * @param ids 闇�瑕佸垹闄ょ殑瀹f暀鍗曚竴浠诲姟涓婚敭闆嗗悎 - * @return 缁撴灉 - */ - public int deleteHeTaskSingleByIds(Long[] ids); - - /** - * 鍒犻櫎瀹f暀鍗曚竴浠诲姟淇℃伅 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 缁撴灉 - */ - public int deleteHeTaskSingleById(Long id); - - public HeTaskSingleVO queryHeTaskByCondition(HeTaskSingle heTaskSingle); -} diff --git a/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java deleted file mode 100644 index efddf63..0000000 --- a/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java +++ /dev/null @@ -1,335 +0,0 @@ -package com.smartor.service.impl; - -import com.google.gson.Gson; -import com.ruoyi.common.exception.base.BaseException; -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.PatTaskRelevanceMapper; -import com.smartor.service.IHeTaskService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * 瀹f暀浠诲姟Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-01-07 - */ -@Slf4j -@Service -public class HeTaskServiceImpl implements IHeTaskService { - @Autowired - private HeTaskMapper heTaskMapper; - - @Autowired - private PatArchiveMapper patArchiveMapper; - - @Autowired - private PatArchiveServiceImpl patArchiveService; - - @Autowired - private HeLibraryServiceImpl heLibraryService; - - @Autowired - private PatTaskRelevanceMapper PatTaskRelevanceMapper; - - @Autowired - private SendService sendService; - - /** - * 鏌ヨ瀹f暀浠诲姟 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 瀹f暀浠诲姟 - */ - @Override - public HeTaskVO selectHeTaskById(Long id) { -// HeTask heTask = heTaskMapper.selectHeTaskById(id); -// HeTaskVO heTaskVO = DtoConversionUtils.sourceToTarget(heTask, HeTaskVO.class); -// -// //鑾峰彇鎮h�呬俊鎭� -// 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); -// } -// -// //鑾峰彇瀹f暀妯℃澘淇℃伅 -// if (heTask.getPreachcategoryid() != null) { -// HeLibrary heLibrary = new HeLibrary(); -// heLibrary.setId(heTask.getPreachcategoryid()); -// HeLibraryVO heLibraryVO = heLibraryService.selectInfoByCondition(heLibrary); -// heTaskVO.setHeLibraryVOs(heLibraryVO); -// } - - return null; - } - - /** - * 鏌ヨ瀹f暀浠诲姟鍒楄〃 - * - * @param patTaskRelevanceVO 瀹f暀浠诲姟 - * @return 瀹f暀浠诲姟 - */ - @Override - public List<PatTaskRelevanceVO> selectHeTaskList(PatTaskRelevanceVO patTaskRelevanceVO) { - PatTaskRelevance patTaskRelevance = new PatTaskRelevance(); - List<PatTaskRelevance> patTaskRelevances = PatTaskRelevanceMapper.selectPatTaskRelevanceList(patTaskRelevance); - List<PatTaskRelevanceVO> PatTaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patTaskRelevances, PatTaskRelevanceVO.class); - for (PatTaskRelevanceVO patTaskRelevanceVO1 : PatTaskRelevanceVOS) { - HeTask heTask1 = heTaskMapper.selectHeTaskById(patTaskRelevanceVO1.getTaskId()); - patTaskRelevanceVO1.setHeTask(heTask1); - } - return PatTaskRelevanceVOS; - } - - /** - * 鏂板瀹f暀浠诲姟 - * - * @param heTaskVO 瀹f暀浠诲姟 - * @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 (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { -// //寮�濮嬪彂閫� -// SendMagParam sendMagParam = new SendMagParam(); -// sendMagParam.setType(sendtype); -// sendMagParam.setPhone(PatTaskRelevance.getPhone()); -// //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓 -// sendMagParam.setTmpCode("SMS_461860582"); -// sendMagParam.setContent("Test鍙戦�佹暟鎹�"); -// Boolean success = sendService.sendMsg(sendMagParam); -// if (success) { -// integer = integer + 1; -// } -// -// //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬� -// if (heTaskVO.getPatTaskRelevances().size() == integer) { -// //濡傛灉鍙戦�佹垚鍔� -// heTaskVO.setSendState(1L); -// } -// } -// //灏嗕换鍔′俊鎭柊澧炲埌瀹f暀浠诲姟琛ㄤ腑 -// HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class); -// heTask.setCreateTime(DateUtils.getNowDate()); -// heTaskMapper.insertHeTask(heTask); -// -// //灏嗕换鍔′笌鎮h�呭叧鑱� -// Integer i = null; -// if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) { -// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { -// PatTaskRelevance.setHeTaskId(heTask.getId()); -// i = PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance); -// } -// -// } -// -// } else if (heTaskVO.getIsSend() == 1) { -// //瀹氭椂鍙戦��(寮傛) -// Timer timer = new Timer(); -// timer.schedule(new TimerTask() { -// @Override -// public void run() { -// Integer integer = 0; -// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { -// String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue()); -// SendMagParam sendMagParam = new SendMagParam(); -// sendMagParam.setType(sendtype); -// sendMagParam.setPhone(PatTaskRelevance.getPhone()); -// //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓 -// sendMagParam.setTmpCode("SMS_461860582"); -// sendMagParam.setContent("Test鍙戦�佹暟鎹�"); -// Boolean success = sendService.sendMsg(sendMagParam); -// if (success) { -// integer = integer + 1; -// } -// } -// //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬� -// if (heTaskVO.getPatTaskRelevances().size() == integer) { -// //濡傛灉鍙戦�佹垚鍔� -// heTaskVO.setSendState(1L); -// } -// HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class); -// heTask.setCreateTime(DateUtils.getNowDate()); -// heTaskMapper.insertHeTask(heTask); -// -// if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) { -// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { -// PatTaskRelevance.setHeTaskId(heTask.getId()); -// PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance); -// } -// -// } -// } -// }, heTaskVO.getSendTime()); -// -// } -// return 1; -// } - - /** - * 鏂板瀹f暀浠诲姟 - * - * @param heTaskVO 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - @Transactional(rollbackFor = Exception.class) - @Override - public int insertOrUpdateHeTask(HeTaskVO heTaskVO) { - if (ObjectUtils.isEmpty(heTaskVO)) { - log.info("瀹f暀浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�"); - throw new BaseException("瀹f暀浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�"); - } - Integer integer = 0; - if (heTaskVO.getIsoperation() != null && heTaskVO.getIsoperation() == 1) { - - //灏嗕换鍔′俊鎭柊澧炲埌瀹f暀浠诲姟琛ㄤ腑 - HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class); - - heTask.setCreateTime(DateUtils.getNowDate()); - heTask.setPreachform(new Gson().toJson(heTaskVO.getPreachform())); - heTask.setTextParam(new Gson().toJson(heTaskVO.getTextParam())); - heTaskMapper.insertHeTask(heTask); - integer = heTask.getId().intValue(); - //鏂板 - if (CollectionUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) { - for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { - PatTaskRelevance.setTaskId(heTask.getId()); - PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance); - } - } - - } else if (heTaskVO.getIsoperation() != null && heTaskVO.getIsoperation() == 2) { - HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class); - heTask.setUpdateTime(DateUtils.getNowDate()); - heTaskMapper.updateHeTask(heTask); - //鏂板銆佸垹闄ゃ�佷慨鏀规偅鑰呬俊鎭� - for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { - if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 1) { - PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance); - } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 2) { - PatTaskRelevance.setTaskId(heTask.getId()); - PatTaskRelevanceMapper.updatePatTaskRelevance(PatTaskRelevance); - } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) { - PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId()); - } - } - integer = heTask.getId().intValue(); - } else if (heTaskVO.getIsoperation() != null && heTaskVO.getIsoperation() == 3) { - heTaskMapper.deleteHeTaskById(heTaskVO.getId()); - - //鍒犻櫎鎮h�呬俊鎭� - for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) { - if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) { - PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId()); - } - } - integer = heTaskVO.getId().intValue(); - } - return integer; - } - - - /** - * 淇敼瀹f暀浠诲姟 - * - * @param heTask 瀹f暀浠诲姟 - * @return 缁撴灉 - */ - @Override - public int updateHeTask(HeTask heTask) { - heTask.setUpdateTime(DateUtils.getNowDate()); - return heTaskMapper.updateHeTask(heTask); - } - - /** - * 鎵归噺鍒犻櫎瀹f暀浠诲姟 - * - * @param ids 闇�瑕佸垹闄ょ殑瀹f暀浠诲姟涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteHeTaskByIds(Long[] ids) { - Integer i = null; - for (Long id : ids) { - i = heTaskMapper.deleteHeTaskById(id); - } - return i; - } - - /** - * 鍒犻櫎瀹f暀浠诲姟淇℃伅 - * - * @param id 瀹f暀浠诲姟涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteHeTaskById(Long id) { - return heTaskMapper.deleteHeTaskById(id); - } - - /** - * 鑾峰彇鎮h�呬俊鎭� - * - * @param patArchiveReq - * @return - */ - @Override - public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) { - List<PatTaskRelevance> PatTaskRelevances = 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) { - PatTaskRelevance patTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class); - patTaskRelevance.setCreateTime(patArchive.getCreateTime()); - patTaskRelevance.setCreateBy(patArchive.getCreateBy()); - patTaskRelevance.setDeptName(patArchive.getDept()); - PatTaskRelevances.add(patTaskRelevance); - } - - return PatTaskRelevances; - } - -} diff --git a/smartor/src/main/java/com/smartor/service/impl/HeTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeTaskSingleServiceImpl.java deleted file mode 100644 index b50cf76..0000000 --- a/smartor/src/main/java/com/smartor/service/impl/HeTaskSingleServiceImpl.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.smartor.service.impl; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.ruoyi.common.exception.base.BaseException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DtoConversionUtils; -import com.smartor.domain.*; -import com.smartor.mapper.HeTaskMapper; -import com.smartor.mapper.HeTaskSingleMapper; -import com.smartor.service.IHeTaskSingleService; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.fasterxml.jackson.core.type.TypeReference; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 瀹f暀鍗曚竴浠诲姟Service涓氬姟灞傚鐞� - * - * @author ruoyi - * @date 2024-04-16 - */ -@Slf4j -@Service -public class HeTaskSingleServiceImpl implements IHeTaskSingleService { - @Autowired - private HeTaskSingleMapper heTaskSingleMapper; - - @Autowired - private HeTaskMapper heTaskMapper; - - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 瀹f暀鍗曚竴浠诲姟 - */ - @Override - public HeTaskSingle selectHeTaskSingleById(Long id) { - return heTaskSingleMapper.selectHeTaskSingleById(id); - } - - /** - * 鏌ヨ瀹f暀鍗曚竴浠诲姟鍒楄〃 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 瀹f暀鍗曚竴浠诲姟 - */ - @Override - public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle) { - return heTaskSingleMapper.selectHeTaskSingleList(heTaskSingle); - } - - /** - * 鏂板瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - @Override - public int insertHeTaskSingle(HeTaskSingle heTaskSingle) { - HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskSingle, HeTask.class); - int heTaskId = heTaskMapper.insertHeTask(heTask); - heTaskSingle.setSvrtaskid(Long.valueOf(heTaskId)); - heTaskSingle.setCreateTime(DateUtils.getNowDate()); - return heTaskSingleMapper.insertHeTaskSingle(heTaskSingle); - } - - /** - * 鏂板鎴栦慨鏀瑰鏁欏崟涓�浠诲姟 - * - * @param heTaskSingleVO - * @return - */ - @Transactional(rollbackFor = Exception.class) - @Override - public Integer addOrUpdateHeTaskSinle(HeTaskSingleVO heTaskSingleVO) { - if (ObjectUtils.isEmpty(heTaskSingleVO)) { - log.info("瀹f暀浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�"); - throw new BaseException("瀹f暀浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�"); - } - Integer integer = null; - HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskSingleVO, HeTask.class); - if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 1) { - //寰�浠诲姟琛ㄤ腑锛屾柊澧炰换鍔� - Integer taskId = heTaskMapper.insertHeTask(heTask); - heTaskSingleVO.setSvrtaskid(taskId.longValue()); - //鏂板 - if (CollectionUtils.isNotEmpty(heTaskSingleVO.getPatTaskRelevances())) { - for (PatTaskRelevance patTaskRelevance : heTaskSingleVO.getPatTaskRelevances()) { - //灏嗕换鍔′俊鎭柊澧炲埌瀹f暀浠诲姟琛ㄤ腑 - HeTaskSingle heTaskSingle = getHeTaskSingle(heTaskSingleVO, patTaskRelevance); - integer = heTaskSingleMapper.insertHeTaskSingle(heTaskSingle); - } - } - } else if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 2) { - //浠诲姟淇敼 - heTaskMapper.updateHeTask(heTask); - - if (CollectionUtils.isNotEmpty(heTaskSingleVO.getPatTaskRelevances())) { - for (PatTaskRelevance patTaskRelevance : heTaskSingleVO.getPatTaskRelevances()) { - HeTaskSingle heTaskSingle = getHeTaskSingle(heTaskSingleVO, patTaskRelevance); - heTaskSingle.setTextParam(new Gson().toJson(heTaskSingleVO.getTextParam())); - if (patTaskRelevance.getIsoperation() == 2) heTaskSingleMapper.updateHeTaskSingle(heTaskSingle); - if (patTaskRelevance.getIsoperation() == 1) heTaskSingleMapper.insertHeTaskSingle(heTaskSingle); - integer = heTaskSingle.getId().intValue(); - } - } - } else if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 3) { - heTaskSingleMapper.deleteHeTaskSingleById(heTaskSingleVO.getId()); - - integer = heTaskSingleVO.getId().intValue(); - } - return integer; - } - - /** - * 淇敼瀹f暀鍗曚竴浠诲姟 - * - * @param heTaskSingle 瀹f暀鍗曚竴浠诲姟 - * @return 缁撴灉 - */ - @Override - public int updateHeTaskSingle(HeTaskSingle heTaskSingle) { - heTaskSingle.setUpdateTime(DateUtils.getNowDate()); - return heTaskSingleMapper.updateHeTaskSingle(heTaskSingle); - } - - /** - * 鎵归噺鍒犻櫎瀹f暀鍗曚竴浠诲姟 - * - * @param ids 闇�瑕佸垹闄ょ殑瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteHeTaskSingleByIds(Long[] ids) { - return heTaskSingleMapper.deleteHeTaskSingleByIds(ids); - } - - /** - * 鍒犻櫎瀹f暀鍗曚竴浠诲姟淇℃伅 - * - * @param id 瀹f暀鍗曚竴浠诲姟涓婚敭 - * @return 缁撴灉 - */ - @Override - public int deleteHeTaskSingleById(Long id) { - return heTaskSingleMapper.deleteHeTaskSingleById(id); - } - - @Override - public HeTaskSingleVO queryHeTaskByCondition(HeTaskSingle heTaskSingle) { - //瀹氫箟鎮h�呬笌鍗曚竴浠诲姟鍏宠仈琛ㄩ泦鍚� - List<PatTaskRelevance> patTaskRelevances = new ArrayList<>(); - List<HeTaskSingle> heTaskSingles = selectHeTaskSingleList(heTaskSingle); - //灏嗘煡鍑烘潵鐨勬暟鎹�掑叆IvrTaskcallVO涓� - HeTaskSingleVO heTaskSingleVO = DtoConversionUtils.sourceToTarget(heTaskSingles.get(0), HeTaskSingleVO.class); - String sendTimeSlot = heTaskSingles.get(0).getSendTimeSlot(); - ObjectMapper objectMapper = new ObjectMapper(); - try { - //鑾峰彇鍒板彂閫佹椂闂寸殑闆嗗悎 - if (StringUtils.isNotEmpty(sendTimeSlot)) { - List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, new TypeReference<List<TaskSendTimeVO>>() {}); - heTaskSingleVO.setSendTimeslot(taskSendTimeVOList); - } - //鏂囨湰鍙橀噺鍙傛暟 - if (com.ruoyi.common.utils.StringUtils.isNotEmpty(heTaskSingles.get(0).getTextParam())) { - Map<String, Map<String, String>> textParam = objectMapper.readValue(heTaskSingles.get(0).getTextParam(), Map.class); - heTaskSingleVO.setTextParam(textParam); - } - } catch (JsonProcessingException e) { - e.printStackTrace(); - } - - for (HeTaskSingle heTaskSingle1 : heTaskSingles) { - PatTaskRelevance patTaskRelevance = new PatTaskRelevance(); - if (!heTaskSingle1.getClassification().equals("2")) { - //鑾峰彇鍒版偅鑰呬俊鎭紝骞舵斁鍏ュ埌闆嗗悎涓� - log.info("瀹f暀鍒嗙被涓猴細{}", heTaskSingle1.getClassification()); - patTaskRelevance.setName(heTaskSingle1.getSendname()); - patTaskRelevance.setAge(heTaskSingle1.getAge()); - patTaskRelevance.setSfzh(heTaskSingle1.getSfzh()); - patTaskRelevance.setPhone(heTaskSingle1.getPhone()); - patTaskRelevance.setAddr(heTaskSingle1.getAddr()); - patTaskRelevance.setDiagname(heTaskSingle1.getDiagname()); - patTaskRelevances.add(patTaskRelevance); - } else if (heTaskSingle1.getClassification().equals("2")) { - log.info("瀹f暀鍒嗙被涓轰綇闄�", heTaskSingle1.getClassification()); - patTaskRelevance.setName(heTaskSingle1.getSendname()); - patTaskRelevance.setAge(heTaskSingle1.getAge()); - patTaskRelevance.setSfzh(heTaskSingle1.getSfzh()); - patTaskRelevance.setPhone(heTaskSingle1.getPhone()); - patTaskRelevance.setAddr(heTaskSingle1.getAddr()); - patTaskRelevance.setDeptName(heTaskSingle1.getDeptname()); - patTaskRelevance.setBedNo(heTaskSingle1.getBedNo()); - patTaskRelevance.setDiagname(heTaskSingle1.getDiagname()); - patTaskRelevances.add(patTaskRelevance); - } - } - - heTaskSingleVO.setPatTaskRelevances(patTaskRelevances); - return heTaskSingleVO; - } - - - private HeTaskSingle getHeTaskSingle(HeTaskSingleVO heTaskSingleVO, PatTaskRelevance patTaskRelevance) { - - HeTaskSingle heTaskSingle = DtoConversionUtils.sourceToTarget(heTaskSingleVO, HeTaskSingle.class); - heTaskSingle.setSendname(patTaskRelevance.getName()); - heTaskSingle.setAge(patTaskRelevance.getAge()); - heTaskSingle.setSfzh(patTaskRelevance.getSfzh()); - heTaskSingle.setPhone(patTaskRelevance.getPhone()); - heTaskSingle.setAddr(patTaskRelevance.getAddr()); - heTaskSingle.setCreateTime(DateUtils.getNowDate()); - if (CollectionUtils.isNotEmpty(heTaskSingleVO.getSendTimeslot())) { - heTaskSingle.setSendTimeSlot(heTaskSingleVO.getSendTimeslot().toString()); - } - return heTaskSingle; - } - -} diff --git a/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml deleted file mode 100644 index 66e2962..0000000 --- a/smartor/src/main/resources/mapper/smartor/HeTaskMapper.xml +++ /dev/null @@ -1,242 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper - PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.smartor.mapper.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"/> - <result property="richText" column="rich_text"/> - <result property="textParam" column="text_param"/> - </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, - rich_text, - text_param - 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> - <if test="richText != null ">and rich_text = #{richText}</if> - <if test="textParam != null ">and text_param = #{textParam}</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> - <if test="richText != null ">rich_text,</if> - <if test="textParam != null ">text_param</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> - <if test="richText != null ">#{richText},</if> - <if test="textParam != null ">#{textParam},</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> - <if test="richText != null ">rich_text = #{richText},</if> - <if test="textParam != null ">text_param = #{textParam},</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/HeTaskSingleMapper.xml b/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml deleted file mode 100644 index 2839d27..0000000 --- a/smartor/src/main/resources/mapper/smartor/HeTaskSingleMapper.xml +++ /dev/null @@ -1,378 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE mapper - PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.smartor.mapper.HeTaskSingleMapper"> - - <resultMap type="com.smartor.domain.HeTaskSingle" id="HeTaskSingleResult"> - <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"/> - <result property="richText" column="rich_text"/> - <result property="textParam" column="text_param"/> - <result property="sendname" column="sendname"/> - <result property="phone" column="phone"/> - <result property="sex" column="sex"/> - <result property="age" column="age"/> - <result property="sfzh" column="sfzh"/> - <result property="addr" column="addr"/> - <result property="senderdetail" column="senderdetail"/> - <result property="wechat" column="wechat"/> - <result property="diagname" column="diagname"/> - <result property="deptname" column="deptname"/> - <result property="admindate" column="admindate"/> - <result property="roomno" column="roomno"/> - <result property="bedNo" column="bedno"/> - <result property="type" column="type"/> - <result property="sendType" column="send_type"/> - <result property="sendTimeSlot" column="send_time_slot"/> - <result property="senddate" column="senddate"/> - <result property="sendlimitabegin" column="sendlimitabegin"/> - <result property="sendlimitaend" column="sendlimitaend"/> - <result property="sendlimitpbegin" column="sendlimitpbegin"/> - <result property="sendlimitpend" column="sendlimitpend"/> - <result property="sendlimitnbegin" column="sendlimitnbegin"/> - <result property="sendlimitnend" column="sendlimitnend"/> - </resultMap> - - <sql id="selectHeTaskSingleVo"> - 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, - rich_text, - text_param, - sendname, - phone, - sex, - age, - sfzh, - addr, - senderdetail, - wechat, - diagname, - deptname, - admindate, - roomno, - bedno, - send_type, - type, - senddate, - sendlimitabegin, - sendlimitaend, - sendlimitpbegin, - sendlimitpend, - sendlimitnbegin, - sendlimitnend, - send_time_slot - from he_task_single - </sql> - - <select id="selectHeTaskSingleList" parameterType="com.smartor.domain.HeTaskSingle" resultMap="HeTaskSingleResult"> - <include refid="selectHeTaskSingleVo"/> - <where> - <if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if> - <if test="patientid != null and patientid != ''">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 != ''">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 sendState != ''">and send_state = #{sendState}</if> - <if test="richText != null and richText != ''">and rich_text = #{richText}</if> - <if test="textParam != null and textParam != ''">and text_param = #{textParam}</if> - <if test="sendname != null and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if> - <if test="phone != null and phone != ''">and phone = #{phone}</if> - <if test="sex != null and sex != ''">and sex = #{sex}</if> - <if test="age != null ">and age = #{age}</if> - <if test="sfzh != null and sfzh != ''">and sfzh = #{sfzh}</if> - <if test="addr != null and addr != ''">and addr = #{addr}</if> - <if test="senderdetail != null and senderdetail != ''">and senderdetail = #{senderdetail}</if> - <if test="wechat != null and wechat != ''">and wechat = #{wechat}</if> - <if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if> - <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if> - <if test="admindate != null ">and admindate = #{admindate}</if> - <if test="roomno != null and roomno != ''">and roomno = #{roomno}</if> - <if test="bedno != null and bedno != ''">and bedno = #{bedno}</if> - <if test="sendType != null and sendType != ''">and send_type = #{sendType}</if> - <if test="sendTimeSlot != null and sendTimeSlot != ''">and send_time_slot = #{sendTimeSlot}</if> - <if test="type != null and type != ''">and type = #{type}</if> - <if test="senddate != null ">and senddate = #{senddate}</if> - <if test="sendlimitabegin != null and sendlimitabegin != ''">and sendlimitabegin = #{sendlimitabegin}</if> - <if test="sendlimitaend != null and sendlimitaend != ''">and sendlimitaend = #{sendlimitaend}</if> - <if test="sendlimitpbegin != null and sendlimitpbegin != ''">and sendlimitpbegin = #{sendlimitpbegin}</if> - <if test="sendlimitpend != null and sendlimitpend != ''">and sendlimitpend = #{sendlimitpend}</if> - <if test="sendlimitnbegin != null and sendlimitnbegin != ''">and sendlimitnbegin = #{sendlimitnbegin}</if> - <if test="sendlimitnend != null and sendlimitnend != ''">and sendlimitnend = #{sendlimitnend}</if> - </where> - </select> - - <select id="selectHeTaskSingleById" parameterType="Long" resultMap="HeTaskSingleResult"> - <include refid="selectHeTaskSingleVo"/> - where id = #{id} - </select> - - <insert id="insertHeTaskSingle" parameterType="com.smartor.domain.HeTaskSingle" useGeneratedKeys="true" - keyProperty="id"> - insert into he_task_single - <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> - <if test="richText != null">rich_text,</if> - <if test="textParam != null">text_param,</if> - <if test="sendname != null">sendname,</if> - <if test="phone != null">phone,</if> - <if test="sex != null">sex,</if> - <if test="age != null">age,</if> - <if test="sfzh != null">sfzh,</if> - <if test="addr != null">addr,</if> - <if test="senderdetail != null">senderdetail,</if> - <if test="wechat != null">wechat,</if> - <if test="diagname != null">diagname,</if> - <if test="deptname != null">deptname,</if> - <if test="admindate != null">admindate,</if> - <if test="roomno != null">roomno,</if> - <if test="bedno != null">bedno,</if> - <if test="sendType != null">send_type,</if> - <if test="sendTimeSlot != null">send_time_slot,</if> - <if test="type != null">type,</if> - <if test="senddate != null">senddate,</if> - <if test="sendlimitabegin != null">sendlimitabegin,</if> - <if test="sendlimitaend != null">sendlimitaend,</if> - <if test="sendlimitpbegin != null">sendlimitpbegin,</if> - <if test="sendlimitpend != null">sendlimitpend,</if> - <if test="sendlimitnbegin != null">sendlimitnbegin,</if> - <if test="sendlimitnend != null">sendlimitnend,</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> - <if test="richText != null">#{richText},</if> - <if test="textParam != null">#{textParam},</if> - <if test="sendname != null">#{sendname},</if> - <if test="phone != null">#{phone},</if> - <if test="sex != null">#{sex},</if> - <if test="age != null">#{age},</if> - <if test="sfzh != null">#{sfzh},</if> - <if test="addr != null">#{addr},</if> - <if test="senderdetail != null">#{senderdetail},</if> - <if test="wechat != null">#{wechat},</if> - <if test="diagname != null">#{diagname},</if> - <if test="deptname != null">#{deptname},</if> - <if test="admindate != null">#{admindate},</if> - <if test="roomno != null">#{roomno},</if> - <if test="bedno != null">#{bedno},</if> - <if test="sendType != null">#{sendType},</if> - <if test="sendTimeSlot != null">#{sendTimeSlot},</if> - <if test="type != null">#{type},</if> - <if test="senddate != null">#{senddate},</if> - <if test="sendlimitabegin != null">#{sendlimitabegin},</if> - <if test="sendlimitaend != null">#{sendlimitaend},</if> - <if test="sendlimitpbegin != null">#{sendlimitpbegin},</if> - <if test="sendlimitpend != null">#{sendlimitpend},</if> - <if test="sendlimitnbegin != null">#{sendlimitnbegin},</if> - <if test="sendlimitnend != null">#{sendlimitnend},</if> - </trim> - </insert> - - <update id="updateHeTaskSingle" parameterType="com.smartor.domain.HeTaskSingle"> - update he_task_single - <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> - <if test="richText != null">rich_text = #{richText},</if> - <if test="textParam != null">text_param = #{textParam},</if> - <if test="sendname != null">sendname = #{sendname},</if> - <if test="phone != null">phone = #{phone},</if> - <if test="sex != null">sex = #{sex},</if> - <if test="age != null">age = #{age},</if> - <if test="sfzh != null">sfzh = #{sfzh},</if> - <if test="addr != null">addr = #{addr},</if> - <if test="senderdetail != null">senderdetail = #{senderdetail},</if> - <if test="wechat != null">wechat = #{wechat},</if> - <if test="diagname != null">diagname = #{diagname},</if> - <if test="deptname != null">deptname = #{deptname},</if> - <if test="admindate != null">admindate = #{admindate},</if> - <if test="roomno != null">roomno = #{roomno},</if> - <if test="bedno != null">bedno = #{bedno},</if> - <if test="sendType != null">send_type = #{sendType},</if> - <if test="sendTimeSlot != null">send_time_slot = #{sendTimeSlot},</if> - <if test="type != null">type = #{type},</if> - <if test="senddate != null">senddate = #{senddate},</if> - <if test="sendlimitabegin != null">sendlimitabegin = #{sendlimitabegin},</if> - <if test="sendlimitaend != null">sendlimitaend = #{sendlimitaend},</if> - <if test="sendlimitpbegin != null">sendlimitpbegin = #{sendlimitpbegin},</if> - <if test="sendlimitpend != null">sendlimitpend = #{sendlimitpend},</if> - <if test="sendlimitnbegin != null">sendlimitnbegin = #{sendlimitnbegin},</if> - <if test="sendlimitnend != null">sendlimitnend = #{sendlimitnend},</if> - </trim> - where id = #{id} - </update> - - <delete id="deleteHeTaskSingleById" parameterType="Long"> - delete - from he_task_single - where id = #{id} - </delete> - - <delete id="deleteHeTaskSingleByIds" parameterType="String"> - delete from he_task_single where id in - <foreach item="id" collection="array" open="(" separator="," close=")"> - #{id} - </foreach> - </delete> -</mapper> -- Gitblit v1.9.3