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 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()+"-"+businessPlanEntity.getDay()+"
"); } 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()+"-"+businessPlanEntity.getDay()+"
"); 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 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()+"-"+businessTotalEntity.getDay()+"
"); } 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()+"-"+businessTotalEntity.getDay()+"
"); data.put("day", businessTotalEntity.getDay()); data.put("isFinished", businessTotalEntity.getIsFinished()); dataDict.put(id, data);