bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结算工程加字段

This commit is contained in:
hongchao 2025-10-15 00:52:40 +08:00
parent cfc9e975e3
commit f63a56ee22
1 changed files with 74 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/controller/ClzSltAgreementInfoController.java
View File

@ -785,6 +785,8 @@ public class ClzSltAgreementInfoController extends BaseController {
maps.put("startTime", bean.getStartTime()==null ? null:dateFormat.format(bean.getStartTime()));
maps.put("endTime", bean.getEndTime()==null ? null:dateFormat.format(bean.getEndTime()));
maps.put("leaseDays", bean.getLeaseDays());
maps.put("actualExitTime", bean.getActualExitTime());
maps.put("overTime", bean.getOverTime());
maps.put("overDay", bean.getOverDay());
maps.put("costs", bean.getCosts().setScale(2, RoundingMode.HALF_UP));
}else {
@ -797,6 +799,8 @@ public class ClzSltAgreementInfoController extends BaseController {
maps.put("startTime", bean.getStartTime()==null ? null:dateFormat.format(bean.getStartTime()));
maps.put("endTime", bean.getEndTime()==null ? null:dateFormat.format(bean.getEndTime()));
maps.put("leaseDays", bean.getLeaseDays());
maps.put("actualExitTime", bean.getActualExitTime());
maps.put("overTime", bean.getOverTime());
maps.put("overDay", bean.getOverDay());
maps.put("costs", bean.getCosts().setScale(2, RoundingMode.HALF_UP));
}
@ -821,6 +825,8 @@ public class ClzSltAgreementInfoController extends BaseController {
maps.put("t2", "");
maps.put("t3", "");
maps.put("t4", "");
maps.put("t5", "");
maps.put("t6", "");
}
}else if(type==3){
if(flag==0){
@ -843,6 +849,8 @@ public class ClzSltAgreementInfoController extends BaseController {
maps.put("t2", "");
maps.put("t3", "");
maps.put("t4", "");
maps.put("t5", "");
maps.put("t6", "");
}
}else if(type==4){
if(flag==0){
@ -865,20 +873,38 @@ public class ClzSltAgreementInfoController extends BaseController {
maps.put("t2", "");
maps.put("t3", "");
maps.put("t4", "");
maps.put("t5", "");
maps.put("t6", "");
}
}
else if(type==5){
if(flag==0) {
maps.put("unitName", bean.getUnitName());
maps.put("typeName", bean.getTypeName());
maps.put("modelName", bean.getModelName());
maps.put("mtUnitName", bean.getUnitName());
maps.put("leasePrice", bean.getLeasePrice());
maps.put("num", bean.getReduceNum());
maps.put("startTime", bean.getStartTime()==null ? null:dateFormat.format(bean.getStartTime()));
maps.put("endTime", bean.getEndTime()==null ? null:dateFormat.format(bean.getEndTime()));
maps.put("startTime", bean.getStartTime() == null ? null : dateFormat.format(bean.getStartTime()));
maps.put("endTime", bean.getEndTime() == null ? null : dateFormat.format(bean.getEndTime()));
maps.put("leaseDays", bean.getLeaseDays());
maps.put("remark", bean.getRemark());
maps.put("costs", bean.getCosts());
}else{
maps.put("unitName", bean.getUnitName());
maps.put("typeName", bean.getTypeName());
maps.put("modelName", bean.getModelName());
maps.put("mtUnitName", bean.getUnitName());
maps.put("leasePrice", bean.getLeasePrice());
maps.put("num", bean.getReduceNum());
maps.put("startTime", bean.getStartTime() == null ? null : dateFormat.format(bean.getStartTime()));
maps.put("endTime", bean.getEndTime() == null ? null : dateFormat.format(bean.getEndTime()));
maps.put("leaseDays", bean.getLeaseDays());
maps.put("remark", bean.getRemark());
maps.put("costs", bean.getCosts());
maps.put("t1", "");
maps.put("t2", "");
}
}
return maps;
}
@ -903,6 +929,8 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("领料日期");
list.add("归还日期");
list.add("租赁天数");
list.add("出场日期");
list.add("超期日期");
list.add("超期天数");
list.add("超期费用（元）");
}else {
@ -915,6 +943,8 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("领料日期");
list.add("归还日期");
list.add("租赁天数");
list.add("出场日期");
list.add("超期日期");
list.add("超期天数");
list.add("超期费用（元）");
}
@ -939,6 +969,8 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add(" ");
list.add(" ");
list.add(" ");
list.add(" ");
list.add(" ");
}
}else if(type==3){
@ -962,6 +994,8 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("");
list.add("");
list.add(" ");
list.add(" ");
list.add(" ");
}
}else if(type==4){
if(flag==0){
@ -984,8 +1018,11 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("");
list.add("");
list.add(" ");
list.add(" ");
list.add(" ");
}
}else if (type==5){
if(flag==0) {
list.add("单位名称");
list.add("设备名称");
list.add("规格型号");
@ -997,6 +1034,21 @@ public class ClzSltAgreementInfoController extends BaseController {
list.add("减免天数");
list.add("减免原因");
list.add("减免费用（元）");
}else{
list.add("单位名称");
list.add("设备名称");
list.add("规格型号");
list.add("单位");
list.add("租赁单价");
list.add("减免数量");
list.add("减免开始日期");
list.add("减免结束日期");
list.add("减免天数");
list.add("减免原因");
list.add("减免费用（元）");
list.add(" ");
list.add(" ");
}
}
return list;
}