From e00ef99886b9ab84f39c81432f8c7640e93026f9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 27 二月 2025 15:54:30 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | 1
smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml | 24 +-
smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml | 326 ++++++++++++++++++-----------------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java | 10
smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java | 3
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 5
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 77 ++++++--
ruoyi-generator/ruoyi-generator.iml | 4
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm | 1
ruoyi-admin/src/main/resources/application-druid.yml | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java | 10
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 4
smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 17 -
14 files changed, 273 insertions(+), 226 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index a50c0e2..289091a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -84,7 +84,6 @@
if (CollectionUtils.isNotEmpty(serviceTaskVOS)) {
for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) {
- if (serviceTask.getAppltype().equals("1") || serviceTask.getAppltype().equals("2")) {
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime());
@@ -98,19 +97,7 @@
ServiceTaskVO.setYfs(yfs);
ServiceTaskVO.setWfs(wfs);
}
- } else if (serviceTask.getAppltype().equals("3") || serviceTask.getAppltype().equals("4")) {
- ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
- serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid());
- List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO);
- if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) {
- //宸插彂閫�
- long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
- //鏈彂閫�
- long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
- ServiceTaskVO.setYfs(yfs);
- ServiceTaskVO.setWfs(wfs);
- }
- }
+
}
//鑾峰彇total
long total = PageUtils.count(new ISelect() {
@@ -118,7 +105,7 @@
public void doSelect() {
serviceTask.setPageNum(null);
serviceTask.setPageSize(null);
- serviceTaskService.selectServiceTaskList(serviceTask);
+ serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask);
}
});
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
index 189d684..6907b56 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskdiagController.java
@@ -42,8 +42,8 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceTaskdiag serviceTaskdiag)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ServiceTaskdiag serviceTaskdiag)
{
startPage();
List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
@@ -105,9 +105,9 @@
@ApiOperation("鍒犻櫎妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskdiag:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id)
{
- return toAjax(serviceTaskdiagService.deleteServiceTaskdiagByIds(ids));
+ return toAjax(serviceTaskdiagService.deleteServiceTaskdiagById(id));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
index 95bfa2e..7f719d3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
@@ -42,8 +42,8 @@
*/
@ApiOperation("鏌ヨ妯℃澘绉戝鍏宠仈鍒楄〃")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:list')")
- @GetMapping("/list")
- public TableDataInfo list(ServiceTaskoper serviceTaskoper)
+ @PostMapping("/list")
+ public TableDataInfo list(@RequestBody ServiceTaskoper serviceTaskoper)
{
startPage();
List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
@@ -105,9 +105,9 @@
@ApiOperation("鍒犻櫎妯℃澘绉戝鍏宠仈")
//@PreAuthorize("@ss.hasPermi('smartor:taskoper:remove')")
@Log(title = "妯℃澘绉戝鍏宠仈", businessType = BusinessType.DELETE)
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
+ @GetMapping("/remove/{id}")
+ public AjaxResult remove(@PathVariable Long id)
{
- return toAjax(serviceTaskoperService.deleteServiceTaskoperByIds(ids));
+ return toAjax(serviceTaskoperService.deleteServiceTaskoperById(id));
}
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index ebc02bd..02b7b84 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,15 +13,15 @@
# 鍏徃
# url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
-# url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: smartor
-# password: Smartor.2023
-# driverClassName: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: smartor
+ # password: Smartor.2023
+ # driverClassName: com.mysql.cj.jdbc.Driver
# 鏂板崕
-# url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: smartor
-# password: Smartor.2023
-# driverClassName: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: smartor
+ # password: Smartor.2023
+ # driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃浜�
url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
diff --git a/ruoyi-generator/ruoyi-generator.iml b/ruoyi-generator/ruoyi-generator.iml
index 860c64d..a185935 100644
--- a/ruoyi-generator/ruoyi-generator.iml
+++ b/ruoyi-generator/ruoyi-generator.iml
@@ -98,6 +98,7 @@
<orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
@@ -154,10 +155,9 @@
<orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" />
</component>
-</module>
\ No newline at end of file
+</module>
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 85d3433..753fd68 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -45,9 +45,9 @@
*/
@ApiOperation("鏌ヨ${functionName}鍒楄〃")
//@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @GetMapping("/list")
+ @PostMapping("/list")
#if($table.crud || $table.sub)
- public TableDataInfo list(${ClassName} ${className})
+ public TableDataInfo list(@RequestBody ${ClassName} ${className})
{
startPage();
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
index ca7df28..540d0ac 100644
--- a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
+++ b/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -32,6 +32,7 @@
resultMap="${ClassName}Result">
<include refid="select${ClassName}Vo"/>
<where>
+ del_flag=0
#foreach($column in $columns)
#set($queryType=$column.queryType)
#set($javaField=$column.javaField)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index ad7ae73..30d1d81 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -71,6 +71,9 @@
private IPatMedInhospService iPatMedInhospService;
@Autowired
+ private IPatMedOperationService iPatMedOperationService;
+
+ @Autowired
private IServiceSubtaskService iServiceSubtaskService;
@Autowired
@@ -243,7 +246,7 @@
* 澶勭悊鎵嬫湳淇℃伅锛岃繘鍏ュ瓙浠诲姟琛�
*/
public void dealOperationInfo() {
- iPatMedInhospService.dealOutHospInfo();
+ iPatMedOperationService.dealOperationInfo();
}
/**
diff --git a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
index 2b93e58..5a65409 100644
--- a/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
@@ -114,6 +114,9 @@
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
private String LianXiDH;
+ @ApiModelProperty(value = "鑱旂郴浜虹數璇�")
+ private String LianXiRDH;
+
@ApiModelProperty(value = "鍗曚綅鐢佃瘽")
private String DanWeiDH;
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 81ba025..744839d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -537,6 +537,7 @@
patArchive.setAge(externalInHospPatientInfo.getNianLing());
patArchive.setAgeUnit(externalInHospPatientInfo.getNianLingDW());
patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
+ patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID());
if (ObjectUtils.isNotEmpty(externalInHospPatientLiaisonInfo))
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index fcb5559..6487261 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -399,7 +399,13 @@
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setCreateTime(new Date());
log.error("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
- serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
+ for (String icd10code : Icd10codes) {
+ serviceTaskdiag.setIcd10code(icd10code);
+ serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ }
+ }
} else if (serviceTaskVO.getAppltype().equals("4")) {
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
@@ -407,12 +413,19 @@
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(0L);
- if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L);
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+ String[] opcodes = serviceTaskVO.getOpcode().split(",");
+ for (String opcode : opcodes) {
+ serviceTaskoper.setOpcode(opcode);
+ log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
+ }
+
} else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -546,42 +559,66 @@
if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
throw new BaseException("鐤剧梾缂栫爜涓虹┖");
}
- serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
- List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
+// serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
+
serviceTaskdiag.setLongtask(1L);
serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
serviceTaskdiag.setGuid(serviceTask.getGuid());
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setUpdateTime(new Date());
- log.error("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
- if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
- serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
- serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag);
- } else {
- serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
+ for (String icdcode : icd10codes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ ServiceTaskdiag serviceTaskdiag2 = new ServiceTaskdiag();
+ serviceTaskdiag2.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskdiag2.setIcd10code(icdcode);
+ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag2);
+ serviceTaskdiag.setIcd10code(icdcode);
+ log.error("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
+ if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
+ serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
+ serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag);
+ } else {
+ serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ }
+ }
}
+
} else if (serviceTaskVO.getAppltype().equals("4")) {
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
throw new BaseException("鎵嬫湳缂栫爜涓虹┖");
}
- serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
+// serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(1L);
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
- serviceTaskoper.setId(serviceTaskopers.get(0).getId());
- serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
- } else {
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+ String[] opcodes = serviceTaskVO.getOpcode().split(",");
+ for (String opcode : opcodes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
+ serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
+
+ serviceTaskoper.setOpcode(opcode);
+ log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+ serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+ serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+ } else {
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
+ }
}
+
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
IvrTaskTemplate ivrTaskTemplate = new IvrTaskTemplate();
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 8431015..3970f13 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -248,18 +248,18 @@
service_task.orgid from service_task
<where>
service_task.del_flag=0
- and taskid in (
- select task_id from service_taskdept
- <where>
- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">
- dept_code in
- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
- close=")">
- #{leaveldeptcode}
- </foreach>
- </if>
- </where>
- )
+<!-- and taskid in (-->
+<!-- select task_id from service_taskdept-->
+<!-- <where>-->
+<!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">-->
+<!-- dept_code in-->
+<!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","-->
+<!-- close=")">-->
+<!-- #{leaveldeptcode}-->
+<!-- </foreach>-->
+<!-- </if>-->
+<!-- </where>-->
+<!-- )-->
<if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName},
'%')
</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
index ed790f8..6892c29 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -45,6 +45,7 @@
resultMap="ServiceTaskdiagResult">
<include refid="selectServiceTaskdiagVo"/>
<where>
+ del_flag=0
<if test="taskId != null ">
and task_id = #{taskId}
</if>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
index b1ea588..16c8a2f 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -5,25 +5,39 @@
<mapper namespace="com.smartor.mapper.ServiceTaskoperMapper">
<resultMap type="com.smartor.domain.ServiceTaskoper" id="ServiceTaskoperResult">
- <result property="id" column="id"/>
- <result property="taskId" column="task_id"/>
- <result property="longtask" column="longtask"/>
- <result property="taskName" column="task_name"/>
- <result property="serviceType" column="service_type"/>
- <result property="opid" column="opid"/>
- <result property="opcode" column="opcode"/>
- <result property="opdesc" column="opdesc"/>
- <result property="delFlag" column="del_flag"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="orgid" column="orgid"/>
- <result property="guid" column="guid"/>
- <result property="pguid" column="pguid"/>
- <result property="pid" column="pid"/>
+ <result property="id" column="id"/>
+ <result property="taskId" column="task_id"/>
+ <result property="longtask" column="longtask"/>
+ <result property="taskName" column="task_name"/>
+ <result property="serviceType" column="service_type"/>
+ <result property="opid" column="opid"/>
+ <result property="opcode" column="opcode"/>
+ <result property="opdesc" column="opdesc"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="orgid" column="orgid"/>
+ <result property="guid" column="guid"/>
+ <result property="pguid" column="pguid"/>
+ <result property="pid" column="pid"/>
</resultMap>
<sql id="selectServiceTaskoperVo">
- select id, task_id, longtask, task_name, service_type, opid, opcode, opdesc, del_flag, create_time, update_time, orgid, guid, pguid, pid
+ select id,
+ task_id,
+ longtask,
+ task_name,
+ service_type,
+ opid,
+ opcode,
+ opdesc,
+ del_flag,
+ create_time,
+ update_time,
+ orgid,
+ guid,
+ pguid,
+ pid
from service_taskoper
</sql>
@@ -31,171 +45,173 @@
resultMap="ServiceTaskoperResult">
<include refid="selectServiceTaskoperVo"/>
<where>
- <if test="taskId != null ">
- and task_id = #{taskId}
- </if>
- <if test="longtask != null ">
- and longtask = #{longtask}
- </if>
- <if test="taskName != null and taskName != ''">
- and task_name like concat('%', #{taskName}, '%')
- </if>
- <if test="serviceType != null and serviceType != ''">
- and service_type = #{serviceType}
- </if>
- <if test="opid != null ">
- and opid = #{opid}
- </if>
- <if test="opcode != null and opcode != ''">
- and opcode = #{opcode}
- </if>
- <if test="opdesc != null and opdesc != ''">
- and opdesc = #{opdesc}
- </if>
- <if test="orgid != null and orgid != ''">
- and orgid = #{orgid}
- </if>
- <if test="guid != null and guid != ''">
- and guid = #{guid}
- </if>
- <if test="pguid != null and pguid != ''">
- and pguid = #{pguid}
- </if>
- <if test="pid != null ">
- and pid = #{pid}
- </if>
+ del_flag=0
+ <if test="taskId != null ">
+ and task_id = #{taskId}
+ </if>
+ <if test="longtask != null ">
+ and longtask = #{longtask}
+ </if>
+ <if test="taskName != null and taskName != ''">
+ and task_name like concat('%', #{taskName}, '%')
+ </if>
+ <if test="serviceType != null and serviceType != ''">
+ and service_type = #{serviceType}
+ </if>
+ <if test="opid != null ">
+ and opid = #{opid}
+ </if>
+ <if test="opcode != null and opcode != ''">
+ and opcode = #{opcode}
+ </if>
+ <if test="opdesc != null and opdesc != ''">
+ and opdesc = #{opdesc}
+ </if>
+ <if test="orgid != null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
+ <if test="guid != null and guid != ''">
+ and guid = #{guid}
+ </if>
+ <if test="pguid != null and pguid != ''">
+ and pguid = #{pguid}
+ </if>
+ <if test="pid != null ">
+ and pid = #{pid}
+ </if>
</where>
</select>
<select id="selectServiceTaskoperById" parameterType="Long"
resultMap="ServiceTaskoperResult">
- <include refid="selectServiceTaskoperVo"/>
- where id = #{id}
+ <include refid="selectServiceTaskoperVo"/>
+ where id = #{id}
</select>
- <insert id="insertServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper" useGeneratedKeys="true"
+ keyProperty="id">
insert into service_taskoper
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="taskId != null">task_id,
- </if>
- <if test="longtask != null">longtask,
- </if>
- <if test="taskName != null">task_name,
- </if>
- <if test="serviceType != null">service_type,
- </if>
- <if test="opid != null">opid,
- </if>
- <if test="opcode != null">opcode,
- </if>
- <if test="opdesc != null">opdesc,
- </if>
- <if test="delFlag != null">del_flag,
- </if>
- <if test="createTime != null">create_time,
- </if>
- <if test="updateTime != null">update_time,
- </if>
- <if test="orgid != null">orgid,
- </if>
- <if test="guid != null">guid,
- </if>
- <if test="pguid != null">pguid,
- </if>
- <if test="pid != null">pid,
- </if>
+ <if test="taskId != null">task_id,
+ </if>
+ <if test="longtask != null">longtask,
+ </if>
+ <if test="taskName != null">task_name,
+ </if>
+ <if test="serviceType != null">service_type,
+ </if>
+ <if test="opid != null">opid,
+ </if>
+ <if test="opcode != null">opcode,
+ </if>
+ <if test="opdesc != null">opdesc,
+ </if>
+ <if test="delFlag != null">del_flag,
+ </if>
+ <if test="createTime != null">create_time,
+ </if>
+ <if test="updateTime != null">update_time,
+ </if>
+ <if test="orgid != null">orgid,
+ </if>
+ <if test="guid != null">guid,
+ </if>
+ <if test="pguid != null">pguid,
+ </if>
+ <if test="pid != null">pid,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="taskId != null">#{taskId},
- </if>
- <if test="longtask != null">#{longtask},
- </if>
- <if test="taskName != null">#{taskName},
- </if>
- <if test="serviceType != null">#{serviceType},
- </if>
- <if test="opid != null">#{opid},
- </if>
- <if test="opcode != null">#{opcode},
- </if>
- <if test="opdesc != null">#{opdesc},
- </if>
- <if test="delFlag != null">#{delFlag},
- </if>
- <if test="createTime != null">#{createTime},
- </if>
- <if test="updateTime != null">#{updateTime},
- </if>
- <if test="orgid != null">#{orgid},
- </if>
- <if test="guid != null">#{guid},
- </if>
- <if test="pguid != null">#{pguid},
- </if>
- <if test="pid != null">#{pid},
- </if>
+ <if test="taskId != null">#{taskId},
+ </if>
+ <if test="longtask != null">#{longtask},
+ </if>
+ <if test="taskName != null">#{taskName},
+ </if>
+ <if test="serviceType != null">#{serviceType},
+ </if>
+ <if test="opid != null">#{opid},
+ </if>
+ <if test="opcode != null">#{opcode},
+ </if>
+ <if test="opdesc != null">#{opdesc},
+ </if>
+ <if test="delFlag != null">#{delFlag},
+ </if>
+ <if test="createTime != null">#{createTime},
+ </if>
+ <if test="updateTime != null">#{updateTime},
+ </if>
+ <if test="orgid != null">#{orgid},
+ </if>
+ <if test="guid != null">#{guid},
+ </if>
+ <if test="pguid != null">#{pguid},
+ </if>
+ <if test="pid != null">#{pid},
+ </if>
</trim>
</insert>
<update id="updateServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper">
update service_taskoper
<trim prefix="SET" suffixOverrides=",">
- <if test="taskId != null">task_id =
- #{taskId},
- </if>
- <if test="longtask != null">longtask =
- #{longtask},
- </if>
- <if test="taskName != null">task_name =
- #{taskName},
- </if>
- <if test="serviceType != null">service_type =
- #{serviceType},
- </if>
- <if test="opid != null">opid =
- #{opid},
- </if>
- <if test="opcode != null">opcode =
- #{opcode},
- </if>
- <if test="opdesc != null">opdesc =
- #{opdesc},
- </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="orgid != null">orgid =
- #{orgid},
- </if>
- <if test="guid != null">guid =
- #{guid},
- </if>
- <if test="pguid != null">pguid =
- #{pguid},
- </if>
- <if test="pid != null">pid =
- #{pid},
- </if>
+ <if test="taskId != null">task_id =
+ #{taskId},
+ </if>
+ <if test="longtask != null">longtask =
+ #{longtask},
+ </if>
+ <if test="taskName != null">task_name =
+ #{taskName},
+ </if>
+ <if test="serviceType != null">service_type =
+ #{serviceType},
+ </if>
+ <if test="opid != null">opid =
+ #{opid},
+ </if>
+ <if test="opcode != null">opcode =
+ #{opcode},
+ </if>
+ <if test="opdesc != null">opdesc =
+ #{opdesc},
+ </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="orgid != null">orgid =
+ #{orgid},
+ </if>
+ <if test="guid != null">guid =
+ #{guid},
+ </if>
+ <if test="pguid != null">pguid =
+ #{pguid},
+ </if>
+ <if test="pid != null">pid =
+ #{pid},
+ </if>
</trim>
where id = #{id}
</update>
- <update id="deleteServiceTaskoperById" parameterType="Long">
+ <update id="deleteServiceTaskoperById" parameterType="Long">
update service_taskoper
<trim prefix="SET" suffixOverrides=",">
del_flag =1
</trim>
- where id = #{id}
+ where id = #{id}
</update>
- <update id="deleteServiceTaskoperByIds" parameterType="String">
- update service_taskoper
+ <update id="deleteServiceTaskoperByIds" parameterType="String">
+ update service_taskoper
<trim prefix="SET" suffixOverrides=",">
del_flag =1
</trim>
@@ -204,8 +220,6 @@
#{id}
</foreach>
</update>
-
-
</mapper>
--
Gitblit v1.9.3