From 9990ac7aae5264573c4db210d455b86c0001bb42 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 18 三月 2025 13:39:11 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 4 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 8 ++--
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 12 -----
smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java | 2 +
smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml | 12 ++++++
smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 16 ++++++++
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | 12 +++--
7 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index 263b88b..647fa44 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -17,10 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 璇煶浠诲姟缁撴灉鏄庣粏Controller
@@ -92,6 +89,9 @@
serviceSubtask.setSendstate(6L);
serviceSubtask.setId(serviceSubTaskDetailReq.getSubId());
serviceSubtask.setRemark("鏁版嵁琛ュ厖瀹屾垚");
+ serviceSubtask.setUpdateTime(new Date());
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setPreachform("1");
serviceSubtask.setResult("success");
aBoolean = serviceSubtaskService.updateServiceSubtask(serviceSubtask);
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index aba3d00..fe52710 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -354,8 +354,8 @@
/**
* 瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊
*/
- @Excel(name = " 瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.浜岀淮鐮� 7.閽夐拤 8.寰俊")
- @ApiModelProperty("瀹ｆ暀褰㈠紡 : 1,鐭俊銆�2,绾夸笅銆�3,璇煶銆�4,瑙嗛銆�5,绾歌川 6.閾炬帴 7.閽夐拤 8.寰俊")
+ @Excel(name = " 浠诲姟褰㈠紡 1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
+ @ApiModelProperty("瀹ｆ暀褰㈠紡 : 浠诲姟褰㈠紡 1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤")
private String preachform;
/**
diff --git a/smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java b/smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java
index 6039de5..be41cfb 100644
--- a/smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/BaseTagMapper.java
@@ -29,6 +29,8 @@
*/
public List<BaseTag> selectBaseTagList(BaseTag baseTag);
+ public List<BaseTag> selectBaseTagListByTagname(BaseTag baseTag);
+
/**
* 鏂板鏍囩
*
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
index 04de82d..b5d3963 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java
@@ -184,6 +184,22 @@
patArchivetag.setGuid(patArchiveVO.getGuid());
patArchivetag.setOrgid(patArchiveVO.getOrgid());
if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 1) {
+ //鍒ゆ柇涓�涓媌ase_tag閲屾槸涓嶆槸瀛樺湪锛屽鏋滀笉瀛樺湪锛屽厛鏂板
+ BaseTag baseTag = new BaseTag();
+ baseTag.setTagname(patArchivetag.getTagname().trim());
+ List<BaseTag> baseTags = baseTagMapper.selectBaseTagListByTagname(baseTag);
+ if (CollectionUtils.isEmpty(baseTags)) {
+ //鍏堢粰鏀惧埌鏈垎绫讳腑
+ baseTag.setTagcategoryid(6L);
+ baseTag.setOrgid(patArchiveVO.getOrgid());
+ baseTag.setDelFlag("0");
+ baseTag.setUpdateTime(new Date());
+ baseTag.setCreateTime(new Date());
+ baseTagMapper.insertBaseTag(baseTag);
+ patArchivetag.setTagid(baseTag.getTagid());
+ } else {
+ patArchivetag.setTagid(baseTags.get(0).getTagid());
+ }
//鏂板
patArchivetag.setUpdateBy(null);
patArchivetag.setCreateTime(new Date());
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 11399ff..054494e 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -256,18 +256,8 @@
@Override
public List<ServiceSubtask> patItem(ServiceSubtaskVO serviceSubtaskVO) {
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
- //鏍规嵁鍑洪櫌 鏃堕棿鍊掑簭
- List<ServiceSubtask> sortedServiceSubtaskList = null;
- if (serviceSubtaskVO.getSort() == null || serviceSubtaskVO.getSort() == 0)
- sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getEndtime, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
- if (serviceSubtaskVO.getSort() != null && serviceSubtaskVO.getSort() == 1)
- sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getEndtime, Comparator.nullsLast(Comparator.naturalOrder())).reversed()).collect(Collectors.toList());
- if (serviceSubtaskVO.getSort() != null && serviceSubtaskVO.getSort() == 2)
- sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getLongSendTime, Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
- if (serviceSubtaskVO.getSort() != null && serviceSubtaskVO.getSort() == 3)
- sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getLongSendTime, Comparator.nullsLast(Comparator.naturalOrder())).reversed()).collect(Collectors.toList());
- return sortedServiceSubtaskList;
+ return selectServiceSubtaskList;
}
@Override
diff --git a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
index 87c93bb..f1e3884 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
@@ -51,6 +51,18 @@
<if test="isenable != null ">and isenable = #{isenable}</if>
</where>
</select>
+ <select id="selectBaseTagListByTagname" parameterType="com.smartor.domain.BaseTag" resultMap="BaseTagResult">
+ <include refid="selectBaseTagVo"/>
+ <where>
+ <if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
+ <if test="tagname != null and tagname != ''">and tagname =#{tagname}</if>
+ <if test="tagdescription != null and tagdescription != ''">and tagdescription = #{tagdescription}</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="isenable != null ">and isenable = #{isenable}</if>
+ </where>
+ </select>
<select id="selectBaseTagByTagid" parameterType="Long" resultMap="BaseTagResult">
<include refid="selectBaseTagVo"/>
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index f50a6dd..63960a3 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -282,11 +282,13 @@
<if test="createBy != null">and create_by = #{createBy}</if>
<if test="taskGuid != null">and task_guid = #{taskGuid}</if>
</where>
- <if test="serviceType != null and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
- long_send_time desc
- </if>
- <if test="serviceType != null and serviceType != ''and serviceType == '2'">order by endtime desc</if>
- <if test="serviceType != null and serviceType != ''and serviceType == '3'">order by admindate desc</if>
+ <if test="sort != null and sort==0">order by endtime asc</if>
+ <if test="sort != null and sort==1">order by endtime desc</if>
+ <if test="sort != null and sort==2">order by long_send_time asc</if>
+ <if test="sort != null and sort==3">order by long_send_time desc</if>
+ <if test="sort != null and sort==5">order by admindate asc</if>
+ <if test="sort != null and sort==6">order by admindate desc</if>
+
<!-- order by update_time desc,id desc -->
</select>
--
Gitblit v1.9.3