Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
f08b4f993b
  1. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java
  2. 2
      anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecord.vue
  3. 26
      anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
  4. 30
      anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
  5. 20
      anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagementAdd.vue
  6. 26
      anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagementInfo.vue
  7. 26
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
  8. 26
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
  9. 26
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
  10. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java
  11. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java
  12. 7
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java
  13. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  14. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java
  15. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue
  16. 4
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue
  17. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoInfo.vue
  18. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  19. 104
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  20. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  21. 9
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java
  22. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java
  23. 1
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

25
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributorapply/BaseDistributorApplyService.java

@ -753,6 +753,22 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
BaseDistributorApply baseDistributorApply = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(baseDistributorApply.getTaskId())) {
bv.setOrgSidPath(baseDistributorApply.getOrgSidPath());
//流程中的参数赋值
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
//若有网关,则赋值网关中判断的字段。
boolean isDecide = true;
//去查询是否同意
if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) {
if (baseDistributorApply.getAgree().equals("0")) {
isDecide = false;
}
}
variables.put("isDecide", isDecide);
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -1044,6 +1060,15 @@ public class BaseDistributorApplyService extends MybatisBaseService<BaseDistribu
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//若有网关,则赋值网关中判断的字段。
boolean isDecide = true;
//去查询是否同意
if (StringUtils.isNotBlank(baseDistributorApply.getAgree())) {
if (baseDistributorApply.getAgree().equals("0")) {
isDecide = false;
}
}
variables.put("isDecide", isDecide);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {

2
anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecord.vue

@ -233,7 +233,7 @@ export default {
procInsId: row.procInstId,
token: getStorage()
}
this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {

26
anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue

@ -199,41 +199,41 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">合作协议</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">合作协议</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list1" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list1" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list2" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list2" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">道路运输许可证</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">法人和实际控制人签署的信息查询授权书</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list3" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list3" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">法人身份证</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">人和实际控制人身份证</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list4" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list4" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他资料</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他资料</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list5" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list5" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
@ -633,4 +633,10 @@ export default {
.addinputInfo {
margin-left: 160px !important;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

30
anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue

@ -181,32 +181,32 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
<div class="span-sty span-sty-special">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
<div class="span-sty span-sty-special">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">道路运输许可证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
<div class="span-sty span-sty-special">法人和实际控制人签署的信息查询授权书</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">法人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
<div class="span-sty span-sty-special">人和实际控制人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
<div class="span-sty span-sty-special">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
</el-col>
</el-row>
</el-form>
@ -361,9 +361,15 @@ export default {
</script>
<style scoped>
.span-sty {
width: 130px !important;
width: 160px !important;
}
.addinputInfo {
margin-left: 120px !important;
margin-left: 150px !important;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

20
anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagementAdd.vue

@ -113,26 +113,26 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span style="color: red">*</span>实际控制人</span>
<span>实际控制人</span>
</el-col>
<el-col :span="4">
<el-form-item prop="legalName">
<el-form-item>
<el-input v-model="temp.legalName" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span style="color: red">*</span>身份证号码</span>
<span>身份证号码</span>
</el-col>
<el-col :span="4">
<el-form-item prop="legalIdCard">
<el-form-item>
<el-input v-model="temp.legalIdCard" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span style="color: red">*</span>手机号码</span>
<span>手机号码</span>
</el-col>
<el-col :span="4">
<el-form-item prop="legalMobile">
<el-form-item>
<el-input v-model="temp.legalMobile" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
@ -278,10 +278,10 @@ export default {
rules: {
pDistributorName: [{ required: true, message: '请选择所属经销商', trigger: 'change' }],
disName: [{ required: true, message: '请填写经销商名称', trigger: 'blur' }],
legalName: [{ required: true, message: '请填写实际控制人姓名', trigger: 'blur' }],
legalIdCard: [{ required: true, message: '请填写实际控制人身份证号码', trigger: 'blur' }],
legalMobile: [{ required: true, validator: checkSubmit, trigger: 'blur' }],
registNum: [{ required: true, message: '请填写统一社会信用代码', trigger: 'blur' }]
registNum: [{ required: true, message: '请填写统一社会信用代码', trigger: 'blur' }],
// legalName: [{ required: true, message: '', trigger: 'blur' }],
// legalIdCard: [{ required: true, message: '', trigger: 'blur' }],
// legalMobile: [{ required: true, validator: checkSubmit, trigger: 'blur' }]
}
}
},

26
anrui-base/anrui-base-ui/src/views/dealer/distributormanagement/distributormanagementInfo.vue

@ -142,32 +142,32 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
<div class="span-sty span-sty-special">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
<div class="span-sty span-sty-special">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">道路运输许可证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
<div class="span-sty span-sty-special">法人和实际控制人签署的信息查询授权书</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">法人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
<div class="span-sty span-sty-special">人和实际控制人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
<div class="span-sty span-sty-special">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
</el-col>
</el-row>
</el-form>
@ -271,4 +271,10 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

26
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue

@ -183,32 +183,32 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
<div class="span-sty span-sty-special">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
<div class="span-sty span-sty-special">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">道路运输许可证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
<div class="span-sty span-sty-special">法人和实际控制人签署的信息查询授权书</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">法人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
<div class="span-sty span-sty-special">人和实际控制人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
<div class="span-sty span-sty-special">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
</el-col>
</el-row>
</el-form>
@ -505,4 +505,10 @@ export default {
.rowClass{
border-top: 1px solid #E0E3EB;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

26
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue

@ -197,41 +197,41 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">合作协议</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">合作协议</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list1" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list1" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">营业执照</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list2" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list2" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">道路运输许可证</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">法人和实际控制人签署的信息查询授权书</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list3" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list3" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">法人身份证</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">人和实际控制人身份证</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list4" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list4" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他资料</div>
<div class="span-sty span-sty-special" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">其他资料</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" v-model="image_list5" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
<upload-img ref="uploadImg" class="addinputInfo addinputInfo-special" v-model="image_list5" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
@ -569,4 +569,10 @@ export default {
.addinputInfo {
margin-left: 160px !important;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

26
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue

@ -181,32 +181,32 @@
<div class="title">附件清单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
<div class="span-sty span-sty-special">合作协议</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.hzxyList" :key="index" :src="item" :preview-src-list="temp.hzxyList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
<div class="span-sty span-sty-special">营业执照</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.yyzzList" :key="index" :src="item" :preview-src-list="temp.yyzzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">道路运输许可证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
<div class="span-sty span-sty-special">法人和实际控制人签署的信息查询授权书</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.dlysxkzList" :key="index" :src="item" :preview-src-list="temp.dlysxkzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">法人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
<div class="span-sty span-sty-special">人和实际控制人身份证</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.frsfzList" :key="index" :src="item" :preview-src-list="temp.frsfzList"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
<div class="span-sty span-sty-special">其他资料</div>
<el-form-item><el-image style="width: 150px; height: 150px" class="addinputInfo addinputInfo-special" v-for="(item, index) in temp.qtzlList" :key="index" :src="item" :preview-src-list="temp.qtzlList"/></el-form-item>
</el-col>
</el-row>
</el-form>
@ -376,4 +376,10 @@ export default {
.addinputInfo {
margin-left: 120px !important;
}
.span-sty-special {
width: 300px !important;
}
.addinputInfo-special {
margin-left: 290px !important;
}
</style>

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeign.java

@ -52,4 +52,8 @@ public interface BusBillApplicationFeign {
@ResponseBody
public ResultBean<BusBillApplicationDetailsVo> fetchDetailByCkSid(@PathVariable("ckSid") String ckSid);
@ApiOperation("查看一条")
@GetMapping("/fetchBySid")
@ResponseBody
ResultBean<BusBillApplication> fetchBySid(@RequestParam("busSid") String busSid);
}

5
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationFeignFallback.java

@ -41,4 +41,9 @@ public class BusBillApplicationFeignFallback implements BusBillApplicationFeign
return null;
}
@Override
public ResultBean<BusBillApplication> fetchBySid(String busSid) {
return null;
}
}

7
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationRest.java

@ -63,4 +63,11 @@ public class BusBillApplicationRest implements BusBillApplicationFeign {
BusBillApplicationDetailsVo vo = busBillApplicationService.fetchDetailByCkSid(ckSid);
return rb.success().setData(vo);
}
@Override
public ResultBean<BusBillApplication> fetchBySid(String busSid) {
ResultBean rb = ResultBean.fireFail();
BusBillApplication busBillApplication = busBillApplicationService.fetchBySid(busSid);
return rb.success().setData(busBillApplication);
}
}

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -928,7 +928,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busValcustFilingDto.setMoney(money.abs().toString());
busValcustFilingDto.setSaleOrderSid(busSalesOrder.getSid());
busValcustFilingDto.setBusSid(busBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingDto.setBusSource("1");
busValcustFilingService.saveOrUpdateDto(busValcustFilingDto);
} else {//不是高低开
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
@ -1583,6 +1583,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
//判断发起人是否为销售专员
variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
@ -1643,6 +1645,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
bv.setModelId(busDeliveredApply.getProcDefId());
Map<String, Object> variables = new HashMap<>();
//判断发起人是否为销售专员
variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
@ -1706,6 +1710,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
//判断发起人是否为销售专员
variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。
@ -2727,6 +2733,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
bv.setUserSid(dto.getUserSid());
//流程定义id
bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
//判断发起人是否为销售专员
variables.put("isAdj", busDeliveredApply.getCreateBySid().equals(busDeliveredApply.getStaffUserSid()));
//若app移动端有此功能,则传递appMap参数
Map<String, Object> appMap = new HashMap<>();
//需和移动端沟通业务sid保存的属性具体值:appMap中sid不是固定的。移动端提供具体字段。

8
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@ -342,6 +342,14 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
variables.put("app", appMap);
//流程定义id
bv.setModelId(ProcDefEnum.BUSVALCUSTFILING.getProDefId());
//========================================
busValcustFiling = fetchBySid(businessSid);
FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
flowProcessMapQuery.setProDefKey(bv.getModelId());
flowProcessMapQuery.setVariables(variables);
flowProcessMapQuery.setContractNo(busValcustFiling.getContractNo());
variables = flowableFeign.getMap(flowProcessMapQuery).getData();
//=======================================
bv.setFormVariables(variables);
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);

4
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/billingapplicationAdd.vue

@ -402,6 +402,10 @@ export default {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
if (this.formobj.zjApplicationAppendxs.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传证件(营业执照或身份证)的附件' })
return
}
this.submitdisabled = true
save(this.formobj).then((res) => {
if (res.success) {

4
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoAdd.vue

@ -402,6 +402,10 @@ export default {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.getUrl()
if (this.formobj.zjApplicationAppendxs.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传证件(营业执照或身份证)的附件' })
return
}
this.submitdisabled = true
save(this.formobj).then((res) => {
if (res.success) {

2
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/kaipiaoInfo.vue

@ -64,7 +64,7 @@
<el-row>
<el-col :span="8">
<div class="span-sty">单台开票金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span><span style="padding-left: 10px;color: red" v-show="formobj.showValueCustomer">价值客户</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开票类型默认</div>

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -762,7 +762,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
/*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
@ -798,7 +798,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
} else {*///不是高低开
} else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
@ -887,7 +887,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
//}
}
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());
@ -2261,7 +2261,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
/*if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
busValcustFilingDto.setCreateByName(finBillApplication.getCreateByName());
@ -2297,7 +2297,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
busValcustFilingDto.setBusSid(finBillApplication.getSid());
busValcustFilingDto.setBusSource("0");
busValcustFilingFeign.save(busValcustFilingDto);
} else {*///不是高低开
} else {//不是高低开
for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
if (count == 0) {
@ -2386,7 +2386,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
}
}
//}
}
BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
if (oneBillMoney == null) {
busSalesOrderFeign.updateOneBillMoneyByOrderSid(busSalesOrder.getSid(), finBillApplication.getOneBillMoney().toString());

104
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@ -49,6 +49,12 @@ import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyVo;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication;
import com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplicationFeign;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerFeign;
import com.yxt.anrui.buscenter.api.busbilltrailer.BusBillTrailerVo;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleFeign;
import com.yxt.anrui.buscenter.api.busbillvehicle.BusBillVehicleVo;
import com.yxt.anrui.buscenter.api.busdelivered.BusDelivered;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto;
import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
@ -204,6 +210,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
private BusArrearsCarryVehicleApplyFeign busArrearsCarryVehicleApplyFeign;
@Autowired
private FinCompanyInvoicingService finCompanyInvoicingService;
@Autowired
private BusBillApplicationFeign busBillApplicationFeign;
@Autowired
private BusBillVehicleFeign busBillVehicleFeign;
@Autowired
private BusBillTrailerFeign busBillTrailerFeign;
private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -1735,7 +1747,97 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
}else {//出库开票申请
BusBillApplication busBillApplication = busBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData();
List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData();
for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(busBillVehicleVo.getVehSid());
finVehicleInvoiceDto.setVIN(busBillVehicleVo.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(busBillVehicleVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(busBillVehicleVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(busBillApplication.getOneBillMoney());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("主车");
finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData();
if (busArrearsCarryVehicleApplyVo == null){
finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
}else {
finVehicleInvoiceDto.setBusinessStateKey("005");
finVehicleInvoiceDto.setBusinessState("欠款提车");
}
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillVehicleVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillVehicleVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
if (busBillTrailerVos != null) {
for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
String gcVinNo = busBillTrailerVo.getGcVinNo();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
if (count == 0) {
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(gcVinNo);
finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid());
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
}
}
}
}
}
}

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -53,7 +53,7 @@ public enum ProcDefEnum {
LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
LOANCREDITAPPEALAPPLY("信用审核申诉", "process_gygvxw8k:2:5212504"),
DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:6:4827504"),
DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:7:5300004"),
LOANTEMPLATEAPPLY("定制金融方案", "process_9q5omebi:2:2685008"),
LOANHOMEVISITAPPEALAPPLY("家访考察申诉", "process_8ujil3h3:1:3665004"),
BUSVALCUSTFILING("价值客户备案申请", "process_n8fwpitk:2:5085004"),

9
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@ -527,6 +527,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
loanHomeVisitInvestigateInitCustomerVo.setLenderNam(busSalesOrderBorrowerDetailsVo.getBorrowerName());
loanHomeVisitInvestigateInitCustomerVo.setIdNumber(crmCustomerTempVo.getIDNumber());
loanHomeVisitInvestigateInitCustomerVo.setMobile(busSalesOrderBorrowerDetailsVo.getMobile());
loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
}
//银行卡附件
@ -541,6 +542,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
//其他人员
List<LoanHomeVisitInvestigateInitOtherPeoVo> loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid);
loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos);
loanHomeVisitInvestigateInitCustomerVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo);
}
@ -632,6 +634,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
loanHomeVisitInvestigateInitOrderVos.setOrderSid(loanHomevisitInvestigate.getSaleOrderSid());
}
loanHomeVisitInvestigateInitOrderVos.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
}
@ -664,6 +667,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomeVisitInvestigateInitOperVo == null) {
loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo();
}
loanHomeVisitInvestigateInitOperVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitOperVo);
}
@ -692,6 +696,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomeVisitInvestigateInitTranVo == null) {
loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo();
}
loanHomeVisitInvestigateInitTranVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitTranVo);
}
@ -729,6 +734,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
if (loanHomeVisitInvestigateInitPropVo == null) {
loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo();
}
loanHomeVisitInvestigateInitPropVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitPropVo);
}
@ -822,6 +828,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
}
loanHomeVisitInvestigateInitJFJZVo.setGroupPhoto(groupPhoto);
loanHomeVisitInvestigateInitJFJZVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitJFJZVo);
}
@ -980,6 +987,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
}
loanHomeVisitInvestigateInitZMWJVo.setGuarantorAccount(guarantorAccount);
loanHomeVisitInvestigateInitZMWJVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitZMWJVo);
}
@ -1126,6 +1134,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
}
}
loanHomeVisitInvestigateInitZCLVo.setCarProperty(carProperty);
loanHomeVisitInvestigateInitZCLVo.setSid(sid);
return rb.success().setData(loanHomeVisitInvestigateInitZCLVo);
}

