Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -123,4 +123,10 @@ public class EnterpriseController {
         return enterpriseService.remark(vo);
     }
 
+    @ApiOperation(value = "企业主体信用评级")
+    @PostMapping(value = "bondCreditRating")
+    public R remark(@RequestBody @Valid EnterpriseBondCreditRatingBody vo) throws Exception {
+        return enterpriseService.bondCreditRating(vo);
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBondCreditRatingBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBondCreditRatingBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

dsk-framework/src/main/java/com/dsk/framework/config/SecurityConfig.java

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/economic/**","/enterprises/**","/specialPurposeBonds/**","/urbanInvestment/**","/enterprise/**").permitAll()
+                .antMatchers("/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

dsk-operate-ui/src/assets/js/common.js

@@ -40,6 +40,16 @@ function changeStr(str, index, changeStr) {
   return str.substr(0, index) + changeStr + str.substr(index + changeStr.length)
 }
 
+//甲方详情子页面互跳
+function changePath(that, pathName){
+  try {
+    that.$parent.showPartPage({pathName})
+  } catch {
+    that.$parent.$parent.showPartPage({pathName})
+  }
+}
+
 export {
-  encodeStr
+  encodeStr,
+  changePath
 }

dsk-operate-ui/src/router/index.js

@@ -89,28 +89,45 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/party',
+    path: '/enterprise',
     component: Layout,
     hidden: true,
-    name: 'Party',
+    name: 'Enterprise',
     redirect: 'noredirect',
     children: [
       {
-        path: 'party-a',
+        path: '/enterprise/:id',
         component: () => import('@/views/detail/party-a/index'),
         name: 'PartyA',
         meta: { title: '甲方详情' },
-      },
+      }
+    ]
+  },
+  {
+    path: '/company',
+    component: Layout,
+    hidden: true,
+    name: 'Company',
+    redirect: 'noredirect',
+    children: [
       {
-        path: 'party-b',
+        path: '/company/:id',
         component: () => import('@/views/detail/party-b/index'),
         name: 'PartyB',
         meta: { title: '已方详情' }
-      },
+      }
+    ]
+  },
+  {
+    path: '/structure',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
       {
-        path: 'structure',
+        path: 'graph',
         component: () => import('@/views/detail/structure/index'),
-        name: 'Structure',
+        name: 'Graph',
         meta: { title: '企业链图' }
       }
     ]

dsk-operate-ui/src/views/detail/party-a/component/Header.vue

@@ -4,36 +4,27 @@
       <el-breadcrumb separator="/">
         <el-breadcrumb-item :to="{ path: '/enterpriseData' }">企业数据</el-breadcrumb-item>
         <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>
-        <el-breadcrumb-item>中铁一建</el-breadcrumb-item>
+        <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
     <div class="flex-box part-header">
-      <img class="header-logo" src="@/assets/images/avatar.png">
-      中交第二航务工程局有限公司
+      <img class="header-logo" :src="companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
+      {{companyInfo.companyName || '--'}}
     </div>
   </div>
 </template>
 
 <script>
-import { infoHeader } from '@/api/detail/party-a/index'
 export default {
   name: 'Header',
-  props: ['companyId'],
+  props: ['companyId', 'companyInfo'],
   data() {
     return {
-      enterprise: {}
     }
   },
   created() {
-    this.getInfoHeader()
   },
   methods: {
-    async getInfoHeader(){
-      let { data } = await infoHeader({companyId:this.companyId})
-      if( data.code == 200){
-        this.enterprise = data.data
-      }
-    }
   }
 }
 </script>

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -8,6 +8,7 @@
     </el-input>
     <el-menu
       :default-active="routeIndex"
+      :unique-opened="true"
       class="detail-menu"
       @open="handleOpen">
       <template v-for="(item, index) in sideRoute">
@@ -119,7 +120,7 @@ export default {
           break
         }else if(sideArr[i].children){
           for(let j=0; j< sideArr[i].children.length ; j++){
-            if(sideArr[i].children.pathName == this.pathName){
+            if(sideArr[i].children[j].pathName == this.pathName){
               idx = i+'-'+j
               break
             }

dsk-operate-ui/src/views/detail/party-a/index.vue

 <template>
   <div class="app-container part-container">
-    <Header :company-id="companyId" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" v-if="companyId" />
     <div class="flex-box part-main">
       <div class="part-left">
         <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
@@ -8,7 +8,7 @@
       <div class="part-right">
         <div id="partBox" v-if="companyId">
           <!-- 企业概览 -->
-          <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" />
+          <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" :companyInfo="companyInfo" />
           <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
           <Holderinfo v-if="currentPath.pathName=='holderinfo'" :company-id="companyId" />
           <Execuinfo v-if="currentPath.pathName=='execuinfo'" :company-id="companyId" />
@@ -142,7 +142,7 @@ export default {
   data() {
     return {
       companyInfo: {},
-      companyId: 10361319,  //企业Id（测试默认3068）
+      companyId: '',  //企业Id（测试默认3068）
       customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
       currentPath: {
         pathName: 'overview'  //默认展示页
@@ -151,9 +151,9 @@ export default {
     }
   },
   created() {
-    if (this.$route.query.companyId) { // 获取companyId
-      let id = this.$route.query.companyId
-      this.getCompanyId(id)
+    if (this.$route.params.id) { // 获取companyId
+      let companyId = this.$route.params.id
+      this.getCompanyId(companyId)
     }
     if (this.$route.query.path) { // 获取跳转对应板块
       this.currentPath.pathName = this.$route.query.path
@@ -163,12 +163,6 @@ export default {
     }
   },
   mounted() {
-    const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("partBox")
-    erd.listenTo(partBox, element => {
-      _this.$nextTick(() => {
-        _this.partBoxHeight = partBox.offsetHeight
-      })
-    })
   },
   methods: {
     showPartPage(e){
@@ -176,9 +170,12 @@ export default {
     },
     // 解密
     async getCompanyId(companyId){
-      let { data } = await idRemark({companyId})
-      if( data.code == 200){
-        this.companyId = data.data
+      let { data } = await idRemark({mark:companyId})
+      if( data ){
+        this.companyId = data
+        this.$nextTick(() => {
+          this.listenSider()
+        })
         this.handleQuery()
       }
     },
@@ -187,6 +184,12 @@ export default {
       if(res.code==200){
         this.companyInfo = res.data
       }
+    },
+    listenSider(){
+      const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("partBox")
+      erd.listenTo(partBox, element => {
+        _this.partBoxHeight = partBox.offsetHeight
+      })
     }
   }
 }
@@ -206,5 +209,6 @@ export default {
   .part-right{
     min-width: 1088px;
     width: 100%;
+    background: #FFFFFF;
   }
 </style>

dsk-operate-ui/src/views/detail/party-a/overview/overview.vue

 <template>
   <div class="app-container part-container">
-    <div class="view-content"><Infoheader /></div><!-- 企业信息 -->
+    <div class="view-content"><Infoheader :companyId="companyId" :companyInfo="companyInfo" /></div><!-- 企业信息 -->
     <div class="view-content"><Operations /></div><!-- 公司经营 -->
     <div class="view-content"><Bidding /></div><!--招标偏好、业务往来-->
     <div class="view-content"><Busclue /></div><!--商机线索-->
@@ -22,7 +22,7 @@ import Risk from './component/risk'
 import Tender from "./component/tender"
 export default {
   name: 'Overview',
-  props: ['companyId'],
+  props: ['companyId', 'companyInfo'],
   components: {
     Infoheader,
     Operations,

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -19,9 +19,9 @@ export default {
     }
   },
   created() {
-    if (this.$route.query.companyId) { // 获取companyId
+    if (this.$route.params.id) { // 获取companyId
       this.loading = true
-      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.query.companyId}?secretId=${this.secretId}`
+      this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
     }
   },
   mounted() {

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -193,4 +193,9 @@ public class EnterpriseService {
     public R remark(EnterpriseRemarkBody vo) throws Exception {
         return R.ok(EncodeIdUtil.avDecode(EncodeIdUtil.binaryToUnicode(vo.mark)));
     }
+
+    public R bondCreditRating(EnterpriseBondCreditRatingBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bondCreditRating", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }