2024年5月27日17:32:04

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -1752,4 +1752,10 @@ public class Bills implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal signForUSD;
 
+	/**
+	 * 是否本部门
+	 */
+	@TableField(exist = false)
+	private String ifThisDept;
+
 }

blade-service/blade-data/src/main/java/org/springblade/data/handler/SynchronizeDataJobHandler.java

@@ -41,7 +41,7 @@ public class SynchronizeDataJobHandler {
 			}
 		} catch (Exception e) {
 			redisTemplate.opsForValue().set("MIQIL_STATUS", "false");
-			returnT.setMsg(e.getMessage());
+			returnT.setMsg("同步失败：" + e);
 		} finally {
 			redisTemplate.opsForValue().set("MIQIL_STATUS", "false");
 		}

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1726,7 +1726,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.apply(ObjectUtils.isNotNull(bills.getIssueStatus()), "find_in_set(issue_status,'" + bills.getIssueStatus() + "')")
 			.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId());
-		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+		if ("1".equals(bills.getIfThisDept())){
 			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
 		}
 		if ("SE".equals(bills.getBusinessType())) {

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -151,10 +151,10 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			feeCenter.setAmountLoc(amount);
 			feeCenter.setAmountDiscountLoc(amount);
 		} else {
-			feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "","1"));
-			feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "","1"));
-			feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "","1"));
-			feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "","1"));
+			feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "", "1"));
+			feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "", "1"));
+			feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
+			feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
 		}
 		feeCenter.setAmountNet(amountNet);
 		feeCenter.setAmountTax(amountTax);
@@ -178,6 +178,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R<List<FeeCenter>> templateImport(LosBFeesTemplate losBFeesTemplate) {
 		List<FeeCenter> list = new ArrayList<>();
+		String text = "";
 		if ("HYCK".equals(losBFeesTemplate.getBusinessTypeCode()) || "HYJK".equals(losBFeesTemplate.getBusinessTypeCode())) {
 			Bills bills = billsMapper.selectById(losBFeesTemplate.getBillNoId());
 			if (bills == null) {
@@ -287,10 +288,12 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					}
 					if ("1".equals(items.getQuantityRule())) {
 						if (preContainers.isEmpty()) {
+							text += "费用："+items.getFeeCnName() + "未找到集装箱信息！";
 							continue;
 						}
 						Integer quantity = preContainers.stream().filter(e -> items.getUnitNo().equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).reduce(0, Integer::sum);
 						if (quantity == 0) {
+							text += "费用："+items.getFeeCnName() + "集装箱数量为零！";
 							continue;
 						}
 						feeCenter.setQuantity(new BigDecimal(quantity + ""));
@@ -303,12 +306,14 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setAmount(items.getPrice().multiply(bills.getGrossWeight()));
 					} else if ("4".equals(items.getQuantityRule())) {
 						if (preContainers.isEmpty()) {
+							text += "费用："+items.getFeeCnName() + "未找到集装箱信息！";
 							continue;
 						}
 						BigDecimal quantityTeu = preContainers.stream().filter(e -> items.getUnitNo().equals(e.getCntrTypeCode())).map(PreContainers::getTeu).reduce(BigDecimal.ZERO, BigDecimal::add);
 						Integer quantityGP = preContainers.stream().filter(e -> items.getUnitNo().equals(e.getCntrTypeCode())).map(PreContainers::getQuantity).mapToInt(Integer::intValue).sum();
 						BigDecimal quantity = quantityTeu.multiply(new BigDecimal(quantityGP + ""));
 						if (quantity.compareTo(new BigDecimal("0")) == 0) {
+							text += "费用："+items.getFeeCnName() + "集装箱teu或数量为零！";
 							continue;
 						}
 						feeCenter.setQuantity(new BigDecimal(quantity + ""));
@@ -384,6 +389,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(new BigDecimal("1"));
 							feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于JOB！";
 							continue;
 						}
 					} else if ("3".equals(items.getQuantityRule())) {
@@ -391,6 +397,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(bills.getGrossWeight());
 							feeCenter.setAmount(items.getPrice().multiply(bills.getGrossWeight()));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于KGS！";
 							continue;
 						}
 					} else if ("5".equals(items.getQuantityRule())) {
@@ -398,6 +405,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(bills.getMeasurement());
 							feeCenter.setAmount(items.getPrice().multiply(bills.getMeasurement()));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于CBM！";
 							continue;
 						}
 					} else {
@@ -466,6 +474,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(new BigDecimal("1"));
 							feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于JOB！";
 							continue;
 						}
 					} else if ("3".equals(items.getQuantityRule())) {
@@ -473,6 +482,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(bills.getGrossWeight());
 							feeCenter.setAmount(items.getPrice().multiply(bills.getGrossWeight()));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于KGS！";
 							continue;
 						}
 					} else if ("5".equals(items.getQuantityRule())) {
@@ -480,6 +490,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							feeCenter.setQuantity(new BigDecimal("1"));
 							feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 						} else {
+							text += "费用："+items.getFeeCnName() + "计量单位不等于CBM！";
 							continue;
 						}
 					} else {
@@ -491,8 +502,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			}
 			this.saveOrUpdateBatch(list);
 		}
-
-		return R.data(list);
+		if (ObjectUtils.isNotNull(text)) {
+			return R.data(list, text + "未导入！！！");
+		} else {
+			return R.data(list);
+		}
 	}
 
 	@Override
@@ -560,10 +574,10 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setAmountLoc(amount);
 					feeCenter.setAmountDiscountLoc(amount);
 				} else {
-					feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "","1"));
-					feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "","1"));
-					feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "","1"));
-					feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "","1"));
+					feeCenter.setAmountNetLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountNet, "", "1"));
+					feeCenter.setAmountTaxLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amountTax, "", "1"));
+					feeCenter.setAmountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
+					feeCenter.setAmountDiscountLoc(bCurrencyService.converterCny(feeCenter.getCurCode(), amount, "", "1"));
 				}
 				feeCenter.setAmountNet(amountNet);
 				feeCenter.setAmountTax(amountTax);
@@ -631,7 +645,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountCrM = amountCrM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(),"1");
+									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
 									amountCrUsdM = amountCrUsdM.add(usd);
 								}
 							} else {
@@ -640,7 +654,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountDrM = amountDrM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(),"1");
+									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
 									amountDrUsdM = amountDrUsdM.add(usd);
 								}
 							}
@@ -670,8 +684,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						//利润 = 收 - 付
 						amountProfitM = amountDrM.subtract(amountCrM);
 						amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D","1")).add(amountDrM);
-						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C","1")).add(amountCrM);
+						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D", "1")).add(amountDrM);
+						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C", "1")).add(amountCrM);
 						amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 						details.setAmountDr(amountDrM);
 						details.setAmountCr(amountCrM);
@@ -691,8 +705,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D","1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C","1")).add(amountCr);
+				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
+				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				bills.setAmountDr(amountDr);
 				bills.setAmountCr(amountCr);
@@ -748,7 +762,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountCrM = amountCrM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(),"1");
+									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
 									amountCrUsdM = amountCrUsdM.add(usd);
 								}
 							} else {
@@ -757,7 +771,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 								} else if ("CNY".equals(item.getCurCode())) {
 									amountDrM = amountDrM.add(item.getAmount());
 								} else {
-									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(),"1");
+									BigDecimal usd = bCurrencyService.converter(item.getCurCode(), item.getAmount(), item.getDc(), "1");
 									amountDrUsdM = amountDrUsdM.add(usd);
 								}
 							}
@@ -787,8 +801,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						//利润 = 收 - 付
 						amountProfitM = amountDrM.subtract(amountCrM);
 						amountProfitUsdM = amountDrUsdM.subtract(amountCrUsdM);
-						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D","1")).add(amountDrM);
-						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C","1")).add(amountCrM);
+						amountDrLocM = amountDrLocM.add(bCurrencyService.converterCny("USD", amountDrUsdM, "D", "1")).add(amountDrM);
+						amountCrLocM = amountCrLocM.add(bCurrencyService.converterCny("USD", amountCrUsdM, "C", "1")).add(amountCrM);
 						amountProfitLocM = amountDrLocM.subtract(amountCrLocM);
 						details.setAmountDr(amountDrM);
 						details.setAmountCr(amountCrM);
@@ -808,8 +822,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D","1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C","1")).add(amountCr);
+				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
+				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				aeaBills.setAmountDr(amountDr);
 				aeaBills.setAmountCr(amountCr);
@@ -827,8 +841,8 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				//利润 = 收 - 付
 				amountProfit = amountDr.subtract(amountCr);
 				amountProfitUsd = amountDrUsd.subtract(amountCrUsd);
