From 628301b49ad5aa13770b45af209d3c28eaa923a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sun, 7 Apr 2024 10:30:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E3=80=81=E6=80=BB=E7=BB=93?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=8B=A4=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/business/controller/BusinessPlanController.java  | 5 ++---
 .../modules/business/controller/BusinessTotalController.java | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/renren/modules/business/controller/BusinessPlanController.java b/src/main/java/io/renren/modules/business/controller/BusinessPlanController.java
index b6921fa..b3ca100 100644
--- a/src/main/java/io/renren/modules/business/controller/BusinessPlanController.java
+++ b/src/main/java/io/renren/modules/business/controller/BusinessPlanController.java
@@ -73,7 +73,7 @@ public class BusinessPlanController {
             if(dataDict.containsKey(id)){
                 Map<String, Object> entry = dataDict.get(id);
                 entry.put("selectPersionId", entry.get("selectPersionId")+","+businessPlanEntity.getSelectPersionId());
-                entry.put("selectPersion", entry.get("selectPersion")+","+businessPlanEntity.getSelectPer());
+                entry.put("selectPersion", entry.get("selectPersion")+businessPlanEntity.getSelectPer()+"-<span style='color:#ff0000'>"+businessPlanEntity.getDay()+"</span><br/>");
             }
             else {
                 data.put("planId", id);
@@ -85,11 +85,10 @@ public class BusinessPlanController {
                 data.put("isOneDay", businessPlanEntity.getIsOneDay());
                 data.put("planFzgz", businessPlanEntity.getFzgz());
                 data.put("selectPersionId", businessPlanEntity.getSelectPersionId());
-                data.put("selectPersion", businessPlanEntity.getSelectPer());
+                data.put("selectPersion", businessPlanEntity.getSelectPer()+"-<span style='color:#ff0000'>"+businessPlanEntity.getDay()+"</span><br/>");
                 data.put("day", businessPlanEntity.getDay());
                 data.put("commit", "1");
                 dataDict.put(id, data);
-                dataDict.put(businessPlanEntity.getId(), data);
             }
 
             // 施工人员工作时间
diff --git a/src/main/java/io/renren/modules/business/controller/BusinessTotalController.java b/src/main/java/io/renren/modules/business/controller/BusinessTotalController.java
index c1edd02..b1b999c 100644
--- a/src/main/java/io/renren/modules/business/controller/BusinessTotalController.java
+++ b/src/main/java/io/renren/modules/business/controller/BusinessTotalController.java
@@ -232,7 +232,7 @@ public class BusinessTotalController {
             if(dataDict.containsKey(id)){
                 Map<String, Object> entry = dataDict.get(id);
                 entry.put("selectPersionId", entry.get("selectPersionId")+","+businessTotalEntity.getSelectPersionId());
-                entry.put("selectPersion", entry.get("selectPersion")+","+businessTotalEntity.getSelectPer());
+                entry.put("selectPersion", entry.get("selectPersion")+businessTotalEntity.getSelectPer()+"-<span style='color:#ff0000'>"+businessTotalEntity.getDay()+"</span><br/>");
             }
             else {
                 data.put("totalId", id);
@@ -244,7 +244,7 @@ public class BusinessTotalController {
                 data.put("isOneDay", businessTotalEntity.getIsOneDay());
                 data.put("planFzgz", businessTotalEntity.getFzgz());
                 data.put("selectPersionId", businessTotalEntity.getSelectPersionId());
-                data.put("selectPersion", businessTotalEntity.getSelectPer());
+                data.put("selectPersion", businessTotalEntity.getSelectPer()+"-<span style='color:#ff0000'>"+businessTotalEntity.getDay()+"</span><br/>");
                 data.put("day", businessTotalEntity.getDay());
                 data.put("isFinished", businessTotalEntity.getIsFinished());
                 dataDict.put(id, data);