24282 11 месяцев назад
Родитель
Сommit
daa7666e24
32 измененных файлов с 45 добавлено и 51 удалено
  1. 3 3
      jy-business/src/main/java/com/jy/business/capital/dao/CapitalAccountDao.java
  2. 2 2
      jy-business/src/main/java/com/jy/business/capital/mapper/CapitalAccountMapper.java
  3. 2 2
      jy-business/src/main/java/com/jy/business/capital/mapper/CapitalTransactionsMapper.java
  4. 1 1
      jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalAccountDto.java
  5. 1 1
      jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalAccountSelectDto.java
  6. 1 1
      jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalTransactionsDto.java
  7. 4 4
      jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java
  8. 1 1
      jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalAccountVo.java
  9. 1 1
      jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalTransactionsVo.java
  10. 1 1
      jy-business/src/main/java/com/jy/business/capital/service/CapitalAccountService.java
  11. 1 1
      jy-business/src/main/java/com/jy/business/capital/service/CapitalTransactionsService.java
  12. 0 2
      jy-business/src/main/java/com/jy/business/corporation/dao/CorporationDao.java
  13. 2 2
      jy-business/src/main/java/com/jy/business/corporation/mapper/CorporationMapper.java
  14. 1 1
      jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationDto.java
  15. 1 1
      jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationSelectDto.java
  16. 1 1
      jy-business/src/main/java/com/jy/business/corporation/model/vo/CorporationVo.java
  17. 1 1
      jy-business/src/main/java/com/jy/business/corporation/service/CorporationService.java
  18. 1 1
      jy-business/src/main/java/com/jy/business/payment/controller/PaymentRequestsController.java
  19. 0 1
      jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java
  20. 0 4
      jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDetailDao.java
  21. 2 2
      jy-business/src/main/java/com/jy/business/payment/mapper/PaymentRequestsDetailMapper.java
  22. 2 2
      jy-business/src/main/java/com/jy/business/payment/mapper/PaymentRequestsMapper.java
  23. 1 1
      jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsDetailDto.java
  24. 1 1
      jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsDetailSelectDto.java
  25. 1 1
      jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsSelectDto.java
  26. 4 3
      jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequests.java
  27. 4 3
      jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequestsDetail.java
  28. 1 1
      jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsDetailVo.java
  29. 1 1
      jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsVo.java
  30. 1 2
      jy-business/src/main/java/com/jy/business/payment/service/PaymentRequestsDetailService.java
  31. 1 1
      jy-business/src/main/java/com/jy/business/payment/service/PaymentRequestsService.java
  32. 1 1
      jy-business/src/main/java/com/jy/business/payment/service/impl/PaymentRequestsDetailServiceImpl.java

+ 3 - 3
jy-business/src/main/java/com/jy/business/capital/dao/CapitalAccountDao.java

@@ -13,7 +13,6 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Service
 public class CapitalAccountDao extends BaseDao<CapitalAccountMapper, CapitalAccount> {
@@ -76,9 +75,10 @@ public class CapitalAccountDao extends BaseDao<CapitalAccountMapper, CapitalAcco
 
     /**
      * 资金账户余额变更
+     *
      * @param capitalAccountId 资金账号id
-     * @param type 类型 1收入 0支出
-     * @param amount 变更金额
+     * @param type             类型 1收入 0支出
+     * @param amount           变更金额
      * @return true/false
      */
     public boolean updateAmount(Long capitalAccountId, Integer type, BigDecimal amount) {

+ 2 - 2
jy-business/src/main/java/com/jy/business/capital/mapper/CapitalAccountMapper.java

@@ -1,14 +1,14 @@
 package com.jy.business.capital.mapper;
 
-import com.jy.business.capital.model.entity.CapitalAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jy.business.capital.model.entity.CapitalAccount;
 
 /**
  * <p>
  * 资金账户 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CapitalAccountMapper extends BaseMapper<CapitalAccount> {

+ 2 - 2
jy-business/src/main/java/com/jy/business/capital/mapper/CapitalTransactionsMapper.java

@@ -1,14 +1,14 @@
 package com.jy.business.capital.mapper;
 
-import com.jy.business.capital.model.entity.CapitalTransactions;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jy.business.capital.model.entity.CapitalTransactions;
 
 /**
  * <p>
  * 资金流水 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CapitalTransactionsMapper extends BaseMapper<CapitalTransactions> {

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalAccountDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 资金账户新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalAccountSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 资金账户列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/model/dto/CapitalTransactionsDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 资金流水新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 4 - 4
jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java

@@ -5,21 +5,21 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jy.framework.model.base.BaseIdPo;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.jy.framework.model.validation.AddGroup;
 import com.jy.framework.model.validation.EditGroup;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 资金流水
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalAccountVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 资金账户列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/model/vo/CapitalTransactionsVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 资金流水列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/service/CapitalAccountService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 资金账户 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CapitalAccountService {

+ 1 - 1
jy-business/src/main/java/com/jy/business/capital/service/CapitalTransactionsService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 资金流水 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CapitalTransactionsService {

+ 0 - 2
jy-business/src/main/java/com/jy/business/corporation/dao/CorporationDao.java

@@ -11,8 +11,6 @@ import com.jy.system.service.AuthService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class CorporationDao extends BaseDao<CorporationMapper, Corporation> {
 

+ 2 - 2
jy-business/src/main/java/com/jy/business/corporation/mapper/CorporationMapper.java

@@ -1,14 +1,14 @@
 package com.jy.business.corporation.mapper;
 
-import com.jy.business.corporation.model.entity.Corporation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jy.business.corporation.model.entity.Corporation;
 
 /**
  * <p>
  * 公司信息 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CorporationMapper extends BaseMapper<Corporation> {

+ 1 - 1
jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 公司信息新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/corporation/model/dto/CorporationSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 公司信息列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/corporation/model/vo/CorporationVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 公司信息列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/corporation/service/CorporationService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 公司信息 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-16
  */
 public interface CorporationService {

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/controller/PaymentRequestsController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 请款 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @RestController

+ 0 - 1
jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDao.java

@@ -9,7 +9,6 @@ import com.jy.business.payment.model.entity.PaymentRequests;
 import com.jy.business.payment.model.table.PaymentRequestsTable;
 import com.jy.business.payment.model.vo.PaymentRequestsVo;
 import com.jy.framework.model.base.BaseDao;
-import com.jy.system.model.entity.SysDept;
 import com.jy.system.model.table.SysDeptTable;
 import com.jy.system.model.table.SysUserTable;
 import com.jy.system.service.AuthService;

+ 0 - 4
jy-business/src/main/java/com/jy/business/payment/dao/PaymentRequestsDetailDao.java

@@ -1,11 +1,7 @@
 package com.jy.business.payment.dao;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jy.business.payment.mapper.PaymentRequestsDetailMapper;
-import com.jy.business.payment.model.dto.PaymentRequestsDetailSelectDto;
 import com.jy.business.payment.model.entity.PaymentRequestsDetail;
-import com.jy.business.payment.model.table.PaymentRequestsDetailTable;
-import com.jy.business.payment.model.vo.PaymentRequestsDetailVo;
 import com.jy.framework.model.base.BaseDao;
 import com.jy.system.service.AuthService;
 import jakarta.annotation.Resource;

+ 2 - 2
jy-business/src/main/java/com/jy/business/payment/mapper/PaymentRequestsDetailMapper.java

@@ -1,14 +1,14 @@
 package com.jy.business.payment.mapper;
 
-import com.jy.business.payment.model.entity.PaymentRequestsDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jy.business.payment.model.entity.PaymentRequestsDetail;
 
 /**
  * <p>
  * 请款明细 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 public interface PaymentRequestsDetailMapper extends BaseMapper<PaymentRequestsDetail> {

+ 2 - 2
jy-business/src/main/java/com/jy/business/payment/mapper/PaymentRequestsMapper.java

@@ -1,14 +1,14 @@
 package com.jy.business.payment.mapper;
 
-import com.jy.business.payment.model.entity.PaymentRequests;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jy.business.payment.model.entity.PaymentRequests;
 
 /**
  * <p>
  * 请款 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 public interface PaymentRequestsMapper extends BaseMapper<PaymentRequests> {

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsDetailDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 请款明细新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsDetailSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 请款明细列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/model/dto/PaymentRequestsSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 请款列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 4 - 3
jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequests.java

@@ -5,17 +5,18 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jy.framework.model.base.BaseIdPo;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 请款
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 4 - 3
jy-business/src/main/java/com/jy/business/payment/model/entity/PaymentRequestsDetail.java

@@ -5,17 +5,18 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jy.framework.model.base.BaseIdPo;
-import java.math.BigDecimal;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 请款明细
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsDetailVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 请款明细列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/model/vo/PaymentRequestsVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 请款列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Getter

+ 1 - 2
jy-business/src/main/java/com/jy/business/payment/service/PaymentRequestsDetailService.java

@@ -1,13 +1,12 @@
 package com.jy.business.payment.service;
 
 
-
 /**
  * <p>
  * 请款明细 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 public interface PaymentRequestsDetailService {

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/service/PaymentRequestsService.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 请款 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 public interface PaymentRequestsService {

+ 1 - 1
jy-business/src/main/java/com/jy/business/payment/service/impl/PaymentRequestsDetailServiceImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
  * 请款明细 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2024-10-18
  */
 @Service