Merge remote-tracking branch 'origin' into dev_20210308_sharing

yd-api/pom.xml

@@ -29,6 +29,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.20</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
@@ -87,14 +92,15 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-			<optional>true</optional>
+            <version>1.18.12</version>
+
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.5</version>
         </dependency>
-<!--
+        <!--
                 <dependency>
                     <groupId>io.springfox</groupId>
                     <artifactId>springfox-swagger2</artifactId>
@@ -105,7 +111,7 @@
                     <artifactId>springfox-swagger-ui</artifactId>
                     <version>2.8.0</version>
                 </dependency>
--->
+        -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -221,6 +227,7 @@
             <scope>system</scope>
             <systemPath>${basedir}/lib/com-libs-pdf-0.0.1.jar</systemPath>
         </dependency>
+
     </dependencies>
 
     <build>

yd-api/src/main/java/com/yd/api/practitioner/PractitionerPDFTest.java

@@ -164,7 +164,8 @@ public class PractitionerPDFTest {
         String templatePDF = "D:\\pcs12\\templatePractitionerContract.pdf";
         templatePDF = PDFConfiguration.getProperty("pdf.template");
         //模板文件生成零时文件
-        String tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
+        String tmpPathPDF = "D:\\pcs12";
+        tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
         String practitionerNO = "SH000012";
 
         //PDF模板输出结果文件
@@ -186,7 +187,7 @@ public class PractitionerPDFTest {
         signResultPDF = tmpPathPDF + practitionerNO + "-signedYD.pdf";
 
         String password="UC645YlB";
-        password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
+        //password = readFileTxt(PDFConfiguration.getProperty("pdf.keyPasswordFile"));
 
         String keyStorePath="D:\\pcs12\\4929078_m.zuihuibi.cn.pfx";
         keyStorePath = PDFConfiguration.getProperty("pdf.keyStorePath");;

yd-api/src/main/java/com/yd/api/practitioner/vo/Commission.java

+package com.yd.api.practitioner.vo;
+
+public class Commission {
+
+	public String getInsurer() {
+		return insurer;
+	}
+
+	public void setInsurer(String insurer) {
+		this.insurer = insurer;
+	}
+
+	private String insurer;
+
+	public String getPolicyNo() {
+		return policyNo;
+	}
+
+	public void setPolicyNo(String policyNo) {
+		this.policyNo = policyNo;
+	}
+
+	private String policyNo;
+
+	public String getEffectiveDate() {
+		return effectiveDate;
+	}
+
+	public void setEffectiveDate(String effectiveDate) {
+		this.effectiveDate = effectiveDate;
+	}
+
+	private String effectiveDate;
+
+	public String getProductCode() {
+		return productCode;
+	}
+
+	public void setProductCode(String productCode) {
+		this.productCode = productCode;
+	}
+
+	private String productCode;
+
+	public String getSubSystem() {
+		return subSystem;
+	}
+
+	public void setSubSystem(String subSystem) {
+		this.subSystem = subSystem;
+	}
+
+	private String subSystem;
+
+	public String getInsured() {
+		return insured;
+	}
+
+	public void setInsured(String insured) {
+		this.insured = insured;
+	}
+
+	private String insured;
+
+	public String getYearMonth() {
+		return yearMonth;
+	}
+
+	public void setYearMonth(String yearMonth) {
+		this.yearMonth = yearMonth;
+	}
+
+	private String yearMonth;
+
+	public String getPremium() {
+		return premium;
+	}
+
+	public void setPremium(String premium) {
+		this.premium = premium;
+	}
+
+	private String premium;
+
+	public String getFyc() {
+		return fyc;
+	}
+
+	public void setFyc(String fyc) {
+		this.fyc = fyc;
+	}
+
+	private String fyc;
+
+	public String getGradeRate() {
+		return gradeRate;
+	}
+
+	public void setGradeRate(String gradeRate) {
+		this.gradeRate = gradeRate;
+	}
+
+	private String gradeRate;
+
+	public String getCommission() {
+		return commission;
+	}
+
+	public void setCommission(String commission) {
+		this.commission = commission;
+	}
+
+	private String commission;
+
+	public String getNote() {
+		return note;
+	}
+
+	public void setNote(String note) {
+		this.note = note;
+	}
+
+	private String note;
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/CommissionItems.java

+package com.yd.api.practitioner.vo;
+
+import java.util.List;
+
+public class CommissionItems {
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	private String name;
+
+	public List<Commission> getItems() {
+		return items;
+	}
+
+	public void setItems(List<Commission> items) {
+		this.items = items;
+	}
+
+	private List<Commission> items;
+
+}