解决冲突

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/agms/AgmsController.java

 package com.yd.api.agms;
 
 import com.yd.api.agms.service.*;
+import com.yd.api.agms.service.AgmsDashboardService;
+import com.yd.api.agms.service.AgmsFortuneService;
+import com.yd.api.agms.service.AgmsHiringService;
+import com.yd.api.agms.service.AgmsPractitionerService;
 import com.yd.api.agms.vo.dashboard.*;
 import com.yd.api.agms.vo.fortune.*;
 import com.yd.api.agms.vo.hiring.*;
 import com.yd.api.agms.vo.sharing.ControllerResponseVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListRequestVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListResponseVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveRequestVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveResponseVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
@@ -31,6 +39,8 @@ public class AgmsController {
     private AgmsHiringService agmsHiringService;
     @Autowired
     private AgmsSharingService agmsSharingService;
+    @Autowired
+    private AgmsPractitionerService agmsPractitionerService;
 
     /**
      * AGMS -- 财务管理报表
@@ -285,7 +295,34 @@ public class AgmsController {
 
     @RequestMapping(value="/controller")
     public Object controller(@RequestParam String action,@RequestParam(value = "upfile",required = false) MultipartFile upfile) {
-        ControllerResponseVO responseVO = agmsSharingService.controller(action,upfile);
+        ControllerResponseVO responseVO = agmsSharingService.controller(action, upfile);
         return responseVO;
     }
+    /**
+     * AGMS -- 经纪人保存文章
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    @RequestMapping(value="/practitionerFileSharingSave")
+    public Object practitionerFileSharingSave(@RequestBody PractitionerFileSharingSaveRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        PractitionerFileSharingSaveResponseVO responseVO = agmsPractitionerService.practitionerFileSharingSave(requestVO);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
+
+    /**
+     * AGMS -- 经纪人查询文章
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    @RequestMapping(value="/practitionerFileSharingList")
+    public Object practitionerFileSharingList(@RequestBody PractitionerFileSharingListRequestVO requestVO) {
+        JsonResult result = new JsonResult();
+        PractitionerFileSharingListResponseVO responseVO = agmsPractitionerService.practitionerFileSharingList(requestVO);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
 }

yd-api/src/main/java/com/yd/api/agms/service/AgmsPractitionerService.java

+package com.yd.api.agms.service;
+
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListRequestVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingListResponseVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveRequestVO;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharingSaveResponseVO;
+
+/**
+ * @author xxy
+ */
+public interface AgmsPractitionerService {
+    /**
+     * AGMS -- 经纪人保存文章
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    PractitionerFileSharingSaveResponseVO practitionerFileSharingSave(PractitionerFileSharingSaveRequestVO requestVO);
+
+    /**
+     * AGMS -- 经纪人查询文章
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO);
+}

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsPractitionerServiceImpl.java

+package com.yd.api.agms.service.impl;
+
+import com.github.pagehelper.PageInfo;
+import com.yd.api.agms.service.AgmsPractitionerService;
+import com.yd.api.agms.vo.practitioner.*;
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.customer.AclPractitionerFileSharing;
+import com.yd.dal.service.agms.AgmsPractitionerDALService;
+import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
+import com.yd.util.config.ZHBErrorConfig;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xxy
+ */
+@Service("agmsPractitionerService")
+public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
+
+    @Autowired
+    private AclPractitionerFileSharingDALService aclPractitionerFileSharingDalService;
+    @Autowired
+    private AgmsPractitionerDALService agmsPractitionerDALService;
+
+    @Override
+    public PractitionerFileSharingSaveResponseVO practitionerFileSharingSave(PractitionerFileSharingSaveRequestVO requestVO) {
+        PractitionerFileSharingSaveResponseVO responseVO = new PractitionerFileSharingSaveResponseVO();
+        AclPractitionerFileSharing fileSharing = new AclPractitionerFileSharing();
+        BeanUtils.copyProperties(requestVO,fileSharing);
+        fileSharing.setUpdatedBy(requestVO.getLoginId());
+        Long id = aclPractitionerFileSharingDalService.saveOrUpdate(fileSharing);
+        responseVO.setId(id);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+
+    @Override
+    public PractitionerFileSharingListResponseVO practitionerFileSharingList(PractitionerFileSharingListRequestVO requestVO) {
+        PractitionerFileSharingListResponseVO responseVO = new PractitionerFileSharingListResponseVO();
+        PageInfo<PractitionerFileSharing> practitionerFileShares = agmsPractitionerDALService.practitionerFileSharingList(requestVO.getMdDropOptionId(),
+                requestVO.getIsActive(),
+                requestVO.getPractitionerFileShares().getPageNum(),
+                requestVO.getPractitionerFileShares().getPageSize());
+        responseVO.setPractitionerFileShares(practitionerFileShares);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharing.java

+package com.yd.api.agms.vo.practitioner;
+
+import java.util.Date;
+
+/**
+ * @author xxy
+ */
+public class PractitionerFileSharing {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * FK ag_md_drop_options_id文章分类
+     */
+    private Long mdDropOptionId;
+
+    private String mdDropOptionName;
+
+    /**
+     * 文章内容html
+     */
+    private String fileContent;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 建置时间
+     */
+    private String createdAt;
+
+    private Long createdBy;
+
+    private String createdName;
+
+    /**
+     * 更改时间
+     */
+    private String updatedAt;
+
+    private Long updatedBy;
+
+    private String updatedName;
+
+
+    /**
+     * 获取 serial id
+     *
+     * @return the id serial id
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * 设置 serial id
+     *
+     * @param id the serial id to set
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取 FK ag_md_drop_options_id文章分类
+     *
+     * @return the mdDropOptionId FK ag_md_drop_options_id文章分类
+     */
+    public Long getMdDropOptionId() {
+        return this.mdDropOptionId;
+    }
+
+    /**
+     * 设置 FK ag_md_drop_options_id文章分类
+     *
+     * @param mdDropOptionId the FK ag_md_drop_options_id文章分类 to set
+     */
+    public void setMdDropOptionId(Long mdDropOptionId) {
+        this.mdDropOptionId = mdDropOptionId;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the mdDropOptionName
+     */
+    public String getMdDropOptionName() {
+        return this.mdDropOptionName;
+    }
+
+    /**
+     * 设置
+     *
+     * @param mdDropOptionName the  to set
+     */
+    public void setMdDropOptionName(String mdDropOptionName) {
+        this.mdDropOptionName = mdDropOptionName;
+    }
+
+    /**
+     * 获取 文章内容html
+     *
+     * @return the fileContent 文章内容html
+     */
+    public String getFileContent() {
+        return this.fileContent;
+    }
+
+    /**
+     * 设置 文章内容html
+     *
+     * @param fileContent the 文章内容html to set
+     */
+    public void setFileContent(String fileContent) {
+        this.fileContent = fileContent;
+    }
+
+    /**
+     * 获取 0=No 1=Yes
+     *
+     * @return the isActive 0=No 1=Yes
+     */
+    public Integer getIsActive() {
+        return this.isActive;
+    }
+
+    /**
+     * 设置 0=No 1=Yes
+     *
+     * @param isActive the 0=No 1=Yes to set
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * 获取 建置时间
+     *
+     * @return the createdAt 建置时间
+     */
+    public String getCreatedAt() {
+        return this.createdAt;
+    }
+
+    /**
+     * 设置 建置时间
+     *
+     * @param createdAt the 建置时间 to set
+     */
+    public void setCreatedAt(String createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the createdBy
+     */
+    public Long getCreatedBy() {
+        return this.createdBy;
+    }
+
+    /**
+     * 设置
+     *
+     * @param createdBy the  to set
+     */
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the createdName
+     */
+    public String getCreatedName() {
+        return this.createdName;
+    }
+
+    /**
+     * 设置
+     *
+     * @param createdName the  to set
+     */
+    public void setCreatedName(String createdName) {
+        this.createdName = createdName;
+    }
+
+    /**
+     * 获取 更改时间
+     *
+     * @return the updatedAt 更改时间
+     */
+    public String getUpdatedAt() {
+        return this.updatedAt;
+    }
+
+    /**
+     * 设置 更改时间
+     *
+     * @param updatedAt the 更改时间 to set
+     */
+    public void setUpdatedAt(String updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the updatedBy
+     */
+    public Long getUpdatedBy() {
+        return this.updatedBy;
+    }
+
+    /**
+     * 设置
+     *
+     * @param updatedBy the  to set
+     */
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the updatedName
+     */
+    public String getUpdatedName() {
+        return this.updatedName;
+    }
+
+    /**
+     * 设置
+     *
+     * @param updatedName the  to set
+     */
+    public void setUpdatedName(String updatedName) {
+        this.updatedName = updatedName;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerFileSharing{" +
+                "id=" + id +
+                ", mdDropOptionId=" + mdDropOptionId +
+                ", mdDropOptionName='" + mdDropOptionName + '\'' +
+                ", fileContent='" + fileContent + '\'' +
+                ", isActive=" + isActive +
+                ", createdAt=" + createdAt +
+                ", createdBy=" + createdBy +
+                ", createdName='" + createdName + '\'' +
+                ", updatedAt=" + updatedAt +
+                ", updatedBy=" + updatedBy +
+                ", updatedName='" + updatedName + '\'' +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListRequestVO.java

+package com.yd.api.agms.vo.practitioner;
+
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @author xxy
+ */
+public class PractitionerFileSharingListRequestVO {
+
+    private Long mdDropOptionId;
+
+    private Integer isActive;
+
+    private PageInfo<PractitionerFileSharing> practitionerFileShares;
+
+    /**
+     * 获取
+     *
+     * @return the mdDropOptionId
+     */
+    public Long getMdDropOptionId() {
+        return this.mdDropOptionId;
+    }
+
+    /**
+     * 设置
+     *
+     * @param mdDropOptionId the  to set
+     */
+    public void setMdDropOptionId(Long mdDropOptionId) {
+        this.mdDropOptionId = mdDropOptionId;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the isActive
+     */
+    public Integer getIsActive() {
+        return this.isActive;
+    }
+
+    /**
+     * 设置
+     *
+     * @param isActive the  to set
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the practitionerFileShares
+     */
+    public PageInfo<PractitionerFileSharing> getPractitionerFileShares() {
+        return this.practitionerFileShares;
+    }
+
+    /**
+     * 设置
+     *
+     * @param practitionerFileShares the  to set
+     */
+    public void setPractitionerFileShares(PageInfo<PractitionerFileSharing> practitionerFileShares) {
+        this.practitionerFileShares = practitionerFileShares;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerFileSharingListRequestVO{" +
+                "mdDropOptionId=" + mdDropOptionId +
+                ", isActive=" + isActive +
+                ", practitionerFileShares=" + practitionerFileShares +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListResponseVO.java

+package com.yd.api.agms.vo.practitioner;
+
+import com.github.pagehelper.PageInfo;
+import com.yd.api.result.CommonResult;
+
+import java.util.List;
+
+/**
+ * @author xxy
+ */
+public class PractitionerFileSharingListResponseVO {
+
+    private PageInfo<PractitionerFileSharing> practitionerFileShares;
+
+    private CommonResult commonResult;
+
+
+    /**
+     * 获取
+     *
+     * @return the practitionerFileSharings
+     */
+    public PageInfo<PractitionerFileSharing> getPractitionerFileShares() {
+        return this.practitionerFileShares;
+    }
+
+    /**
+     * 设置
+     *
+     * @param practitionerFileShares the  to set
+     */
+    public void setPractitionerFileShares(PageInfo<PractitionerFileSharing> practitionerFileShares) {
+        this.practitionerFileShares = practitionerFileShares;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the commonResult
+     */
+    public CommonResult getCommonResult() {
+        return this.commonResult;
+    }
+
+    /**
+     * 设置
+     *
+     * @param commonResult the  to set
+     */
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerFileSharingListResponseVO{" +
+                "practitionerFileShares=" + practitionerFileShares +
+                ", commonResult=" + commonResult +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingSaveRequestVO.java

+package com.yd.api.agms.vo.practitioner;
+
+import java.util.Date;
+
+/**
+ * @author xxy
+ */
+public class PractitionerFileSharingSaveRequestVO {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * FK ag_md_drop_options_id文章分类
+     */
+    private Long mdDropOptionId;
+
+    /**
+     * 文章内容html
+     */
+    private String fileContent;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    private Long loginId;
+
+
+    /**
+     * 获取 serial id
+     *
+     * @return the id serial id
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * 设置 serial id
+     *
+     * @param id the serial id to set
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取 FK ag_md_drop_options_id文章分类
+     *
+     * @return the mdDropOptionId FK ag_md_drop_options_id文章分类
+     */
+    public Long getMdDropOptionId() {
+        return this.mdDropOptionId;
+    }
+
+    /**
+     * 设置 FK ag_md_drop_options_id文章分类
+     *
+     * @param mdDropOptionId the FK ag_md_drop_options_id文章分类 to set
+     */
+    public void setMdDropOptionId(Long mdDropOptionId) {
+        this.mdDropOptionId = mdDropOptionId;
+    }
+
+    /**
+     * 获取 文章内容html
+     *
+     * @return the fileContent 文章内容html
+     */
+    public String getFileContent() {
+        return this.fileContent;
+    }
+
+    /**
+     * 设置 文章内容html
+     *
+     * @param fileContent the 文章内容html to set
+     */
+    public void setFileContent(String fileContent) {
+        this.fileContent = fileContent;
+    }
+
+    /**
+     * 获取 0=No 1=Yes
+     *
+     * @return the isActive 0=No 1=Yes
+     */
+    public Integer getIsActive() {
+        return this.isActive;
+    }
+
+    /**
+     * 设置 0=No 1=Yes
+     *
+     * @param isActive the 0=No 1=Yes to set
+     */
+    public void setIsActive(Integer isActive) {
+        this.isActive = isActive;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the loginId
+     */
+    public Long getLoginId() {
+        return this.loginId;
+    }
+
+    /**
+     * 设置
+     *
+     * @param loginId the  to set
+     */
+    public void setLoginId(Long loginId) {
+        this.loginId = loginId;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerFileSharingSaveRequestVO{" +
+                "id=" + id +
+                ", mdDropOptionId=" + mdDropOptionId +
+                ", fileContent='" + fileContent + '\'' +
+                ", isActive=" + isActive +
+                ", loginId=" + loginId +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingSaveResponseVO.java

+package com.yd.api.agms.vo.practitioner;
+
+import com.yd.api.result.CommonResult;
+
+/**
+ * @author xxy
+ */
+public class PractitionerFileSharingSaveResponseVO {
+    private Long id;
+    private CommonResult commonResult;
+
+    /**
+     * 获取
+     *
+     * @return the id
+     */
+    public Long getId() {
+        return this.id;
+    }
+
+    /**
+     * 设置
+     *
+     * @param id the  to set
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the commonResult
+     */
+    public CommonResult getCommonResult() {
+        return this.commonResult;
+    }
+
+    /**
+     * 设置
+     *
+     * @param commonResult the  to set
+     */
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerFileSharingSaveResponseVO{" +
+                "id=" + id +
+                ", commonResult=" + commonResult +
+                '}';
+    }
+}

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;
+
+}

yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerFileSharing.java

+package com.yd.dal.entity.customer;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 经纪人分享文章表
+ */
+@Data
+public class AclPractitionerFileSharing {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * FK ag_md_drop_options_id文章分类
+     */
+    private Long mdDropOptionId;
+
+    /**
+     * 文章内容html
+     */
+    private String fileContent;
+
+    /**
+     * 0=No, 1=Yes
+     */
+    private Integer isActive;
+
+    /**
+     * 建置时间
+     */
+    private Date createdAt;
+
+    private Long createdBy;
+
+    /**
+     * 更改时间
+     */
+    private Date updatedAt;
+
+    private Long updatedBy;
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsPractitionerMapper.java

+package com.yd.dal.mapper.agms;
+
+import com.github.pagehelper.Page;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author xxy
+ */
+public interface AgmsPractitionerMapper {
+    /**
+     *
+     * @param mdDropOptionId 文章类型
+     * @param isActive 是否启用
+     * @return
+     */
+    Page<PractitionerFileSharing> practitionerFileSharingList(@Param("mdDropOptionId") Long mdDropOptionId ,@Param("isActive") Integer isActive);
+}

yd-api/src/main/java/com/yd/dal/mapper/customer/AclPractitionerFileSharingMapper.java

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AclPractitionerFileSharing;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AclPractitionerFileSharingMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AclPractitionerFileSharing record);
+
+    int insertSelective(AclPractitionerFileSharing record);
+
+    AclPractitionerFileSharing selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AclPractitionerFileSharing record);
+
+    int updateByPrimaryKey(AclPractitionerFileSharing record);
+
+    int updateBatch(List<AclPractitionerFileSharing> list);
+
+    int updateBatchSelective(List<AclPractitionerFileSharing> list);
+
+    int batchInsert(@Param("list") List<AclPractitionerFileSharing> list);
+}
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/agms/AgmsPractitionerDALService.java

+package com.yd.dal.service.agms;
+
+import com.github.pagehelper.PageInfo;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+
+/**
+ * @author xxy
+ */
+public interface AgmsPractitionerDALService {
+
+    /**
+     *
+     * @param mdDropOptionId 文章类型id
+     * @param pageNum 当前页
+     * @param size 每页的数量
+     * @return 查询结果
+     */
+    PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size);
+}

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsPractitionerDALServiceImpl.java

+package com.yd.dal.service.agms.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+import com.yd.dal.mapper.agms.AgmsPractitionerMapper;
+import com.yd.dal.service.agms.AgmsPractitionerDALService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xxy
+ */
+@Service("agmsPractitionerDALService")
+public class AgmsPractitionerDALServiceImpl implements AgmsPractitionerDALService {
+
+    @Autowired
+    private AgmsPractitionerMapper mapper;
+    @Override
+    public PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long mdDropOptionId, Integer isActive, int pageNum, int size) {
+        PageHelper.startPage(pageNum, size);
+        Page<PractitionerFileSharing> practitionerFileShares = mapper.practitionerFileSharingList(mdDropOptionId,isActive);
+        PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
+        return pageInfo;
+    }
+}

yd-api/src/main/java/com/yd/dal/service/customer/AclPractitionerFileSharingDALService.java

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclPractitionerFileSharing;
+
+/**
+ * @author xxy
+ */
+public interface AclPractitionerFileSharingDALService {
+    /**
+     * 修改或保存
+     * @param fileSharing 修改保存的数据
+     * @return id
+     */
+    Long saveOrUpdate(AclPractitionerFileSharing fileSharing);
+}

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclPractitionerFileSharingDALServiceImpl.java

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclPractitionerFileSharing;
+import com.yd.dal.mapper.customer.AclPractitionerFileSharingMapper;
+import com.yd.dal.service.customer.AclPractitionerFileSharingDALService;
+import com.yd.util.CommonUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+
+/**
+ * @author xxy
+ */
+@Service("aclPractitionerFileSharingDALService")
+public class AclPractitionerFileSharingDALServiceImpl implements AclPractitionerFileSharingDALService {
+
+    @Resource
+    private AclPractitionerFileSharingMapper mapper;
+
+    @Override
+    public Long saveOrUpdate(AclPractitionerFileSharing fileSharing) {
+        if (CommonUtil.isNullOrZero(fileSharing.getId())){
+            //没有id做保存
+            fileSharing.setCreatedAt(new Date());
+            fileSharing.setUpdatedAt(new Date());
+            fileSharing.setCreatedBy(fileSharing.getUpdatedBy());
+            mapper.insert(fileSharing);
+        }else {
+            //有id,做更新
+            fileSharing.setUpdatedAt(new Date());
+            mapper.updateByPrimaryKeySelective(fileSharing);
+        }
+        return fileSharing.getId();
+    }
+}

yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yd.dal.mapper.agms.AgmsPractitionerMapper">
+
+    <select id="practitionerFileSharingList" resultType="com.yd.api.agms.vo.practitioner.PractitionerFileSharing">
+        select  s.id id,
+                s.md_drop_option_id mdDropOptionId,
+                o.drop_option_name dropOptionName,
+                s.file_content fileContent,
+                s.is_active isActive,
+                s.created_at createdAt,
+                s.created_by createdBy,
+                uc.name createdName,
+                s.updated_at updatedAt,
+                s.updated_by updatedBy,
+                uu.name updatedName
+        from ag_acl_practitioner_file_sharing s
+                left join  ag_md_drop_options o on o.id = s.md_drop_option_id
+                left join  ag_acl_user uc on uc.id = s.created_by
+                left join  ag_acl_user uu on uu.id = s.created_by
+            <where>
+                <if test="mdDropOptionId != null">
+                    s.md_drop_option_id = #{mdDropOptionId,jdbcType=BIGINT}
+                </if>
+                <if test="isActive != null">
+                    and s.is_active = #{isActive,jdbcType=INTEGER}
+                </if>
+            </where>
+
+    </select>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclPractitionerFileSharingMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yd.dal.mapper.customer.AclPractitionerFileSharingMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AclPractitionerFileSharing">
+    <!--@mbg.generated-->
+    <!--@Table ag_acl_practitioner_file_sharing-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="md_drop_option_id" jdbcType="BIGINT" property="mdDropOptionId" />
+    <result column="file_content" jdbcType="LONGVARCHAR" property="fileContent" />
+    <result column="is_active" jdbcType="INTEGER" property="isActive" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, md_drop_option_id, file_content, is_active, created_at, created_by, updated_at, 
+    updated_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from ag_acl_practitioner_file_sharing
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ag_acl_practitioner_file_sharing
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerFileSharing" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_practitioner_file_sharing (md_drop_option_id, file_content, is_active, 
+      created_at, created_by, updated_at, 
+      updated_by)
+    values (#{mdDropOptionId,jdbcType=BIGINT}, #{fileContent,jdbcType=LONGVARCHAR}, #{isActive,jdbcType=INTEGER}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclPractitionerFileSharing" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_practitioner_file_sharing
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="mdDropOptionId != null">
+        md_drop_option_id,
+      </if>
+      <if test="fileContent != null">
+        file_content,
+      </if>
+      <if test="isActive != null">
+        is_active,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="mdDropOptionId != null">
+        #{mdDropOptionId,jdbcType=BIGINT},
+      </if>
+      <if test="fileContent != null">
+        #{fileContent,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="isActive != null">
+        #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclPractitionerFileSharing">
+    <!--@mbg.generated-->
+    update ag_acl_practitioner_file_sharing
+    <set>
+      <if test="mdDropOptionId != null">
+        md_drop_option_id = #{mdDropOptionId,jdbcType=BIGINT},
+      </if>
+      <if test="fileContent != null">
+        file_content = #{fileContent,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="isActive != null">
+        is_active = #{isActive,jdbcType=INTEGER},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.customer.AclPractitionerFileSharing">
+    <!--@mbg.generated-->
+    update ag_acl_practitioner_file_sharing
+    set md_drop_option_id = #{mdDropOptionId,jdbcType=BIGINT},
+      file_content = #{fileContent,jdbcType=LONGVARCHAR},
+      is_active = #{isActive,jdbcType=INTEGER},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      updated_by = #{updatedBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateBatch" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update ag_acl_practitioner_file_sharing
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="md_drop_option_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.mdDropOptionId,jdbcType=BIGINT}
+        </foreach>
+      </trim>
+      <trim prefix="file_content = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.fileContent,jdbcType=LONGVARCHAR}
+        </foreach>
+      </trim>
+      <trim prefix="is_active = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.isActive,jdbcType=INTEGER}
+        </foreach>
+      </trim>
+      <trim prefix="created_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.createdAt,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="created_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.createdBy,jdbcType=BIGINT}
+        </foreach>
+      </trim>
+      <trim prefix="updated_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.updatedAt,jdbcType=TIMESTAMP}
+        </foreach>
+      </trim>
+      <trim prefix="updated_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.updatedBy,jdbcType=BIGINT}
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </update>
+  <update id="updateBatchSelective" parameterType="java.util.List">
+    <!--@mbg.generated-->
+    update ag_acl_practitioner_file_sharing
+    <trim prefix="set" suffixOverrides=",">
+      <trim prefix="md_drop_option_id = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.mdDropOptionId != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.mdDropOptionId,jdbcType=BIGINT}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="file_content = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.fileContent != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.fileContent,jdbcType=LONGVARCHAR}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="is_active = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.isActive != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.isActive,jdbcType=INTEGER}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="created_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.createdAt != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.createdAt,jdbcType=TIMESTAMP}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="created_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.createdBy != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.createdBy,jdbcType=BIGINT}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="updated_at = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.updatedAt != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.updatedAt,jdbcType=TIMESTAMP}
+          </if>
+        </foreach>
+      </trim>
+      <trim prefix="updated_by = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.updatedBy != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.updatedBy,jdbcType=BIGINT}
+          </if>
+        </foreach>
+      </trim>
+    </trim>
+    where id in
+    <foreach close=")" collection="list" item="item" open="(" separator=", ">
+      #{item.id,jdbcType=BIGINT}
+    </foreach>
+  </update>
+  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_practitioner_file_sharing
+    (md_drop_option_id, file_content, is_active, created_at, created_by, updated_at, 
+      updated_by)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.mdDropOptionId,jdbcType=BIGINT}, #{item.fileContent,jdbcType=LONGVARCHAR}, 
+        #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT}, 
+        #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT})
+    </foreach>
+  </insert>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/template/practitionerSalaryTemplate.html

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>
+        薪资样例
+    </title>
+    <style type="text/css">
+        * {margin:0; padding:0; text-indent:0;text-decoration: none; }
+        html,body{width:735pt;margin: 0 auto;}
+        ul,ol{list-style: none;}
+        .layout{width: 100%;margin: 0 auto;}
+        h1 {  font-weight: bold;  font-size:16pt; }
+        .s1 ,.s2 {  text-decoration: none; font-size: 10pt;font-weight: normal;}
+        p {  font-weight: normal; text-decoration: none; font-size: 8pt; margin:0pt; }
+        .s3 ,.s4,.s6{  font-size: 8pt; }
+        .s5 {font-size: 9pt; }
+        h3 {  font-weight: bold; font-size: 8pt; }
+        h2 { font-size: 10pt; }
+        .s7 { font-size: 8pt; }
+        .header{position: relative;padding: 10pt 0;}
+        .header img{position: relative;height: 22pt;width: auto;top: 10pt;}
+        .header_right{margin-top: -10pt;float: right;}
+        .header_right span{display: block;}
+        .part_1{border: 2pt #333 solid;padding:0 5pt;font-size: 6pt;}
+        .part_1 p{width: 32%;display: inline-block;line-height: 1.8;}
+        .part_2{margin-top: 10pt;font-size: 6pt;}
+        .part_2 .table_1 thead{background: #CCC;}
+        table td{height: 20pt;line-height: 20pt;padding: 0 5pt;}
+        .table1_total td{border-top-style: solid; border-top-width: 1pt;}
+    </style>
+</head>
+<body>
+<div class="layout">
+    <div class="header">
+        <img alt="image" src="images/Image_002.png"/>
+        <h1 style="padding-left: 466pt;text-indent: -340pt;line-height: 108%;text-align: left;">
+            上海银盾保险经纪从业人员佣金明细
+            <div class="header_right">
+                <span class="s1" style="vertical-align: -5pt;">发佣年月：${commissionYearMonth}</span>
+                <span class="s2">制单日期：${commissionDate}</span>
+            </div>
+        </h1>
+    </div>
+
+    <table cellspacing="0" class="table_1" width="100%" style="font-size: 6pt;border: 2pt solid black;">
+        <tr>
+            <td>分支机构：${branch}</td>
+            <td>体系：${subSystem}</td>
+            <td>身分别：经纪人</td>
+        </tr>
+        <tr>
+            <td>姓名员编：${practitionerNameCode} </td>
+            <td>职称：${grade}</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td rowspan="3">银行账号：${bankAccount}</td>
+        </tr>
+    </table>
+
+    <div class="part_2">
+        <table cellspacing="0" class="table_1" width="100%">
+            <thead>
+            <tr>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">个人营销</td>
+                <td style="border-bottom: 2pt #333 solid;width: 10%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">销售管理</td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">其它</td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"> </td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td style="width: 20%;">首年度销售佣金</td>
+                <td style="width: 10%;text-align: right;">${fyp}</td>
+                <td style="width: 20%;">首年度辅导奖金</td>
+                <td style="width: 15%;text-align: right;">${fap}</td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;">特别管理奖金</td>
+                <td style="width: 15%;text-align: right;">${other}</td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;border-top: 1pt #333 solid;"></td>
+                <td style="width: 10%;text-align: right;border-top: 1pt #333 solid;">${fyp}</td>
+                <td style="width: 20%;border-top: 1pt #333 solid;"></td>
+                <td style="width: 15%;text-align: right;border-top: 1pt #333 solid;">${fap}</td>
+                <td style="width: 20%;border-top: 1pt #333 solid;"></td>
+                <td style="width: 15%;text-align: right;border-top: 1pt #333 solid;">${other}</td>
+            </tr>
+            <tr >
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;"> 佣金合计</td>
+                <td style="width: 15%;text-align: right;"> ${totalCommission}</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="part_2">
+        <table cellspacing="0" class="table_1" width="100%">
+            <thead>
+            <tr>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">其他应税项目</td>
+                <td style="border-bottom: 2pt #333 solid;width: 10%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">其他非应税项目</td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">本期实领</td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"> </td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td style="width: 20%;">应税其他加扣款</td>
+                <td style="width: 10%;text-align: right;">${otherAddPlus}</td>
+                <td style="width: 20%;">代扣个人所得税/增值税/附加税</td>
+                <td style="width: 15%;text-align: right;">${tax}</td>
+                <td style="width: 20%;"> 佣金合计</td>
+                <td style="width: 15%;text-align: right;">${totalCommission}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">其他应税项目合计</td>
+                <td style="width: 15%;text-align: right;">${otherSummary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;">补缴一月个人所得税</td>
+                <td style="width: 15%;text-align: right;">${supplementTax}</td>
+                <td style="width: 20%;">其他非应税项目合计</td>
+                <td style="width: 15%;text-align: right;"> ${otherTaxSummary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;border-top: 1pt #333 solid;"></td>
+                <td style="width: 10%;text-align: right;border-top: 1pt #333 solid;"> ${branch}</td>
+                <td style="width: 20%;border-top: 1pt #333 solid;"></td>
+                <td style="width: 15%;text-align: right;border-top: 1pt #333 solid;"> ${branch}</td>
+                <td style="width: 20%;border-top: 1pt #333 solid;font-weight: bold;">本期实领</td>
+                <td style="width: 15%;text-align: right;border-top: 1pt #333 solid;font-weight: bold;">${currentActualSalary}</td>
+            </tr>
+            </tbody>
+        </table>
+
+    </div>
+    <div class="part_2">
+        <table cellspacing="0" class="table_1" width="100%">
+            <thead>
+            <tr>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"></td>
+                <td style="border-bottom: 2pt #333 solid;width: 10%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"></td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"></td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">个人所得税预扣</td>
+                <td style="border-bottom: 2pt #333 solid;width: 15%;"> </td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;"> 本期应税所得</td>
+                <td style="width: 15%;text-align: right;">${currentTaxBeforeSalary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">年度累计应税所得</td>
+                <td style="width: 15%;text-align: right;">${currentYearTaxBeforeSalary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">预扣率</td>
+                <td style="width: 15%;text-align: right;">${preTaxOffRate}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">累计应扣所得税</td>
+                <td style="width: 15%;text-align: right;"> ${currentYearTaxBeforeSalary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">累计已扣所得税</td>
+                <td style="width: 15%;text-align: right;">${currentYearTaxSummary}</td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 10%;text-align: right;"></td>
+                <td style="width: 20%;"></td>
+                <td style="width: 15%;text-align: right;"></td>
+                <td style="width: 20%;">本期应扣所得税</td>
+                <td style="width: 15%;text-align: right;"> ${currentTax}</td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="part_2">
+        <table cellspacing="0" class="table_1" width="100%">
+            <thead>
+            <tr>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;">绩效信息</td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"> </td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"></td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"></td>
+                <td style="border-bottom: 2pt #333 solid;width: 20%;"></td>
+            </tr>
+            </thead>
+            <tbody>
+            <tr>
+                <td style="width: 20%;">个人业绩</td>
+                <td style="width: 20%;text-align: center;">当月FYC<hr style="color: #333;"/></td>
+                <td style="width: 20%;text-align: center;">年度FYC累计<hr style="color: #333;"/></td>
+                <td style="width: 20%;text-align: center;">当月RYC<hr style="color: #333;"/></td>
+                <td style="width: 20%;text-align: center;">年度RYC累计<hr style="color: #333;"/></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;"></td>
+                <td style="width: 20%;text-align: right;"> ${currentMonthFYC}</td>
+                <td style="width: 20%;text-align: right;"> ${currentYearFYC}</td>
+                <td style="width: 20%;text-align: right;"></td>
+                <td style="width: 20%;text-align: right;"></td>
+            </tr>
+            <tr>
+                <td style="width: 20%;">天使体系业绩</td>
+                <td style="width: 20%;text-align: right;"> ${currentMonthFYC}</td>
+                <td style="width: 20%;text-align: right;"> ${currentYearFYC}</td>
+                <td style="width: 20%;text-align: right;"></td>
+                <td style="width: 20%;text-align: right;"></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="part_2">
+        <div style="border: 1pt #333 solid;width: 70%;height: 175pt;float: left; margin-right: 20pt;"></div>
+        <img style="float: right;" src="images/Image_012.jpg" alt="" />
+    </div>
+    <#list comList as com>
+    <br/>
+    <p style="text-indent: 0pt;text-align: left;">
+        ${com.name}
+    </p>
+    <table style="border-collapse:collapse;width:100%;font-size: 5pt;" cellspacing="0">
+        <tr style="height:30pt">
+            <td style="width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                保险公司
+            </td>
+            <td style="width:80pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                保单号码
+            </td>
+            <td style="width:40pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                生效日期
+            </td>
+            <td style="width:50pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                商品代码
+            </td>
+            <td style="width:30pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                体系
+            </td>
+            <td style="width:50pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                被保人姓名
+            </td>
+            <td style="width:30pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                年 度
+            </td>
+            <td style="text-align: right;width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                保费
+            </td>
+            <td style="text-align: right;width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                FYC/RYC
+            </td>
+            <td style="text-align: right;width:35pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                职阶 率%
+            </td>
+            <td style="text-align: right;width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                佣金
+            </td>
+            <td style="width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                备注
+            </td>
+        </tr>
+        <#list com.items as item>
+        <tr style="height:30pt">
+            <td style="width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.insurer}
+            </td>
+            <td style="width:80pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.policyNo}
+            </td>
+            <td style="width:40pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.effectiveDate}
+            </td>
+            <td style="width:50pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.productCode}
+            </td>
+            <td style="width:30pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.subSystem}
+            </td>
+            <td style="width:50pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.insured}
+            </td>
+            <td style="width:15pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.yearMonth}
+            </td>
+            <td style="text-align: right;width:65pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.premium}
+            </td>
+            <td style="text-align: right;width:60pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.fyc}
+            </td>
+            <td style="text-align: right;width:20pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.gradeRate}
+            </td>
+            <td style="text-align: right;width:55pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.commission}
+            </td>
+            <td style="width:45pt;border-top-style:solid;border-top-width:1pt;border-left-style:solid;border-left-width:1pt;border-bottom-style:solid;border-bottom-width:1pt;border-right-style:solid;border-right-width:1pt">
+                ${item.note}
+            </td>
+        </tr>
+    </#list>
+    </table>
+</#list>
+</div>
+</body>
+</html>
\ No newline at end of file