Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/ApplicationPolicyController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.picc.modules.business.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
@@ -74,7 +75,7 @@ public class ApplicationPolicyController {
     }
 
 
-    @ApiOperation(value="第一次投保除外的每月投保单列表")
+    @ApiOperation(value="下月投保单列表")
     @RequestMapping(value = "otherPageList",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name="definitionId",value = "险种编号",required = true,paramType = "query"),
@@ -146,6 +147,83 @@ public class ApplicationPolicyController {
     }
 
 
+    @ApiOperation(value="下月投保单标签页数量提示")
+    @RequestMapping(value = "tabCount",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="definitionId",value = "险种编号",required = true,paramType = "query"),
+            @ApiImplicitParam(name="companyName",value = "企业名称",paramType = "query"),
+            @ApiImplicitParam(name="insuredName",value = "投保人姓名",paramType = "query"),
+            @ApiImplicitParam(name="status",value = "状态",paramType = "query"),
+            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query"),
+            @ApiImplicitParam(name="policyNo",value = "保险单号",paramType = "query")
+    })
+    public MessageResult<Map> tabCount(
+            String definitionId,String userType,String policyNo,
+            String insuredName,String companyName,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(definitionId)) {
+            searchParams.put("definitionId",definitionId);
+        }
+
+        if (StringUtils.isNotEmpty(companyName)) {
+            searchParams.put("companyName","%" + companyName + "%");
+        }
+
+        if (StringUtils.isNotEmpty(insuredName)) {
+            searchParams.put("insuredName","%"+insuredName+"%");
+        }
+
+        if (StringUtils.isNotEmpty(userType)) {
+            if(userType.equals("1")){
+                searchParams.put("userType",userType);
+            }
+        }
+
+        if (startTime != null) {
+            searchParams.put("startTime", startTime);
+        }
+
+        if (endTime != null) {
+            searchParams.put("endTime", endTime);
+        }
+
+        if (StringUtils.isNotEmpty(policyNo)) {
+            searchParams.put("policyNo","%" + policyNo + "%");
+        }
+
+        Map<String,Object> countMap = new HashMap<>();
+
+        Page<ApplicationPolicy> allPage = applicationPolicyService.otherSearch(searchParams,1,1,sortList);
+        countMap.put("all",allPage.getTotal());
+
+        for (PolicyStatus policyStatus : PolicyStatus.values()) {
+            searchParams.put("status",policyStatus.getValue());
+            Page<ApplicationPolicy> page = applicationPolicyService.otherSearch(searchParams,1,1,sortList);
+            countMap.put(policyStatus.getValue() + "" , page.getTotal());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(countMap);
+
+        return msgResult;
+    }
+
+
     @ApiOperation(value="每月投保单详情")
     @RequestMapping(value = "detail",method = RequestMethod.POST)
     @ApiImplicitParams({

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsuranceApplicationController.java

@@ -8,6 +8,7 @@ import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.service.ApplicationPolicyService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
+import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import com.jpsoft.picc.modules.common.utils.NumberToCN;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
@@ -349,7 +350,82 @@ public class InsuranceApplicationController {
         return msgResult;
     }
 
+    @ApiOperation(value="标签页数量提示")
+    @RequestMapping(value = "tabCount",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query"),
+            @ApiImplicitParam(name="companyName",value = "企业名称",paramType = "query"),
+            @ApiImplicitParam(name="insuredName",value = "投保人姓名",paramType = "query"),
+            @ApiImplicitParam(name="startTime",value = "开始时间",paramType = "query"),
+            @ApiImplicitParam(name="endTime",value = "结束时间",paramType = "query"),
+            @ApiImplicitParam(name="userType",value = "用户类型（0为人才超市，1为PICC）",paramType = "query"),
+            @ApiImplicitParam(name="policyNo",value = "保险服务单号",paramType = "query")
+    })
+    public MessageResult<Map> tabCount(
+            String status,String definitionId,
+            String insuredName,String companyName,
+            String startTime,String endTime,String userType,String policyNo,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("create_time","desc"));
+
+        if (StringUtils.isNotEmpty(definitionId)) {
+            searchParams.put("definitionId",definitionId);
+        }
+
+        if (StringUtils.isNotEmpty(companyName)) {
+            searchParams.put("companyName","%" + companyName + "%");
+        }
+
+        if (StringUtils.isNotEmpty(insuredName)) {
+            searchParams.put("insuredName","%"+insuredName+"%");
+        }
+
+        if (StringUtils.isNotEmpty(startTime)) {
+            searchParams.put("startTime",startTime);
+        }
+
+        if (StringUtils.isNotEmpty(endTime)) {
+            searchParams.put("endTime",endTime);
+        }
+
+        if (StringUtils.isNotEmpty(userType)) {
+            if(userType.equals("1")){
+                searchParams.put("userType",userType);
+            }
+        }
+
+        if (StringUtils.isNotEmpty(policyNo)) {
+            searchParams.put("policyNo","%" + policyNo + "%");
+        }
+
+        Map<String,Object> countMap = new HashMap<>();
 
+        Page<InsuranceApplication> allPage = insuranceApplicationService.pageSearch(searchParams,1,1,sortList);
+
+        countMap.put("all",allPage.getTotal());
+
+        for (PolicyStatus policyStatus : PolicyStatus.values()) {
+            searchParams.put("status",policyStatus.getValue());
+            Page<InsuranceApplication> page = insuranceApplicationService.pageSearch(searchParams,1,1,sortList);
+            countMap.put(policyStatus.getValue() + "" , page.getTotal());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(countMap);
+
+        return msgResult;
+    }
 
     @ApiOperation(value="获取承保信息")
     @RequestMapping(value = "acceptDetail",method = RequestMethod.POST)

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

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: root
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: picc
+    password: picc
   devtools:
     add-properties: false
     restart:

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsuranceApplication.java

@@ -75,8 +75,8 @@ public class InsuranceApplication {
     @ApiModelProperty(value = "创建人")
 	private String createBy;
 
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
 	private Date createTime;
     @ApiModelProperty(value = "更新人")
@@ -97,8 +97,8 @@ public class InsuranceApplication {
 	@ApiModelProperty(value = "投保单号")
 	private String policyNo;
 
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
 	@ApiModelProperty(value = "出单时间")
 	private Date finishTime;
 

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -52,6 +52,8 @@ public class InsurancePolicy {
     private String issuingBank;
     @ApiModelProperty(value = "单号")
     private String singlNumber;
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     @ApiModelProperty(value = "转账时间")
     private Date transferTime;
     @ApiModelProperty(value = "保险代理人")
@@ -69,16 +71,16 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     @ApiModelProperty(value = "修改人")
     private String updateBy;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
@@ -90,8 +92,8 @@ public class InsurancePolicy {
     @ApiModelProperty(value = "投保单号")
     private String policyNo;
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
     @ApiModelProperty(value = "出单时间")
     private Date finishTime;
 

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

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: root
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: picc
+    password: picc
   devtools:
     add-properties: false
     restart:
@@ -12,13 +12,13 @@ cas:
 #  server-url-prefix: http://localhost:8080/cas-server
   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:7070
+  client-host-url: http://localhost:9090
   # 如果不设则无法获取用户扩展信息
   validation-type: cas
 
 jpcloud:
-  notifyBackUrl: http://localhost:7070/picc-enterprise-server/pay/orderNotifyBack
-  synchroBackUrl: http://localhost:7070/picc-enterprise-server/pay/paySuccess
+  notifyBackUrl: ${client-host-url}/picc-enterprise-server/pay/orderNotifyBack
+  synchroBackUrl: ${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

weixin-middleware/src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: root
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/picc?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: picc
+    password: picc
   devtools:
     add-properties: false
     restart: