Merge remote-tracking branch 'origin/master'

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

@@ -305,7 +305,7 @@ public class JwtsUserController {
                 }
             }
             else{
-                message = "您已注册!请在电脑端登录荆州人才超市联盟平台（http://www.jzrccs.com）完成投保申请。";
+                message = "您已注册!请在电脑端登录荆州人才超市联盟平台（http://picc.jzrccs.com）完成投保申请。";
             }
         }
         catch (Exception ex){

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

@@ -59,8 +59,8 @@
 		(
 			#{id,jdbcType=VARCHAR}
 			,#{name,jdbcType=VARCHAR}
-			,#{legalPhone,jdbcType=VARCHAR}
 			,#{legalName,jdbcType=VARCHAR}
+			,#{legalPhone,jdbcType=VARCHAR}
 			,#{legalCard,jdbcType=VARCHAR}
 			,#{legalCardFile,jdbcType=VARCHAR}
 			,#{usccCode,jdbcType=VARCHAR}

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

@@ -291,7 +291,8 @@
     <select id="mySearch" parameterType="hashmap" resultMap="InsurancePolicyMap">
         <![CDATA[
 			SELECT a.id_,a.policy_no,b.name_ AS definition_name,a.number_,a.start_time,
-			a.end_time,a.create_time,a.finish_time,a.insurance_fee,a.status_
+			a.end_time,a.create_time,a.finish_time,a.insurance_fee,a.status_,
+			a.insurance_policy_file
 			FROM business_insurance_policy a
             LEFT JOIN base_insurance_definition b ON a.definition_id = b.id_
 		]]>

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

@@ -942,6 +942,8 @@ public class InsurancePolicyController {
             Page<InsurancePolicy> page = insurancePolicyService.myPageSearch(searchParams, 1, 1000,sortList);
 
             //内容-写入数据
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat sdfEx = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             for(int i=0;i<page.size();i++){
                 InsurancePolicy insurancePolicy = page.get(i);
 
@@ -949,17 +951,17 @@ public class InsurancePolicyController {
                 HSSFCell cellContent1 = rowContent.createCell(0);
                 cellContent1.setCellValue(i+1);
                 HSSFCell cellContent2 = rowContent.createCell(1);
-                if(insurancePolicy.getSinglNumber() != null) cellContent2.setCellValue(insurancePolicy.getSinglNumber());
+                if(insurancePolicy.getPolicyNo() != null) cellContent2.setCellValue(insurancePolicy.getPolicyNo());
                 HSSFCell cellContent3 = rowContent.createCell(2);
                 if(insurancePolicy.getDefinitionName() != null) cellContent3.setCellValue(insurancePolicy.getDefinitionName());
                 HSSFCell cellContent4 = rowContent.createCell(3);
                 if(insurancePolicy.getNumber() != null) cellContent4.setCellValue(insurancePolicy.getNumber());
                 HSSFCell cellContent5 = rowContent.createCell(4);
-                if(insurancePolicy.getStartTime() != null && insurancePolicy.getEndTime() != null) cellContent5.setCellValue(insurancePolicy.getStartTime() + " - " + insurancePolicy.getEndTime());
+                if(insurancePolicy.getStartTime() != null && insurancePolicy.getEndTime() != null) cellContent5.setCellValue(sdf.format(insurancePolicy.getStartTime()) + " - " + sdf.format(insurancePolicy.getEndTime()));
                 HSSFCell cellContent6 = rowContent.createCell(5);
-                if(insurancePolicy.getCreateTime() != null) cellContent6.setCellValue(insurancePolicy.getCreateTime());
+                if(insurancePolicy.getCreateTime() != null) cellContent6.setCellValue(sdfEx.format(insurancePolicy.getCreateTime()));
                 HSSFCell cellContent7 = rowContent.createCell(6);
-                if(insurancePolicy.getFinishTime() != null) cellContent7.setCellValue(insurancePolicy.getFinishTime());
+                if(insurancePolicy.getFinishTime() != null) cellContent7.setCellValue(sdfEx.format(insurancePolicy.getFinishTime()));
                 HSSFCell cellContent8 = rowContent.createCell(7);
                 if(insurancePolicy.getInsuranceFee() != null) cellContent8.setCellValue(insurancePolicy.getInsuranceFee().floatValue());
                 HSSFCell cellContent9 = rowContent.createCell(8);

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/dto/CompanyInfoDTO.java

@@ -37,4 +37,6 @@ public class CompanyInfoDTO {
     private String industryType;
     @ApiModelProperty(value = "地址")
     private String address;
+    @ApiModelProperty(value = "邮政编号")
+    private String postal;
 }