货代 1.业务数据修改增加日期类型

 2.amend报表打印抓取数据不对

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -6143,9 +6143,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								List<FeeCenterReports> feeCenterD = feeCenterReportsD.stream().filter(e -> e.getFeeCnName().equals(fee.getFeeCnName())
 										&& fee.getBillCorpCnName().equals(e.getBillCorpCnName())).collect(Collectors.toList());
 								if (!feeCenterD.isEmpty()) {
-									feeCenterReports1.setAmountD(fee.getAmountD() == null ? BigDecimal.ZERO : fee.getAmountD());
+									/*feeCenterReports1.setAmountD(fee.getAmountD() == null ? BigDecimal.ZERO : fee.getAmountD());
 									feeCenterReports1.setAmountLocD(fee.getAmountLocD() == null ? BigDecimal.ZERO : fee.getAmountLocD());
-									feeCenterReports1.setAmountUsdD(fee.getAmountUsdD() == null ? BigDecimal.ZERO : fee.getAmountUsdD());
+									feeCenterReports1.setAmountUsdD(fee.getAmountUsdD() == null ? BigDecimal.ZERO : fee.getAmountUsdD());*/
+									feeCenterReports1.setAmountD(feeCenterD.stream().map(FeeCenterReports::getAmountD).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+									feeCenterReports1.setAmountLocD(feeCenterD.stream().map(FeeCenterReports::getAmountLocD).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
+									feeCenterReports1.setAmountUsdD(feeCenterD.stream().map(FeeCenterReports::getAmountUsdD).filter(Objects::nonNull).reduce(BigDecimal.ZERO,BigDecimal::add));
 									amountDr = amountDr.add(feeCenterReports1.getAmountD());
 									amountDrUsd = amountDrUsd.add(feeCenterReports1.getAmountUsdD());
 								}

blade-service/blade-los/src/main/java/org/springblade/los/business/update/service/impl/UpdateServiceImpl.java

@@ -81,6 +81,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.lang.reflect.Field;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -665,6 +667,16 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 				fieldId.setAccessible(true); // 使私有字段可访问
 				fieldId.set(bills, item.getFieldValueNew());
 			}
+		} else if ("日期选择器".equals(item.getFieldValueType())){
+			Field fieldId = bills.getClass().getDeclaredField(item.getField());
+			fieldId.setAccessible(true); // 使私有字段可访问
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			try {
+				Date date = sdf.parse(item.getFieldValueNew());
+				fieldId.set(bills, date);
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 		} else {
 			Field fieldId = bills.getClass().getDeclaredField(item.getField());
 			fieldId.setAccessible(true); // 使私有字段可访问
@@ -1268,7 +1280,17 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(amends, item.getFieldValueNew());
 				}
-			} else {
+			} else if ("日期选择器".equals(item.getFieldValueType())){
+				Field fieldId = amends.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				try {
+					Date date = sdf.parse(item.getFieldValueNew());
+					fieldId.set(amends, date);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}else {
 				if (ObjectUtils.isNotNull(item.getAmendsFieldCname())) {
 					Field fieldId = amends.getClass().getDeclaredField(item.getAmendsFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
@@ -1440,7 +1462,17 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(feeCenter, item.getFieldValueNew());
 				}
-			} else {
+			} else if ("日期选择器".equals(item.getFieldValueType())){
+				Field fieldId = feeCenter.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				try {
+					Date date = sdf.parse(item.getFieldValueNew());
+					fieldId.set(feeCenter, date);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}else {
 				if (ObjectUtils.isNotNull(item.getFeeCenterFieldCname())) {
 					Field fieldId = feeCenter.getClass().getDeclaredField(item.getFeeCenterFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
@@ -1613,7 +1645,17 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(accBills, item.getFieldValueNew());
 				}
-			} else {
+			} else if ("日期选择器".equals(item.getFieldValueType())){
+				Field fieldId = accBills.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				try {
+					Date date = sdf.parse(item.getFieldValueNew());
+					fieldId.set(accBills, date);
+				} catch (ParseException e) {
+					e.printStackTrace();
+				}
+			}else {
 				if (ObjectUtils.isNotNull(item.getFinAccBillsFieldCname())) {
 					Field fieldId = accBills.getClass().getDeclaredField(item.getFinAccBillsFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问