diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/controller/LoanController.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java similarity index 77% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/controller/LoanController.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java index 04b73b0..c5a2d93 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/controller/LoanController.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/controller/LoanController.java @@ -1,15 +1,12 @@ -package com.chushang.controller; +package com.chushang.loan.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chushang.common.core.web.AjaxResult; -import com.chushang.common.mybatis.page.CommonParam; -import com.chushang.domin.dto.LoanApproval; -import com.chushang.domin.dto.LoanFormData; -import com.chushang.domin.entity.LoanEntity; -import com.chushang.domin.query.LoanFormQuery; -import com.chushang.service.ILoanService; +import com.chushang.loan.domin.dto.LoanApproval; +import com.chushang.loan.domin.entity.LoanEntity; +import com.chushang.loan.domin.query.LoanFormQuery; +import com.chushang.loan.service.ILoanService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -17,8 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletResponse; - @RestController @RequestMapping("/loan") public class LoanController { diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanApproval.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanApproval.java similarity index 96% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanApproval.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanApproval.java index a9067f0..f25fcde 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanApproval.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanApproval.java @@ -1,4 +1,4 @@ -package com.chushang.domin.dto; +package com.chushang.loan.domin.dto; import lombok.Data; import org.hibernate.validator.constraints.Range; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanFormData.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanFormData.java similarity index 98% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanFormData.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanFormData.java index 44196d7..b36025f 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/dto/LoanFormData.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/dto/LoanFormData.java @@ -1,4 +1,4 @@ -package com.chushang.domin.dto; +package com.chushang.loan.domin.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanAduitEntity.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanAduitEntity.java similarity index 97% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanAduitEntity.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanAduitEntity.java index f4fa54d..f38e7c2 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanAduitEntity.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanAduitEntity.java @@ -1,4 +1,4 @@ -package com.chushang.domin.entity; +package com.chushang.loan.domin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanEntity.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanEntity.java similarity index 81% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanEntity.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanEntity.java index 772e59c..167eed4 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/entity/LoanEntity.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/entity/LoanEntity.java @@ -1,5 +1,6 @@ -package com.chushang.domin.entity; +package com.chushang.loan.domin.entity; +import cn.hutool.core.date.DatePattern; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -7,10 +8,12 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.chushang.common.mybatis.annotation.Condition; import com.chushang.common.mybatis.base.BaseEntity; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * 借贷业务数据表 实体类。 @@ -41,6 +44,7 @@ public class LoanEntity extends BaseEntity { * 渠道id */ @TableField(value = "dept_id") + @Condition(name = "dept_id", type = Condition.ConditionType.eq) private Long deptId; /** @@ -53,6 +57,7 @@ public class LoanEntity extends BaseEntity { * 表单编号 */ @TableField(value = "form_number") + @Condition(name = "form_number", type = Condition.ConditionType.eq) private String formNumber; /** @@ -109,6 +114,7 @@ public class LoanEntity extends BaseEntity { * 跟进状态 1 待审核 2 审核成功 3 审核拒绝 */ @TableField(value = "status") + @Condition(name = "status", type = Condition.ConditionType.eq) private Integer status; /** @@ -124,7 +130,10 @@ public class LoanEntity extends BaseEntity { private String denialReason; - + @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) + @Condition(name = "submission_time", type = Condition.ConditionType.between) + @TableField(exist = false) + private List submissionTimes; } diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/query/LoanFormQuery.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/query/LoanFormQuery.java similarity index 96% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/query/LoanFormQuery.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/query/LoanFormQuery.java index 9e54501..8964a91 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/query/LoanFormQuery.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/query/LoanFormQuery.java @@ -1,4 +1,4 @@ -package com.chushang.domin.query; +package com.chushang.loan.domin.query; import cn.hutool.core.date.DatePattern; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanData.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanData.java similarity index 94% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanData.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanData.java index feadddf..f4e4cba 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanData.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanData.java @@ -1,4 +1,4 @@ -package com.chushang.domin.vo; +package com.chushang.loan.domin.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanVO.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanVO.java similarity index 94% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanVO.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanVO.java index 1832913..0212b66 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/domin/vo/LoanVO.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/domin/vo/LoanVO.java @@ -1,4 +1,4 @@ -package com.chushang.domin.vo; +package com.chushang.loan.domin.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanAduitMapper.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanAduitMapper.java similarity index 59% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanAduitMapper.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanAduitMapper.java index 9e2747b..97ee6ad 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanAduitMapper.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanAduitMapper.java @@ -1,7 +1,7 @@ -package com.chushang.mapper; +package com.chushang.loan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.domin.entity.LoanAduitEntity; +import com.chushang.loan.domin.entity.LoanAduitEntity; public interface LoanAduitMapper extends BaseMapper { diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanMapper.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanMapper.java similarity index 50% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanMapper.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanMapper.java index 74bac89..57115e9 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/mapper/LoanMapper.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/mapper/LoanMapper.java @@ -1,10 +1,9 @@ -package com.chushang.mapper; +package com.chushang.loan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.chushang.domin.entity.LoanEntity; -import com.chushang.domin.query.LoanFormQuery; -import com.chushang.domin.vo.LoanData; -import com.chushang.domin.vo.LoanVO; +import com.chushang.loan.domin.entity.LoanEntity; +import com.chushang.loan.domin.query.LoanFormQuery; +import com.chushang.loan.domin.vo.LoanData; import java.util.List; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanAduitService.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanAduitService.java new file mode 100644 index 0000000..a244887 --- /dev/null +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanAduitService.java @@ -0,0 +1,10 @@ +package com.chushang.loan.service; + +import com.chushang.loan.domin.entity.LoanAduitEntity; + +public interface ILoanAduitService { + + void insertAduit(LoanAduitEntity loanAduitEntity); + + +} diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanService.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanService.java similarity index 50% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanService.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanService.java index 6af9d0d..87e3d78 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanService.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/ILoanService.java @@ -1,16 +1,11 @@ -package com.chushang.service; +package com.chushang.loan.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chushang.common.mybatis.utils.PageResult; -import com.chushang.domin.dto.LoanApproval; -import com.chushang.domin.dto.LoanFormData; -import com.chushang.domin.entity.LoanEntity; -import com.chushang.domin.query.LoanFormQuery; -import com.chushang.domin.vo.LoanVO; -import org.springframework.stereotype.Service; - -import java.util.List; +import com.chushang.loan.domin.dto.LoanApproval; +import com.chushang.loan.domin.dto.LoanFormData; +import com.chushang.loan.domin.entity.LoanEntity; +import com.chushang.loan.domin.query.LoanFormQuery; public interface ILoanService { diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanAduitServiceImpl.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanAduitServiceImpl.java similarity index 68% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanAduitServiceImpl.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanAduitServiceImpl.java index 0ed23e2..e03db30 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanAduitServiceImpl.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanAduitServiceImpl.java @@ -1,9 +1,9 @@ -package com.chushang.service.impl; +package com.chushang.loan.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.chushang.domin.entity.LoanAduitEntity; -import com.chushang.mapper.LoanAduitMapper; -import com.chushang.service.ILoanAduitService; +import com.chushang.loan.domin.entity.LoanAduitEntity; +import com.chushang.loan.mapper.LoanAduitMapper; +import com.chushang.loan.service.ILoanAduitService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanServiceImpl.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java similarity index 84% rename from chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanServiceImpl.java rename to chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java index d576b2f..6f01346 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/impl/LoanServiceImpl.java +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/loan/service/impl/LoanServiceImpl.java @@ -1,17 +1,9 @@ -package com.chushang.service.impl; +package com.chushang.loan.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.LocalDateTimeUtil; -import cn.hutool.core.img.ImgUtil; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.extra.qrcode.QrCodeUtil; -import cn.hutool.extra.qrcode.QrConfig; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,35 +13,29 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.datascope.annotation.DataScope; -import com.chushang.domin.dto.LoanApproval; -import com.chushang.domin.dto.LoanFormData; -import com.chushang.domin.entity.LoanAduitEntity; -import com.chushang.domin.entity.LoanEntity; -import com.chushang.domin.query.LoanFormQuery; -import com.chushang.domin.vo.LoanData; -import com.chushang.domin.vo.LoanVO; -import com.chushang.mapper.LoanMapper; +import com.chushang.loan.domin.dto.LoanApproval; +import com.chushang.loan.domin.dto.LoanFormData; +import com.chushang.loan.domin.entity.LoanAduitEntity; +import com.chushang.loan.domin.entity.LoanEntity; +import com.chushang.loan.domin.query.LoanFormQuery; +import com.chushang.loan.domin.vo.LoanData; +import com.chushang.loan.domin.vo.LoanVO; +import com.chushang.loan.service.ILoanService; +import com.chushang.loan.mapper.LoanMapper; import com.chushang.oss.feign.RemoteOssService; -import com.chushang.security.entity.po.SysDept; import com.chushang.security.entity.po.SysUser; -import com.chushang.security.entity.vo.LoginUser; import com.chushang.security.utils.SecurityUtils; -import com.chushang.service.ILoanAduitService; -import com.chushang.service.ILoanService; +import com.chushang.loan.service.ILoanAduitService; import com.chushang.system.entity.dto.UserQcCodeDTO; import com.chushang.system.entity.po.SysUserQcCode; import com.chushang.system.feign.RemoteUserQcCodeService; import com.chushang.system.feign.RemoteUserService; import lombok.extern.slf4j.Slf4j; -import org.apache.logging.log4j.util.Strings; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanAduitService.java b/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanAduitService.java deleted file mode 100644 index d75b928..0000000 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/java/com/chushang/service/ILoanAduitService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.chushang.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.chushang.domin.dto.LoanApproval; -import com.chushang.domin.dto.LoanFormData; -import com.chushang.domin.entity.LoanAduitEntity; -import com.chushang.domin.entity.LoanEntity; -import com.chushang.domin.query.LoanFormQuery; - -public interface ILoanAduitService { - - void insertAduit(LoanAduitEntity loanAduitEntity); - - -} diff --git a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml index 866bc59..b6fcd8e 100644 --- a/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml +++ b/chushang-modules/chushang-module-loan/loan-service/src/main/resources/mapper/LoanMapper.xml @@ -1,9 +1,9 @@ - + - select channel_name, author_name, author_phone,