diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgage.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgage.java new file mode 100644 index 0000000000..2623fbd5da --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgage.java @@ -0,0 +1,73 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:34 + */ +@Data +@ApiModel(value = "解抵管理", description = "解抵管理") +@TableName("loan_relieve_mortgage") +public class LoanRelieveMortgage extends BaseEntity { + + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; + @ApiModelProperty("销售订单关联业务车辆sid") + private String busVinSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("消贷合同号") + private String loanContractNo; + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("销售部门") + private String dept; + @ApiModelProperty("销售部门sid") + private String deptSid; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("销售专员sid") + private String salesmanSid; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("贷款人sid") + private String borrowerSid; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("移交日期") + private Date transferDate; + @ApiModelProperty("接收文件") + private String receiveFiles; + @ApiModelProperty("快递单号") + private String trackingNo; + @ApiModelProperty("移交方式key") + private String transferWayKey; + @ApiModelProperty("移交方式value(001邮寄002自送)") + private String transferWayValue; + @ApiModelProperty("接收人/签收人") + private String recipient; + @ApiModelProperty("移交备注") + private String transferRemarks; + @ApiModelProperty("其他移交资料") + private String otherInformation; + @ApiModelProperty("资方") + private String bankName; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDetailsVo.java new file mode 100644 index 0000000000..7b03067f7f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDetailsVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:13 + */ +@Data +public class LoanRelieveMortgageDetailsVo implements Vo { + private String sid; + private String remarks; + private String userSid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织全路径") + private String orgPath; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDto.java new file mode 100644 index 0000000000..021e235054 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/21 9:12 + */ +@Data +public class LoanRelieveMortgageDto implements Dto { + + private String sid; + private String remarks; + private String userSid; + @ApiModelProperty("参数编码") + private String parameterNo; + @ApiModelProperty("参数名称") + private String parameterName; + @ApiModelProperty("参数值") + private String parameterValue; + @ApiModelProperty("使用组织全路径") + private String orgPath; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java new file mode 100644 index 0000000000..3a40cb6738 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeign.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + + +/** + * @description: 解抵管理 + * @author: fan + * @date: 2023/7/6 + **/ +@Api(tags = "解抵管理") +@FeignClient( + contextId = "anrui-riskcenter-LoanRelieveMortgage", + name = "anrui-riskcenter", + path = "v1/loanrelievemortgage", + fallback = LoanRelieveMortgageFeignFallback.class) +public interface LoanRelieveMortgageFeign { + + /** + * 根据条件分页查询数据的列表（已测试） + * + * @param pq + */ + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增") + @PostMapping("/saveRelieveMortgage") + @ResponseBody + public ResultBean saveRelieveMortgage(@RequestBody LoanRelieveMortgageSaveDto dto); +// +// @ApiOperation("批量删除") +// @DeleteMapping("/deleteBySids") +// @ResponseBody +// public ResultBean deleteBySids(@RequestBody String[] sids); +// +// @ApiOperation("根据SID获取一条记录") +// @GetMapping("/fetchDetailsBySid/{sid}") +// @ResponseBody +// public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +// +// @ApiOperation("根据参数编码查询参数值") +// @PostMapping("/fetchByParNo") +// @ResponseBody +// ResultBean fetchByParNo(@RequestParam("parNo") String parNo); +// +// @ApiOperation("根据参数编码查询记录") +// @PostMapping("/fetchOneByParNo") +// @ResponseBody +// ResultBean fetchOneByParNo(@RequestParam("parNo") String parNo); +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeignFallback.java new file mode 100644 index 0000000000..cf5495eb20 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageFeignFallback.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +/** + * @author Administrator + * @description + * @date 2023/8/16 14:36 + */ +@Component +public class LoanRelieveMortgageFeignFallback implements LoanRelieveMortgageFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveRelieveMortgage(LoanRelieveMortgageSaveDto dto) { + return null; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageQuery.java new file mode 100644 index 0000000000..6c95564653 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageQuery.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:05 + */ +@Data +public class LoanRelieveMortgageQuery implements Query { + + @ApiModelProperty("移交状态") + private String state; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("销售部门") + private String dept; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("消贷合同号") + private String loanContractNo; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("移交开始日期") + private String transferStartDate; + @ApiModelProperty("移交结束日期") + private String transferEndDate; + + @ApiModelProperty("组织全路径") + private String orgPath; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("菜单url") + private String menuUrl; + @ApiModelProperty("用户sid") + private String userSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageSaveDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageSaveDto.java new file mode 100644 index 0000000000..feb6e8f0ce --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageSaveDto.java @@ -0,0 +1,53 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/2/1 17:35 + */ +@Data +public class LoanRelieveMortgageSaveDto implements Dto { + + @ApiModelProperty("创建者") + private String createBySid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; + @ApiModelProperty("使用组织全路径") + private String orgSidPath; + @ApiModelProperty("销售订单关联业务车辆sid") + private String busVinSid; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vehSid; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("消贷合同号") + private String loanContractNo; + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("销售部门") + private String dept; + @ApiModelProperty("销售部门sid") + private String deptSid; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("销售专员sid") + private String salesmanSid; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("贷款人sid") + private String borrowerSid; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("客户Sid") + private String customerSid; + @ApiModelProperty("资方") + private String bankName; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageVo.java new file mode 100644 index 0000000000..a30299428f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrelievemortgage/LoanRelieveMortgageVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.riskcenter.api.loanrelievemortgage; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author Administrator + * @description + * @date 2023/8/16 15:04 + */ +@Data +public class LoanRelieveMortgageVo implements Vo { + + private String sid; + @ApiModelProperty("移交状态") + private String state; + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("销售部门") + private String dept; + @ApiModelProperty("销售专员") + private String salesman; + @ApiModelProperty("消贷合同号") + private String loanContractNo; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String vehMark; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("资方合同号") + private String bankContractNo; + @ApiModelProperty("客户名称") + private String customer; + @ApiModelProperty("贷款人") + private String borrowerName; + @ApiModelProperty("移交日期") + private String transferDate; + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java new file mode 100644 index 0000000000..b49ddf308a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.riskcenter.biz.loanrelievemortgage; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList; +import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgage; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +@Mapper +public interface LoanRelieveMortgageMapper extends BaseMapper { + + + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml new file mode 100644 index 0000000000..21aa6e0811 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageMapper.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageRest.java new file mode 100644 index 0000000000..fd52bccd28 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageRest.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.biz.loanrelievemortgage; + +import com.yxt.anrui.riskcenter.api.loanparameter.LoanParameterVo; +import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVehFeign; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageFeign; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageQuery; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@Api(tags = "解抵管理") +@RestController +@RequestMapping("v1/loanrelievemortgage") +public class LoanRelieveMortgageRest implements LoanRelieveMortgageFeign { + + @Autowired + private LoanRelieveMortgageService loanRelieveMortgageService; + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = loanRelieveMortgageService.listPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveRelieveMortgage(LoanRelieveMortgageSaveDto dto) { + return loanRelieveMortgageService.saveRelieveMortgage(dto); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java new file mode 100644 index 0000000000..c63ef0d4a1 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrelievemortgage/LoanRelieveMortgageService.java @@ -0,0 +1,147 @@ +package com.yxt.anrui.riskcenter.biz.loanrelievemortgage; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanredemptionapply.LoanRedemptionApply; +import com.yxt.anrui.riskcenter.api.loanredemptionapply.LoanRedemptionApplyQuery; +import com.yxt.anrui.riskcenter.api.loanredemptionapply.LoanRedemptionApplyVo; +import com.yxt.anrui.riskcenter.api.loanredemptionapply.RedemptionVinList; +import com.yxt.anrui.riskcenter.api.loanredemptionveh.LoanRedemptionVeh; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgage; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageQuery; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageSaveDto; +import com.yxt.anrui.riskcenter.api.loanrelievemortgage.LoanRelieveMortgageVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: fzz + * @date: 2023/7/6 + **/ +@Service +public class LoanRelieveMortgageService extends MybatisBaseService { + + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean saveRelieveMortgage(LoanRelieveMortgageSaveDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanRelieveMortgage entity = new LoanRelieveMortgage(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + int i = baseMapper.insert(entity); + if (i > 0) { + return rb.success(); + } + return rb; + } + + public PagerVo listPage(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + LoanRelieveMortgageQuery pagerQuery = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(pagerQuery.getOrgPath()); + privilegeQuery.setMenuSid(pagerQuery.getMenuSid()); + privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl()); + privilegeQuery.setUserSid(pagerQuery.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = pagerQuery.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", pagerQuery.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //======================= + //移交状态 + if (StringUtils.isNotBlank(pagerQuery.getState())) { + qw.like("`state`", pagerQuery.getState()); + } + //分公司 + if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { + qw.like("useOrgName", pagerQuery.getUseOrgName()); + } + //申请部门 + if (StringUtils.isNotBlank(pagerQuery.getDept())) { + qw.like("dept", pagerQuery.getDept()); + } + //消贷合同号 + if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) { + qw.like("loanContractNo", pagerQuery.getLoanContractNo()); + } + //资方 + if (StringUtils.isNotBlank(pagerQuery.getBankName())) { + qw.like("bankName", pagerQuery.getBankName()); + } + //资方合同号 + if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) { + qw.like("bankContractNo", pagerQuery.getBankContractNo()); + } + //客户名称 + if (StringUtils.isNotBlank(pagerQuery.getCustomer())) { + qw.like("customer", pagerQuery.getCustomer()); + } + //贷款人 + if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) { + qw.like("borrowerName", pagerQuery.getBorrowerName()); + } + //车架号 + if (StringUtils.isNotBlank(pagerQuery.getVinNo())) { + qw.like("vinNo", pagerQuery.getVinNo()); + } + //车牌号 + if (StringUtils.isNotBlank(pagerQuery.getVehMark())) { + qw.like("vehMark", pagerQuery.getVehMark()); + } + String startDate = pagerQuery.getTransferStartDate(); + String endDate = pagerQuery.getTransferEndDate(); + qw.apply(StringUtils.isNotEmpty(startDate), "date_format (transferDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(endDate), "date_format (transferDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')" + ); + + qw.eq("a.isDelete", 0); + qw.orderBy(true, false, "`state`") + .orderBy(true, false, "createTime") + ; + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 928c3cb522..f8c2ace9d8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -236,7 +236,19 @@