-				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D","1")).add(amountDr);
-				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C","1")).add(amountCr);
+				amountDrLoc = amountDrLoc.add(bCurrencyService.converterCny("USD", amountDrUsd, "D", "1")).add(amountDr);
+				amountCrLoc = amountCrLoc.add(bCurrencyService.converterCny("USD", amountCrUsd, "C", "1")).add(amountCr);
 				amountProfitLoc = amountDrLoc.subtract(amountCrLoc);
 				customsDeclaration.setAmountDr(amountDr);
 				customsDeclaration.setAmountCr(amountCr);

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/controller/FinGenlegCalcController.java

@@ -17,30 +17,29 @@
 package org.springblade.los.finance.genleg.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
 import org.springblade.common.annotation.RepeatSubmit;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.basic.acc.entity.Accounts;
 import org.springblade.los.basic.acc.service.IAccountsService;
-import org.springblade.los.finance.genleg.entity.FinGenleg;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.los.finance.genleg.entity.FinGenlegCalc;
-import org.springblade.los.finance.genleg.vo.FinGenlegCalcVO;
 import org.springblade.los.finance.genleg.service.IFinGenlegCalcService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.los.finance.genleg.vo.FinGenlegCalcVO;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -81,7 +80,7 @@ public class FinGenlegCalcController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入finGenlegCalc")
 	public R<IPage<FinGenlegCalc>> list(FinGenlegCalc finGenlegCalc, Query query) {
 		LambdaQueryWrapper<FinGenlegCalc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq( FinGenlegCalc::getTenantId, AuthUtil.getTenantId())
+		lambdaQueryWrapper.eq(FinGenlegCalc::getTenantId, AuthUtil.getTenantId())
 			.eq(ObjectUtils.isNotNull(finGenlegCalc.getAccyear()), FinGenlegCalc::getAccyear, finGenlegCalc.getAccyear())
 			.eq(ObjectUtils.isNotNull(finGenlegCalc.getIsCorp()), FinGenlegCalc::getIsCorp, finGenlegCalc.getIsCorp())
 			.eq(ObjectUtils.isNotNull(finGenlegCalc.getCorpId()), FinGenlegCalc::getCorpId, finGenlegCalc.getCorpId())
@@ -119,7 +118,7 @@ public class FinGenlegCalcController extends BladeController {
 			}
 		}
 		lambdaQueryWrapper.orderByAsc(FinGenlegCalc::getAccCode);
-		IPage<FinGenlegCalc> pages = finGenlegCalcService.page(Condition.getPage(query), Condition.getQueryWrapper(finGenlegCalc));
+		IPage<FinGenlegCalc> pages = finGenlegCalcService.selectPage(Condition.getPage(query), finGenlegCalc);
 		List<Accounts> accountsList = new ArrayList<>();
 		if (!pages.getRecords().isEmpty()) {
 			List<Long> accIds = pages.getRecords().stream().map(FinGenlegCalc::getAccId).collect(Collectors.toList());
@@ -163,6 +162,28 @@ public class FinGenlegCalcController extends BladeController {
 			}
 			item.setFinGenlegCalcs(finGenlegs);
 		}
