客户端个人操作日志-拼接到新增的节点

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1958,9 +1958,16 @@ public class InformationWriteQueryController extends BladeController {
     @NotNull
     private R<Boolean> saveOrCopyNodeTree(List<WbsTreeContract> saveList, List<ConstructionLedger> saveLedger, Integer operationType, WbsTreeContract currentNode) {
         if (saveList.size() > 0) {
+            StringBuilder str = new StringBuilder();
             //保存施工日志
             if (saveLedger.size() > 0) {
                 this.constructionLedgerService.saveBatch(saveLedger, 1000);
+                str.append("-[");
+                for (ConstructionLedger ledger : saveLedger) {
+                    str.append(ledger.getSite()+",");
+                }
+                str.deleteCharAt(str.length()-1);
+                str.append("]");
             }
 
             try {
@@ -1973,7 +1980,7 @@ public class InformationWriteQueryController extends BladeController {
                     WbsTreeContract node = result.get(result.size() - i);
                     pathName.append("-").append(StringUtils.isNotEmpty(node.getFullName()) ? node.getFullName() : node.getNodeName());
                 }
-
+                pathName.append(str);
                 JSONObject json = new JSONObject();
                 json.put("operationObjIds", JSONArray.parseArray(JSONObject.toJSONString(saveList.stream().map(WbsTreeContract::getPKeyId).distinct().collect(Collectors.toList())), String.class));
                 json.put("operationObjName", pathName.substring(1));

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -397,7 +397,8 @@
                 iq.id,
                 (case iq.STATUS when 0 THEN null else t.batch end) as report_number,
                 date_format(iq.create_time,'%Y-%m-%d') as createTimes
-                from u_information_query iq left join (select  * from u_task k where k.status!=3 and k.contract_id = #{query.contractId}) t on iq.id = t.form_data_id  and t.is_deleted = 0
+                from u_information_query iq left join (select  * from u_task k where k.status!=3 and k.contract_id = #{query.contractId} group by
+        form_data_id) t on iq.id = t.form_data_id  and t.is_deleted = 0
                 where
                 iq.is_deleted = 0
                 and iq.classify = #{query.classify}