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

@@ -81,6 +81,24 @@ public class EnterpriseController {
         return enterpriseService.bidNoticePage(vo);
     }
 
+    @ApiOperation(value = "招标公告省份（建设库）")
+    @PostMapping(value = "bidNoticeProvince")
+    public R bidNoticeProvince(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
+        return enterpriseService.bidNoticeProvince(vo);
+    }
+
+    @ApiOperation(value = "招标公告信息类型（建设库）")
+    @PostMapping(value = "bidNoticeTenderStage")
+    public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseBidNoticePageBody vo) throws Exception {
+        return enterpriseService.bidNoticeTenderStage(vo);
+    }
+
+    @ApiOperation(value = "招标公告详情（建设库）")
+    @PostMapping(value = "bidNoticeDeatil")
+    public R bidNoticeDeatil(@RequestBody @Valid EnterpriseBidNoticeDetailBody vo) throws Exception {
+        return enterpriseService.bidNoticeDeatil(vo);
+    }
+
     @ApiOperation(value = "企业动态列表（建设库）")
     @PostMapping(value = "dynamicPage")
     public R dynamicPage(@RequestBody @Valid EnterpriseDynamicPageBody vo) throws Exception {
@@ -105,4 +123,10 @@ public class EnterpriseController {
         return enterpriseService.keymembers(vo);
     }
 
+    @ApiOperation(value = "工商股东信息（openApi）")
+    @PostMapping(value = "bestStockPage")
+    public R bestStockPage(@RequestBody @Valid EnterpriseKeymembersBody vo) throws Exception {
+        return enterpriseService.bestStockPage(vo);
+    }
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBestStockPageBody.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 EnterpriseBestStockPageBody extends BasePage
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    //是否历史 0 否  1 是
+    private Integer isHistory;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeDetailBody.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 EnterpriseBidNoticeDetailBody
+{
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
+
+}

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

@@ -19,4 +19,15 @@ public class EnterpriseBidNoticePageBody extends BasePage
     @NotNull(message = "企业id不能为空")
     private Integer companyId;
 
+    //信息类型
+    private String tenderStage;
+
+    //项目名称
+    private String projectName;
+
+    /**
+     * provinceId
+     */
+    private Integer provinceId;
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeProvinceBody.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 EnterpriseBidNoticeProvinceBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBidNoticeTenderStageBody.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 EnterpriseBidNoticeTenderStageBody
+{
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer companyId;
+
+}

dsk-operate-ui/src/assets/styles/sidebar.scss

@@ -359,6 +359,14 @@
   }
   .svg-icon {
     margin-right: 0 !important;
+	width: 1em;
+	height: 1em;
+	font-size: 16px;
+	margin-bottom: -2px;
+	vertical-align: -0.15em;
+	fill: currentColor;
+	overflow: hidden;
+	margin-left: 0px;
   }
 }
 .side-one-popover{

dsk-operate-ui/src/layout/components/Sidebar/SidebarItem.vue

@@ -26,45 +26,45 @@
     </template>
 		<!-- 收起 -->
 		<template v-else>
-		  <div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow" class="side-retract">
-		    <el-popover
-		      placement="right-start"
-		      popper-class="side-popover side-one-popover"
-		      :visible-arrow="true"
-		      trigger="hover"
-		      :disabled="onlyOneChild.meta||item.meta?false:true"
-		    >
-		      <div class="side-container">
-		        <div class="side-title">
-		          <app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">
-		            {{ onlyOneChild.meta.title || item.meta.title }}
-		          </app-link>
-		        </div>
-		      </div>
-		      <item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />
-		    </el-popover>
-		  </div>
-		  <div v-else class="side-retract">
-		    <el-popover
-		      placement="right-start"
-		      popper-class="side-popover"
-		      :visible-arrow="true"
-		      trigger="hover"
-		      :disabled="item.meta?false:true"
-		    >
-		      <div class="side-container">
-		        <div class="side-title">{{ item.meta.title }}</div>
-		        <ul class="side-list">
-		          <li v-for="child in item.children" :key="child.path">
-		            <app-link v-if="child.meta" :to="resolvePath(child.path)">
-		              {{ child.meta.title }}
-		            </app-link>
-		          </li>
-		        </ul>
-		      </div>
-		      <item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />
-		    </el-popover>
-		  </div>
+			<div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow" class="side-retract">
+			  <el-popover
+			    placement="right-start"
+			    popper-class="side-popover side-one-popover"
+			    :visible-arrow="true"
+			    trigger="hover"
+			    :disabled="onlyOneChild.meta||item.meta?false:true"
+			  >
+			    <div class="side-container">
+			      <div class="side-title">
+			        <app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">
+			          {{ onlyOneChild.meta.title || item.meta.title }}
+			        </app-link>
+			      </div>
+			    </div>
+			    <item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />
+			  </el-popover>
+			</div>
+			<div v-else class="side-retract">
+			  <el-popover
+			    placement="right-start"
+			    popper-class="side-popover"
+			    :visible-arrow="true"
+			    trigger="hover"
+			    :disabled="item.meta?false:true"
+			  >
+			    <div class="side-container">
+			      <div class="side-title">{{ item.meta.title }}</div>
+			      <ul class="side-list">
+			        <li v-for="child in item.children" :key="child.path">
+			          <app-link v-if="child.meta" :to="resolvePath(child.path)">
+			            {{ child.meta.title }}
+			          </app-link>
+			        </li>
+			      </ul>
+			    </div>
+			    <item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />
+			  </el-popover>
+			</div>
 		</template>
   </div>
 </template>
@@ -118,8 +118,7 @@ export default {
           let tempPath = ''
           if (onlyOneChild.path) {
             tempPath = this.resolvePath(onlyOneChild.path)
-			console.log(tempPath);
-			console.log(this.activeMenu);
+			
             if (this.activeMenu === tempPath&&onlyOneChild.meta.icon!='#') {
               icon = onlyOneChild.meta.icon+'s'
             }
@@ -138,7 +137,7 @@ export default {
             icon = item.meta.icon+'s'
           }
         }
-		console.log(icon);
+		
         return icon
       }
     }

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

+<template>
+  <div class="app-container">
+    财务简析
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Financial',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -77,6 +77,27 @@ public class EnterpriseService {
         return BeanUtil.toBean(map, R.class);
     }
 
+    public R bidNoticeProvince(EnterpriseBidNoticePageBody body) throws Exception {
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("Api-Version", "1.0");
+        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectBidProvinceByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidNoticeTenderStage(EnterpriseBidNoticePageBody body) throws Exception {
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("Api-Version", "1.0");
+        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectTenderStageByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidNoticeDeatil(EnterpriseBidNoticeDetailBody body) throws Exception {
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("Api-Version", "1.0");
+        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/bid/detail", BeanUtil.beanToMap(body, false, false), headerMap);
+        return BeanUtil.toBean(map, R.class);
+    }
+
     public R dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
@@ -96,4 +117,9 @@ public class EnterpriseService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public R bestStockPage(EnterpriseKeymembersBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }