企业首次投保 完成

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

@@ -52,11 +52,14 @@ id_,application_id,policy_id		from business_application_policy where id_=#{0}
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="ApplicationPolicyMap">
 		<![CDATA[
-			select * from business_application_policy
+			SELECT a.* FROM business_application_policy a LEFT JOIN business_insurance_policy b ON a.policy_id = b.id_
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.applicationId != null">
+				and a.application_id like #{searchParams.applicationId}
+			</if>
+			<if test="searchParams.policyId != null">
+				and a.policy_id like #{searchParams.policyId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -88,12 +88,15 @@ id_,policy_id,member_id,status_,is_add,del_flag,create_by,create_time,update_by,
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsurancePolicyMemberMap">
 		<![CDATA[
-			select * from business_insurance_policy_member
+			select * from business_insurance_policy_member a LEFT JOIN base_company_member b ON a.member_id = b.id_
 		]]>
 		<where>
 			and del_flag = false
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.policyId != null">
+				and a.policy_id like #{searchParams.policyId}
+			</if>
+			<if test="searchParams.jobsId != null">
+				and b.jobs_id like #{searchParams.jobsId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -88,8 +88,8 @@ id_,policy_id,opinion_,process_status,del_flag,create_by,create_time,update_by,u
 			select * from business_insurance_policy_record
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
+			<if test="searchParams.policyId != null">
+				and policy_id like #{searchParams.policyId}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

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

@@ -1,6 +1,8 @@
 package com.jpsoft.picc.modules.auth.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.picc.modules.auth.dto.InsuranceApplicationDTO;
+import com.jpsoft.picc.modules.auth.dto.InsuranceJobsDTO;
 import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
 import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
@@ -10,7 +12,9 @@ import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
 import com.jpsoft.picc.modules.base.service.InsuranceDefinitionService;
 import com.jpsoft.picc.modules.base.service.InsuranceJobsService;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
 import com.jpsoft.picc.modules.common.constant.PolicyStatus;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
@@ -27,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.*;
 
 @Api(description="投保信息")
@@ -50,6 +55,9 @@ public class InsuranceApplicationController {
     @Autowired
     private CompanyService companyService;
 
+    @Autowired
+    private InsurancePolicyMemberService insurancePolicyMemberService;
+
     @ApiOperation(value="投保单列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -87,12 +95,13 @@ public class InsuranceApplicationController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<Map<String,Object>> insureDetail(@RequestParam(value="id",defaultValue="") String id,
+    public MessageResult<InsuranceApplicationDTO> insureDetail(@RequestParam(value="id",defaultValue="") String id,
                                                           HttpServletRequest request){
-        MessageResult<Map<String,Object>> msgResult = new MessageResult<>();
+        MessageResult<InsuranceApplicationDTO> msgResult = new MessageResult<>();
 
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
+
         if(company == null){
             msgResult.setResult(false);
             msgResult.setMessage("请先完善企业信息！");
@@ -100,40 +109,35 @@ public class InsuranceApplicationController {
             return msgResult;
         }
 
-        Map<String,Object> objectMap = new HashMap<>();
+        InsuranceApplicationDTO insuranceApplicationDTO = new InsuranceApplicationDTO();
 
         try {
             InsuranceApplication insuranceApplication = insuranceApplicationService.get(id);
 
             if (insuranceApplication != null) {
                 insuranceApplication = insuranceApplicationService.get(id);
+                PojoUtils.map(insuranceApplication, insuranceApplicationDTO);
             } else {
-                insuranceApplication = new InsuranceApplication();
-//                insuranceApplication.setCompanyId();
-//                insuranceApplication.setDefinitionId();
-
-//                insuranceApplication.setStartTime();
-//                insuranceApplication.setEndTime();
-//
-//                insuranceApplication.setInsuredName();
-//                insuranceApplication.setInsuredTel();
-//                insuranceApplication.setCompanyName();
-//                //business_nature
-//                insuranceApplication.setUsccCode();
-//                insuranceApplication.setBusinessScope();
-//                insuranceApplication.setIndustryType();
-//                insuranceApplication.setEmployeesNumber();
-//                insuranceApplication.setInsuredNumber();
-//                //tel_
-//                //mail_
-//                insuranceApplication.setCompanyAddress();
-//                insuranceApplication.setLossInRecentYears();
+                insuranceApplicationDTO.setCompanyId(company.getId());
+//                insuranceApplicationDTO.setDefinitionId();
+//                insuranceApplicationDTO.setStartTime();
+//                insuranceApplicationDTO.setEndTime();
+                insuranceApplicationDTO.setInsuredName(company.getName());
+                insuranceApplicationDTO.setInsuredTel(company.getTel());
+                insuranceApplicationDTO.setCompanyName(company.getName());
+                insuranceApplicationDTO.setBusinessNature(company.getBusinessNature());
+                insuranceApplicationDTO.setUsccCode(company.getUsccCode());
+                insuranceApplicationDTO.setBusinessScope(company.getBusinessScope());
+                insuranceApplicationDTO.setIndustryType(company.getIndustryType());
+                insuranceApplicationDTO.setEmployeesNumber(company.getEmployeesNumber());
+                insuranceApplicationDTO.setInsuredNumber(company.getInsuredNumber());
+                insuranceApplicationDTO.setTel(company.getTel());
+                insuranceApplicationDTO.setPostal(company.getPostal());
+                insuranceApplication.setCompanyAddress(company.getAddress());
+                insuranceApplication.setLossInRecentYears(company.getRemark());
             }
 
-            objectMap.put("insuranceApplication",insuranceApplication);
-            objectMap.put("business_nature",company);
-
-            msgResult.setData(objectMap);
+            msgResult.setData(insuranceApplicationDTO);
         }
         catch(Exception ex){
             logger.error(ex.getMessage(),ex);
@@ -148,14 +152,16 @@ public class InsuranceApplicationController {
     @ApiOperation(value="获取承保信息")
     @RequestMapping(value = "acceptDetail",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id",value = "编号", required = true, paramType = "form",dataType = "String")
+            @ApiImplicitParam(name = "ApplicationId",value = "投保单ID", required = true, paramType = "form",dataType = "String"),
+            @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String"),
     })
-    public MessageResult<Map<String,Object>> acceptDetail(@RequestParam(value="id",defaultValue="") String id){
+    public MessageResult<Map<String,Object>> acceptDetail(@RequestParam(value="ApplicationId",defaultValue="") String ApplicationId,
+                                                          @RequestParam(value="policyId",defaultValue="") String policyId){
         MessageResult<Map<String,Object>> msgResult = new MessageResult<>();
         Map<String,Object> objectMap = new HashMap<>();
 
         try {
-            InsuranceApplication insuranceApplication = insuranceApplicationService.get(id);
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(ApplicationId);
 
             InsuranceDefinition insuranceDefinition = insuranceDefinitionService.get(insuranceApplication.getDefinitionId());
 
@@ -167,9 +173,28 @@ public class InsuranceApplicationController {
             Page<InsuranceDefinitionLimit> insuranceDefinitionLimitPage = insuranceDefinitionLimitService.pageSearch(searchParams,1,100,sortList);
             insuranceDefinition.setLimits(insuranceDefinitionLimitPage.getResult());
             Page<InsuranceJobs> insuranceJobsPage = insuranceJobsService.pageSearch(searchParams,1,100,sortList);
+            BigDecimal allMoney = new BigDecimal(0);
+            for(InsuranceJobs insuranceJobs : insuranceJobsPage.getResult()){
+                InsuranceJobsDTO insuranceJobsDTO = new InsuranceJobsDTO();
+                PojoUtils.map(insuranceApplication, insuranceJobsDTO);
+
+                Map<String,Object> searchParams1 = new HashMap<>();
+                searchParams1.put("policyId",policyId);
+                searchParams1.put("jobsId",insuranceJobs.getJobsId());
+                List<Sort> sortList1 = new ArrayList<>();
+                sortList1.add(new Sort("id_","asc"));
+                Page<InsurancePolicyMember> insurancePolicyMemberPage = insurancePolicyMemberService.pageSearch(searchParams1,1,100,sortList1);
+
+                insuranceJobsDTO.setChargesY(insuranceJobsDTO.getCharges().multiply(new BigDecimal(12)));
+                insuranceJobsDTO.setNumber(insurancePolicyMemberPage.size());
+                insuranceJobsDTO.setMoney(insuranceJobsDTO.getCharges().multiply(new BigDecimal(insurancePolicyMemberPage.size())));
+
+                allMoney.add(insuranceJobsDTO.getCharges().multiply(new BigDecimal(insurancePolicyMemberPage.size())));
+            }
 
             objectMap.put("insuranceDefinition",insuranceDefinition);
             objectMap.put("insuranceJobs",insuranceJobsPage.getResult());
+            objectMap.put("allMoney",allMoney);
 
             msgResult.setData(objectMap);
         }
@@ -214,36 +239,39 @@ public class InsuranceApplicationController {
         return msgResult;
     }
 
-    @ApiOperation(value="保存草稿")
+    @ApiOperation(value="保存草稿(如果点击保存，需要将返回的ID写入前台参数。如果点击下一步，需要将ID作为参数带入下个页面)")
     @RequestMapping(value = "saveDraft",method = RequestMethod.POST)
-    public MessageResult<InsuranceApplication> saveDraft(@ModelAttribute InsuranceApplication insuranceApplication,
+    public MessageResult<InsuranceApplicationDTO> saveDraft(@ModelAttribute InsuranceApplicationDTO insuranceApplicationDTO,
                                                         HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
 
-        MessageResult<InsuranceApplication> msgResult = new MessageResult<>();
+        MessageResult<InsuranceApplicationDTO> msgResult = new MessageResult<>();
+        InsuranceApplication insuranceApplication = new InsuranceApplication();
 
         try {
             int affectCount = 0;
-            if(insuranceApplication.getId() == null){
-                insuranceApplication.setId(UUID.randomUUID().toString());
-                insuranceApplication.setCompanyId(company.getId());
-                insuranceApplication.setStatus(String.valueOf(PolicyStatus.Draft));
-                insuranceApplication.setDelFlag(false);
-                insuranceApplication.setCreateBy(principal.getName());
-                insuranceApplication.setCreateTime(new Date());
-
+            if(insuranceApplicationDTO.getId() == null){
+                insuranceApplicationDTO.setId(UUID.randomUUID().toString());
+                insuranceApplicationDTO.setCompanyId(company.getId());
+                insuranceApplicationDTO.setStatus(String.valueOf(PolicyStatus.Draft));
+                insuranceApplicationDTO.setDelFlag(false);
+                insuranceApplicationDTO.setCreateBy(principal.getName());
+                insuranceApplicationDTO.setCreateTime(new Date());
+
+                PojoUtils.map(insuranceApplicationDTO, insuranceApplication);
                 affectCount = insuranceApplicationService.insert(insuranceApplication);
             }else {
-                insuranceApplication.setUpdateBy(principal.getName());
-                insuranceApplication.setUpdateTime(new Date());
+                insuranceApplicationDTO.setUpdateBy(principal.getName());
+                insuranceApplicationDTO.setUpdateTime(new Date());
 
+                PojoUtils.map(insuranceApplicationDTO, insuranceApplication);
                 affectCount = insuranceApplicationService.update(insuranceApplication);
             }
 
             if(affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(insuranceApplication);
+                msgResult.setData(insuranceApplicationDTO);
             }else {
                 msgResult.setResult(false);
             }

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

@@ -5,7 +5,9 @@ import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.service.CompanyService;
 import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicyRecord;
 import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.business.service.InsurancePolicyRecordService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
@@ -39,6 +41,9 @@ public class InsurancePolicyController {
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
+    @Autowired
+    private InsurancePolicyRecordService insurancePolicyRecordService;
+
     @Autowired
     private CompanyService companyService;
 
@@ -160,4 +165,26 @@ public class InsurancePolicyController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="查看退回理由")
+    @RequestMapping(value = "backReason",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String")
+    })
+    public MessageResult<List<InsurancePolicyRecord>> backReason(@RequestParam(value="policyId",defaultValue="") String policyId){
+        MessageResult<List<InsurancePolicyRecord>> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("policyId",policyId);
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        Page<InsurancePolicyRecord> page = insurancePolicyRecordService.pageSearch(searchParams,1,100,sortList);
+
+        msgResult.setResult(true);
+        msgResult.setData(page.getResult());
+
+        return msgResult;
+    }
 }

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

@@ -6,8 +6,14 @@ import com.jpsoft.picc.modules.base.entity.Company;
 import com.jpsoft.picc.modules.base.entity.CompanyMember;
 import com.jpsoft.picc.modules.base.service.CompanyMemberService;
 import com.jpsoft.picc.modules.base.service.CompanyService;
+import com.jpsoft.picc.modules.business.entity.ApplicationPolicy;
+import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicy;
 import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
+import com.jpsoft.picc.modules.business.service.ApplicationPolicyService;
+import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
+import com.jpsoft.picc.modules.business.service.InsurancePolicyService;
 import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.POIUtils;
@@ -25,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Api(description="每月参保人员")
@@ -42,26 +49,65 @@ public class InsurancePolicyUserController {
     @Autowired
     private InsurancePolicyMemberService insurancePolicyMemberService;
 
+    @Autowired
+    private ApplicationPolicyService applicationPolicyService;
+
+    @Autowired
+    private InsuranceApplicationService insuranceApplicationService;
+
+    @Autowired
+    private InsurancePolicyService insurancePolicyService;
+
     @ApiOperation(value="读取参保人员分页列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "PolicyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String")
+            @ApiImplicitParam(name = "ApplicationId",value = "投保单ID", required = true, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(
-            @RequestParam(value="PolicyId",defaultValue="") String PolicyId,
+            @RequestParam(value="applicationId",defaultValue="") String applicationId,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize){
-        MessageResult<Map> msgResult = new MessageResult<>();
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
+        Company company = companyService.findByCreateBy(principal.getName());
 
-        Map<String,Object> searchParams = new HashMap<>();
+        MessageResult<Map> msgResult = new MessageResult<>();
+        String policyId = "";
+
+        List<Sort> sortList1 = new ArrayList<>();
+        sortList1.add(new Sort("b.effective_date","desc"));
+        Map<String,Object> searchParams1 = new HashMap<>();
+        searchParams1.put("applicationId",applicationId);
+        Page<ApplicationPolicy> page1 = applicationPolicyService.pageSearch(searchParams1,1,100,sortList1);
+        if(page1.size() == 0){
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+
+            InsurancePolicy insurancePolicy = new InsurancePolicy();
+            insurancePolicy.setId(UUID.randomUUID().toString());
+            insurancePolicy.setEffectiveDate(sdf.format(insuranceApplication.getStartTime()));
+            insurancePolicy.setDelFlag(false);
+            insurancePolicy.setCreateBy(principal.getName());
+            insurancePolicy.setCreateTime(new Date());
+            insurancePolicy.setNo(1);
+            int affectCount = insurancePolicyService.insert(insurancePolicy);
+            if(affectCount > 0){
+                policyId = insurancePolicy.getId();
+
+                ApplicationPolicy applicationPolicy = new ApplicationPolicy();
+                applicationPolicy.setId(UUID.randomUUID().toString());
+                applicationPolicy.setApplicationId(applicationId);
+                applicationPolicy.setPolicyId(policyId);
+                applicationPolicyService.insert(applicationPolicy);
+            }
+        }else {
+            policyId = page1.get(0).getPolicyId();
+        }
 
         List<Sort> sortList = new ArrayList<>();
         sortList.add(new Sort("id_","asc"));
-
-        if (StringUtils.isNotEmpty(PolicyId)) {
-            searchParams.put("PolicyId",PolicyId);
-        }
-
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("policyId",policyId);
         Page<InsurancePolicyMember> page = insurancePolicyMemberService.pageSearch(searchParams,pageIndex,pageSize,sortList);
 
         msgResult.setResult(true);
@@ -70,35 +116,43 @@ public class InsurancePolicyUserController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加参保人员")
+    @ApiOperation(value="添加参保人员(添加完成后，要将policyId作为参数，传至下一页)")
     @PostMapping("add")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String"),
-//            @ApiImplicitParam(name = "memberId",value = "企业用户ID", required = true, paramType = "form",dataType = "String")
+            @ApiImplicitParam(name = "memberIds",value = "企业用户ID", required = true, paramType = "form",dataType = "String"),
     })
-    public MessageResult<InsurancePolicyMember> add(@RequestParam(value="policyId",defaultValue="") String policyId,
-//                                                    @RequestParam(value="memberId",defaultValue="") String memberId,
+    public MessageResult<String> add(@RequestParam(value="policyId",defaultValue="") String policyId,
+                                                    @RequestParam(value="memberIds",defaultValue="") String memberIds,
                                                     HttpServletRequest request){
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
         Company company = companyService.findByCreateBy(principal.getName());
 
-        MessageResult<InsurancePolicyMember> msgResult = new MessageResult<>();
-        InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
+        MessageResult<String> msgResult = new MessageResult<>();
 
         try {
-            insurancePolicyMember.setId(UUID.randomUUID().toString());
-            if(StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
-            if(StringUtils.isNotEmpty(company.getId())) insurancePolicyMember.setMemberId(company.getId());
-            insurancePolicyMember.setStatus("0");
-            insurancePolicyMember.setDelFlag(false);
-            insurancePolicyMember.setCreateBy(principal.getName());
-            insurancePolicyMember.setCreateTime(new Date());
+            int affectCount = 0;
+            String[] memberId = memberIds.split("|");
+            for(String li : memberId) {
+                InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
+                insurancePolicyMember.setId(UUID.randomUUID().toString());
+                insurancePolicyMember.setPolicyId(policyId);
+                insurancePolicyMember.setMemberId(li);
+                insurancePolicyMember.setStatus("0");
+                insurancePolicyMember.setDelFlag(false);
+                insurancePolicyMember.setCreateBy(principal.getName());
+                insurancePolicyMember.setCreateTime(new Date());
 
-            int affectCount = insurancePolicyMemberService.insert(insurancePolicyMember);
+                Integer count = insurancePolicyMemberService.insert(insurancePolicyMember);
+                if(count > 0){
+                    affectCount++;
+                }
+            }
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData(insurancePolicyMember);
+                msgResult.setData(policyId);
+                msgResult.setMessage("新增"+affectCount+"条数据。");
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/dto/InsuranceApplicationDTO.java

@@ -0,0 +1,67 @@
+package com.jpsoft.picc.modules.auth.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "企业信息")
+public class InsuranceApplicationDTO {
+    @ApiModelProperty(value = "ID")
+    private String id;
+    @ApiModelProperty(value = "企业ID")
+    private String companyId;
+    @ApiModelProperty(value = "保险种类")
+    private String definitionId;
+    @ApiModelProperty(value = "投保人姓名")
+    private String insuredName;
+    @ApiModelProperty(value = "联系电话")
+    private String insuredTel;
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+    @ApiModelProperty(value = "营业性质")
+    private String businessNature;
+    @ApiModelProperty(value = "组织机构代码证")
+    private String usccCode;
+    @ApiModelProperty(value = "营业范围")
+    private String businessScope;
+    @ApiModelProperty(value = "行业类型")
+    private String industryType;
+    @ApiModelProperty(value = "联系电话")
+    private String tel;
+    @ApiModelProperty(value = "邮编")
+    private String postal;
+    @ApiModelProperty(value = "雇员人数")
+    private Integer employeesNumber;
+    @ApiModelProperty(value = "已投保人数")
+    private Integer insuredNumber;
+    @ApiModelProperty(value = "公司地址")
+    private String companyAddress;
+    @ApiModelProperty(value = "近三年损失情况")
+    private String lossInRecentYears;
+    @ApiModelProperty(value = "保障开始时间")
+    private Date startTime;
+    @ApiModelProperty(value = "保障结束时间")
+    private Date endTime;
+    @ApiModelProperty(value = "保障月份数量")
+    private Integer monthNumber;
+    @ApiModelProperty(value = "保险费合计(总金额)")
+    private BigDecimal insuranceFee;
+    @ApiModelProperty(value = "状态:草稿10/待初审20/待复审30/待缴费40/待制单50/待出单60/已出单70/已过期100")
+    private String status;
+    @ApiModelProperty(value = "流程审核状态:正常/回退等")
+    private String processStatus;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/dto/InsuranceJobsDTO.java

@@ -0,0 +1,43 @@
+package com.jpsoft.picc.modules.auth.dto;
+
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinition;
+import com.jpsoft.picc.modules.base.entity.Jobs;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "收费标准")
+public class InsuranceJobsDTO {
+    @ApiModelProperty(value = "编号")
+    private String id;
+    @ApiModelProperty(value = "行业ID")
+    private String jobsId;
+    @ApiModelProperty(value = "险种信息ID")
+    private String definitionId;
+    @ApiModelProperty(value = "行业实体")
+    private Jobs jobs;
+    @ApiModelProperty(value = "险种信息实体")
+    private InsuranceDefinition definition;
+    @ApiModelProperty(value = "收费标准(月)")
+    private BigDecimal charges;
+    @ApiModelProperty(value = "收费标准(年)")
+    private BigDecimal chargesY;
+    @ApiModelProperty(value = "投保人数")
+    private Integer number;
+    @ApiModelProperty(value = "保险费")
+    private BigDecimal money;
+    @ApiModelProperty(value = "是否删除")
+    private Boolean delFlag;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+}