2022年9月2日 12:43

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsBank.java

@@ -16,10 +16,7 @@
  */
 package org.springblade.client.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -129,5 +126,4 @@ public class CorpsBank implements Serializable {
 	@ApiModelProperty(value = "科目编码")
 	private String subjectNumber;
 
-
 }

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

@@ -28,4 +28,9 @@ public class OrderIncomeVo implements Serializable {
 	 */
 	private String tenantName;
 
+	/**
+	 * 待审核条数
+	 */
+	private Integer proecessCount;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java

@@ -96,7 +96,7 @@ public class NoticeController extends BladeController {
 		//根据角色设置权限
 		String role = AuthUtil.getUserRole();
 		if (!role.contains("admin")){//admin能看全部，不是admin根据登录人查询
-			lambdaQueryWrapper.in(Notice::getSendRange,AuthUtil.getUserId());
+			lambdaQueryWrapper.like(Notice::getSendRange,AuthUtil.getUserId());
 		}
 
 		IPage<Notice> pages = noticeService.page(Condition.getPage(query), lambdaQueryWrapper);

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

@@ -175,6 +175,15 @@ public interface OrderMapper extends BaseMapper<Order> {
 								   @Param("orderEndDate") String orderEndDate);
 
 	/**
+	 * APP获得当前待审批数
+	 * @param tenantId 		租户id
+	 * @param userId		登录人
+	 * @return
+	 */
+	Integer proecessCount(@Param("tenantId") String tenantId,
+									@Param("userId") Long userId);
+
+	/**
 	 * 首页获取当月销售数量
 	 * @param tenantId 租户id
 	 * @param tradeType 贸易类型

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

@@ -1407,4 +1407,17 @@ ORDER BY
             </if>
         </where>
     </select>
+    <select id="proecessCount" resultType="Integer">
+        SELECT COUNT(*) FROM audit_proecess
+        <where>
+            is_delete = 0
+            AND audit_status = 'S'
+            <if test="tenantId != null and tenantId !=''">
+                AND tenant_id = #{tenantId}
+            </if>
+            <if test="userId != null and userId != ''">
+                AND audit_user_id = #{userId}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1540,6 +1540,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		incomeVo.setBusinessIncome(baseMapper.orderIncome(order.getTenantId(),order.getTradeType(), order.getOrderStartDate(), order.getOrderEndDate()));
 		//获得采购支出
 		incomeVo.setProcurementExpenditure(baseMapper.purchaseExpenditure(order.getTenantId(),order.getTradeType(), order.getOrderStartDate(), order.getOrderEndDate()));
+		//获得当前登录人待审核条数
+		incomeVo.setProecessCount(baseMapper.proecessCount(order.getTenantId(),AuthUtil.getUserId()));
 		return incomeVo;
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -51,6 +51,7 @@ 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.CollectionUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 
@@ -228,6 +229,20 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 				throw new SecurityException("开启审批失败：未查询到审批信息");
 			}
 
+			//获得明细
+			LambdaQueryWrapper<ClaimItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper.eq(ClaimItem::getTenantId, AuthUtil.getTenantId());
+			lambdaQueryWrapper.eq(ClaimItem::getIsDeleted, 0);
+			lambdaQueryWrapper.eq(ClaimItem::getPid, claim.getId());
+			List<ClaimItem> list = claimItemMapper.selectList(lambdaQueryWrapper);
+			if (CollectionUtil.isEmpty(list)){
+				throw new SecurityException("开启审批失败：单据明细不能为空");
+			}
+			//明细总数量
+			BigDecimal quantity = list.stream().map(ClaimItem::getQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+			//总金额
+			BigDecimal amount = list.stream().map(ClaimItem::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+
 			AuditProecessDTO auditProecessDTO = new AuditProecessDTO();
 			// 绑定审核类型
 			auditProecessDTO.setCheckType(claim.getCheckType());
@@ -244,6 +259,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 			auditProecessDTO.setSendUserId(AuthUtil.getUserId());
 			auditProecessDTO.setSendName(AuthUtil.getUserName());
 			auditProecessDTO.setSendTime(new Date());
+			auditProecessDTO.setOrderQuantity(quantity);//数量
+			auditProecessDTO.setAmount(amount);//金额
 			R financeProcess = checkClient.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败，请联系管理员");

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/LeadsServiceImpl.java

@@ -100,7 +100,7 @@ public class LeadsServiceImpl extends ServiceImpl<LeadsMapper, Leads> implements
 	@Override
 	public IPage<Leads> getList(Leads leads, Query query) {
 		LambdaQueryWrapper<Leads> leadsQueryWrapper = new LambdaQueryWrapper<>();
-		leadsQueryWrapper.like(StringUtil.isNotBlank(leads.getCorpName()), Leads::getCorpName, leads.getCorpName())
+		leadsQueryWrapper.like(ObjectUtil.isNotEmpty(leads.getCorpId()), Leads::getCorpId, leads.getCorpId())
 			.between(StringUtil.isNotBlank(leads.getBeginBizDate()) && StringUtil.isNotBlank(leads.getEndBizDate()),
 				Leads::getBizDate, leads.getBeginBizDate(), leads.getEndBizDate())
 			.eq(ObjectUtil.isNotEmpty(leads.getStatus()), Leads::getStatus, leads.getStatus())