|
@@ -56,7 +56,12 @@ import com.fjhx.sale.entity.contract.po.Contract;
|
|
|
import com.fjhx.sale.entity.contract.po.ContractProduct;
|
|
|
import com.fjhx.sale.entity.contract.po.ContractProject;
|
|
|
import com.fjhx.sale.entity.contract.po.ContractShipment;
|
|
|
-import com.fjhx.sale.entity.contract.vo.*;
|
|
|
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.ContractVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.DecisionAidVo;
|
|
|
+import com.fjhx.sale.entity.contract.vo.PayDecisionAidVo;
|
|
|
import com.fjhx.sale.entity.purchase.vo.EhsdPurchaseProductVo;
|
|
|
import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
|
|
|
import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
|
|
@@ -92,7 +97,15 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.Collections;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Locale;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -223,6 +236,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
wrapper.ne("t1.refundStatusNew", 20);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ wrapper.between("t1", Contract::getCreateTime, dto.getBeginTime(), dto.getEndTime());
|
|
|
+ wrapper.eq("t1", Contract::getId, dto.getId());
|
|
|
Page<ContractVo> page = baseMapper.getProfitSettlement(dto.getPage(), wrapper);
|
|
|
|
|
|
return page;
|
|
@@ -260,6 +276,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
wrapper.ne("t1.refundStatusNew", 20);
|
|
|
}
|
|
|
}
|
|
|
+ wrapper.between("t1", Contract::getCreateTime, dto.getBeginTime(), dto.getEndTime());
|
|
|
List<ContractVo> list = baseMapper.getProfitSettlementHead(wrapper);
|
|
|
return list;
|
|
|
}
|