Merge remote-tracking branch 'origin/master'

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

@@ -308,7 +308,7 @@
         <![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.insurance_policy_file
+			a.insurance_policy_file,a.electronic_invoice_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/InsurancePolicyUserController.java

@@ -78,13 +78,15 @@ public class InsurancePolicyUserController {
         MessageResult<Map> msgResult = new MessageResult<>();
 
         if (StringUtils.isNotEmpty(applicationId)) {
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+
             List<ApplicationPolicy> relatePolicyList = applicationPolicyService.findByApplicationId(applicationId);
 
             if (relatePolicyList.size() == 0) {
                 InsurancePolicy insurancePolicy = new InsurancePolicy();
                 insurancePolicy.setId(policyId);
                 insurancePolicy.setLatestApplicationId(applicationId);
-
+                insurancePolicy.setPolicyNo(insuranceApplication.getPolicyNo());
                 insurancePolicy.setDelFlag(false);
                 insurancePolicy.setCreateBy(principal.getName());
                 insurancePolicy.setCreateTime(new Date());

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

@@ -5,9 +5,9 @@ server:
 
 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: