2022年11月22 18:17

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Acc.java

@@ -424,5 +424,10 @@ public class Acc implements Serializable {
 	@ApiModelProperty(value = "开船日期")
 	private Date sailDate;
 
+	/**
+	 * 收付款余额
+	 */
+	@TableField(exist = false)
+	private BigDecimal balance;
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/land/service/impl/LandVehicleServiceImpl.java

@@ -189,14 +189,14 @@ public class LandVehicleServiceImpl extends ServiceImpl<LandVehicleMapper, LandV
 				throw new SecurityException("第" + (i + 1) + "行数据异常，车号不能为空");
 			}
 
-			Integer count = baseMapper.selectCount(new LambdaQueryWrapper<LandVehicle>()
+			/*Integer count = baseMapper.selectCount(new LambdaQueryWrapper<LandVehicle>()
 				.eq(LandVehicle::getPlateNo, excel.getPlateNo())
 				.eq(LandVehicle::getTenantId, AuthUtil.getTenantId())
 				.eq(LandVehicle::getIsDeleted, 0)
 			);
 			if (count > 0) {
 				throw new SecurityException("第" + (i + 1) + "行数据异常，车牌号已存在");
-			}
+			}*/
 
 			Long fleetId = null;
 			if (StringUtil.isNotBlank(excel.getFleetName())) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -719,7 +719,8 @@ ORDER BY
                 and bo.create_time <= #{detailsVo.endCreateTime}
             </if>
         </where>
-        order BY bo.create_time desc
+        GROUP BY bgd.brand,bo.saleman,bgd.size,zboi.price_type
+        order BY bo.create_time,bo.saleman desc
     </select>
 
     <select id="salesCommissionList" resultType="org.springblade.purchase.sales.excel.SalesCommissionExcel">

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -561,4 +561,15 @@ public class AccController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 应收账款余额
+	 */
+	@GetMapping("/billBalance")
+	@ApiOperation(value = "收付款余额", notes = "传入acc")
+	public R<IPage<Acc>> billBalance(Acc acc, Query query){
+		acc.setTenantId(AuthUtil.getTenantId());
+		IPage<Acc> page = accService.selBillBalance(Condition.getPage(query), acc);
+		return R.data(page);
+	}
+
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.java

@@ -85,4 +85,6 @@ public interface AccMapper extends BaseMapper<Acc> {
 	List<Long> selectListCorpId(Acc acc);
 
 	R deleteBySrcId(Long srcId);
+
+	List<Acc> selBillBalance(IPage<Acc> page, @Param("acc") Acc acc);
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -56,6 +56,28 @@
         delete from finance_acc where Src_id = #{srcId}
     </delete>
 
+    <select id="selBillBalance" resultMap="accResultMap">
+        SELECT
+            BCD.cname AS corpName,
+            SUM(FC.Amount) as amount,
+            SUM(FC.Settlement_Amount) AS settlementAmount,
+            SUM(FC.Amount) - SUM(FC.Settlement_Amount) as balance
+        FROM finance_acc FC
+        LEFT JOIN basic_corps_desc BCD ON BCD.id = FC.Corpid
+        <where>
+            FC.tenant_id = #{acc.tenantId}
+            and FC.is_deleted = 0
+            and FC.bill_type = #{acc.billType}
+            <if test="acc.createStartDate !=null and acc.createStartDate != ''">
+                AND create_time &gt;= #{acc.createStartDate}
+            </if>
+            <if test="acc.createEndDate !=null and acc.createEndDate != ''">
+                AND create_time &lt;= #{acc.createEndDate}
+            </if>
+        </where>
+        GROUP BY FC.Corpid
+        HAVING SUM(FC.Amount-FC.Settlement_Amount) >= 100
+    </select>
 
     <select id="selectAccPage" resultMap="accResultMap">
         select * from finance_acc where is_deleted = 0

blade-service/trade-finance/src/main/java/org/springblade/finance/service/IAccService.java

@@ -101,4 +101,6 @@ public interface IAccService extends IService<Acc> {
 	IPage<Acc> selectAccBillList(Acc acc, Query query);
 
 	R deleteBySrcId(Long srcId);
+
+	IPage<Acc> selBillBalance(IPage<Acc> page, Acc acc);
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/AccServiceImpl.java

@@ -445,4 +445,9 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		return baseMapper.deleteBySrcId(srcId);
 	}
 
+	@Override
+	public IPage<Acc> selBillBalance(IPage<Acc> iPage, Acc acc){
+		return iPage.setRecords(baseMapper.selBillBalance(iPage, acc));
+	}
+
 }