1.管理端标签页增加数量提醒。

2.管理端详情页没有正常显示人员审核状态。
3.管理端增加显示人才超市与PICC结算填的信息。

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsuranceApplicationController.java

@@ -323,7 +323,13 @@ public class InsuranceApplicationController {
             }
 
             acceptInsuranceDTO.setInsuranceJobsList(insuranceJobsList);
-            acceptInsuranceDTO.setTotalAmount(totalAmount);
+
+            if(insuranceApplication.getInsuranceFee()!=null){
+                acceptInsuranceDTO.setTotalAmount(insuranceApplication.getInsuranceFee());
+            }
+            else {
+                acceptInsuranceDTO.setTotalAmount(totalAmount);
+            }
 
             msgResult.setData(acceptInsuranceDTO);
             msgResult.setResult(true);

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/InsurancePolicyController.java

@@ -353,6 +353,13 @@ public class InsurancePolicyController {
         try {
             InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
 
+            //todo 查询是否有待合并的投保单存在，如果有说明新增人员未完成，不能提交
+            List<InsuranceApplication> insuranceApplicationList = insuranceApplicationService.findByCombinePolicyId(insurancePolicy.getId());
+
+            if (insuranceApplicationList.size()>0){
+                throw new Exception("有新增投保人员流程未完成！");
+            }
+
             List<InsurancePolicyMember> insurancePolicyMemberList = insurancePolicyMemberService.findByPolicyId(insurancePolicy.getId());
 
             boolean isUnChecked = false;

picc-enterprise-server/src/main/resources/application-dev.yml

@@ -9,16 +9,16 @@ spring:
       enabled: true
 
 cas:
-#  server-url-prefix: http://localhost:8080/cas-server
+#  server-url-prefix: http://localhost:8080/cas-server bn
   server-url-prefix: http://gyxm.jing-zhou.gov.cn/jp-cloud-cas
   server-login-url: ${cas.server-url-prefix}/login
-  client-host-url: http://localhost:9090
+  client-host-url: http://localhost:7070
   # 如果不设则无法获取用户扩展信息
   validation-type: cas
 
 jpcloud:
-  notifyBackUrl: ${client-host-url}/picc-enterprise-server/pay/orderNotifyBack
-  synchroBackUrl: ${client-host-url}/picc-enterprise-server/pay/paySuccess
+  notifyBackUrl: ${cas.client-host-url}/picc-enterprise-server/pay/orderNotifyBack
+  synchroBackUrl: ${cas.client-host-url}/picc-enterprise-server/pay/paySuccess
   apiUrl: http://localhost:9081/jp-cloud-api
   findMemberByNamesUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberByNamesForPicc
   findMemberUrl: ${jpcloud.apiUrl}/api/member/v1/findMemberForPicc

picc-enterprise-server/src/test/java/com/jpsoft/picc/test/HuToolTest.java

@@ -0,0 +1,22 @@
+package com.jpsoft.picc.test;
+
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HuToolTest {
+    public static void main(String[] args) {
+
+        Map<String,Object> map = new HashMap<>();
+
+        map.put("Name","zq");
+
+        JSONObject jsonObject = new JSONObject(map);
+
+        System.out.println(jsonObject.toString());
+    }
+
+    public void testMap(){
+    }
+}