投保查询 企业首次投保

picc-admin-server/picc-admin-server.iml

@@ -28,6 +28,9 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.27" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
     <orderEntry type="module" module-name="picc-common" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.27" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.27" level="project" />

picc-common/src/main/resources/mapper/business/InsuranceApplication.xml

@@ -124,6 +124,9 @@ id_,company_id,definition_id,insured_name,insured_tel,start_time,end_time,number
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>
+			<if test="searchParams.companyId != null">
+				and company_id like #{searchParams.companyId}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -110,7 +111,10 @@ public class CompanyMemberController {
                                             @RequestParam(value="jobsId",defaultValue="") String jobsId,
                                             @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
                                             @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
-                                            @RequestParam(value="status",defaultValue="") String status){
+                                            @RequestParam(value="status",defaultValue="") String status,
+                                            HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
         CompanyMember companyMember = new CompanyMember();
 
@@ -127,7 +131,7 @@ public class CompanyMemberController {
             if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
             if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
             companyMember.setDelFlag(false);
-//            companyMember.setCreateBy(subject);
+            companyMember.setCreateBy(principal.getName());
             companyMember.setCreateTime(new Date());
 
             int affectCount = companyMemberService.insert(companyMember);
@@ -204,7 +208,10 @@ public class CompanyMemberController {
                                                @RequestParam(value="jobsId",defaultValue="") String jobsId,
                                                @RequestParam(value="healthStatus",defaultValue="") String healthStatus,
                                                @RequestParam(value="cardFiles",defaultValue="") String cardFiles,
-                                               @RequestParam(value="status",defaultValue="") String status){
+                                               @RequestParam(value="status",defaultValue="") String status,
+                                               HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<CompanyMember> msgResult = new MessageResult<>();
 
         try {
@@ -220,7 +227,7 @@ public class CompanyMemberController {
             if(StringUtils.isNotEmpty(healthStatus)) companyMember.setHealthStatus(healthStatus);
             if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
             if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
-//            companyMember.setUpdateBy(subject);
+            companyMember.setUpdateBy(principal.getName());
             companyMember.setUpdateTime(new Date());
 
             int affectCount = companyMemberService.update(companyMember);
@@ -248,13 +255,16 @@ public class CompanyMemberController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<Integer> delete(@RequestParam(value="id",defaultValue="") String id){
+    public MessageResult<Integer> delete(@RequestParam(value="id",defaultValue="") String id,
+                                         HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
             CompanyMember companyMember = companyMemberService.get(id);
             companyMember.setDelFlag(true);
-//            companyMember.setUpdateBy(subject);
+            companyMember.setUpdateBy(principal.getName());
             companyMember.setUpdateTime(new Date());
 
             int affectCount = companyMemberService.update(companyMember);
@@ -282,7 +292,10 @@ public class CompanyMemberController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "uploadFile",value = "上传文件", required = true,paramType="form", dataType = "__file")
     })
-    public MessageResult<String> importXls(MultipartFile uploadFile){
+    public MessageResult<String> importXls(MultipartFile uploadFile,
+                                           HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<String> msgResult = new MessageResult<>();
         CompanyMember companyMember = new CompanyMember();
 
@@ -312,7 +325,7 @@ public class CompanyMemberController {
 //                if(StringUtils.isNotEmpty(cardFiles)) companyMember.setCardFiles(cardFiles);
 //                if(StringUtils.isNotEmpty(status)) companyMember.setStatus(status);
                 companyMember.setDelFlag(false);
-//            companyMember.setCreateBy(subject);
+                companyMember.setCreateBy(principal.getName());
                 companyMember.setCreateTime(new Date());
 
                 if(companyMemberService.insert(companyMember) > 0) {

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

@@ -1,9 +1,91 @@
 package com.jpsoft.picc.modules.auth.controller;
 
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
+import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.dto.Sort;
+import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Api(description="投保信息")
 @RestController
 public class InsuranceApplicationController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private InsuranceApplicationService insuranceApplicationService;
+
+    @ApiOperation(value="投保单列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "companyId",value = "企业ID", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<Map> pageList(
+            @RequestParam(value="companyId",defaultValue="") String companyId,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(companyId)) {
+            searchParams.put("companyId",companyId);
+        }
+
+        Page<InsuranceApplication> page = insuranceApplicationService.pageSearch(searchParams,pageIndex,pageSize,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取投保信息")
+    @RequestMapping(value = "insureDetail",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<InsuranceApplication> insureDetail(@RequestParam(value="id",defaultValue="") String id){
+        MessageResult<InsuranceApplication> msgResult = new MessageResult<>();
+
+        try {
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(id);
+
+            if (insuranceApplication != null) {
+                msgResult.setResult(true);
+                msgResult.setData(insuranceApplication);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

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

@@ -1,9 +1,52 @@
 package com.jpsoft.picc.modules.auth.controller;
 
+import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
+import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.dto.Sort;
+import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Api(description="险种信息")
 @RestController
 public class InsuranceDefinitionController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private InsuranceDefinitionService insuranceDefinitionService;
+
+    @ApiOperation(value="所有险种列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<Map> list(){
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<InsuranceDefinition> page = insuranceDefinitionService.pageSearch(searchParams,1,1000,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }

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

@@ -90,12 +90,12 @@ public class InsurancePolicyController {
         return msgResult;
     }
 
-    @ApiOperation(value="查看退回理由")
-    @RequestMapping(value = "backReason",method = RequestMethod.POST)
+    @ApiOperation(value="查看附件")
+    @RequestMapping(value = "attachmentList",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<String> backReason(@RequestParam(value="id",defaultValue="") String id){
+    public MessageResult<String> attachmentList(@RequestParam(value="id",defaultValue="") String id){
         MessageResult<String> msgResult = new MessageResult<>();
 
         try {
@@ -103,7 +103,7 @@ public class InsurancePolicyController {
 
             if (insurancePolicy != null) {
                 msgResult.setResult(true);
-                msgResult.setData("aaa");
+                msgResult.setData(insurancePolicy.getInsurancePolicyFile());
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");

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

@@ -11,11 +11,13 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
+import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Api(description="消息列表")
@@ -67,13 +69,16 @@ public class MessageController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<Integer> read(@RequestParam(value="id",defaultValue="") String id){
+    public MessageResult<Integer> read(@RequestParam(value="id",defaultValue="") String id,
+                                       HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
             Message message = messageService.get(id);
             message.setStatus(true);
-//            companyMember.setUpdateBy(subject);
+            message.setUpdateBy(principal.getName());
             message.setUpdateTime(new Date());
 
             int affectCount = messageService.update(message);