Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceJobsController.java

@@ -71,7 +71,7 @@ public class InsuranceJobsController {
         return msgResult;
     }
 
-/*    @ApiOperation(value="获取信息")
+    @ApiOperation(value="获取信息")
     @GetMapping("edit/{id}")
     public MessageResult<InsuranceJobs> edit(@PathVariable("id") String id){
         MessageResult<InsuranceJobs> msgResult = new MessageResult<>();
@@ -124,7 +124,7 @@ public class InsuranceJobsController {
         }
 
         return msgResult;
-    }*/
+    }
 
 	@ApiOperation(value="删除")
     @PostMapping("delete/{id}")
@@ -158,7 +158,7 @@ public class InsuranceJobsController {
     }
 
 
-/*    @ApiOperation(value="批量删除")
+    @ApiOperation(value="批量删除")
     @PostMapping("batchDelete")
     public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();
@@ -221,7 +221,7 @@ public class InsuranceJobsController {
         msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;
-    }*/
+    }
 
 
 

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

@@ -3,6 +3,8 @@ package com.jpsoft.picc.modules.business.controller;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.InsuranceAgent;
 import com.jpsoft.picc.modules.base.service.InsuranceAgentService;
+import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
+import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
 import com.jpsoft.picc.modules.business.service.InsurancePolicyRecordService;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.dto.Sort;
