解决冲突

yd-api/pom.xml

@@ -22,8 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-  
-        <!-- 编译时的编码 -->  
+
+        <!-- 编译时的编码 -->
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
     </properties>
 
@@ -236,7 +236,7 @@
     </dependencies>
 
     <build>
-    	<finalName>ydapi</finalName>
+        <finalName>ydapi</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

yd-api/src/main/java/com/yd/api/agms/AgmsController.java

@@ -14,6 +14,11 @@ 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.service.*;
+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.insurer.SealUploadResponseVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
@@ -43,6 +48,8 @@ public class AgmsController {
     private AgmsSharingService agmsSharingService;
     @Autowired
     private AgmsPractitionerService agmsPractitionerService;
+    @Autowired
+    private AgmsInsurerService agmsInsurerService;
 
     /**
      * AGMS -- 财务管理报表
@@ -330,4 +337,23 @@ public class AgmsController {
         result.addResult(responseVO);
         return result;
     }
+    /**
+     * 上传公司印章接口
+     * @param sealFile
+     * @param loginId
+     * @param insurerBranchId
+     * @param insurerBranchDeptId
+     * @return
+     */
+    @RequestMapping(value="/sealUpload")
+    public Object sealUpload(@RequestParam(value = "sealFile") MultipartFile sealFile,
+                             @RequestParam(value = "loginId",required = true) Long loginId,
+                             @RequestParam(value = "insurerBranchId",required = false) Long insurerBranchId,
+                             @RequestParam(value = "insurerBranchDeptId",required = false) Long insurerBranchDeptId) {
+        JsonResult result = new JsonResult();
+        SealUploadResponseVO responseVO = agmsInsurerService.sealUpload(sealFile,loginId,insurerBranchId,insurerBranchDeptId);
+        result.setData(responseVO);
+        result.addResult(responseVO);
+        return result;
+    }
 }

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

+package com.yd.api.agms.service;
+
+import com.yd.api.agms.vo.hiring.PractitionerHiringListResponseVO;
+import com.yd.api.agms.vo.insurer.SealUploadResponseVO;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author xxy
+ */
+public interface AgmsInsurerService {
+    /**
+     * 上传公司印章接口
+     * @param sealFile
+     * @param loginId
+     * @param insurerBranchId
+     * @param insurerBranchDeptId
+     * @return
+     */
+    SealUploadResponseVO sealUpload(MultipartFile sealFile, Long loginId, Long insurerBranchId, Long insurerBranchDeptId);
+}

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

