yangjun
/
yhjz_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计划、总结人员增加出勤显示

This commit is contained in:
曹磊 2024-04-07 10:30:47 +08:00
parent 134212bd1b
commit 628301b49a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/io/renren/modules/business/controller/BusinessPlanController.java
View File

@ -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);
}
// 施工人员工作时间

4
src/main/java/io/renren/modules/business/controller/BusinessTotalController.java
View File

@ -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);