From 41d9c70dfc6dbe060eaaf5bfc153885be8140c76 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 27 四月 2025 09:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 5 ++++-
server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java | 7 ++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java b/server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
index 6a4f965..b802b3c 100644
--- a/server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
+++ b/server/src/main/java/com/doumee/biz/system/impl/SystemJobTriggerBizImpl.java
@@ -11,6 +11,7 @@
import com.doumee.core.job.JobContext;
import com.doumee.core.job.JobParam;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.system.SystemJobLogMapper;
import com.doumee.dao.system.SystemJobMapper;
import com.doumee.dao.system.SystemJobSnippetMapper;
import com.doumee.dao.system.model.SystemJob;
@@ -32,7 +33,7 @@
public class SystemJobTriggerBizImpl implements SystemJobTriggerBiz {
@Autowired
- private SystemJobLogService systemJobLogService;
+ private SystemJobLogMapper systemJobLogMapper;
@Autowired
private SystemJobMapper systemJobMapper;
@@ -75,7 +76,7 @@
systemJobLog.setStatus(Constants.Job.LogStatus.NONE.getCode());
systemJobLog.setTriggerType(dto.getTriggerType());
systemJobLog.setRemark("浠诲姟姝ｅ湪鎵ц涓�");
- systemJobLogService.create(systemJobLog);
+ systemJobLogMapper.insert(systemJobLog);
}
// 浠诲姟鍔犻攣锛岄槻姝㈠鏈嶅姟鍣ㄩ噸澶嶆墽琛�
this.lock(job);
@@ -132,7 +133,7 @@
if (job != null && job.getWithLog() && systemJobLog.getId() != null) {
systemJobLog.setRunTimeEnd(new Date());
systemJobLog.setRunSpendTime(Integer.valueOf("" + (systemJobLog.getRunTimeEnd().getTime() - systemJobLog.getRunTimeStart().getTime())));
- systemJobLogService.updateById(systemJobLog);
+ systemJobLogMapper.updateById(systemJobLog);
}
// 浠诲姟瑙ｉ攣
if (locked) {
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index dcf2962..f99971e 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -186,8 +186,11 @@
}else{
textCard.setTitle(Constants.equalsInteger(workorder.getType(),Constants.ONE)?"銆怐CA涓婃姤銆�":"銆愯穼缁婃粦椋庨櫓涓婃姤銆�");
if(Constants.equalsInteger(workorder.getType(),Constants.THREE)){
- message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":"浠诲姟宸插鐞�")) +"</div>";
+ message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"浠诲姟宸插鐞�")))) +"</div>";//:"浠诲姟宸插鐞�")) +"</div>";
message = message + " <div class=\"normal\">"+ DateUtil.formatDate(new Date(),"yyyy-MM-dd HH:mm") +"/"+ workorder.getLocationName() +"/"+ categoryName+"</div>";
+ if(Constants.equalsInteger(contentType,Constants.TWO)){
+ message = message + " <div class=\"normal\">璇存槑 "+ csInfo +"</div>";
+ }
}else{
message = message + " <div class=\"normal\">"+ (org.apache.commons.lang3.StringUtils.isNotBlank(userName)?userName:"绯荤粺") + (Constants.equalsInteger(contentType,Constants.ZERO)?"浠诲姟鍒嗛厤缁欎綘":(Constants.equalsInteger(contentType,Constants.ONE)?"瀵硅宸ュ崟杩涜浜嗗偓淇冿紝璇峰敖蹇鐞�":((Constants.equalsInteger(contentType,Constants.TWO)?"鎶勯�佺粰浣�":"宸插鐞嗕竴椤�")))) +"</div>";
message = message + " <div class=\"normal\">瑙傚療涓婚 "+ categoryName +"</div>";
--
Gitblit v1.9.3