+package com.yd.api.agms.service.impl;
+
+import com.yd.api.agms.service.AgmsInsurerService;
+import com.yd.api.agms.vo.insurer.SealUploadResponseVO;
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.customer.AclInsurerBranch;
+import com.yd.dal.entity.customer.AclInsurerBranchDept;
+import com.yd.dal.service.customer.AclInsurerBranchDALService;
+import com.yd.dal.service.customer.AclInsurerBranchDeptDALService;
+import com.yd.util.CommonUtil;
+import com.yd.util.config.ZHBErrorConfig;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.net.InetAddress;
+import java.util.Date;
+
+/**
+ * @author xxy
+ */
+@Service("agmsInsurerService")
+@PropertySource({"classpath:pdfconfiguration.properties"})
+public class AgmsInsurerServiceImpl implements AgmsInsurerService {
+
+    @Value("${pdf.signImage}")
+    private String signImage;
+
+    @Autowired
+    private AclInsurerBranchDALService aclInsurerBranchDALService;
+
+    @Autowired
+    private AclInsurerBranchDeptDALService aclInsurerBranchDeptDALService;
+
+    @Override
+    public SealUploadResponseVO sealUpload(MultipartFile sealFile, Long loginId, Long insurerBranchId, Long insurerBranchDeptId) {
+        SealUploadResponseVO responseVO = new SealUploadResponseVO();
+        boolean success = true;
+        String message = ZHBErrorConfig.getErrorInfo("800000");
+        InputStream in = null;
+        FileOutputStream out = null;
+        try {
+            byte[] bytes = sealFile.getBytes();
+            in = new ByteArrayInputStream(bytes);
+            InetAddress address = InetAddress.getLocalHost();
+            File outFile = new File(signImage + sealFile.getOriginalFilename());
+            System.out.println(address.getHostAddress());
+            System.out.println("http://" + address.getHostAddress() + signImage + sealFile.getOriginalFilename());
+//            File outFile = new File("D:\\"+sealFile.getOriginalFilename());
+            out = new FileOutputStream(outFile);
+            byte[] bts = new byte[1024];
+            int len = 0;
+            while ((len = in.read(bts)) != -1) {
+                out.write(bts, 0, len);
+            }
+            if (!CommonUtil.isNullOrZero(insurerBranchId)) {
+                AclInsurerBranch branch = new AclInsurerBranch();
+                branch.setId(insurerBranchId);
+                branch.setElectronicTaxSeal("http://" + address.getHostAddress() + signImage+sealFile.getOriginalFilename());
+                branch.setUpdatedAt(new Date());
+                branch.setUpdatedBy(loginId);
+                aclInsurerBranchDALService.update(branch);
+            }
+            if (!CommonUtil.isNullOrZero(insurerBranchDeptId)) {
+                AclInsurerBranchDept dept = new AclInsurerBranchDept();
+                dept.setId(insurerBranchDeptId);
+                dept.setElectronicTaxSeal("http://" + address.getHostAddress() + signImage+sealFile.getOriginalFilename());
+                dept.setUpdatedAt(new Date());
+                dept.setUpdatedBy(loginId);
+                aclInsurerBranchDeptDALService.update(dept);
+            }
+            responseVO.setFileUrl("http://" + address.getHostAddress() + signImage+sealFile.getOriginalFilename());
+        } catch (Exception e) {
+            success = false;
+            message = ZHBErrorConfig.getErrorInfo("830025");
+            e.printStackTrace();
+        }finally {
+            try {
+                assert in != null;
+                in.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }finally {
+                try {
+                    assert out != null;
+                    out.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        responseVO.setCommonResult(new CommonResult(success, message));
+        return responseVO;
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/insurer/SealUploadResponseVO.java

+package com.yd.api.agms.vo.insurer;
+
+import com.yd.api.result.CommonResult;
+
+/**
+ * @author xxy
+ */
+public class SealUploadResponseVO {
+
+    private String fileUrl;
+
+    private CommonResult commonResult;
+
+
+
+    /**
+     * 获取
+     *
+     * @return the commonResult
+     */
+    public CommonResult getCommonResult() {
+        return this.commonResult;
+    }
+
+    /**
+     * 设置
+     *
+     * @param commonResult the  to set
+     */
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    /**
+     * 获取
+     *
+     * @return the fileUrl
+     */
+    public String getFileUrl() {
+        return this.fileUrl;
+    }
+
+    /**
+     * 设置
+     *
+     * @param fileUrl the  to set
+     */
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "SealUploadResponseVO{" +
+                "fileUrl='" + fileUrl + '\'' +
+                ", commonResult=" + commonResult +
+                '}';
+    }
+}

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

+package com.yd.api.practitioner;
+
+import com.yd.api.practitioner.service.PractitionerArticleService;
+import com.yd.api.practitioner.vo.ArticleTrackSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveRequestVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleTrackSaveRequestVO;
+import com.yd.api.result.JsonResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/practitionerArticle")
+public class PractitionerArticleController {
+    @Autowired
+    private PractitionerArticleService practitionerArticleService;
+
+    @RequestMapping("/articleShareCodeSave")
+    public Object articleShareCodeSave(@RequestBody ArticleShareCodeSaveRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        ArticleShareCodeSaveResponseVO responseVO = practitionerArticleService.articleShareCodeSave(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+
+    @RequestMapping("/articleTrackSave")
+    public Object articleTrackSave(@RequestBody ArticleTrackSaveRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        ArticleTrackSaveResponseVO responseVO = practitionerArticleService.articleTrackSave(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerArticleService.java

+package com.yd.api.practitioner.service;
+
+import com.yd.api.practitioner.vo.ArticleTrackSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveRequestVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleTrackSaveRequestVO;
+
+public interface PractitionerArticleService {
+    ArticleShareCodeSaveResponseVO articleShareCodeSave(ArticleShareCodeSaveRequestVO requestVO);
+
+    ArticleTrackSaveResponseVO articleTrackSave(ArticleTrackSaveRequestVO requestVO);
+}

yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringContractService.java

 package com.yd.api.practitioner.service;
 
-import com.yd.api.practitioner.vo.hiring.GeneratePDFRequestVO;
+import com.yd.dal.entity.customer.AclPractitioner;
 
 import java.util.Map;
 
 public interface PractitionerHiringContractService {
 
-    String generatePractitionerContract(String practitionerNO, String contractNo, Long hiringBasicInfoId) throws Exception;
+    String generatePractitionerContract(AclPractitioner practitioner) throws Exception;
 
     Map<String, String> initHiringBasicInfoData(Long hiringBasicInfoId, String contractNo);
 
-    Map<String, String> initHiringImageInfoData(Long hiringBasicInfoId);
+    Map<String, String> initHiringImageInfoData(Long hiringBasicInfoId, String signImage);
 
-    String generatePractitionerPDF(String practitionerNO,Map<String, String> initDatas,Map<String, String> initImages);
+    String generatePractitionerPDF(AclPractitioner practitioner, String signImage, Map<String, String> initDatas, Map<String, String> initImages) throws Exception;
 
     String getNextContractNo();
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerArticleServiceImpl.java

+package com.yd.api.practitioner.service.impl;
+
+import com.yd.api.practitioner.service.PractitionerArticleService;
+import com.yd.api.practitioner.vo.ArticleTrackSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveRequestVO;
+import com.yd.api.practitioner.vo.article.ArticleShareCodeSaveResponseVO;
+import com.yd.api.practitioner.vo.article.ArticleTrackSaveRequestVO;
+import com.yd.api.result.CommonResult;
+import com.yd.dal.entity.customer.AclCustomerObjectShare;
+import com.yd.dal.entity.customer.AclCustomerObjectShareTrack;
+import com.yd.dal.service.customer.AclCustomerObjectShareDALService;
+import com.yd.dal.service.customer.AclCustomerObjectShareTrackDALService;
+import com.yd.util.CommonUtil;
+import com.yd.util.config.ZHBErrorConfig;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service("practitionerArticleService")
+public class PractitionerArticleServiceImpl implements PractitionerArticleService {
+    @Autowired
+    private AclCustomerObjectShareDALService aclCustomerObjectShareDALService;
+    @Autowired
+    private AclCustomerObjectShareTrackDALService aclCustomerObjectShareTrackDALService;
+
+    @Override
+    public ArticleShareCodeSaveResponseVO articleShareCodeSave(ArticleShareCodeSaveRequestVO requestVO) {
+        ArticleShareCodeSaveResponseVO responseVO = new ArticleShareCodeSaveResponseVO();
+        AclCustomerObjectShare objectShare = new AclCustomerObjectShare();
+        BeanUtils.copyProperties(requestVO,objectShare);
+        objectShare.setItemType(1);
+        objectShare.setCreatedAt(new Date());
+        objectShare.setCreatedBy(-1L);
+        Long id = aclCustomerObjectShareDALService.save(objectShare);
+        responseVO.setId(id);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+
+    @Override
+    public ArticleTrackSaveResponseVO articleTrackSave(ArticleTrackSaveRequestVO requestVO) {
+        ArticleTrackSaveResponseVO responseVO = new ArticleTrackSaveResponseVO();
+        AclCustomerObjectShareTrack shareTrack = new AclCustomerObjectShareTrack();
+        BeanUtils.copyProperties(requestVO,shareTrack);
+        shareTrack.setCreatedAt(new Date());
+        shareTrack.setCreatedBy(-1L);
+        Long id = requestVO.getId();
+        if (CommonUtil.isNullOrZero(id)){
+            shareTrack.setTrackInTime(CommonUtil.stringParseDate(requestVO.getTrackInTime(),"yyyy-MM-dd HH:mm:ss"));
+            id = aclCustomerObjectShareTrackDALService.save(shareTrack);
+        }else {
+            shareTrack.setTrackOutTime(CommonUtil.stringParseDate(requestVO.getTrackOutTime(),"yyyy-MM-dd HH:mm:ss"));
+            aclCustomerObjectShareTrackDALService.update(shareTrack);
+        }
+        responseVO.setId(id);
+        responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+        return responseVO;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -62,6 +62,7 @@ import com.yd.rmi.n22.staff.service.N22StaffService;
 import com.yd.util.CommonUtil;
 import com.yd.util.config.ZHBErrorConfig;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -174,6 +175,9 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         } else if (Integer.valueOf("2") == time) {
             startTime = CommonUtil.getBeginDayOfYear();
             endTime = CommonUtil.getEndDayOfYear();
+        } else if (Integer.valueOf("4") == time) {
+            // 历史
+            endTime = CommonUtil.getSpecifiedDayBefore(CommonUtil.getBeginDayOfYear());
         }
 
         policyListQueryRequestBody.setStarttime(startTime);
@@ -265,7 +269,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         // 投保人信息
         HolderInfo holderInfo = new HolderInfo();
         PolicyHolderN22 holder = policyDetail.getPolicyHolder();
-        holderInfo.setName(holder.getFullName());
+        holderInfo.setName(holder.getFirstName());
         holderInfo.setMobileNo(holder.getMobile().trim());
         holderInfo.setGender("1".equals(holder.getGender()) ? 1 : 2);
         holderInfo.setBirthDay(holder.getDateOfBirth());
@@ -285,11 +289,11 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             if ("2".equals(insured.getCustomerType())) {
                 insuredInfo = new InsuredInfo();
                 insuredInfo.setRelationType(N22Utils.getN22RelationType(insured.getIdType()));
-                insuredInfo.setName(insured.getFullName());
+                insuredInfo.setName(insured.getFirstName());
                 insuredInfo.setMobileNo(insured.getMobile());
                 insuredInfo.setGender("1".equals(insured.getGender()) ? 1 : 2);
                 insuredInfo.setBirthDay(insured.getDateOfBirth());
-                insuredInfo.setAge(CommonUtil.getAge(CommonUtil.stringParseDate(insured.getDateOfBirth(),"yyyy-MM-dd")));
+                insuredInfo.setAge(CommonUtil.getAge(CommonUtil.stringParseDate(insured.getDateOfBirth(), "yyyy-MM-dd")));
 
                 idInfo = new IDInfo();
                 idInfo.setIdType(N22Utils.getN22IdType(insured.getIdType()));
@@ -362,60 +366,6 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         Long practitionerId = requestVO.getPractitionerId();
         Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
 
-//        String mobileNo = aclPractitionerDALService.findMobileNoByPractitionerId(practitionerId);
-//        String n22LoginName = n22StaffService.queryN22LoginNameByMobileNo(mobileNo);
-//        if (n22LoginName == null) {
-//            responseVO.setCommonResult(new CommonResult(false, "未查询到N22LoginName"));
-//            return responseVO;
-//        }
-//
-//        // 1.根据Agent_id当前经纪人的佣金明细
-//        SalaryDetailsSearchRequestBody salaryDetailsSearchRequestBody = new SalaryDetailsSearchRequestBody();
-//        salaryDetailsSearchRequestBody.setLoginName(n22LoginName);
-//        salaryDetailsSearchRequestBody.setSearchType("1");
-//        SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
-//
-//        if (!"查询成功".equals(salaryDetailsSearchResponseVO.getResponseHead().getMessage())){
-//            responseVO.setCommonResult(new CommonResult(false, "查询N22佣金明细列表错误"));
-//            return responseVO;
-//        }
-//        List<SalaryDetails> salaryDetailsList = salaryDetailsSearchResponseVO.getResponseBody().getSalaryDetailsLIST();
-//
-//        // list分组
-//        Map<String, List<SalaryDetails>> group = this.groupByCheckDate(salaryDetailsList);
-//
-//        // 组装返回参数
-//        List<PayScaleInfo> resultList = new ArrayList<>();
-//        // 应发佣金
-//        Double monDtlAmount = 0D;
-//        // 应发佣金
-//        Double monDtlRAmount = 0D;
-//        for (String key : group.keySet()) {
-//
-//            System.out.println("Key = " + key);
-//
-//            List<SalaryDetails> list = group.get(key);
-//            if (CollectionUtils.isNotEmpty(list)) {
-//                monDtlAmount = list.get(0).getSumcommission();
-//                monDtlRAmount = list.get(0).getTax_free_comis();
-//            }
-//
-//            PayScaleInfo payScaleInfo = new PayScaleInfo();
-//            payScaleInfo.setMonDtlAmount(monDtlAmount);
-//            payScaleInfo.setMonDtlItem("实发薪水");
-//            payScaleInfo.setMonDtlRAmount(monDtlRAmount);
-//            payScaleInfo.setDrpTitleCode(list.get(0).getGrade());
-//            payScaleInfo.setMonDtlPeriod(Long.valueOf(key));
-//
-//            resultList.add(payScaleInfo);
-//        }
-//
-//        resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
-//        responseVO.setPayScaleInfos(resultList);
-//
-//        return responseVO;
-
-
         if(!Strings.isNullOrEmpty(practitionerIdEG)){
             List<PayScaleInfo> payScaleInfoListAll =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
             if(!payScaleInfoListAll.isEmpty()){

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringContractServiceImpl.java

@@ -10,6 +10,8 @@ import com.yd.rmi.cache.SystemConfigService;
 import com.yd.util.CommonUtil;
 import com.yd.util.HttpUtil;
 import com.yd.util.PDFConfiguration;
+import com.yd.util.config.ZHBErrorConfig;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,16 +39,24 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
     private AclPractitionerHiringPersonalStatementsMapper statementsMapper;
     @Autowired
     private SystemConfigService systemConfigService;
+    @Autowired
+    private AclInsurerBranchMapper branchMapper;
+    @Autowired
+    private AclInsurerBranchDeptMapper deptMapper;
 
 
     /**
      * 申请经纪人的ID，生成电子合同，在经纪人表中自动生成记录
      *
-     * @param hiringBasicInfoId
+     * @param practitioner
      * @return
      */
     @Override
-    public String generatePractitionerContract(String practitionerNO, String contractNo, Long hiringBasicInfoId) throws Exception {
+    public String generatePractitionerContract(AclPractitioner practitioner) throws Exception {
+        String contractNo = practitioner.getContractNo();
+        Long hiringBasicInfoId = practitioner.getHiringBasicInfoId();
+        //0、查询分公司电子印章
+        String signImage = this.getSignImageLocalPath(practitioner);
 
         //1、从DB中按照hiringBasicInfoId，获取经纪人的文字信息
         Map<String, String> initDatas = new HashMap<String, String>();
@@ -54,15 +64,11 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
 
         //2、从DB中按照hiringBasicInfoId，从oss上获取经纪人上传的图片信息，需存本地临时文件
         Map<String, String> initImages = new HashMap<String, String>();
-        initImages = initHiringImageInfoData(hiringBasicInfoId);
+        initImages = initHiringImageInfoData(hiringBasicInfoId, signImage);
 
-        //ag_acl_practitioner.practitioner_code
-
-        //String practitionerNO = "YDSH00009";
-        //String contractNO = "CTSH00009";
 
         //3、PDF模板生成合同文件，存本地临时文件后，上传oss
-        String contractFile = generatePractitionerPDF(practitionerNO, initDatas, initImages);
+        String contractFile = generatePractitionerPDF(practitioner, signImage, initDatas, initImages);
 
         //上传至oss    ossService
         String contractFileOSS = this.putContractFileToOSS(contractFile, hiringBasicInfoId);
@@ -383,7 +389,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
      * @return
      */
     @Override
-    public Map<String, String> initHiringImageInfoData(Long hiringBasicInfoId) {
+    public Map<String, String> initHiringImageInfoData(Long hiringBasicInfoId, String signImage) {
 
         AclPractitionerHiringBasicInfo basicInfo = basicInfoMapper.selectByPrimaryKey(hiringBasicInfoId);
 
@@ -401,7 +407,7 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         String personerPicture = this.getImgTolocal(localDirectory,"personerPicture.png", basicInfo.getPersonerPictureOssPath());
         images.put("secondPersonerPicture", personerPicture);
         //印章从配置文件读
-        String signImage = PDFConfiguration.getProperty("pdf.signImage");
+//        String signImage = PDFConfiguration.getProperty("pdf.signImage");
         images.put("yindunESignature1001", signImage);
         images.put("yindunESignature1201", signImage);
         images.put("yindunESignature1401", signImage);
@@ -589,13 +595,16 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
      * @return
      */
     @Override
-    public String generatePractitionerPDF(String practitionerNO, Map<String, String> initDatas, Map<String, String> initImages) {
+    public String generatePractitionerPDF(AclPractitioner practitioner, String signImage,
+                                          Map<String, String> initDatas, Map<String, String> initImages) throws Exception {
         String templatePDF = "D:\\pcs12\\templatePractitionerContract.pdf";
         templatePDF = PDFConfiguration.getProperty("pdf.template");
         //模板文件生成零时文件
         String tmpPathPDF = PDFConfiguration.getProperty("pdf.temp.path");
 
+
         //PDF模板输出结果文件
+        String practitionerNO = practitioner.getPractitionerCode();
         String templateResultPDF = tmpPathPDF + practitionerNO + "-template.pdf";
         //按模板填充数据生成结果PDF
         PDFTemplate.generatePDF(templatePDF, templateResultPDF, initDatas, initImages);
@@ -614,8 +623,9 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         String signSourcePDF = templateResultPDF;
 
         //电子印章文件
-        String signImage = "D:\\pcs12\\上海银盾保险经纪有限公司.png";
-        signImage = PDFConfiguration.getProperty("pdf.signImage");
+//        String signImage = "D:\\pcs12\\上海银盾保险经纪有限公司.png";
+//        signImage = PDFConfiguration.getProperty("pdf.signImage");
+
         float x = 450;
         float y = 150;
         x = Float.parseFloat(PDFConfiguration.getProperty("pdf.position.x"));
@@ -629,6 +639,38 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
         return signResultPDF;
     }
 
+    private String getSignImageLocalPath(AclPractitioner practitioner) throws Exception {
+        Long insurerBranchId = practitioner.getInsurerBranchId();
+        Long deptId = practitioner.getDeptId();
+
+        // 1.获取电子印章url
+        InputStream inputStream = null;
+        String electronicTaxSeal = null;
+
+        AclInsurerBranchDept dept = deptMapper.selectByPrimaryKey(deptId);
+
+        if (dept != null && StringUtils.isNotBlank(dept.getElectronicTaxSeal())) {
+            electronicTaxSeal = dept.getElectronicTaxSeal();
+        } else {
+            AclInsurerBranch insurerBranch = branchMapper.selectByPrimaryKey(insurerBranchId);
+            if (insurerBranch != null && StringUtils.isNotBlank(insurerBranch.getElectronicTaxSeal())) {
+                electronicTaxSeal = insurerBranch.getElectronicTaxSeal();
+            }
+        }
+
+        if (StringUtils.isBlank(electronicTaxSeal)) {
+            throw new Exception("分公司和部门电子印章url不能同时为空");
+        }
+
+        // 2.从Oss下载电子印章图片到本地
+        //本地图片目录
+        String localDirectory = PDFConfiguration.getProperty("pdf.signImage");
+        String signature = this.getImgTolocal(localDirectory,"signImage.png", electronicTaxSeal);
+
+        return signature;
+    }
+
+
     @Override
     public String getNextContractNo() {
         return practitionerHiringMapper.getNextContractNo();

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java

@@ -756,7 +756,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
             if (StringUtils.isEmpty(contractNo)) {
                 contractNo = hiringContractService.getNextContractNo();
             }
-            String contractOssPath = hiringContractService.generatePractitionerContract(practitionerCode, contractNo, hiringBasicInfoId);
+            String contractOssPath = hiringContractService.generatePractitionerContract(practitioner);
 
             //4、经纪人表生成经纪人记录ag_acl_practitioner，ag_acl_practitioner.contract_oss_path
             //   经纪人经纪人类型级别定义表ag_acl_practitioner_setting

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

+package com.yd.api.practitioner.vo;
+
+import com.yd.api.result.CommonResult;
+
+public class ArticleTrackSaveResponseVO {
+
+    private Long id;
+
+    private CommonResult commonResult;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public CommonResult getCommonResult() {
+        return commonResult;
+    }
+
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/article/ArticleShareCodeSaveRequestVO.java

+package com.yd.api.practitioner.vo.article;
+
+import java.util.Date;
+
+public class ArticleShareCodeSaveRequestVO {
+
+    /**
+     * 分类类别id
+     */
+    private Long itemId;
+
+    /**
+     * 经纪人ID
+     */
+    private Long practitionerId;
+
+    /**
+     * 分享码
+     */
+    private String shareCode;
+
+    /**
+     * FK ag_acl_customer.id
+     */
+    private Long customerId;
+
+    /**
+     * 1. ios, 2.android 3.windows 4. mac os  5. Linux  6. other
+     */
+    private Integer os;
+
+    /**
+     * 1. wechat  2. wechat friend 3.QQ  4. QZone  5.weibo
+     */
+    private Integer channel;
+
+    /**
+     * entire url of shared link
+     */
+    private String url;
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
+
+    public String getShareCode() {
+        return shareCode;
+    }
+
+    public void setShareCode(String shareCode) {
+        this.shareCode = shareCode;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getOs() {
+        return os;
+    }
+
+    public void setOs(Integer os) {
+        this.os = os;
+    }
+
+    public Integer getChannel() {
+        return channel;
+    }
+
+    public void setChannel(Integer channel) {
+        this.channel = channel;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/article/ArticleShareCodeSaveResponseVO.java

+package com.yd.api.practitioner.vo.article;
+
+import com.yd.api.result.CommonResult;
+
+public class ArticleShareCodeSaveResponseVO {
+
+    private Long id;
+
+    private CommonResult commonResult;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public CommonResult getCommonResult() {
+        return commonResult;
+    }
+
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/vo/article/ArticleTrackSaveRequestVO.java

+package com.yd.api.practitioner.vo.article;
+
+import java.util.Date;
+
+public class ArticleTrackSaveRequestVO {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 分享ID FK ag_acl_customer_object_share.id
+     */
+    private Long shareId;
+
+    /**
+     * 分享码 FK ag_acl_customer_object_share.share_code
+     */
+    private String shareCode;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
+    /**
+     * 1=Male, 2=Female
+     */
+    private Integer gender;
+
+    /**
+     * 微信头像
+     */
+    private String imagePath;
+
+    /**
+     * 跟踪开始时间
+     */
+    private String trackInTime;
+
+    /**
+     * 跟踪结束时间
+     */
+    private String trackOutTime;
+
+    /**
+     * 地域
+     */
+    private String region;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+    /**
+     * 入口页面
+     */
+    private String entryPage;
+
+    /**
+     * 访问功能ID
+     */
+    private String buttonId;
+
+    /**
+     * 锚点ID
+     */
+    private String anchorId;
+
+    /**
+     * 行为动作类型enter、close、buttonclick
+     */
+    private String actionType;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 访问IP
+     */
+    private String ipAddress;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getShareId() {
+        return shareId;
+    }
+
+    public void setShareId(Long shareId) {
+        this.shareId = shareId;
+    }
+
+    public String getShareCode() {
+        return shareCode;
+    }
+
+    public void setShareCode(String shareCode) {
+        this.shareCode = shareCode;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getImagePath() {
+        return imagePath;
+    }
+
+    public void setImagePath(String imagePath) {
+        this.imagePath = imagePath;
+    }
+
+    public String getTrackInTime() {
+        return trackInTime;
+    }
+
+    public void setTrackInTime(String trackInTime) {
+        this.trackInTime = trackInTime;
+    }
+
+    public String getTrackOutTime() {
+        return trackOutTime;
+    }
+
+    public void setTrackOutTime(String trackOutTime) {
+        this.trackOutTime = trackOutTime;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getSourceFrom() {
+        return sourceFrom;
+    }
+
+    public void setSourceFrom(String sourceFrom) {
+        this.sourceFrom = sourceFrom;
+    }
+
+    public String getEntryPage() {
+        return entryPage;
+    }
+
+    public void setEntryPage(String entryPage) {
+        this.entryPage = entryPage;
+    }
+
+    public String getButtonId() {
+        return buttonId;
+    }
+
+    public void setButtonId(String buttonId) {
+        this.buttonId = buttonId;
+    }
+
+    public String getAnchorId() {
+        return anchorId;
+    }
+
+    public void setAnchorId(String anchorId) {
+        this.anchorId = anchorId;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+}

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

+package com.yd.dal.entity.customer;
+
+import java.util.Date;
+
+/**
+    * customer object share record = referral record
+    */
+public class AclCustomerObjectShare {
+    /**
+    * serial id
+    */
+    private Long id;
+
+    /**
+    * 分享分类 1-文章 2-其他 
+    */
+    private Integer itemType;
+
+    /**
+    * 分类类别id
+    */
+    private Long itemId;
+
+    /**
+    * 经纪人ID
+    */
+    private Long practitionerId;
+
+    /**
+    * 分享码
+    */
+    private String shareCode;
+
+    /**
+    * FK ag_acl_customer.id
+    */
+    private Long customerId;
+
+    /**
+    * 1. ios, 2.android 3.windows 4. mac os  5. Linux  6. other 
+    */
+    private Integer os;
+
+    /**
+    * 1. wechat  2. wechat friend 3.QQ  4. QZone  5.weibo 
+    */
+    private Integer channel;
+
+    /**
+    * entire url of shared link
+    */
+    private String url;
+
+    /**
+    * 参数过多直接存参数的JSON字符串
+    */
+    private String jsonParams;
+
+    /**
+    * 存试算结果的JSON字符串tableRateDetails
+    */
+    private String jsonParamsCoverageInfo;
+
+    /**
+    * 创建时间
+    */
+    private Date createdAt;
+
+    /**
+    * 创建人
+    */
+    private Long createdBy;
+
+    /**
+    * 修改时间
+    */
+    private Date updatedAt;
+
+    /**
+    * 修改人
+    */
+    private Long updatedBy;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getItemType() {
+        return itemType;
+    }
+
+    public void setItemType(Integer itemType) {
+        this.itemType = itemType;
+    }
+
+    public Long getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
+    }
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
+
+    public String getShareCode() {
+        return shareCode;
+    }
+
+    public void setShareCode(String shareCode) {
+        this.shareCode = shareCode;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getOs() {
+        return os;
+    }
+
+    public void setOs(Integer os) {
+        this.os = os;
+    }
+
+    public Integer getChannel() {
+        return channel;
+    }
+
+    public void setChannel(Integer channel) {
+        this.channel = channel;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getJsonParams() {
+        return jsonParams;
+    }
+
+    public void setJsonParams(String jsonParams) {
+        this.jsonParams = jsonParams;
+    }
+
+    public String getJsonParamsCoverageInfo() {
+        return jsonParamsCoverageInfo;
+    }
+
+    public void setJsonParamsCoverageInfo(String jsonParamsCoverageInfo) {
+        this.jsonParamsCoverageInfo = jsonParamsCoverageInfo;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+}
\ No newline at end of file

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

+package com.yd.dal.entity.customer;
+
+import java.util.Date;
+
+/**
+ * 用户浏览分享跟踪表
+ */
+public class AclCustomerObjectShareTrack {
+    /**
+     * serial id
+     */
+    private Long id;
+
+    /**
+     * 分享ID FK ag_acl_customer_object_share.id
+     */
+    private Long shareId;
+
+    /**
+     * 分享码 FK ag_acl_customer_object_share.share_code
+     */
+    private String shareCode;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
+    /**
+     * 1=Male, 2=Female
+     */
+    private Integer gender;
+
+    /**
+     * 微信头像
+     */
+    private String imagePath;
+
+    /**
+     * 跟踪开始时间
+     */
+    private Date trackInTime;
+
+    /**
+     * 跟踪结束时间
+     */
+    private Date trackOutTime;
+
+    /**
+     * 地域
+     */
+    private String region;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+    /**
+     * 入口页面
+     */
+    private String entryPage;
+
+    /**
+     * 访问功能ID
+     */
+    private String buttonId;
+
+    /**
+     * 锚点ID
+     */
+    private String anchorId;
+
+    /**
+     * 行为动作类型enter、close、buttonclick
+     */
+    private String actionType;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 访问IP
+     */
+    private String ipAddress;
+
+    private Date createdAt;
+
+    private Long createdBy;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getShareId() {
+        return shareId;
+    }
+
+    public void setShareId(Long shareId) {
+        this.shareId = shareId;
+    }
+
+    public String getShareCode() {
+        return shareCode;
+    }
+
+    public void setShareCode(String shareCode) {
+        this.shareCode = shareCode;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getImagePath() {
+        return imagePath;
+    }
+
+    public void setImagePath(String imagePath) {
+        this.imagePath = imagePath;
+    }
+
+    public Date getTrackInTime() {
+        return trackInTime;
+    }
+
+    public void setTrackInTime(Date trackInTime) {
+        this.trackInTime = trackInTime;
+    }
+
+    public Date getTrackOutTime() {
+        return trackOutTime;
+    }
+
+    public void setTrackOutTime(Date trackOutTime) {
+        this.trackOutTime = trackOutTime;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getSourceFrom() {
+        return sourceFrom;
+    }
+
+    public void setSourceFrom(String sourceFrom) {
+        this.sourceFrom = sourceFrom;
+    }
+
+    public String getEntryPage() {
+        return entryPage;
+    }
+
+    public void setEntryPage(String entryPage) {
+        this.entryPage = entryPage;
+    }
+
+    public String getButtonId() {
+        return buttonId;
+    }
+
+    public void setButtonId(String buttonId) {
+        this.buttonId = buttonId;
+    }
+
+    public String getAnchorId() {
+        return anchorId;
+    }
+
+    public void setAnchorId(String anchorId) {
+        this.anchorId = anchorId;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getIpAddress() {
+        return ipAddress;
+    }
+
+    public void setIpAddress(String ipAddress) {
+        this.ipAddress = ipAddress;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+}
\ No newline at end of file

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

+package com.yd.dal.entity.customer;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 保险公司分公司/营业部
+    */
+@Data
+public class AclInsurerBranch {
+    /**
+    * serial id
+    */
+    private Long id;
+
+    /**
+    * 分公司/营业部代码
+    */
+    private String branchCode;
+
+    /**
+    * FK ag_acl_insurer.id
+    */
+    private Long insurerId;
+
+    /**
+    * 保险公司名称
+    */
+    private String insurerName;
+
+    /**
+    * 分公司/营业部名称
+    */
+    private String branchName;
+
+    /**
+    * 0=No, 1=Yes
+    */
+    private Integer isActive;
+
+    /**
+    * 有效起日
+    */
+    private Date effectiveStartDate;
+
+    /**
+    * 有效终日
+    */
+    private Date effectiveEndDate;
+
+    /**
+    * 联系人
+    */
+    private String contactName;
+
+    /**
+    * 联系电话
+    */
+    private String contactNo;
+
+    /**
+    * 分公司地址
+    */
+    private String address;
+
+    /**
+    * 分公司电子印章
+    */
+    private String electronicTaxSeal;
+
+    /**
+    * 备注
+    */
+    private String remark;
+
+    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/entity/customer/AclInsurerBranchDept.java

+package com.yd.dal.entity.customer;
+
+import java.util.Date;
+import lombok.Data;
+
+/**
+    * 经纪人所属部门
+    */
+@Data
+public class AclInsurerBranchDept {
+    /**
+    * serial id
+    */
+    private Long id;
+
+    /**
+    * FK ag_acl_insurer.id
+    */
+    private Long insurerId;
+
+    /**
+    * FK ag_acl_insurer.id
+    */
+    private Long insurerBranchId;
+
+    private String deptCode;
+
+    /**
+    * dept name
+    */
+    private String name;
+
+    /**
+    * dept english name
+    */
+    private String nameEn;
+
+    /**
+    * 联系人
+    */
+    private String contactName;
+
+    /**
+    * 联系电话
+    */
+    private String contactNo;
+
+    /**
+    * 部门地址
+    */
+    private String address;
+
+    /**
+    * 经纪人所属部门电子印章
+    */
+    private String electronicTaxSeal;
+
+    /**
+    * memo or tips
+    */
+    private String remark;
+
+    /**
+    * 0=No, 1=Yes
+    */
+    private Integer isActive;
+
+    private Date createdAt;
+
+    /**
+    * FK ag_acl_user.id
+    */
+    private Long createdBy;
+
+    private Date updatedAt;
+
+    /**
+    * FK ag_acl_user.id
+    */
+    private Long updatedBy;
+}
\ No newline at end of file

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

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShare;
+
+public interface AclCustomerObjectShareMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AclCustomerObjectShare record);
+
+    int insertSelective(AclCustomerObjectShare record);
+
+    AclCustomerObjectShare selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AclCustomerObjectShare record);
+
+    int updateByPrimaryKey(AclCustomerObjectShare record);
+}
\ No newline at end of file

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

+package com.yd.dal.mapper.customer;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShareTrack;
+
+public interface AclCustomerObjectShareTrackMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AclCustomerObjectShareTrack record);
+
+    int insertSelective(AclCustomerObjectShareTrack record);
+
+    AclCustomerObjectShareTrack selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AclCustomerObjectShareTrack record);
+
+    int updateByPrimaryKey(AclCustomerObjectShareTrack record);
+}
\ No newline at end of file

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

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

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

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

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

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShare;
+
+public interface AclCustomerObjectShareDALService {
+    Long save(AclCustomerObjectShare objectShare);
+}

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

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShareTrack;
+
+public interface AclCustomerObjectShareTrackDALService {
+    Long save(AclCustomerObjectShareTrack shareTrack);
+
+    void update(AclCustomerObjectShareTrack shareTrack);
+}

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

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclInsurerBranch;
+
+/**
+ * @author xxy
+ */
+public interface AclInsurerBranchDALService {
+    void update(AclInsurerBranch branch);
+}

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

+package com.yd.dal.service.customer;
+
+import com.yd.dal.entity.customer.AclInsurerBranchDept;
+
+import java.util.List;
+
+/**
+ * @author xxy
+ */
+public interface AclInsurerBranchDeptDALService {
+    void update(AclInsurerBranchDept dept);
+}

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

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShare;
+import com.yd.dal.mapper.customer.AclCustomerMembershipMapper;
+import com.yd.dal.mapper.customer.AclCustomerObjectShareMapper;
+import com.yd.dal.service.customer.AclCustomerObjectShareDALService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("aclCustomerObjectShareDALService")
+public class AclCustomerObjectShareDALServiceImpl implements AclCustomerObjectShareDALService {
+
+    @Autowired
+    private AclCustomerObjectShareMapper mapper;
+
+    @Override
+    public Long save(AclCustomerObjectShare objectShare) {
+        mapper.insertSelective(objectShare);
+        return objectShare.getId();
+    }
+}

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

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclCustomerObjectShareTrack;
+import com.yd.dal.mapper.customer.AclCustomerObjectShareTrackMapper;
+import com.yd.dal.service.customer.AclCustomerObjectShareTrackDALService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("aclCustomerObjectShareTrackDALService")
+public class AclCustomerObjectShareTrackDALServiceImpl implements AclCustomerObjectShareTrackDALService {
+
+    @Autowired
+    private AclCustomerObjectShareTrackMapper mapper;
+
+    @Override
+    public Long save(AclCustomerObjectShareTrack shareTrack) {
+        mapper.insertSelective(shareTrack);
+        return shareTrack.getId();
+    }
+
+    @Override
+    public void update(AclCustomerObjectShareTrack shareTrack) {
+        mapper.updateByPrimaryKeySelective(shareTrack);
+    }
+}

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

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclInsurerBranch;
+import com.yd.dal.mapper.customer.AclInsurerBranchMapper;
+import com.yd.dal.service.customer.AclInsurerBranchDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * @author xxy
+ */
+@Service("aclInsurerBranchDALService")
+public class AclInsurerBranchDALServiceImpl implements AclInsurerBranchDALService {
+    @Resource
+    private AclInsurerBranchMapper mapper;
+
+    @Override
+    public void update(AclInsurerBranch branch) {
+        mapper.updateByPrimaryKeySelective(branch);
+    }
+}

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

+package com.yd.dal.service.customer.impl;
+
+import com.yd.dal.entity.customer.AclInsurerBranchDept;
+import com.yd.dal.mapper.customer.AclInsurerBranchDeptMapper;
+import com.yd.dal.service.customer.AclInsurerBranchDeptDALService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author xxy
+ */
+@Service("aclInsurerBranchDeptDALService")
+public class AclInsurerBranchDeptDALServiceImpl implements AclInsurerBranchDeptDALService {
+
+    @Resource
+    private AclInsurerBranchDeptMapper mapper;
+
+    @Override
+    public void update(AclInsurerBranchDept dept) {
+        mapper.updateByPrimaryKeySelective(dept);
+    }
+}

yd-api/src/main/java/com/yd/rmi/n22/policy/service/impl/N22PolicyServiceImpl.java

@@ -17,7 +17,6 @@ import java.util.UUID;
 
 @Service
 public class N22PolicyServiceImpl implements N22PolicyService {
-    private final static Logger logger = LoggerFactory.getLogger(N22PolicyServiceImpl.class);
 
     @Autowired
     private SystemConfigService systemConfigService;
@@ -32,13 +31,10 @@ public class N22PolicyServiceImpl implements N22PolicyService {
 
         obj.put("requestHead", requestHead);
         obj.put("requestBody", requestBody);
-        logger.info("N22查询保单列表请求报文："+obj.toString());
-
 
         String url = systemConfigService.getSingleConfigValue("N22_URL_Policy_List ");
         String result = N22Utils.postTransaction(url, obj.toString());
 
-        logger.info("N22查询保单列表响应报文："+result);
         rObj = JSONObject.parseObject(result, PolicyListQueryResponseVO.class);
 
         return rObj;
@@ -54,12 +50,10 @@ public class N22PolicyServiceImpl implements N22PolicyService {
 
         obj.put("requestHead", requestHead);
         obj.put("requestBody", requestBody);
-        logger.info("N22查询保单详情请求报文："+obj.toString());
 
         String url = systemConfigService.getSingleConfigValue("N22_URL_Policy_Info ");
         String result = N22Utils.postTransaction(url, obj.toString());
 
-        logger.info("N22查询保单详情响应报文："+result);
         rObj = JSONObject.parseObject(result, PolicyDetailQueryResponseVO.class);
 
         return rObj;

yd-api/src/main/java/com/yd/rmi/n22/staff/service/impl/N22StaffServiceImpl.java

@@ -18,7 +18,6 @@ import java.util.UUID;
 
 @Service
 public class N22StaffServiceImpl implements N22StaffService {
-    private final static Logger logger = LoggerFactory.getLogger(N22PolicyServiceImpl.class);
 
     @Autowired
     private SystemConfigService systemConfigService;
@@ -33,18 +32,12 @@ public class N22StaffServiceImpl implements N22StaffService {
 
         obj.put("requestHead", requestHead);
         obj.put("requestBody", getStaffNewRequestBody);
-        logger.info("N22员工查询请求报文："+obj.toString());
-
 
         String url = systemConfigService.getSingleConfigValue("N22_URL_Get_Staff_New");
         String result = N22Utils.postTransaction(url, obj.toString());
 
-        logger.info("N22员工查询响应报文："+result);
         GetStaffNewResponseVO response = JSONObject.parseObject(result, GetStaffNewResponseVO.class);
 
-
-
-
         return response;
     }
 

yd-api/src/main/java/com/yd/util/CommonUtil.java

@@ -1596,4 +1596,37 @@ public class CommonUtil {
 		return dateParseString(c.getTime(), "yyyy-MM-dd");
 	}
 
+	/**
+	 * 获得指定日期的前一天
+	 *
+	 * @param specifiedDay
+	 * @return
+	 * @throws Exception
+	 */
+	public static String getSpecifiedDayBefore(String specifiedDay) {
+
+		// SimpleDateFormat simpleDateFormat = new
+		// SimpleDateFormat("yyyy-MM-dd");
+
+		Calendar c = Calendar.getInstance();
+		Date date = null;
+		try {
+
+			date = new SimpleDateFormat("yy-MM-dd").parse(specifiedDay);
+
+		} catch (ParseException e) {
+
+			e.printStackTrace();
+
+		}
+
+		c.setTime(date);
+		int day = c.get(Calendar.DATE);
+		c.set(Calendar.DATE, day - 1);
+
+		String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(c.getTime());
+
+		return dayBefore;
+	}
+
 }

yd-api/src/main/resources/mapper/customer/AclCustomerObjectShareMapper.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.AclCustomerObjectShareMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AclCustomerObjectShare">
+    <!--@mbg.generated-->
+    <!--@Table ag_acl_customer_object_share-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="item_type" jdbcType="INTEGER" property="itemType" />
+    <result column="item_id" jdbcType="BIGINT" property="itemId" />
+    <result column="practitioner_id" jdbcType="BIGINT" property="practitionerId" />
+    <result column="share_code" jdbcType="VARCHAR" property="shareCode" />
+    <result column="customer_id" jdbcType="BIGINT" property="customerId" />
+    <result column="os" jdbcType="INTEGER" property="os" />
+    <result column="channel" jdbcType="INTEGER" property="channel" />
+    <result column="url" jdbcType="LONGVARCHAR" property="url" />
+    <result column="json_params" jdbcType="LONGVARCHAR" property="jsonParams" />
+    <result column="json_params_coverage_info" jdbcType="LONGVARCHAR" property="jsonParamsCoverageInfo" />
+    <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, item_type, item_id, practitioner_id, share_code, customer_id, os, channel, url, 
+    json_params, json_params_coverage_info, 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_customer_object_share
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ag_acl_customer_object_share
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclCustomerObjectShare" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_customer_object_share (item_type, item_id, practitioner_id, 
+      share_code, customer_id, os, 
+      channel, url, json_params, 
+      json_params_coverage_info, created_at, 
+      created_by, updated_at, updated_by
+      )
+    values (#{itemType,jdbcType=INTEGER}, #{itemId,jdbcType=BIGINT}, #{practitionerId,jdbcType=BIGINT}, 
+      #{shareCode,jdbcType=VARCHAR}, #{customerId,jdbcType=BIGINT}, #{os,jdbcType=INTEGER}, 
+      #{channel,jdbcType=INTEGER}, #{url,jdbcType=LONGVARCHAR}, #{jsonParams,jdbcType=LONGVARCHAR}, 
+      #{jsonParamsCoverageInfo,jdbcType=LONGVARCHAR}, #{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.AclCustomerObjectShare" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_customer_object_share
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="itemType != null">
+        item_type,
+      </if>
+      <if test="itemId != null">
+        item_id,
+      </if>
+      <if test="practitionerId != null">
+        practitioner_id,
+      </if>
+      <if test="shareCode != null">
+        share_code,
+      </if>
+      <if test="customerId != null">
+        customer_id,
+      </if>
+      <if test="os != null">
+        os,
+      </if>
+      <if test="channel != null">
+        channel,
+      </if>
+      <if test="url != null">
+        url,
+      </if>
+      <if test="jsonParams != null">
+        json_params,
+      </if>
+      <if test="jsonParamsCoverageInfo != null">
+        json_params_coverage_info,
+      </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="itemType != null">
+        #{itemType,jdbcType=INTEGER},
+      </if>
+      <if test="itemId != null">
+        #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerId != null">
+        #{practitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="shareCode != null">
+        #{shareCode,jdbcType=VARCHAR},
+      </if>
+      <if test="customerId != null">
+        #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="os != null">
+        #{os,jdbcType=INTEGER},
+      </if>
+      <if test="channel != null">
+        #{channel,jdbcType=INTEGER},
+      </if>
+      <if test="url != null">
+        #{url,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="jsonParams != null">
+        #{jsonParams,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="jsonParamsCoverageInfo != null">
+        #{jsonParamsCoverageInfo,jdbcType=LONGVARCHAR},
+      </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.AclCustomerObjectShare">
+    <!--@mbg.generated-->
+    update ag_acl_customer_object_share
+    <set>
+      <if test="itemType != null">
+        item_type = #{itemType,jdbcType=INTEGER},
+      </if>
+      <if test="itemId != null">
+        item_id = #{itemId,jdbcType=BIGINT},
+      </if>
+      <if test="practitionerId != null">
+        practitioner_id = #{practitionerId,jdbcType=BIGINT},
+      </if>
+      <if test="shareCode != null">
+        share_code = #{shareCode,jdbcType=VARCHAR},
+      </if>
+      <if test="customerId != null">
+        customer_id = #{customerId,jdbcType=BIGINT},
+      </if>
+      <if test="os != null">
+        os = #{os,jdbcType=INTEGER},
+      </if>
+      <if test="channel != null">
+        channel = #{channel,jdbcType=INTEGER},
+      </if>
+      <if test="url != null">
+        url = #{url,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="jsonParams != null">
+        json_params = #{jsonParams,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="jsonParamsCoverageInfo != null">
+        json_params_coverage_info = #{jsonParamsCoverageInfo,jdbcType=LONGVARCHAR},
+      </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.AclCustomerObjectShare">
+    <!--@mbg.generated-->
+    update ag_acl_customer_object_share
+    set item_type = #{itemType,jdbcType=INTEGER},
+      item_id = #{itemId,jdbcType=BIGINT},
+      practitioner_id = #{practitionerId,jdbcType=BIGINT},
+      share_code = #{shareCode,jdbcType=VARCHAR},
+      customer_id = #{customerId,jdbcType=BIGINT},
+      os = #{os,jdbcType=INTEGER},
+      channel = #{channel,jdbcType=INTEGER},
+      url = #{url,jdbcType=LONGVARCHAR},
+      json_params = #{jsonParams,jdbcType=LONGVARCHAR},
+      json_params_coverage_info = #{jsonParamsCoverageInfo,jdbcType=LONGVARCHAR},
+      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>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclCustomerObjectShareTrackMapper.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.AclCustomerObjectShareTrackMapper">
+  <resultMap id="BaseResultMap" type="com.yd.dal.entity.customer.AclCustomerObjectShareTrack">
+    <!--@mbg.generated-->
+    <!--@Table ag_acl_customer_object_share_track-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="share_id" jdbcType="BIGINT" property="shareId" />
+    <result column="share_code" jdbcType="VARCHAR" property="shareCode" />
+    <result column="nickname" jdbcType="LONGVARCHAR" property="nickname" />
+    <result column="gender" jdbcType="INTEGER" property="gender" />
+    <result column="image_path" jdbcType="LONGVARCHAR" property="imagePath" />
+    <result column="track_in_time" jdbcType="TIMESTAMP" property="trackInTime" />
+    <result column="track_out_time" jdbcType="TIMESTAMP" property="trackOutTime" />
+    <result column="region" jdbcType="VARCHAR" property="region" />
+    <result column="source_from" jdbcType="LONGVARCHAR" property="sourceFrom" />
+    <result column="entry_page" jdbcType="LONGVARCHAR" property="entryPage" />
+    <result column="button_id" jdbcType="VARCHAR" property="buttonId" />
+    <result column="anchor_id" jdbcType="VARCHAR" property="anchorId" />
+    <result column="action_type" jdbcType="VARCHAR" property="actionType" />
+    <result column="device_type" jdbcType="VARCHAR" property="deviceType" />
+    <result column="ip_address" jdbcType="VARCHAR" property="ipAddress" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, share_id, share_code, nickname, gender, image_path, track_in_time, track_out_time, 
+    region, source_from, entry_page, button_id, anchor_id, action_type, device_type, 
+    ip_address, created_at, created_by
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--@mbg.generated-->
+    select 
+    <include refid="Base_Column_List" />
+    from ag_acl_customer_object_share_track
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--@mbg.generated-->
+    delete from ag_acl_customer_object_share_track
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclCustomerObjectShareTrack" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_customer_object_share_track (share_id, share_code, nickname, 
+      gender, image_path, track_in_time, 
+      track_out_time, region, source_from, 
+      entry_page, button_id, anchor_id, 
+      action_type, device_type, ip_address, 
+      created_at, created_by)
+    values (#{shareId,jdbcType=BIGINT}, #{shareCode,jdbcType=VARCHAR}, #{nickname,jdbcType=LONGVARCHAR}, 
+      #{gender,jdbcType=INTEGER}, #{imagePath,jdbcType=LONGVARCHAR}, #{trackInTime,jdbcType=TIMESTAMP}, 
+      #{trackOutTime,jdbcType=TIMESTAMP}, #{region,jdbcType=VARCHAR}, #{sourceFrom,jdbcType=LONGVARCHAR}, 
+      #{entryPage,jdbcType=LONGVARCHAR}, #{buttonId,jdbcType=VARCHAR}, #{anchorId,jdbcType=VARCHAR}, 
+      #{actionType,jdbcType=VARCHAR}, #{deviceType,jdbcType=VARCHAR}, #{ipAddress,jdbcType=VARCHAR}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.yd.dal.entity.customer.AclCustomerObjectShareTrack" useGeneratedKeys="true">
+    <!--@mbg.generated-->
+    insert into ag_acl_customer_object_share_track
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shareId != null">
+        share_id,
+      </if>
+      <if test="shareCode != null">
+        share_code,
+      </if>
+      <if test="nickname != null">
+        nickname,
+      </if>
+      <if test="gender != null">
+        gender,
+      </if>
+      <if test="imagePath != null">
+        image_path,
+      </if>
+      <if test="trackInTime != null">
+        track_in_time,
+      </if>
+      <if test="trackOutTime != null">
+        track_out_time,
+      </if>
+      <if test="region != null">
+        region,
+      </if>
+      <if test="sourceFrom != null">
+        source_from,
+      </if>
+      <if test="entryPage != null">
+        entry_page,
+      </if>
+      <if test="buttonId != null">
+        button_id,
+      </if>
+      <if test="anchorId != null">
+        anchor_id,
+      </if>
+      <if test="actionType != null">
+        action_type,
+      </if>
+      <if test="deviceType != null">
+        device_type,
+      </if>
+      <if test="ipAddress != null">
+        ip_address,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shareId != null">
+        #{shareId,jdbcType=BIGINT},
+      </if>
+      <if test="shareCode != null">
+        #{shareCode,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null">
+        #{nickname,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="gender != null">
+        #{gender,jdbcType=INTEGER},
+      </if>
+      <if test="imagePath != null">
+        #{imagePath,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="trackInTime != null">
+        #{trackInTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="trackOutTime != null">
+        #{trackOutTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="region != null">
+        #{region,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceFrom != null">
+        #{sourceFrom,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="entryPage != null">
+        #{entryPage,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="buttonId != null">
+        #{buttonId,jdbcType=VARCHAR},
+      </if>
+      <if test="anchorId != null">
+        #{anchorId,jdbcType=VARCHAR},
+      </if>
+      <if test="actionType != null">
+        #{actionType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null">
+        #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="ipAddress != null">
+        #{ipAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yd.dal.entity.customer.AclCustomerObjectShareTrack">
+    <!--@mbg.generated-->
+    update ag_acl_customer_object_share_track
+    <set>
+      <if test="shareId != null">
+        share_id = #{shareId,jdbcType=BIGINT},
+      </if>
+      <if test="shareCode != null">
+        share_code = #{shareCode,jdbcType=VARCHAR},
+      </if>
+      <if test="nickname != null">
+        nickname = #{nickname,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="gender != null">
+        gender = #{gender,jdbcType=INTEGER},
+      </if>
+      <if test="imagePath != null">
+        image_path = #{imagePath,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="trackInTime != null">
+        track_in_time = #{trackInTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="trackOutTime != null">
+        track_out_time = #{trackOutTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="region != null">
+        region = #{region,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceFrom != null">
+        source_from = #{sourceFrom,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="entryPage != null">
+        entry_page = #{entryPage,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="buttonId != null">
+        button_id = #{buttonId,jdbcType=VARCHAR},
+      </if>
+      <if test="anchorId != null">
+        anchor_id = #{anchorId,jdbcType=VARCHAR},
+      </if>
+      <if test="actionType != null">
+        action_type = #{actionType,jdbcType=VARCHAR},
+      </if>
+      <if test="deviceType != null">
+        device_type = #{deviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="ipAddress != null">
+        ip_address = #{ipAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.yd.dal.entity.customer.AclCustomerObjectShareTrack">
+    <!--@mbg.generated-->
+    update ag_acl_customer_object_share_track
+    set share_id = #{shareId,jdbcType=BIGINT},
+      share_code = #{shareCode,jdbcType=VARCHAR},
+      nickname = #{nickname,jdbcType=LONGVARCHAR},
+      gender = #{gender,jdbcType=INTEGER},
+      image_path = #{imagePath,jdbcType=LONGVARCHAR},
+      track_in_time = #{trackInTime,jdbcType=TIMESTAMP},
+      track_out_time = #{trackOutTime,jdbcType=TIMESTAMP},
+      region = #{region,jdbcType=VARCHAR},
+      source_from = #{sourceFrom,jdbcType=LONGVARCHAR},
+      entry_page = #{entryPage,jdbcType=LONGVARCHAR},
+      button_id = #{buttonId,jdbcType=VARCHAR},
+      anchor_id = #{anchorId,jdbcType=VARCHAR},
+      action_type = #{actionType,jdbcType=VARCHAR},
+      device_type = #{deviceType,jdbcType=VARCHAR},
+      ip_address = #{ipAddress,jdbcType=VARCHAR},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      created_by = #{createdBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

yd-api/src/main/resources/pdfconfiguration.properties

 pdf.template=/opt/tomcat8/conf/ydpdf/pdfres/templatePractitionerContract.pdf
-pdf.signImage=/opt/tomcat8/conf/ydpdf/pdfres/yindunsign.png
+pdf.signImage=/opt/tomcat8/conf/ydpdf/pdfres/
 pdf.keyStorePath=/opt/tomcat8/conf/ydpdf/pdfres/4929078_m.zuihuibi.cn.pfx
 pdf.keyPassword=UC645YlB