From 0a8f9800a264c848adf1361db5bcab5b2fc32869 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 二月 2026 15:56:34 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
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 e1a9e99..c474912 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -255,34 +255,34 @@
List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
//鑾峰彇鍒嗘暟
- for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
- //璁＄畻鎮ｈ�呯殑鍒嗘暟
- if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
- //濡傛灉涓虹┖鐨勮瘽锛屽幓detail閲屾嬁鍒版瘡涓鐨勯�夐」鍒嗭紝濡傛灉鏄綔绛旈锛岀洿鎺ユ嬁棰樼洰鍒嗭紙鍓嶉锛岃妯℃澘鏄垎鏁扮被鍨嬶級
- Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
- serviceSubtask.setScore((BigDecimal) map.get("score"));
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
- if ((Boolean) map.get("isExist") == true) {
- //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
- serviceSubtaskList.add(serviceSubtask);
- }
- } else {
- //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
- if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
- ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
- serviceSubtaskDetail.setSubId(serviceSubtask.getId());
- List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
- for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
- if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
- serviceSubtaskList.add(serviceSubtask);
- }
- }
- }else {
- serviceSubtaskList.add(serviceSubtask);
- }
- }
- }
- return serviceSubtaskList;
+// for (ServiceSubtask serviceSubtask : selectServiceSubtaskList) {
+// //璁＄畻鎮ｈ�呯殑鍒嗘暟
+// if (serviceSubtask.getScore() == null || BigDecimal.ZERO.equals(serviceSubtask.getScore())) {
+// //濡傛灉涓虹┖鐨勮瘽锛屽幓detail閲屾嬁鍒版瘡涓鐨勯�夐」鍒嗭紝濡傛灉鏄綔绛旈锛岀洿鎺ユ嬁棰樼洰鍒嗭紙鍓嶉锛岃妯℃澘鏄垎鏁扮被鍨嬶級
+// Map<String, Object> map = getScore(serviceSubtask, serviceSubtaskVO.getDetailResult());
+// serviceSubtask.setScore((BigDecimal) map.get("score"));
+// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+// if ((Boolean) map.get("isExist") == true) {
+// //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// } else {
+// //娴嬭瘯瀹屽垹闄わ紙搴斾粯娴嬭瘯鐢ㄧ殑锛�
+// if (!StringUtils.isEmpty(serviceSubtaskVO.getDetailResult())) {
+// ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
+// serviceSubtaskDetail.setSubId(serviceSubtask.getId());
+// List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
+// for (ServiceSubtaskDetail ssd : serviceSubtaskDetails) {
+// if (ssd.getAsrtext().equals(serviceSubtaskVO.getDetailResult())) {
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// }
+// }else {
+// serviceSubtaskList.add(serviceSubtask);
+// }
+// }
+// }
+ return selectServiceSubtaskList;
}
@Override
@@ -298,10 +298,11 @@
@Override
public Map<String, Object> patItemCount(ServiceSubtaskVO serviceSubtaskVO) {
- serviceSubtaskVO.setSendstate(null);
- serviceSubtaskVO.setPageSize(99999999);
- serviceSubtaskVO.setPageNum(1);
- List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
+ ServiceSubtaskVO serviceSubtaskVO1 = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskVO.class);
+ serviceSubtaskVO1.setSendstate(null);
+ serviceSubtaskVO1.setPageSize(99999999);
+ serviceSubtaskVO1.setPageNum(1);
+ List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO1);
Map<String, Object> map = new HashMap<>();
Integer wzx = 0;
Integer ysf = 0;
@@ -2224,12 +2225,15 @@
}
private String getOutPath(String phone, Long tid, String taskName, Long pId, Integer type) {
+ log.info("tid鐨勫�间负锛歿},pid鐨勫�间负锛歿}",tid,pId);
//瀵箄rl涓袱涓弬鏁板姞瀵�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key);
+ String taskId = rsaPublicKeyExample.encryptedData(tid.toString(), pub_key).toString();
String outpath = null;
try {
- String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key);
+ String patid = rsaPublicKeyExample.encryptedData(pId.toString(), pub_key).toString();
+
+ log.info("tid鍔犲瘑鍚庣殑鍊间负锛歿},pid鍔犲瘑鍚庣殑鍊间负锛歿}",taskId,patid);
SendMagParam sendMagParam = new SendMagParam();
sendMagParam.setType("4");
if (type == 1) {
--
Gitblit v1.9.3