2022年11月25 18:50

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/SalesDetailsVo.java

@@ -32,8 +32,8 @@ public class SalesDetailsVo implements Serializable {
 	private Long corpId;
 	//客户名称
 	private String corpName;
-	//时间
-	private String careteTime;
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	private Date careteTime;
 	//业务员
 	private String salesName;
 	//产品编码

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

@@ -287,6 +287,12 @@ public class Acc implements Serializable {
 	@TableField(exist = false)
 	private String createEndDate;
 
+	/**
+	 * 日期检索区间
+	 */
+	@TableField(exist = false)
+	private List<String> createDateList;
+
 	@ApiModelProperty(value = "采购or销售 费用明细id")
 	@TableField("Src_fees_id")
 	private Long srcFeesId;

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/extra/feign/IClaimClient.java

@@ -3,7 +3,9 @@ package com.trade.purchase.extra.feign;
 import com.trade.purchase.extra.entity.Claim;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -19,7 +21,7 @@ public interface IClaimClient {
 	String PASS_CHECK = API_PREFIX + "/pass-check";
 	String PASS_CANCEL = API_PREFIX + "/pass-cancel";
 	String UNDER_REVIEW = API_PREFIX + "/under-review";
-	String GET_CLAIM_ITEM = API_PREFIX + "/detail";
+	String GET_CLAIM_DETAIL = API_PREFIX + "/getClaimDetail";
 
 	/**
 	 * 审核通过
@@ -48,10 +50,7 @@ public interface IClaimClient {
 	@PostMapping(UNDER_REVIEW)
 	R underReview(@RequestParam("id") Long id);
 
-	/**
-	 *
-	 */
-	@PostMapping(GET_CLAIM_ITEM)
-	R<Claim> getClaimItem(@RequestParam("claim") Claim claim);
+	@PostMapping(GET_CLAIM_DETAIL)
+	Claim getClaimDetail(@RequestBody Claim claim);
 
 }

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -490,9 +490,9 @@ public class AuditProecessController extends BladeController {
 		Claim claim = new Claim();
 		claim.setId(srcBillId);
 		claim.setTenantId(AuthUtil.getTenantId());
-		R<Claim> claimR = claimClient.getClaimItem(claim);
+		Claim claimR = claimClient.getClaimDetail(claim);
 		if (ObjectUtils.isNotNull(claimR)) {
-			List<ClaimItem> list = claimR.getData().getItemList();
+			List<ClaimItem> list = claimR.getItemList();
 			if (ObjectUtil.isNotEmpty(list)){
 				return R.data(list);
 			}else {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1414,7 +1414,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						// 更新库存
 						boolean r = stockGoodsClient.updateStock(oneStock);
 						if (!r) {
-							throw new SecurityException("撤销失败: 更新库存失败");
+							throw new SecurityException("撤销失败: "+oneStock.getCode()+"更新库存失败");
 						}
 					});
 				}

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

@@ -564,12 +564,23 @@ public class AccController extends BladeController {
 	/**
 	 * 应收账款余额
 	 */
-	@GetMapping("/billBalance")
+	@GetMapping("/selBillBalance")
 	@ApiOperation(value = "收付款余额", notes = "传入acc")
-	public R<IPage<Acc>> billBalance(Acc acc, Query query){
+	public R<IPage<Acc>> selBillBalance(Acc acc, Query query){
 		acc.setTenantId(AuthUtil.getTenantId());
 		IPage<Acc> page = accService.selBillBalance(Condition.getPage(query), acc);
 		return R.data(page);
 	}
 
+	/**
+	 * 获得应收应付总额
+	 */
+	@GetMapping("/SumBillBalance")
+	@ApiOperation(value = "收付款总余额", notes = "传入acc")
+	public R<Map<String, Object>> SumBillBalance(Acc acc){
+		acc.setTenantId(AuthUtil.getTenantId());
+		Map<String, Object> map = accService.SumBillBalance(acc);
+		return R.data(map);
+	}
+
 }

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

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

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

@@ -56,7 +56,7 @@
         delete from finance_acc where Src_id = #{srcId}
     </delete>
 
-    <select id="selBillBalance" resultMap="accResultMap">
+    <select id="selBillBalance" resultType="org.springblade.finance.vojo.Acc">
         SELECT
             BCD.cname AS corpName,
             IFNULL( BC.amount, 0 ) AS amount,
@@ -74,11 +74,17 @@
                 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 FC.create_time &gt;= #{acc.createStartDate}
+                <if test='acc.createDateList != null and acc.createDateList[0] != null and acc.createDateList[0]!= ""'>
+                    and FC.create_time &gt;= #{acc.createDateList[0]}
                 </if>
-                <if test="acc.createEndDate !=null and acc.createEndDate != ''">
-                    AND FC.create_time &lt;= #{acc.createEndDate}
+                <if test='acc.createDateList != null and acc.createDateList[1] != null and acc.createDateList[1]!= ""'>
+                    and FC.create_time &lt;= #{acc.createDateList[1]}
+                </if>
+                <if test='acc.createStartDate != null and acc.createStartDate != ""'>
+                    and FC.create_time &gt;= #{acc.createStartDate}
+                </if>
+                <if test='acc.createEndDate != null and acc.createEndDate != ""'>
+                    and FC.create_time &lt;= #{acc.createEndDate}
                 </if>
             </where>
             GROUP BY
@@ -96,6 +102,24 @@
         HAVING SUM(FC.Amount-FC.Settlement_Amount) >= 100
     </select>
 
+    <select id="SumBillBalance" resultType="java.util.Map">
+        SELECT
+            SUM(CASE WHEN bill_type = '收费' THEN Amount ELSE 0 END) AS ysAmount,
+            SUM(CASE WHEN bill_type = '申请' THEN Amount ELSE 0 END) AS yfAmount
+        FROM
+            finance_acc
+        <where>
+            is_deleted = 0
+            and tenant_id = #{acc.tenantId}
+            <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>
+    </select>
+
     <select id="selectAccPage" resultMap="accResultMap">
         select * from finance_acc where is_deleted = 0
     </select>

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

@@ -103,4 +103,6 @@ public interface IAccService extends IService<Acc> {
 	R deleteBySrcId(Long srcId);
 
 	IPage<Acc> selBillBalance(IPage<Acc> page, Acc acc);
+
+	Map<String, Object> SumBillBalance(Acc acc);
 }

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

@@ -450,4 +450,8 @@ public class AccServiceImpl extends ServiceImpl<AccMapper, Acc> implements IAccS
 		return iPage.setRecords(baseMapper.selBillBalance(iPage, acc));
 	}
 
+	@Override
+	public Map<String, Object> SumBillBalance(Acc acc){
+		return baseMapper.SumBillBalance(acc);
+	}
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/controller/ClaimController.java

@@ -168,4 +168,13 @@ public class ClaimController extends BladeController {
 		return R.data(modify);
 	}
 
+	/**
+	 * 详情
+	 */
+	@PostMapping("/getClaimDetail")
+	@ApiOperation(value = "详情", notes = "传入claim")
+	public Claim getClaimDetail(@RequestBody Claim claim) {
+		return claimService.getDetail(claim);
+	}
+
 }