bug

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/EMPayInfo.java

@@ -30,8 +30,8 @@ public class EMPayInfo extends BaseEntity {
     @ApiModelProperty(value = "申请金额")
     private BigDecimal afMoney;
 
-    @ApiModelProperty(value = "收款人id")
-    private Long payeeUserId;
+    @ApiModelProperty(value = "收款人")
+    private String payeeUserName;
 
     @ApiModelProperty(value = "收款人开户行")
     private String payeeUserBankName;

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/EMPayInfoVO.java

@@ -7,9 +7,6 @@ import org.springblade.control.entity.EMPayInfo;
 @Data
 public class EMPayInfoVO extends EMPayInfo {
 
-    @ApiModelProperty(value = "收款人")
-    private String payeeUserName;
-
     @ApiModelProperty(value = "创建人")
     private String createName;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ExMaByLoanVO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Data
 public class ExMaByLoanVO implements Serializable {
@@ -14,4 +15,7 @@ public class ExMaByLoanVO implements Serializable {
     @ApiModelProperty(value = "借款名称")
     private String loanName;
 
+    @ApiModelProperty(value = "借款金额")
+    private BigDecimal loanMoney;
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/ExMaTwoController.java

@@ -112,6 +112,7 @@ public class ExMaTwoController extends BladeController {
             BigDecimal difference = obj.getLoanMoney().subtract(obj.getReturnMoney()).abs();
             String title = format + "借款" + difference + "元";
             vo.setLoanName(title);
+            vo.setLoanMoney(difference);
             return vo;
         }).collect(Collectors.toList());
         return R.data(collect);

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/EMPayServiceImpl.java

@@ -47,7 +47,6 @@ public class EMPayServiceImpl extends BaseServiceImpl<ExMPayMapper, EMPayInfo> i
         return pages.convert(obj -> {
             EMPayInfoVO vo = new EMPayInfoVO();
             BeanUtils.copyProperties(obj, vo);
-            vo.setPayeeUserName(userMap.get(vo.getPayeeUserId()));
             vo.setCreateName(userMap.get(vo.getCreateUser()));
             vo.setApprovalStatusName(vo.getStatus().equals(1) ? "待审批" : (vo.getStatus().equals(2) ? "已审批" : (vo.getStatus().equals(3) ? "已驳回" : "未上报")));
             vo.setApprovalResultName(vo.getApprovalStatusName().equals("已审批") || vo.getApprovalStatusName().equals("已驳回") ? "已通过" : "未通过");

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/LogHistoryServiceImpl.java

@@ -55,9 +55,7 @@ public class LogHistoryServiceImpl extends BaseServiceImpl<LogHistoryMapper, Log
             queryWrapper.eq(LogHistoryInfo::getUserId, dto.getUserId());
         }
         if (StringUtils.isNotEmpty(dto.getStartTime()) && StringUtils.isNotEmpty(dto.getEndTime())) {
-            String endTime = dto.getEndTime();
-            endTime = DateUtil.format(DateUtils.addDays(DateUtil.parse(endTime, "yyyy-MM"), 1), "yyyy-MM");
-            queryWrapper.between(LogHistoryInfo::getCreateTime, dto.getStartTime(), endTime);
+            queryWrapper.apply("DATE_FORMAT(create_time, '%Y-%m') BETWEEN '" + dto.getStartTime() + "' AND '" + dto.getEndTime() + "'");
         } else {
             //默认查询当月所有日志
             LocalDate today = LocalDate.now();