Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/api/Common/dictcommons.js

@@ -8,6 +8,15 @@ export function typeValues(data) {
   })
 }
 
+// 获取数据字典（根据分组）
+export function getTypeValueList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/getTypeValueList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 获取所有分公司
 export function selectOrgSidList(data) {
   return request({

anrui-riskcenter-ui/src/views/courseofthecase/courseofthecaseAdd.vue

@@ -196,7 +196,9 @@
             </el-table-column>
             <el-table-column label="缴费项目" align="center" width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.paymentItems" clearable placeholder=""/>
+                <el-select v-model="scope.row.paymentItems" placeholder="请选择" clearable filterable @change="paymentItemsChange(scope.row, $event)">
+                  <el-option v-for="item in paymentItems_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
               </template>
             </el-table-column>
             <el-table-column label="缴费时间" align="center" width="200">
@@ -252,7 +254,9 @@
             </el-table-column>
             <el-table-column label="保全项目" align="center" width="200">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.preserveItems" clearable placeholder=""/>
+                <el-select v-model="scope.row.preserveItems" placeholder="请选择" clearable filterable @change="preserveItemsChange(scope.row, $event)">
+                  <el-option v-for="item in preserveItems_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
               </template>
             </el-table-column>
             <el-table-column label="保全日期" align="center" width="200">
@@ -345,7 +349,7 @@
 
 <script>
 import req from '@/api/courseofthecase/courseofthecase'
-import { getGressionUserList, typeValues, getLegalStaffS } from '@/api/Common/dictcommons'
+import { getGressionUserList, typeValues, getLegalStaffS, getTypeValueList } from '@/api/Common/dictcommons'
 import uploadImg from '@/components/uploadFile/uploadImg'
 import caseactionInfo from '../caseaction/caseactionInfo'
 import firstinstance from './relation/firstinstance/firstinstance'
@@ -380,6 +384,8 @@ export default {
       user_list: [],
       legalHead_list: [],
       preserveType_list: [],
+      paymentItems_list: [],
+      preserveItems_list: [],
       activeName: 0, // 一审、二审、再审、执行、结案模块切换
       isFirstSelect: false, // 一审是否选中
       isTwoSelect: false, // 二审是否选中
@@ -438,6 +444,16 @@ export default {
           this.preserveType_list = res.data
         }
       })
+      getTypeValueList({ type: 'payCostTitle', groupNum: 'susong' }).then((res) => {
+        if (res.success) {
+          this.paymentItems_list = res.data
+        }
+      })
+      getTypeValueList({ type: 'payCostTitle', groupNum: 'susongbaoquan' }).then((res) => {
+        if (res.success) {
+          this.preserveItems_list = res.data
+        }
+      })
       getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.user_list = res.data
@@ -524,6 +540,14 @@ export default {
         feesfile: []
       })
     },
+    paymentItemsChange(row, value) {
+      const choose = this.paymentItems_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.paymentItemsKey = choose[0].dictKey
+      } else {
+        row.paymentItemsKey = ''
+      }
+    },
     feesUserChange(row, value) {
       const choose = this.user_list.filter((item) => item.userSid === value)
       if (choose.length > 0 && choose !== null) {
@@ -602,6 +626,14 @@ export default {
         row.preserveType = ''
       }
     },
+    preserveItemsChange(row, value) {
+      const choose = this.preserveItems_list.filter((item) => item.dictValue === value)
+      if (choose.length > 0 && choose !== null) {
+        row.preserveItemsKey = choose[0].dictKey
+      } else {
+        row.preserveItemsKey = ''
+      }
+    },
     preserveUserChange(row, value) {
       const choose = this.user_list.filter((item) => item.userSid === value)
       if (choose.length > 0 && choose !== null) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalescustomer/LoanSecondarySalesCustomerService.java

@@ -24,6 +24,7 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.SalesVehVo;
 import com.yxt.anrui.riskcenter.biz.loanoutboundapply.LoanOutboundApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesbidding.LoanSecondarySalesBiddingService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostMapper;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesveh.LoanSecondarySalesVehService;
@@ -64,6 +65,8 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
     private LoanReturnVehLedgerService loanReturnVehLedgerService;
     @Autowired
     private SysNoticeFeign sysNoticeFeign;
+    @Autowired
+    private LoanSecondarySalesBiddingService loanSecondarySalesBiddingService;
 
     public ResultBean saveSalesCustomer(LoanSecondarySalesCustomerDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -174,7 +177,14 @@ public class LoanSecondarySalesCustomerService extends MybatisBaseService<LoanSe
         salesInitVo.setCreateDept(loanSecondarySalesApply.getCreateDept());
         salesInitVo.setSaleDate(loanSecondarySalesApply.getCloseDate());
         LoanSecondarySalesCost loanSecondarySalesCost = loanSecondarySalesCostMapper.selectMainSid(sid);
-        salesInitVo.setSalePrice(loanSecondarySalesCost.getVehPrice().toString());
+
+        //补充信息的最终价格-取竞价结果的最高价格
+        LoanSecondarySalesBidding loanSecondarySalesBidding = loanSecondarySalesBiddingService.selectByMainSid(sid);
+        if(loanSecondarySalesBidding != null){
+            salesInitVo.setSalePrice(loanSecondarySalesBidding.getPrice().toString());
+        }else{
+            salesInitVo.setSalePrice(loanSecondarySalesCost.getVehPrice().toString());
+        }
         if(loanSecondarySalesCustomer != null){
             String contractFiles = loanSecondarySalesCustomer.getContractFiles();
             String otherFiles = loanSecondarySalesCustomer.getOtherFiles();