Pārlūkot izejas kodu

增加投保状态。

tomatozq 5 gadi atpakaļ
vecāks
revīzija
decfd3445c

+ 7 - 0
picc-admin-server/src/main/resources/application.yml

@@ -94,6 +94,13 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql
 
+oss:
+  accessKeyId: LTAILGOo7bwpkvnq
+  accessKeySecret: ZGsaTO5klbSHxULr2Q3s2PiqKDzN15
+  endpoint: http://oss-cn-hangzhou.aliyuncs.com
+  bucketName: wzzgh2out
+  urlPrefix: http://vod.wzgh.org
+  objectPre: picc
 
 
 

+ 32 - 0
picc-common/src/main/java/com/jpsoft/picc/modules/common/constant/InsuranceStatus.java

@@ -0,0 +1,32 @@
+package com.jpsoft.picc.modules.common.constant;
+
+public class InsuranceStatus {
+    /**
+     * 草稿
+     */
+    public static final int DRAFT = 10;
+    /**
+     * 初审
+     */
+    public static final int PENDING_TIRAL= 20;
+    /**
+     * 复审
+     */
+    public static final int PENDING_RETIRAL= 30;
+    /**
+     * 缴费
+     */
+    public static final int PENDING_PAY= 40;
+    /**
+     * 制单
+     */
+    public static final int MARKING_POLICY= 50;
+    /**
+     * 待出单
+     */
+    public static final int PENDING_POLICY= 60;
+    /**
+     * 已出单
+     */
+    public static final int SEND_OUT_POLICY= 70;
+}

+ 2 - 4
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyController.java

@@ -10,15 +10,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.UUID;
 
+@CrossOrigin
 @Api(description="企业信息管理")
 @RestController
 @RequestMapping("/auth/company")

+ 1 - 0
picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/CompanyMemberController.java

@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.*;
 
+@CrossOrigin
 @Api(description="企业人员管理")
 @RestController
 @RequestMapping("/auth/companyMember")

+ 8 - 0
picc-enterprise-server/src/main/resources/application.yml

@@ -76,3 +76,11 @@ cas:
   client-host-url: http://localhost:7070
   # 如果不设则无法获取用户扩展信息
   validation-type: cas
+
+oss:
+  accessKeyId: LTAILGOo7bwpkvnq
+  accessKeySecret: ZGsaTO5klbSHxULr2Q3s2PiqKDzN15
+  endpoint: http://oss-cn-hangzhou.aliyuncs.com
+  bucketName: wzzgh2out
+  urlPrefix: http://vod.wzgh.org
+  objectPre: picc