提交

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

@@ -295,4 +295,6 @@ public class Acc implements Serializable {
 	@TableField("Src_type")
 	private int srcType;
 
+	private String tradeType;
+
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Items.java

@@ -215,4 +215,5 @@ public class Items implements Serializable {
 	@TableField("Src_type")
 	private int srcType;
 
+	private String tradeType;
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -119,7 +119,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 					Message message=new Message();
 					message.setUserId(AuthUtil.getUserId());
 					message.setUserName(AuthUtil.getUserName());
-					message.setToUserId(Long.valueOf(auditProecessDTO.getSendUserId()));
+					message.setToUserId(Long.valueOf(e.getAuditUserId()));
 				    message.setMessageType(1);
 					message.setMessageBody("你有新的审批待操作,请及时处理");
 					R save = messageClient.save(message);

blade-service/blade-client/src/main/java/org/springblade/client/message/controller/MessageController.java

@@ -39,6 +39,8 @@ import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  *  控制器
  *
@@ -82,16 +84,15 @@ public class MessageController extends BladeController {
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入message")
-	public R<IPage<Message>> list(Message message, Query query) {
+	public R<List<Message>> list(Message message, Query query) {
 		LambdaQueryWrapper<Message> messageLambdaQueryWrapper=new LambdaQueryWrapper<>();
 		messageLambdaQueryWrapper
 			.like(Message::getToUserId, AuthUtil.getUserId())
 			.eq(Message::getTenantId,AuthUtil.getTenantId())
-		     .orderByDesc(Message::getCreateTime)
-		         .orderByAsc(Message::getIsRead)
-		;
-		IPage<Message> pages = messageService.page(Condition.getPage(query), messageLambdaQueryWrapper);
-		return R.data(pages);
+		         .orderByAsc(Message::getIsRead);
+
+		List<Message> list = messageService.list(messageLambdaQueryWrapper);
+		return R.data(list);
 	}
 
 	/**

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

@@ -539,6 +539,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			acc.setSrcBillNo(e.getBillNo());
 			acc.setBillType(billType);
 			acc.setCreateTime(new Date());
+			acc.setTradeType(e.getTradeType());
 			acc.setStatus(0);
 			acc.setCostType(e.getCostType());
 			acc.setCreateUser(AuthUtil.getUserId());
@@ -659,6 +660,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				acc.setCostType(e.getCostType());
 				acc.setSrcFeesId(e.getSrcFeesId());
 				acc.setSrcType(e.getSrcType());
+				acc.setTradeType(e.getTradeType());
 				accMapper.insert(acc);
 
 				//绑定accId,从申请表传递给结算表,后续结算时操作账单表的结算金额