+		List<FinGenlegCalc> finGenlegCalcList = new ArrayList<>();
+		for (int i = 0; i < pages.getRecords().size(); i++) {
+			FinGenlegCalc item = pages.getRecords().get(i);
+			FinGenlegCalc finGenlegCalc1 = new FinGenlegCalc();
+			finGenlegCalc1.setId(item.getId());
+			finGenlegCalc1.setAccCode(item.getCorpCnName());
+			finGenlegCalc1.setFullName(item.getCorpCnName());
+			List<FinGenlegCalc> finGenlegCalcList1 = item.getFinGenlegCalcs();
+			if (!finGenlegCalcList1.isEmpty()){
+				item.setPid(item.getId());
+				item.setFinGenlegCalcs(null);
+				finGenlegCalcList1.add(0,item);
+			}else{
+				finGenlegCalcList1 = new ArrayList<>();
+				item.setFinGenlegCalcs(null);
+				item.setPid(item.getId());
+				finGenlegCalcList1.add(0,item);
+			}
+			finGenlegCalc1.setFinGenlegCalcs(finGenlegCalcList1);
+			finGenlegCalcList.add(finGenlegCalc1);
+		}
+		pages.setRecords(finGenlegCalcList);
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/mapper/FinGenlegCalcMapper.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.finance.genleg.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.springblade.los.finance.genleg.entity.FinGenlegCalc;
 import org.springblade.los.finance.genleg.vo.FinGenlegCalcVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -39,4 +40,5 @@ public interface FinGenlegCalcMapper extends BaseMapper<FinGenlegCalc> {
 	 */
 	List<FinGenlegCalcVO> selectFinGenlegCalcPage(IPage page, FinGenlegCalcVO finGenlegCalc);
 
+	List<FinGenlegCalc> selectPageList(IPage page, @Param("calc") FinGenlegCalc finGenlegCalc);
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/mapper/FinGenlegCalcMapper.xml

@@ -94,5 +94,8 @@
     <select id="selectFinGenlegCalcPage" resultMap="finGenlegCalcResultMap">
         select * from los_fin_genleg_calc where is_deleted = 0
     </select>
+    <select id="selectPageList" resultMap="finGenlegCalcResultMap">
+
+    </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/IFinGenlegCalcService.java

@@ -41,4 +41,6 @@ public interface IFinGenlegCalcService extends IService<FinGenlegCalc> {
 	IPage<FinGenlegCalcVO> selectFinGenlegCalcPage(IPage<FinGenlegCalcVO> page, FinGenlegCalcVO finGenlegCalc);
 
     List<FinGenlegCalc> initialization();
+
+	IPage<FinGenlegCalc> selectPage(IPage<FinGenlegCalc> page, FinGenlegCalc finGenlegCalc);
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinGenlegCalcServiceImpl.java

@@ -138,4 +138,9 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 		return finGenlegList;
 	}
 
+	@Override
+	public IPage<FinGenlegCalc> selectPage(IPage<FinGenlegCalc> page, FinGenlegCalc finGenlegCalc) {
+		return page.setRecords(baseMapper.selectPageList(page, finGenlegCalc));
+	}
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinPeriodServiceImpl.java

@@ -545,8 +545,8 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenlegCalc.setAmountCrUsd(new BigDecimal("0.00"));
 			finGenlegCalc.setAmountCrUsd(new BigDecimal("0.00"));
 			//本期余额 = 上期余额+借-贷
-			finGenlegCalc.setAmountBlc(finGenlegCalc.getAmountLastBlc().add(finGenlegCalc.getAmountDr()).subtract(finGenlegCalc.getAmountCr()));
-			finGenlegCalc.setAmountUsdBlc(finGenlegCalc.getAmountLastBlcUsd().add(finGenlegCalc.getAmountDrUsd()).subtract(finGenlegCalc.getAmountCrUsd()));
+			finGenlegCalc.setAmountBlc(item.getAmountBlc());
+			finGenlegCalc.setAmountUsdBlc(item.getAmountUsdBlc());
 
 			//本期上期数量等于上期余额数量
 			finGenlegCalc.setQuantityLastBlc(item.getQuantityBlc());
@@ -554,7 +554,7 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenlegCalc.setQuantityDr(new BigDecimal("0.00"));
 			finGenlegCalc.setQuantityCr(new BigDecimal("0.00"));
 			//本期余额数量 = 上期余额数量+借-贷
-			finGenlegCalc.setQuantityBlc(finGenlegCalc.getQuantityLastBlc().add(finGenlegCalc.getQuantityDr()).subtract(finGenlegCalc.getQuantityCr()));
+			finGenlegCalc.setQuantityBlc(item.getQuantityBlc());
 			finGenlegCalcNewList.add(finGenlegCalc);
 		}
 		if (!finGenlegCalcNewList.isEmpty()) {
@@ -580,8 +580,8 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenleg.setAmountCrUsd(new BigDecimal("0.00"));
 			finGenleg.setAmountCrUsd(new BigDecimal("0.00"));
 			//本期余额 = 上期余额+借-贷
-			finGenleg.setAmountBlc(finGenleg.getAmountLastBlc().add(finGenleg.getAmountDr()).subtract(finGenleg.getAmountCr()));
-			finGenleg.setAmountUsdBlc(finGenleg.getAmountLastBlcUsd().add(finGenleg.getAmountDrUsd()).subtract(finGenleg.getAmountCrUsd()));
+			finGenleg.setAmountBlc(item.getAmountBlc());
+			finGenleg.setAmountUsdBlc(item.getAmountUsdBlc());
 
 			//本期上期数量等于上期余额数量
 			finGenleg.setQuantityLastBlc(item.getQuantityBlc());
@@ -589,7 +589,7 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenleg.setQuantityDr(new BigDecimal("0.00"));
 			finGenleg.setQuantityCr(new BigDecimal("0.00"));
 			//本期余额数量 = 上期余额数量+借-贷
-			finGenleg.setQuantityBlc(finGenleg.getQuantityLastBlc().add(finGenleg.getQuantityDr()).subtract(finGenleg.getQuantityCr()));
+			finGenleg.setQuantityBlc(item.getQuantityBlc());
 			finGenlegNewList.add(finGenleg);
 		}
 		if (!finGenlegNewList.isEmpty()) {