11
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@ -44,6 +44,7 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@ -237,9 +238,10 @@ public class InvoicedService {
BusDeliveredApply busDeliveredApply = busDeliveredApplyFeign.fetchBySid(query.getSid()).getData();
List<BusDeliveredApplyDetails> busDeliveredApplyDetails = busDeliveredApplyDetailsFeign.selectByApplySid(query.getSid()).getData();
if (data != null) {
billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
billApplicationIInfoVo.setSid(data.getSid());
billApplicationIInfoVo.setProcInsId(data.getProcInstSid());
billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney());
billApplicationIInfoVo.setOrgPath(data.getOrgSidPath());
billApplicationIInfoVo.setSaleType(data.getSaleTypeValue());
billApplicationIInfoVo.setSellerDept(data.getSaleDeptName());
@ -328,6 +330,9 @@ public class InvoicedService {
registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
}
}
if (StringUtils.isNotBlank(data.getOneBillMoney())){
billApplicationIInfoVo.setInvoiceTotal(new BigDecimal(data.getOneBillMoney()).multiply(new BigDecimal(busBillVehicleVos.size())).toString());
}
billApplicationIInfoVo.setCarBuyContractImages(appCarBuyContractImages);
billApplicationIInfoVo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
billApplicationIInfoVo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
@ -341,6 +346,8 @@ public class InvoicedService {
billApplicationIInfoVo.setIsCanEdit(true);
}
}else {
billApplicationIInfoVo.setModelSid(busDeliveredApply.getModelSid());
billApplicationIInfoVo.setModelName(busDeliveredApply.getModelName());
billApplicationIInfoVo.setProcInsId(busDeliveredApply.getProcInstId());
billApplicationIInfoVo.setOrgPath(busDeliveredApply.getOrgSidPath());
billApplicationIInfoVo.setSaleType(busDeliveredApply.getPaymentMethodKey());
@ -520,6 +527,8 @@ public class InvoicedService {
busBillApplicationDto.setCreateBySid(billApplicationIInfoDto.getUserSid());
busBillApplicationDto.setNodeState(billApplicationIInfoDto.getNodeState());
busBillApplicationDto.setBillNo(billApplicationIInfoDto.getBillNo());
busBillApplicationDto.setModelSid(billApplicationIInfoDto.getModelSid());
busBillApplicationDto.setModelName(billApplicationIInfoDto.getModelName());
String publishInfo = billApplicationIInfoDto.getPublishInfo();
String[] split = publishInfo.split("-");
busBillApplicationDto.setDeptName(split[0]);

1
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -307,6 +307,7 @@ public class AppBusDeliveredApplyService {
BillApplicationIInfoVo billApplicationIInfoVo = new BillApplicationIInfoVo();
BusBillApplicationDetailsVo data = busBillApplicationFeign.fetchDetailByCkSid(sid).getData();
if (data != null) {
billApplicationIInfoVo.setShowValueCustomer(data.getShowValueCustomer());
billApplicationIInfoVo.setProcInsId(data.getProcInstSid());
billApplicationIInfoVo.setInvoiceTotal(data.getTotalBillMoney());
billApplicationIInfoVo.setOrgPath(data.getOrgSidPath());

Loading…
Cancel
Save