Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
69249e4945
  1. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java
  2. 62
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
  4. 12
      anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
  5. 4
      anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue
  6. 4
      anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
  7. 2
      anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue
  8. 2
      anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue
  9. 6
      anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue
  10. 2
      anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsYiban.vue
  11. 24
      anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue
  12. 10
      anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue
  13. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleExportQuery.java

@ -15,11 +15,8 @@ import java.util.List;
public class BaseVehicleExportQuery implements Query {
private static final long serialVersionUID = -1272461446561155125L;
/**
* 选中的sid的list
*/
@ApiModelProperty(value = "sids", required = false)
private List<String> sids;
@ApiModelProperty(value = "采购系统")
private String purchaseSystemName;
@ApiModelProperty(value = "厂家采购订单类型value")
private String manPurOrderTypeValue;
@ApiModelProperty(value = "厂家库龄")
@ -62,7 +59,11 @@ public class BaseVehicleExportQuery implements Query {
@ApiModelProperty(value = "买断结束日期")
private String solidEndDate;
@ApiModelProperty(value = "分公司名称")
private String orgName;
private String userSid;
private String menuUrl;
private String menuSid;
/***************车型查询**********************/
@ApiModelProperty(value = "品牌")

62
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -545,19 +545,61 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
public List<BaseVehicleExportVo> listExcel(BaseVehicleExportQuery pagerQuery) {
QueryWrapper<BaseVehicleExportVo> qw = new QueryWrapper<>();
List<String> sids = pagerQuery.getSids();
if (sids != null) {
for (String sid : sids) {
if (sids.size() != 0) {
qw.in("bv.sid", sid);
if (pagerQuery != null) {
//========================================数据授权开始
if (StringUtils.isNotBlank(pagerQuery.getMenuUrl()) || StringUtils.isNotBlank(pagerQuery.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(pagerQuery.getOrgSidPath());
privilegeQuery.setMenuUrl(pagerQuery.getMenuUrl());
privilegeQuery.setMenuSid(pagerQuery.getMenuSid());
privilegeQuery.setUserSid(pagerQuery.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = pagerQuery.getOrgSidPath();
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("bv.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("bv.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("bv.createBySid", pagerQuery.getUserSid());
} else {
List<BaseVehicleExportVo> p = new ArrayList<>();
return p;
}
} else {
List<BaseVehicleExportVo> p = new ArrayList<>();
return p;
}
}
}
if (pagerQuery != null) {
qw.eq("bv.isDelete", "0");
if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) {
qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
// if (StringUtils.isNotBlank(pagerQuery.getCreateOrgSid())) {
// qw.eq("bv.createOrgSid", pagerQuery.getCreateOrgSid());
// }
if (StringUtils.isNotBlank(pagerQuery.getOrgName())){
qw.like("bv.createOrgName",pagerQuery.getOrgName());
}
if (StringUtils.isNotBlank(pagerQuery.getPurchaseSystemName())){
qw.like("bv.purchaseSystemName",pagerQuery.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(pagerQuery.getOrgSid())) {
qw.eq("bv.createOrgSid", pagerQuery.getOrgSid());
}
if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {//车架号
qw.like("bv.vinNo", pagerQuery.getVinNo());

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@ -512,11 +512,9 @@
select distinct bo.sid
from bus_sales_order bo
left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
left join anrui_riskcenter.loan_solutions lo on lo.salesOrderSid = bo.sid
<where>
${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结'
<!-- and bo.financePlan = '2'-->
and (lo.typeKey = '01' or lo.typeKey = '02')
and bo.financePlan = '2'
and length(bv.linkSid)>0
</where>
</select>

12
anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@ -232,7 +232,7 @@
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
</el-form-item>
</div>
</el-col>
@ -246,7 +246,7 @@
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶购置税</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
</el-form-item>
</div>
</el-col>
@ -383,11 +383,11 @@ export default {
return val
},
showAdd(value) {
this.finance = value
this.finance = JSON.parse(JSON.stringify(value))
this.init()
},
showEdit(value) {
this.finance = value
this.finance = JSON.parse(JSON.stringify(value))
this.init()
selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), isPack: this.finance.isPack }).then((resp) => {
if (resp.success) {
@ -665,11 +665,11 @@ export default {
}
}
if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium)) && this.finance.premiumCb) {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
return
}
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax)) && this.finance.purchaseTaxCb) {
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
return
}

4
anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue

@ -365,7 +365,7 @@ export default {
},
methods: {
showInfo(value) {
this.formobj = value
this.formobj = JSON.parse(JSON.stringify(value))
},
financialComputing() {
this.viewState = 2
@ -373,7 +373,7 @@ export default {
},
backData(value) {
this.viewState = 1
this.formobj = value
this.formobj = JSON.parse(JSON.stringify(value))
},
backParameters() {
this.$emit('backParameters', this.formobj)

4
anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue

@ -286,9 +286,7 @@ export default {
methods: {
showInfo(value) {
this.viewTitle = '金融方案'
this.formobj = value
console.log(value, 8888)
console.log(this.formobj, 9999)
this.formobj = JSON.parse(JSON.stringify(value))
},
handleReturn() {
this.$emit('doback')

2
anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue

@ -482,7 +482,7 @@ export default {
},
//
backData(value) {
this.formobj.loanTemplateSolutions = value
this.formobj.loanTemplateSolutions = JSON.parse(JSON.stringify(value))
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {

2
anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue

@ -198,7 +198,7 @@
<script>
import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
import financialschemeInfo from '../publicPage/financialschemeInfo'
export default {
name: 'CustomizedFinancialSolutionsDaiBan',

6
anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue

@ -190,7 +190,7 @@ import { typeValues, getAnnounceList } from '@/api/Common/dictcommons'
import shangzhuangselect from './relation/shangzhuangselect'
import modelSelect from './relation/modelSelect'
import guacheselect from './relation/guacheselect'
import financialschemeEdit from '@/components/publicPage/financialschemeEdit'
import financialschemeEdit from '../publicPage/financialschemeEdit'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
@ -368,7 +368,7 @@ export default {
})
},
getAnnounceList() {
getAnnounceList({ modelSid: this.formobj.vehModelSid, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
getAnnounceList({ modelSid: this.formobj.vehModelSid, orgPath: this.formobj.orgPath }).then((res) => {
if (res.success) {
this.NoticeModel_list = []
}
@ -384,7 +384,7 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions, this.formobj.orgPath)
if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) {
this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => {
this.image_list.push({

2
anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsYiban.vue

@ -171,7 +171,7 @@
<script>
import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
import financialschemeInfo from '../publicPage/financialschemeInfo'
export default {
name: 'CustomizedFinancialSolutionsYiBan',

24
anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@ -232,7 +232,7 @@
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="finance.premiumCb" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
</el-form-item>
</div>
</el-col>
@ -246,7 +246,7 @@
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶购置税</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="finance.purchaseTaxCb" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
</el-form-item>
</div>
</el-col>
@ -354,6 +354,7 @@ export default {
vehTotalPrice: '',
nominalPrice: ''
},
orgPath: '',
rules: {
}
}
@ -382,19 +383,20 @@ export default {
}
return val
},
showAdd(value) {
this.finance = value
showAdd(value, orgPath) {
this.finance = JSON.parse(JSON.stringify(value))
this.orgPath = orgPath
this.init()
},
showEdit(value) {
this.finance = value
this.finance = JSON.parse(JSON.stringify(value))
this.init()
selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), isPack: this.finance.isPack }).then((resp) => {
selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
if (resp.success) {
this.policy_list = resp.data
}
})
selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), sid: this.finance.policySid }).then((res) => {
selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: this.finance.policySid }).then((res) => {
if (res.success) {
this.other_list = res.data
}
@ -476,7 +478,7 @@ export default {
vehTotalPrice: '',
nominalPrice: ''
}
selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), isPack: this.finance.isPack }).then((resp) => {
selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
if (resp.success) {
this.policy_list = resp.data
}
@ -498,7 +500,7 @@ export default {
//
this.finance.factoryDiscountUse = '抵利息'
this.finance.factoryDiscountUseKey = '02'
selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), sid: choose[0].sid }).then((res) => {
selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
if (res.success) {
this.other_list = res.data
}
@ -665,11 +667,11 @@ export default {
}
}
if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium)) && this.finance.premiumCb) {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
return
}
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax)) && this.finance.purchaseTaxCb) {
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
return
}

10
anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue

@ -360,20 +360,22 @@ export default {
vehTotalPrice: '',
nominalPrice: ''
},
orgPath: '',
rules: {}
}
},
methods: {
showInfo(value) {
this.formobj = value
showInfo(value, orgPath) {
this.formobj = JSON.parse(JSON.stringify(value))
this.orgPath = orgPath
},
financialComputing() {
this.viewState = 2
this.$refs['divCount'].showAdd(this.formobj)
this.$refs['divCount'].showAdd(this.formobj, this.orgPath)
},
backData(value) {
this.viewState = 1
this.formobj = value
this.formobj = JSON.parse(JSON.stringify(value))
},
backParameters() {
this.$emit('backParameters', this.formobj)

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantemplate/LoanTemplateService.java

@ -189,6 +189,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
solutionsDto.setBusSid(sid);
solutionsDto.setShowMore(true);
ResultBean resultBean = loanSolutionsService.saveDtoss(solutionsDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -208,6 +209,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
SolutionDetailsDto solutionsDto = new SolutionDetailsDto();
BeanUtil.copyProperties(loanTemplateSolutionsDto, solutionsDto, "sid");
solutionsDto.setBusSid(sid);
solutionsDto.setShowMore(true);
loanSolutionsService.saveDtoss(solutionsDto);
}
baseMapper.updateById(loanTemplate);
@ -628,6 +630,7 @@ public class LoanTemplateService extends MybatisBaseService<LoanTemplateMapper,
BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo);
}
}
solutionssVo.setShowMore(true);
List<SolutionListVo> formList = loanSolutionsService.getFormList(solutionssVo);
templateApplyVo.setFinanceForms(formList);
return rb.success().setData(templateApplyVo);

Loading…
Cancel
Save