@@ -39,6 +41,9 @@ public class InsurancePolicyController {
     @Autowired
     private InsurancePolicyRecordService insurancePolicyRecordService;
 
+    @Autowired
+    private InsuranceApplicationService insuranceApplicationService;
+
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsurancePolicy> create(){
@@ -391,4 +396,38 @@ public class InsurancePolicyController {
 
 
 
+
+
+    @ApiOperation(value="企业缴费")
+    @RequestMapping(value = "pay",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
+    })
+    public MessageResult<Integer> pay(String applicationId,String policyId, @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+
+        insuranceApplication.setStatus("50");//状态改为待出单
+
+        int affectCount = insuranceApplicationService.update(insuranceApplication);
+
+        if(affectCount>0){
+            InsurancePolicy insurancePolicy = insurancePolicyService.get(policyId);
+
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(affectCount);
+
+        return msgResult;
+    }
+
+
+
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/InsuranceDefinitionLimit.java

@@ -17,7 +17,7 @@ public class InsuranceDefinitionLimit {
     @ApiModelProperty(value = "编号")
 	private String id;
     @ApiModelProperty(value = "险种信息ID")
-	private String definitionId;
+	private InsuranceDefinition definition;
     @ApiModelProperty(value = "限额名称")
 	private String name;
     @ApiModelProperty(value = "责任限额/免赔额")
@@ -55,15 +55,15 @@ public class InsuranceDefinitionLimit {
 	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
-		return definitionId;
+    	public InsuranceDefinition getDefinition(){
+		return definition;
 	}
 	
 	/**
 	 *设置险种信息ID
 	 */
-	public void setDefinitionId(String definitionId){
-		this.definitionId = definitionId;
+	public void setDefinition(InsuranceDefinition definition){
+		this.definition = definition;
 	}
 
 	/**

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/InsuranceJobs.java

@@ -16,10 +16,14 @@ import io.swagger.annotations.ApiModel;
 public class InsuranceJobs {
     @ApiModelProperty(value = "编号")
 	private String id;
-    @ApiModelProperty(value = "行业ID")
+	@ApiModelProperty(value = "行业ID")
 	private String jobsId;
-    @ApiModelProperty(value = "险种信息ID")
+	@ApiModelProperty(value = "险种信息ID")
 	private String definitionId;
+    @ApiModelProperty(value = "行业实体")
+	private Jobs jobs;
+	@ApiModelProperty(value = "险种信息实体")
+	private InsuranceDefinition definition;
     @ApiModelProperty(value = "收费标准(月)")
 	private BigDecimal charges;
     @ApiModelProperty(value = "是否删除")
@@ -50,30 +54,50 @@ public class InsuranceJobs {
 	/**
 	 *获取行业ID
 	 */
-	public String getJobsId(){
-		return jobsId;
+	public Jobs getJobs(){
+		return jobs;
 	}
 	
 	/**
 	 *设置行业ID
 	 */
-	public void setJobsId(String jobsId){
-		this.jobsId = jobsId;
+	public void setJobs(Jobs jobs){
+		this.jobs = jobs;
 	}
 
 	/**
 	 *获取险种信息ID
 	 */
-	public String getDefinitionId(){
-		return definitionId;
+	public InsuranceDefinition getDefinition(){
+		return definition;
 	}
-	
+
 	/**
 	 *设置险种信息ID
 	 */
-	public void setDefinitionId(String definitionId){
+	public void setDefinition(InsuranceDefinition definition){
+		this.definition = definition;
+	}
+
+	/**
+	 *设置行业ID
+	 */
+	public String getJobsId(){
+		return jobsId;
+	}
+	public void setJobsId(String jobsId){
+		this.jobsId = jobsId;
+	}
+
+	/**
+	 *获取险种信息ID
+	 */
+	public void setDefinitionId(String definitionId) {
 		this.definitionId = definitionId;
 	}
+	public String getDefinitionId() {
+		return definitionId;
+	}
 
 	/**
 	 *获取收费标准(月)

picc-common/src/main/java/com/jpsoft/picc/modules/base/entity/Jobs.java

@@ -16,8 +16,8 @@ import io.swagger.annotations.ApiModel;
 public class Jobs {
     @ApiModelProperty(value = "编号")
 	private String id;
-    @ApiModelProperty(value = "险种信息ID")
-	private String definitionId;
+    @ApiModelProperty(value = "险种信息")
+	private InsuranceDefinition definition;
     @ApiModelProperty(value = "名称")
 	private String name;
     @ApiModelProperty(value = "详细信息")
@@ -52,15 +52,15 @@ public class Jobs {
 	/**
 	 *获取险种信息ID
 	 */
-    	public String getDefinitionId(){
-		return definitionId;
+	public InsuranceDefinition getDefinition(){
+		return definition;
 	}
-	
+
 	/**
 	 *设置险种信息ID
 	 */
-	public void setDefinitionId(String definitionId){
-		this.definitionId = definitionId;
+	public void setDefinition(InsuranceDefinition definition){
+		this.definition = definition;
 	}
 
 	/**

picc-common/src/main/resources/mapper/base/InsuranceDefinitionLimit.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionLimitDAO">
 	<resultMap id="InsuranceDefinitionLimitMap" type="com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit">
 		<id property="id" column="id_" />
-			<result property="definitionId" column="definition_id" />
+<!--			<result property="definitionId" column="definition_id" />-->
 			<result property="name" column="name_" />
 			<result property="limit" column="limit_" />
 			<result property="unit" column="unit_" />
@@ -15,6 +15,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
+			<association property="definition" column="definition_id" select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit">
 	<!--

picc-common/src/main/resources/mapper/base/InsuranceJobs.xml

@@ -13,6 +13,8 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
+			<association property="definition" column="definition_id" select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
+			<association property="jobs" column="jobs_id" select="com.jpsoft.picc.modules.base.dao.JobsDAO.get"></association>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.InsuranceJobs">
 	<!--

picc-common/src/main/resources/mapper/base/Jobs.xml

@@ -5,7 +5,6 @@
 <mapper namespace="com.jpsoft.picc.modules.base.dao.JobsDAO">
 	<resultMap id="JobsMap" type="com.jpsoft.picc.modules.base.entity.Jobs">
 		<id property="id" column="id_" />
-			<result property="definitionId" column="definition_id" />
 			<result property="name" column="name_" />
 			<result property="content" column="content_" />
 			<result property="status" column="status_" />
@@ -14,6 +13,7 @@
 			<result property="createTime" column="create_time" />
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
+			<association property="definition" column="definition_id" select="com.jpsoft.picc.modules.base.dao.InsuranceDefinitionDAO.get"></association>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.picc.modules.base.entity.Jobs">
 	<!--