diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApply.java index 20959620fe..f4b1508851 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApply.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApply.java @@ -91,6 +91,8 @@ public class LoanSecondarySalesApply extends BaseEntity { private String orgSidPath; @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty("有效期") + private String validityDate; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java index ffc1c60efc..1e1f73043d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java @@ -94,5 +94,8 @@ public class LoanSecondarySalesApplyDetailsVo { @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty("有效期") + private String validityDate; + } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java index 69e9a1fc53..cfb6873e0b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; @@ -16,4 +17,6 @@ public class SalesBiddingVo { private String vinNo; private List biddingList = new ArrayList<>(); + @ApiModelProperty("是否显示竞价按钮") + private boolean validate; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml index 5922820af0..37256d45cb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml @@ -4,30 +4,32 @@ diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 0e6d02c8a9..21611c06f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -480,16 +480,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService maps = new HashMap<>(); maps.put("sid", businessSid); pushNoticeQuery.setArgs_json(JSONObject.toJSONString(maps)); + ResultBean resultBeans = sysNoticeFeign.savePushNotice(pushNoticeQuery); LoanSecondarySalesBiddingDto loanSecondarySalesBiddingDto = new LoanSecondarySalesBiddingDto(); loanSecondarySalesBiddingDto.setMainSid(businessSid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java index 0d3341652b..2dae2fbe68 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java @@ -7,10 +7,12 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto; import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo; +import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; @@ -21,7 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Collections; +import java.util.Date; import java.util.List; /** @@ -38,6 +44,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService sdf.parse(endtime).getTime()) {//转成long类型比较 + salesBiddingVo.setValidate(false); + } else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) { + salesBiddingVo.setValidate(true); + } + } catch (ParseException e) { + e.printStackTrace(); + } return rb.success().setData(salesBiddingVo); } } diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index ce6437ecee..7f82684515 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -489,19 +489,19 @@ const codemenu = [ { path: '/bikerebate/bikerebatemanagement', component: () => import('@/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue'), - name: 'bicyclerebatemanagement', + name: 'BicycleRebateManagement', meta: { title: '单车返利管理', noCache: true } }, { path: '/bikerebate/bicyclerebatewithholding', component: () => import('@/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue'), - name: 'bicyclerebatewithholding', + name: 'BicycleRebateWithholding', meta: { title: '单车返利预提', noCache: true } }, { path: '/bikerebate/bicyclerebatecheck', component: () => import('@/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue'), - name: 'bicyclerebatetobechecked', + name: 'BicycleRebateToBeChecked', meta: { title: '单车返利核对', noCache: true } } ] @@ -1076,42 +1076,42 @@ const codemenu = [ path: '/danchefanliyutiFlow/danchefanliyutiDaiBanInfo', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue'), - name: 'danchefanliyutiDaiBanInfo' + name: 'DanCheFanLiYuTiDaiBanInfo' }, // 单车返利预提办理页面 { path: '/danchefanliyutiFlow/danchefanliyutiYiBanInfo', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue'), - name: 'danchefanliyutiYiBanInfo' + name: 'DanCheFanLiYuTiYiBanInfo' }, // 单车返利预提 { path: '/danchefanliyutiFlow/danchefanliyutiEdit', component: () => import('@/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue'), - name: 'danchefanliyutiEdit' + name: 'DanCheFanLiYuTiEdit' }, // 单车返利核对申请详情页面 { path: '/danchefanliheduiFlow/danchefanliheduiDaiBanInfo', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue'), - name: 'danchefanliheduiDaiBanInfo' + name: 'DanCheFanLiHeDuiDaiBanInfo' }, // 单车返利核对办理页面 { path: '/danchefanliheduiFlow/danchefanliheduiYiBanInfo', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue'), - name: 'danchefanliheduiYiBanInfo' + name: 'DanCheFanLiHeDuiYiBanInfo' }, // 单车返利核对 { path: '/danchefanliheduiFlow/danchefanliheduiEdit', component: () => import('@/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue'), - name: 'danchefanliheduiEdit' + name: 'DanCheFanLiHeDuiEdit' }, // 专项返利预提申请详情页面 { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue index a87446ca67..38505012c7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue @@ -129,7 +129,7 @@ import bicyclerebatecheckInfo from './bicyclerebatecheckInfo' import {getStorage} from "@/utils/auth"; export default { - name: 'bicyclerebatecheck', + name: 'BicycleRebateCheck', components: { Pagination, pageye, @@ -175,7 +175,10 @@ export default { checkApply: '', createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -275,6 +278,9 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path req.pagelist(this.listQuery).then((response) => { console.log('列表查询结果:', response) this.listLoading = false @@ -299,7 +305,10 @@ export default { checkApply: '', createOrgSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index cfdc68c29f..5eaeee703f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -200,7 +200,7 @@ import yiheduidanchefanli from './relation/yiheduidanchefanli' import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd' export default { - name: 'bicyclerebatecheckAdd', + name: 'BicycleRebateCheckAdd', components: { yiheduidanchefanli, bicyclerebatetobecheckedAdd @@ -233,6 +233,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenVehrebateCheckapplydetailDetails: [], scmLastVehrebateCheckapplydetailDetails: [] }, @@ -272,6 +273,7 @@ export default { this.formobj.useOrgSid = createOrgSid this.formobj.createByName = window.sessionStorage.getItem('name') this.formobj.createBySid = window.sessionStorage.getItem('userSid') + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.viewTitle = '【新增】单车返利核对审核申请' }, showEdit(row) { @@ -531,6 +533,7 @@ export default { remarks: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmWhenVehrebateCheckapplydetailDetails: [], scmLastVehrebateCheckapplydetailDetails: [] } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index b218ad9d85..28db0e2aab 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -146,7 +146,7 @@ import req from '@/api/bikerebate/bicyclerebatecheck' import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo' export default { - name: 'bicyclerebatecheckInfo', + name: 'BicycleRebateCheckInfo', components: { bicyclerebatetobecheckedInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 51baec0cd1..5f3cad6d38 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -277,7 +277,7 @@ import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' import { brandDown, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'bicyclerebatetobechecked', + name: 'BicycleRebateToBeChecked', components: { Pagination, ButtonBar, @@ -351,7 +351,10 @@ export default { rebateName: '', state: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -446,6 +449,9 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path req.listPage(this.listQuery).then((response) => { console.log('列表查询结果:', response) this.listLoading = false @@ -473,7 +479,10 @@ export default { rebateName: '', state: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue index a2d8a7c508..2c159659b1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue @@ -113,10 +113,9 @@