优化工作

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -135,7 +135,6 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
                 qw.eq("useOrg", orgSid);
             }
-
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1915,8 +1915,12 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         for (BaseVehicleOutVoExeclNew baseVehicleOutVoExeclNew : baseVehicleOutVoExeclNews) {
             baseVehicleOutVoExeclNew.setRankNo(id);
             String createOrgSid = baseVehicleOutVoExeclNew.getCreateOrgSid();
-            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+            if (StringUtils.isNotBlank(createOrgSid)){
-            baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
+                SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+                baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
+            }else {
+                baseVehicleOutVoExeclNew.setCreateOrgName("无");
+            }
             id = id + 1;
             //贴息
             String concatNo = baseVehicleOutVoExeclNew.getConcatNo();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
+
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/7/11
+ **/
+@Data
+public class LoanFinOtherPolicyDtos implements Dto {
+
+    private String sid;
+    @ApiModelProperty("资方名称")
+    private String bankShortName;
+    @ApiModelProperty("其他融名称（资方+产品类别+最高融资比例+期数）")
+    private String otherPolicyName;
+    @ApiModelProperty("资方sid")
+    private String bankSid;
+    @ApiModelProperty("主产品sid")
+    private String mainPolicySid;
+    @ApiModelProperty("适用销售部门sids(逗号分隔)")
+    private String useDeptSids;
+    @ApiModelProperty("适用销售部门名称(逗号分隔)")
+    private String useDeptNames;
+    @ApiModelProperty("适用销售部门List")
+    private List<UseDept> useDeptList = new ArrayList<>();
+    @ApiModelProperty("产品类别key")
+    private String productTypeKey;
+    @ApiModelProperty("产品类别value")
+    private String productTypeValue;
+    @ApiModelProperty("业务类型key")
+    private String busTypeKey;
+    @ApiModelProperty("业务类型value")
+    private String busTypeValue;
+    @ApiModelProperty("车辆大类key")
+    private String vehCategoryKey;
+    @ApiModelProperty("车辆大类value")
+    private String vehCategoryValue;
+    @ApiModelProperty("车辆功能key")
+    private String vehTypeKey;
+    @ApiModelProperty("车辆功能value")
+    private String vehTypeValue;
+    @ApiModelProperty("最高融资额比例（%）")
+    private String maxLoanRatio;
+    @ApiModelProperty("最高融资额")
+    private String maxLoanAmount;
+    @ApiModelProperty("期数")
+    private int period;
+    private String periodKey;
+    @ApiModelProperty("年利率（%）")
+    private String yearRatio;
+    @ApiModelProperty("有效期至")
+    private String validDateTo;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanfinotherPolicy;
 
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyQuery;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -30,6 +31,16 @@ public interface LoanFinOtherPolicyFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(@RequestBody PagerQuery<LoanFinOtherPolicyQuery> pq);
 
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody LoanFinOtherPolicyDtos dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
     @GetMapping("details")
     @ApiOperation("详情")
     ResultBean<LoanFinOtherPolicyVos> details(@RequestParam("sid") String sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java

@@ -15,11 +15,11 @@ import java.math.BigDecimal;
 public class LoanFinOtherPolicyQuery implements Query {
 
     @ApiModelProperty("报备状态：1已报备，0未报备")
-    private int filingState;
+    private String filingState;
     @ApiModelProperty("风控状态：1禁用 0正常  风控中心设置的状态")
-    private int riskState;
+    private String riskState;
     @ApiModelProperty("使用状态：1停用  0正常 各分公司设置的状态")
-    private int useSate;
+    private String useSate;
     @ApiModelProperty("创建组织名称")
     private String createOrgName;
     @ApiModelProperty("业务类型value")
@@ -35,7 +35,7 @@ public class LoanFinOtherPolicyQuery implements Query {
     @ApiModelProperty("结束有效期至")
     private String validEndDateTo;
     @ApiModelProperty("期数")
-    private int period;
+    private String period;
     @ApiModelProperty("年利率（%）")
-    private BigDecimal yearRatio;
+    private String yearRatio;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos;
+import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,4 +31,6 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper<LoanFinOtherPolicy>
     List<OtherPolicyVo> selectListOne(String sid);
 
     List<OtherPolicyVo> selectListTwo(String useOrgSid);
+
+    IPage<LoanFinOtherPolicyPageVo> selectPageVo(IPage<LoanFinOtherPolicy> page,@Param(Constants.WRAPPER)QueryWrapper<LoanPreloanCreditApply> qw);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -44,4 +44,14 @@
         and lfo.filingState = 2
         and lfo.validDateTo > now()
     </select>
+
+    <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyPageVo">
+        SELECT
+        *
+        FROM
+        loan_fin_otherpolicy
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
 
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -26,7 +27,20 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
 
     @Override
     public ResultBean<PagerVo<LoanFinOtherPolicyPageVo>> listPage(PagerQuery<LoanFinOtherPolicyQuery> pq) {
-        return null;
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<LoanFinOtherPolicyPageVo> pv = loanFinOtherPolicyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean save(LoanFinOtherPolicyDtos dto) {
+        return loanFinOtherPolicyService.saveOrUpdateDto(dto);
+    }
+
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        loanFinOtherPolicyService.delBySids(sids);
+        return new ResultBean().success();
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -1,12 +1,21 @@
 package com.yxt.anrui.riskcenter.biz.loanfinotherPolicy;
 
+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.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
+import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicyVos;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.UseDept;
-import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
+import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
 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;
 
@@ -66,4 +75,90 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         return rb.success().setData(list);
 
     }
+
+    public PagerVo<LoanFinOtherPolicyPageVo> listPageVo(PagerQuery<LoanFinOtherPolicyQuery> pq) {
+        LoanFinOtherPolicyQuery query = pq.getParams();
+        QueryWrapper<LoanPreloanCreditApply> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getCreateOrgName())) {
+            qw.like("createOrgName", query.getCreateOrgName());
+        }
+        if (StringUtils.isNotBlank(query.getFilingState())) {
+            qw.eq("filingState", query.getFilingState());
+        }
+        if (StringUtils.isNotBlank(query.getRiskState())) {
+            qw.eq("riskState", query.getRiskState());
+        }
+        if (StringUtils.isNotBlank(query.getUseSate())) {
+            qw.eq("useSate", query.getUseSate());
+        }
+        if (StringUtils.isNotBlank(query.getBusTypeValue())) {
+            qw.like("busTypeValue", query.getBusTypeValue());
+        }
+        if (StringUtils.isNotBlank(query.getVehCategoryValue())) {
+            qw.like("vehCategoryValue", query.getVehCategoryValue());
+        }
+        if (StringUtils.isNotBlank(query.getVehTypeValue())) {
+            qw.like("vehTypeValue", query.getVehTypeValue());
+        }
+        if (StringUtils.isNotBlank(query.getOtherPolicyName())) {
+            qw.like("otherPolicyName", query.getOtherPolicyName());
+        }
+        if (StringUtils.isNotBlank(query.getYearRatio())) {
+            qw.like("yearRatio", query.getYearRatio());
+        }
+        String validStartDateTo = query.getValidStartDateTo();
+        String validEndDateTo = query.getValidEndDateTo();
+        qw.apply(StringUtils.isNotEmpty(validStartDateTo), "date_format (validDateTo,'%Y-%m-%d') >= date_format('" + validStartDateTo + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(validEndDateTo), "date_format (validDateTo,'%Y-%m-%d') <= date_format('" + validEndDateTo + "','%Y-%m-%d')"
+                );
+        IPage<LoanFinOtherPolicy> page = PagerUtil.queryToPage(pq);
+        IPage<LoanFinOtherPolicyPageVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<LoanFinOtherPolicyPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(LoanFinOtherPolicyDtos dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {//新增
+            this.insertByDto(dto);
+            return rb.success();
+        }
+        this.updateByDto(dto);
+        return rb.success();
+    }
+
+    public void insertByDto(LoanFinOtherPolicyDtos dto) {
+        List<UseDept> useDeptList = dto.getUseDeptList();
+        LoanFinOtherPolicy entity = new LoanFinOtherPolicy();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String useDeptSid = "";
+        String useDeptName = "";
+        for (UseDept useDept : useDeptList) {
+            useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
+            useDeptName = useDeptName + useDept.getDeptName() + ",";
+        }
+        entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
+        entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(LoanFinOtherPolicyDtos dto) {
+        String dtoSid = dto.getSid();
+        List<UseDept> useDeptList = dto.getUseDeptList();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        LoanFinOtherPolicy entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        String useDeptSid = "";
+        String useDeptName = "";
+        for (UseDept useDept : useDeptList) {
+            useDeptSid = useDeptSid + useDept.getDeptSid() + ",";
+            useDeptName = useDeptName + useDept.getDeptName() + ",";
+        }
+        entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
+        entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
+        baseMapper.updateById(entity);
+    }
 }