Merge remote-tracking branch 'origin/dev' into test

# Conflicts: # yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

Merge remote-tracking branch 'origin/dev' into test
# Conflicts: # yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
7232a1e5 · zhangxingmin · a8b60061 · 4b7e7bb2 · 7232a1e5 · 7232a1e5
Commit 7232a1e5 authored Sep 17, 2026 by zhangxingmin
34 changed files
--- a/yd-api/pom.xml
+++ b/yd-api/pom.xml
@@ -63,7 +63,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
-            <version>1.2.42</version>
+            <version>1.2.83</version>
        </dependency>
        <dependency>
            <groupId>mysql</groupId>

--- a/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java
--- a/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsHiringServiceImpl.java
@@ -803,6 +803,14 @@ public class AgmsHiringServiceImpl implements AgmsHiringService {
        setting.setPractitionerId(practitioner.getId());
        setting.setPractitionerTypeId(28L);
        setting.setPractitionerLevel(membership.getMdDropOptionId());
+        try {
+            MdDropOptions levelInfo = mdDropOptionsDALService.findById(membership.getMdDropOptionId());
+            MdDropOptions dropOptions = mdDropOptionsDALService.selectByMasterCodeAndOptionsCode("practitioner_level", levelInfo.getDropOptionCode());
+            if (dropOptions != null) {
+                setting.setPractitionerLevel(dropOptions.getId());
+            }
+        } catch (Exception e) {
+        }
        setting.setIsActive(1);
        setting.setCreatedAt(new Date());
        setting.setCreatedBy(operater);

--- a/yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
@@ -257,6 +257,21 @@ public class PractitionerHiringController {
 	}
 	/**
+	 * 手工生成报聘合同
+	 *
+	 * @param requestVO
+	 * @return
+	 */
+	@RequestMapping("/handGeneratePDF")
+	public Object handGeneratePDF(@RequestBody GeneratePDFRequestVO requestVO){
+		JsonResult result = new JsonResult();
+		GeneratePDFResponseVO responseVO = practitionerHiringService.handGeneratePDF(requestVO);
+		result.addResult(responseVO);
+		result.setData(responseVO);
+		return result;
+	}
+	/**
 	 * 报聘成功后查看经纪人信息
 	 * @param requestVO 请求数据
 	 * @return 响应数据

--- a/yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
@@ -60,4 +60,6 @@ public interface PractitionerHiringService {
    CommonResultResponseVO hiringSubmit(HiringBasicInfoIdRequestVO requestVO);
    SaveWeChatQRcodeResponseVO saveWeChatQRcode(SaveWeChatQRcodeRequestVO requestVO);
+    GeneratePDFResponseVO handGeneratePDF(GeneratePDFRequestVO requestVO);
 }
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringContractServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringContractServiceImpl.java
@@ -4,9 +4,11 @@ import com.libs.pdf.PDFSign;
 import com.libs.pdf.PDFTemplate;
 import com.yd.api.practitioner.service.PractitionerHiringContractService;
 import com.yd.dal.entity.customer.*;
+import com.yd.dal.entity.meta.MdDropOptions;
 import com.yd.dal.mapper.customer.*;
 import com.yd.dal.mapper.practitioner.PractitionerHiringMapper;
 import com.yd.dal.service.customer.AclPractitionerSubordinateSystemDALService;
+import com.yd.dal.service.meta.MdDropOptionsDALService;
 import com.yd.rmi.ali.oss.service.OssService;
 import com.yd.rmi.cache.SystemConfigService;
 import com.yd.util.CommonUtil;
@@ -46,6 +48,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
    private AclInsurerBranchDeptMapper deptMapper;
    @Autowired
    private AclPractitionerSubordinateSystemDALService aclPractitionerSubordinateSystemDALService;
+	@Autowired
+	private MdDropOptionsDALService mdDropOptionsDALService;
    /**
@@ -217,18 +221,17 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
        data.put("firstPartyAddress", firstPartyAddress);
        // 设置一些地址
        this.setSomeAddress(data, hiringBasicInfoId);
+//        Calendar now = Calendar.getInstance();
-        Calendar now = Calendar.getInstance();
+//        data.put("contactYear", now.get(Calendar.YEAR) + "");
-        data.put("contactYear", now.get(Calendar.YEAR) + "");
+//        data.put("contactMonth", (now.get(Calendar.MONTH) + 1) + "");
-        data.put("contactMonth", (now.get(Calendar.MONTH) + 1) + "");
+//        data.put("contactDay", now.get(Calendar.DAY_OF_MONTH) + "");
-        data.put("contactDay", now.get(Calendar.DAY_OF_MONTH) + "");
        //8页
        data.put("secondParty801", basicInfo.getName());
        Calendar secondBirthday = Calendar.getInstance();
        Date practitionerBirthdate = CommonUtil.stringParseDate(basicInfo.getPractitionerBirthdate(), "yyyy-MM-dd");
        secondBirthday.setTime(practitionerBirthdate);
        data.put("secondBirthYear801", secondBirthday.get(Calendar.YEAR) + "");
        data.put("secondBirthMonth801", (secondBirthday.get(Calendar.MONTH) + 1) + "");
        data.put("secondBirthDay801", secondBirthday.get(Calendar.DAY_OF_MONTH) + "");
@@ -258,6 +261,11 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
        data.put("secondMentor801", mentorName);
        data.put("secondSubsystem", subsystemName);
        data.put("secondSubsystemNo", "");
+        data.put("contactYear", applyDate.get(Calendar.YEAR) + "");
+        data.put("contactMonth", (applyDate.get(Calendar.MONTH) + 1) + "");
+        data.put("contactDay", applyDate.get(Calendar.DAY_OF_MONTH) + "");
        // 签核人员
        this.setApprovepeople(data, hiringBasicInfoId);
@@ -435,6 +443,8 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
        images.put("secondSignature1401", signature);
        images.put("secondSignature1601", signature);
        images.put("secondSignature1701", signature);
+        images.put("secondPartyImg", signature);
+        images.put("secondParty802Img", signature);
        // 证件照
        String IDFront = this.getImgTolocal(localDirectory,"IDFront.png", basicInfo.getIdFrontPageOssPath());
        String IDBack = this.getImgTolocal(localDirectory,"IDBack.png", basicInfo.getIdBackPageOssPath());
@@ -465,32 +475,62 @@ public class PractitionerHiringContractServiceImpl implements PractitionerHiring
        images.put("secondPosition4", unCheckFile);
        images.put("secondPosition5", unCheckFile);
        images.put("secondPosition6", unCheckFile);
+        images.put("secondPosition7", unCheckFile);
+        images.put("secondPosition8", unCheckFile);
+        images.put("secondPosition9", unCheckFile);
+        images.put("secondPosition10", unCheckFile);
+        images.put("secondPosition11", unCheckFile);
        Long mdDropOptionId = memberShip == null ? null : memberShip.getMdDropOptionId();
-        if (Long.valueOf("30").equals(mdDropOptionId)) {
+        if(mdDropOptionId != null){
+        	MdDropOptions mdDropOptions = mdDropOptionsDALService.findById(mdDropOptionId);
+        	if(mdDropOptions != null){
+                if ("S3".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition1", checkFile);
                    return;
                }
-        if (Long.valueOf("32").equals(mdDropOptionId)) {
+                if ("S2".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition2", checkFile);
                    return;
                }
-        if (Long.valueOf("33").equals(mdDropOptionId)) {
+                if ("S1".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition3", checkFile);
                    return;
                }
-        if (Long.valueOf("34").equals(mdDropOptionId)) {
+                if ("M3".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition4", checkFile);
                    return;
                }
-        if (Long.valueOf("35").equals(mdDropOptionId)) {
+                if ("M2".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition5", checkFile);
                    return;
                }
-        if (Long.valueOf("36").equals(mdDropOptionId)) {
+                if ("M1".equals(mdDropOptions.getDropOptionCode())) {
                    images.put("secondPosition6", checkFile);
                    return;
                }
+                if ("A3".equals(mdDropOptions.getDropOptionCode())) {
+                    images.put("secondPosition7", checkFile);
+                    return;
+                }
+                if ("A2".equals(mdDropOptions.getDropOptionCode())) {
+                    images.put("secondPosition8", checkFile);
+                    return;
+                }
+                if ("A1".equals(mdDropOptions.getDropOptionCode())) {
+                    images.put("secondPosition9", checkFile);
+                    return;
+                }
+                if ("A0".equals(mdDropOptions.getDropOptionCode())) {
+                    images.put("secondPosition10", checkFile);
+                    return;
+                }
+                if ("IA".equals(mdDropOptions.getDropOptionCode())) {
+                    images.put("secondPosition11", checkFile);
+                    return;
+                }
+        	}
+        }
    }

--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
@@ -1025,6 +1025,57 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService 
        return resp;
    }
+    @Override
+    public GeneratePDFResponseVO handGeneratePDF(GeneratePDFRequestVO requestVO) {
+        GeneratePDFResponseVO resp = new GeneratePDFResponseVO();
+        try {
+            Long hiringBasicInfoId = requestVO.getHiringBasicInfoId();
+            Long practitionerId = requestVO.getPractitionerId();
+            if (hiringBasicInfoId == null) {
+                resp.setCommonResult(new CommonResult(false, "此经纪人无电子合同"));
+                return resp;
+            }
+            AclPractitioner practitioner = aclPractitionerMapper.selectByPrimaryKey(practitionerId);
+            String practitionerCode = practitioner == null ? null : practitioner.getPractitionerCode().trim();
+            String practitionerRegNo = practitioner == null ? null : practitioner.getPractitionerRegNo();
+            if (StringUtils.isBlank(practitionerRegNo)) {
+                resp.setCommonResult(new CommonResult(false, "执业编号不能为空，请保存后再生成合同"));
+                return resp;
+            }
+            if (StringUtils.isBlank(practitionerCode)) {
+                resp.setCommonResult(new CommonResult(false, "内部编号不能为空，请保存后再生成合同"));
+                return resp;
+            }
+            // 合同编号已存在就不生成新的
+            String contractNo = practitioner.getContractNo();
+            if (StringUtils.isEmpty(contractNo)) {
+                contractNo = hiringContractService.getNextContractNo();
+                practitioner.setContractNo(contractNo);
+            }
+            String contractOssPath = hiringContractService.generatePractitionerContract(practitioner);
+            //4、经纪人表生成经纪人记录ag_acl_practitioner，ag_acl_practitioner.contract_oss_path
+            //   经纪人经纪人类型级别定义表ag_acl_practitioner_setting
+            AclPractitioner updateObj = new AclPractitioner();
+            updateObj.setId(practitionerId);
+            updateObj.setContractNo(contractNo);
+            updateObj.setContractOssPath(contractOssPath);
+            aclPractitionerMapper.updateByPrimaryKeySelective(updateObj);
+            resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
+            resp.setContractOssPath(contractOssPath);
+        } catch (Exception e) {
+            e.printStackTrace();
+            resp.setCommonResult(new CommonResult(false, e.getMessage()));
+        }
+        return resp;
+    }
    private void distributeToSubsystemOwner(AclPractitionerHiringMembership hiringMemberShip) {
        String mdDropOptionName = hiringMemberShip.getMdDropOptionName();

--- a/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java
--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/QueryCanSeeResponseVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/QueryCanSeeResponseVO.java
@@ -7,4 +7,5 @@ import lombok.Data;
 public class QueryCanSeeResponseVO {
    private CommonResult commonResult;
    private String canSeeYdCollege;
+    private String cffpRoleCode;
 }
--- a/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveBasicInfoRequestVO.java
+++ b/yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveBasicInfoRequestVO.java
@@ -86,4 +86,9 @@ public class SaveBasicInfoRequestVO {
     * email地址
     */
    private String email;
+    /**
+    * 视频URl
+    */
+    private String videoOssPath;
 }
--- a/yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringBasicInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/agms/hiring/PractitionerHiringBasicInfo.java
@@ -134,6 +134,11 @@ public class PractitionerHiringBasicInfo {
    private String personalSignOssPath;
    /**
+     * 视频URl
+     */
+    private String videoOssPath;
+    /**
     * 获取 邀请人名字
     *
     * @return inviteePractitionerName 邀请人名字
@@ -519,6 +524,14 @@ public class PractitionerHiringBasicInfo {
        this.payrollOssPath = payrollOssPath;
    }
+    public String getVideoOssPath() {
+        return videoOssPath;
+    }
+    public void setVideoOssPath(String videoOssPath) {
+        this.videoOssPath = videoOssPath;
+    }
    public String getApproveStatus() {
        return approveStatus;
    }

--- a/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitioner.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitioner.java
@@ -253,6 +253,11 @@ public class AclPractitioner {
    private String canSeeYdCollege;
    /**
+     * cffp角色代码,通过,分割
+     */
+    private String cffpRoleCode;
+    /**
     * 详细地址
     */
    private String detailAddress;

--- a/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringBasicInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/customer/AclPractitionerHiringBasicInfo.java
@@ -165,6 +165,11 @@ public class AclPractitionerHiringBasicInfo {
    private String personalSignOssPath;
    /**
+    * 视频URl
+    */
+    private String videoOssPath;
+    /**
    * 0=No, 1=Yes
    */
    private Integer isActive;

--- a/yd-api/src/main/java/com/yd/dal/entity/practitioner/opportunity/OwnOpportunityInfo.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/practitioner/opportunity/OwnOpportunityInfo.java
 package com.yd.dal.entity.practitioner.opportunity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import java.util.Date;
 @Data
 public class OwnOpportunityInfo {
    private Long opportunityId;
@@ -17,5 +20,6 @@ public class OwnOpportunityInfo {
    private Long expertType;//0.经纪人指派  1.专家指派
    private Long sfpMainId;
    private String wechatNo;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    private Date returnVisitTime;
 }
--- a/yd-api/src/main/java/com/yd/dal/entity/practitioner/payscale/AgAclLifePractitionerSalary.java
+++ b/yd-api/src/main/java/com/yd/dal/entity/practitioner/payscale/AgAclLifePractitionerSalary.java
@@ -55,6 +55,7 @@ public class AgAclLifePractitionerSalary implements Serializable {
     * 0,预览薪资单，1，经纪人查看薪资单
     */
    private Integer isActive;
+    private Long payoutBatchId;
    private static final long serialVersionUID = 1L;
@@ -149,6 +150,7 @@ public class AgAclLifePractitionerSalary implements Serializable {
            && (this.getPayableAmount() == null ? other.getPayableAmount() == null : this.getPayableAmount().equals(other.getPayableAmount()))
            && (this.getTaxoutAmount() == null ? other.getTaxoutAmount() == null : this.getTaxoutAmount().equals(other.getTaxoutAmount()))
            && (this.getNetAmount() == null ? other.getNetAmount() == null : this.getNetAmount().equals(other.getNetAmount()))
+            && (this.getPayoutBatchId() == null ? other.getPayoutBatchId() == null : this.getPayoutBatchId().equals(other.getPayoutBatchId()))
            && (this.getPdfOssPath() == null ? other.getPdfOssPath() == null : this.getPdfOssPath().equals(other.getPdfOssPath()));
    }
@@ -163,6 +165,7 @@ public class AgAclLifePractitionerSalary implements Serializable {
        result = prime * result + ((getPayableAmount() == null) ? 0 : getPayableAmount().hashCode());
        result = prime * result + ((getTaxoutAmount() == null) ? 0 : getTaxoutAmount().hashCode());
        result = prime * result + ((getNetAmount() == null) ? 0 : getNetAmount().hashCode());
+        result = prime * result + ((getPayoutBatchId() == null) ? 0 : getPayoutBatchId().hashCode());
        result = prime * result + ((getPdfOssPath() == null) ? 0 : getPdfOssPath().hashCode());
        return result;
    }
@@ -193,4 +196,13 @@ public class AgAclLifePractitionerSalary implements Serializable {
    public void setIsBasic(String isBasic) {
        this.isBasic = isBasic;
    }
+	public Long getPayoutBatchId() {
+		return payoutBatchId;
+	}
+	public void setPayoutBatchId(Long payoutBatchId) {
+		this.payoutBatchId = payoutBatchId;
+	}
 }
--- a/yd-api/src/main/java/com/yd/dal/mapper/customer/AclCustomerFortuneMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/customer/AclCustomerFortuneMapper.java
@@ -42,4 +42,6 @@ public interface AclCustomerFortuneMapper {
    List<AclCustomerFortune> queryLifeFortuneListByOrderId(Long orderId);
    List<AclCustomerFortune> queryLifeFortuneListByCommissionId(Long commissionId);
+    List<AclCustomerFortune> queryByPractitionerIdAndPayoutBatchId(AclCustomerFortune aclCustomerFortune);
 }
\ No newline at end of file
--- a/yd-api/src/main/java/com/yd/dal/mapper/practitioner/AgAclLifePractitionerSalaryMapper.java
+++ b/yd-api/src/main/java/com/yd/dal/mapper/practitioner/AgAclLifePractitionerSalaryMapper.java
@@ -24,4 +24,9 @@ public interface AgAclLifePractitionerSalaryMapper {
                                                                          @Param("isActive") Integer isActive, @Param("isHistory") String isHistory);
    List<AgAclLifePractitionerSalary> queryByRecord(AgAclLifePractitionerSalary lifePractitionerSalary);
+    int deleteByPractitionerIdAndYearMonth(AgAclLifePractitionerSalary lifePractitionerSalary);
+    int deleteSalaryTaxByPractitionerIdAndYearMonth(AgAclLifePractitionerSalary lifePractitionerSalary);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerFortuneDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerFortuneDALService.java
@@ -33,4 +33,7 @@ public interface AclCustomerFortuneDALService {
    List<AclCustomerFortune> queryLifeFortuneListByOrderId(Long orderId);
    List<AclCustomerFortune> queryLifeFortuneListByCommissionId(Long commissionId);
+    List<AclCustomerFortune> queryByPractitionerIdAndPayoutBatchId(AclCustomerFortune aclCustomerFortune);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerFortunePayoutBatchDALService.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerFortunePayoutBatchDALService.java
@@ -13,4 +13,6 @@ public interface AclCustomerFortunePayoutBatchDALService {
    void save(AclCustomerFortunePayoutBatch customerFortunePayoutBatch);
    List<String> findAll();
+    AclCustomerFortunePayoutBatch selectByPrimaryKey(Long id);
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerFortuneDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerFortuneDALServiceImpl.java
@@ -68,4 +68,9 @@ public class AclCustomerFortuneDALServiceImpl implements AclCustomerFortuneDALSe
    public List<AclCustomerFortune> queryLifeFortuneListByCommissionId(Long commissionId) {
        return aclCustomerFortuneMapper.queryLifeFortuneListByCommissionId(commissionId);
    }
+    @Override
+    public List<AclCustomerFortune> queryByPractitionerIdAndPayoutBatchId(AclCustomerFortune aclCustomerFortune) {
+    	return aclCustomerFortuneMapper.queryByPractitionerIdAndPayoutBatchId(aclCustomerFortune);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerFortunePayoutBatchDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerFortunePayoutBatchDALServiceImpl.java
@@ -31,4 +31,10 @@ public class AclCustomerFortunePayoutBatchDALServiceImpl implements AclCustomerF
    public List<String> findAll() {
        return customerFortunePayoutBatchMapper.selectAll();
    }
+    @Override
+    public AclCustomerFortunePayoutBatch selectByPrimaryKey(Long id) {
+    	return customerFortunePayoutBatchMapper.selectByPrimaryKey(id);
+    }
 }
--- a/yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktAnnouncementDALServiceImpl.java
+++ b/yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktAnnouncementDALServiceImpl.java
 package com.yd.dal.service.marketing.Impl;
-import java.util.Date;
-import java.util.List;
-import javax.annotation.Resource;
-import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yd.dal.entity.marketing.MktAnnouncement;
 import com.yd.dal.mapper.marketing.MktAnnouncementMapper;
 import com.yd.dal.service.marketing.MktAnnouncementDALService;
+import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 @Service("mktAnnouncementDALService")
 public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService {
@@ -32,7 +30,7 @@ public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService 
        MktAnnouncement info = new MktAnnouncement();
        info.setAnnouncementType(announcementType);
        info.setIsActive(1);
-        PageHelper.orderBy("seq desc , created_at desc");
+        PageHelper.orderBy("seq asc , created_at desc");
        Page<MktAnnouncement> mktAnnouncementPageInfo = mktAnnouncementMapper.selectByObj(info);
        PageInfo<MktAnnouncement> pageInfo = new PageInfo<>(mktAnnouncementPageInfo);
        List<MktAnnouncement> list = pageInfo.getList();

--- a/yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
+++ b/yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
@@ -34,6 +34,8 @@ public class SearchStaffSalaryDetailsResponseBody {
    private List<RecommendSystemCommission> RecommendSystemCommissionList;
+    private List<RecommendSystemCommission> RecommendSystemCommissionC16List;
    private List<FirstYearPerformanceCommission> FirstYearPerformanceCommissionList;
    private List<RenewalYearPerformanceCommission> RenewalYearPerformanceCommissionList;//续年度绩效奖金
@@ -154,6 +156,14 @@ public class SearchStaffSalaryDetailsResponseBody {
        RecommendSystemCommissionList = recommendSystemCommissionList;
    }
+    public List<RecommendSystemCommission> getRecommendSystemCommissionC16List() {
+        return RecommendSystemCommissionC16List;
+    }
+    @JsonProperty("RecommendSystemCommissionC16List")
+    public void setRecommendSystemCommissionC16List(List<RecommendSystemCommission> recommendSystemCommissionC16List) {
+    	RecommendSystemCommissionC16List = recommendSystemCommissionC16List;
+    }
    public List<FirstYearPerformanceCommission> getFirstYearPerformanceCommissionList() {
        return FirstYearPerformanceCommissionList;
    }

--- a/yd-api/src/main/java/com/yd/util/HttpUtil.java
+++ b/yd-api/src/main/java/com/yd/util/HttpUtil.java
@@ -18,16 +18,17 @@ import java.util.Map;
 public class HttpUtil {
    public static String defaultEncoding= "utf-8";
    /**
     * 通过url取得文件返回InputStream类型数据
     *
     */
    public static Map<String,Object> getInput(String path) {
        URL url = null;
-        InputStream is =null;
+        InputStream is = null;
-        boolean success=true;
+        boolean success = true;
-        String message="下载文件成功";
+        String message = "下载文件成功";
-        Map<String,Object> resp=new HashMap<>();
+        Map<String,Object> resp = new HashMap<>();
        try {
            url = new URL(path);
@@ -36,14 +37,15 @@ public class HttpUtil {
            conn.connect();
            is = conn.getInputStream();	//得到网络返回的输入流
        } catch (IOException e) {
-            success=false;
+            success = false;
-            message="下载文件失败";
+            message = "下载文件失败";
        } finally {
-            resp.put("is",is);
+            resp.put("is", is);
-            resp.put("message",message);
+            resp.put("message", message);
-            resp.put("success",success);
+            resp.put("success", success);
-            return resp;
        }
+        return resp;
    }
    /**

--- a/yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
+++ b/yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
--- a/yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
+++ b/yd-api/src/main/resources/mapper/agms/AgmsHiringMapper.xml
@@ -28,6 +28,7 @@
        <result column="bankAccountId" jdbcType="VARCHAR" property="bankAccountId"/>
        <result column="personalSignOssPath" jdbcType="VARCHAR" property="personalSignOssPath"/>
        <result column="payrollOssPath" jdbcType="VARCHAR" property="payrollOssPath" />
+        <result column="videoOssPath" jdbcType="VARCHAR" property="videoOssPath" />
        <result column="approveStatus" jdbcType="VARCHAR" property="approveStatus" />
    </resultMap>
    <select id="findPractitionerHiringBasicInfo" resultMap="practitionerHiringBasicInfo">
@@ -55,7 +56,8 @@
               b.bank_account_opening                                 bankAccountOpening,
               b.bank_account_id                                      bankAccountId,
               b.payroll_oss_path                                     payrollOssPath,
-               b.personal_sign_oss_path                               personalSignOssPath
+               b.personal_sign_oss_path                               personalSignOssPath,
+               b.video_oss_path										  videoOssPath
        from ag_acl_practitioner_hiring_basic_info b
                     left join ag_acl_practitioner p on b.invitee_practitioner_id = p.id
        where b.id = #{hiringBasicInfoId,jdbcType=BIGINT}

--- a/yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclCustomerFortuneMapper.xml
@@ -1057,4 +1057,13 @@
    where 1=1
    and f.commission_id = #{commissionId,jdbcType=BIGINT}
  </select>
+  <select id="queryByPractitionerIdAndPayoutBatchId" resultMap="BaseResultMap" parameterType="com.yd.dal.entity.customer.AclCustomerFortune">
+    select
+    <include refid="Base_Column_List" />
+    from  ag_acl_customer_fortune f
+    where f.commission_payout_status = 2 and f.practitioner_id = #{practitionerId,jdbcType=BIGINT}
+    and f.payout_batch_id = #{payoutBatchId,jdbcType=BIGINT}
+  </select>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/customer/AclCustomerFortunePayoutBatchMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclCustomerFortunePayoutBatchMapper.xml
@@ -208,6 +208,6 @@
        payout_yearmonth
    from ag_acl_customer_fortune_payout_batch
      where payout_yearmonth is not null
-    order by payout_yearmonth
+    order by payout_yearmonth desc
    </select>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/customer/AclCustomerFortuneWithdrawMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclCustomerFortuneWithdrawMapper.xml
@@ -549,7 +549,8 @@
              #{item}
            </foreach>
    and w.is_paid != 1
-    and (f.payout_batch_id = #{payoutBatchId,jdbcType=BIGINT} or w.withdraw_amount = 0)
+    and f.payout_batch_id = #{payoutBatchId,jdbcType=BIGINT}
+<!--     and (f.payout_batch_id = #{payoutBatchId,jdbcType=BIGINT} or w.withdraw_amount = 0) -->
    group by w.customer_id
    </select>

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerHiringBasicInfoMapper.xml
@@ -35,6 +35,7 @@
    <result column="bank_account_opening" jdbcType="VARCHAR" property="bankAccountOpening" />
    <result column="bank_account_id" jdbcType="VARCHAR" property="bankAccountId" />
    <result column="personal_sign_oss_path" jdbcType="VARCHAR" property="personalSignOssPath" />
+    <result column="video_oss_path" jdbcType="VARCHAR" property="videoOssPath" />
    <result column="is_active" jdbcType="INTEGER" property="isActive" />
    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -47,7 +48,7 @@
    id_type, id_no, gender, practitioner_birthdate, province_id, province_name, city_id, 
    city_name, political_outlook, resident_address, wechat_id, wechat_QRcode_oss_path, email, personer_picture_oss_path, payroll_oss_path, id_front_page_oss_path,
    id_back_page_oss_path, last_graduate_code, last_graduate_grade, last_graduate_school, last_graduate_certification_oss_path,
-    bank_account_opening, bank_account_id, personal_sign_oss_path, is_active, created_at, 
+    bank_account_opening, bank_account_id, personal_sign_oss_path,video_oss_path, is_active, created_at, 
    created_by, updated_at, updated_by, approve_status
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -73,7 +74,7 @@
      id_front_page_oss_path, id_back_page_oss_path, 
      last_graduate_grade, last_graduate_school, 
      last_graduate_certification_oss_path, bank_account_opening, 
-      bank_account_id, personal_sign_oss_path, is_active, 
+      bank_account_id, personal_sign_oss_path,video_oss_path, is_active, 
      created_at, created_by, updated_at, 
      updated_by)
    values (#{practitionerPotentialId,jdbcType=BIGINT}, #{inviteePractitionerId,jdbcType=BIGINT}, 
@@ -85,7 +86,7 @@
      #{idFrontPageOssPath,jdbcType=VARCHAR}, #{idBackPageOssPath,jdbcType=VARCHAR}, 
      #{lastGraduateGrade,jdbcType=VARCHAR}, #{lastGraduateSchool,jdbcType=VARCHAR}, 
      #{lastGraduateCertificationOssPath,jdbcType=VARCHAR}, #{bankAccountOpening,jdbcType=VARCHAR}, 
-      #{bankAccountId,jdbcType=VARCHAR}, #{personalSignOssPath,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, 
+      #{bankAccountId,jdbcType=VARCHAR}, #{personalSignOssPath,jdbcType=VARCHAR}, #{videoOssPath,jdbcType=VARCHAR}, #{isActive,jdbcType=INTEGER}, 
      #{createdAt,jdbcType=TIMESTAMP}, #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=TIMESTAMP}, 
      #{updatedBy,jdbcType=BIGINT})
  </insert>
@@ -168,6 +169,9 @@
      <if test="personalSignOssPath != null">
        personal_sign_oss_path,
      </if>
+      <if test="videoOssPath != null">
+        video_oss_path,
+      </if>
      <if test="isActive != null">
        is_active,
      </if>
@@ -260,6 +264,9 @@
      <if test="personalSignOssPath != null">
        #{personalSignOssPath,jdbcType=VARCHAR},
      </if>
+      <if test="videoOssPath != null">
+        #{videoOssPath,jdbcType=VARCHAR},
+      </if>
      <if test="isActive != null">
        #{isActive,jdbcType=INTEGER},
      </if>
@@ -368,6 +375,9 @@
      <if test="personalSignOssPath != null">
        personal_sign_oss_path = #{personalSignOssPath,jdbcType=VARCHAR},
      </if>
+      <if test="videoOssPath != null">
+        video_oss_path = #{videoOssPath,jdbcType=VARCHAR},
+      </if>
      <if test="approveStatus != null">
        approve_status = #{approveStatus,jdbcType=VARCHAR},
      </if>
@@ -419,6 +429,7 @@
      bank_account_opening = #{bankAccountOpening,jdbcType=VARCHAR},
      bank_account_id = #{bankAccountId,jdbcType=VARCHAR},
      personal_sign_oss_path = #{personalSignOssPath,jdbcType=VARCHAR},
+      video_oss_path = #{videoOssPath,jdbcType=VARCHAR},
      is_active = #{isActive,jdbcType=INTEGER},
      created_at = #{createdAt,jdbcType=TIMESTAMP},
      created_by = #{createdBy,jdbcType=BIGINT},
@@ -555,6 +566,11 @@
          when id = #{item.id,jdbcType=BIGINT} then #{item.personalSignOssPath,jdbcType=VARCHAR}
        </foreach>
      </trim>
+      <trim prefix="video_oss_path = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          when id = #{item.id,jdbcType=BIGINT} then #{item.videoOssPath,jdbcType=VARCHAR}
+        </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}
@@ -765,6 +781,13 @@
          </if>
        </foreach>
      </trim>
+      <trim prefix="video_oss_path = case" suffix="end,">
+        <foreach collection="list" index="index" item="item">
+          <if test="item.videoOssPath != null">
+            when id = #{item.id,jdbcType=BIGINT} then #{item.videoOssPath,jdbcType=VARCHAR}
+          </if>
+        </foreach>
+      </trim>
      <trim prefix="is_active = case" suffix="end,">
        <foreach collection="list" index="index" item="item">
          <if test="item.isActive != null">
@@ -813,7 +836,7 @@
      id_type, id_no, gender, practitioner_birthdate, province_id, province_name, city_id, 
      city_name, resident_address, wechat_id, email, personer_picture_oss_path, id_front_page_oss_path, 
      id_back_page_oss_path, last_graduate_grade, last_graduate_school, last_graduate_certification_oss_path, 
-      bank_account_opening, bank_account_id, personal_sign_oss_path, is_active, created_at, 
+      bank_account_opening, bank_account_id, personal_sign_oss_path, video_oss_path, is_active, created_at, 
      created_by, updated_at, updated_by)
    values
    <foreach collection="list" item="item" separator=",">
@@ -827,7 +850,7 @@
        #{item.idFrontPageOssPath,jdbcType=VARCHAR}, #{item.idBackPageOssPath,jdbcType=VARCHAR}, 
        #{item.lastGraduateGrade,jdbcType=VARCHAR}, #{item.lastGraduateSchool,jdbcType=VARCHAR}, 
        #{item.lastGraduateCertificationOssPath,jdbcType=VARCHAR}, #{item.bankAccountOpening,jdbcType=VARCHAR}, 
-        #{item.bankAccountId,jdbcType=VARCHAR}, #{item.personalSignOssPath,jdbcType=VARCHAR}, 
+        #{item.bankAccountId,jdbcType=VARCHAR}, #{item.personalSignOssPath,jdbcType=VARCHAR}, #{item.videoOssPath,jdbcType=VARCHAR}, 
        #{item.isActive,jdbcType=INTEGER}, #{item.createdAt,jdbcType=TIMESTAMP}, #{item.createdBy,jdbcType=BIGINT}, 
        #{item.updatedAt,jdbcType=TIMESTAMP}, #{item.updatedBy,jdbcType=BIGINT})
    </foreach>

--- a/yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
+++ b/yd-api/src/main/resources/mapper/customer/AclPractitionerMapper.xml
@@ -52,6 +52,7 @@
    <result column="can_login_dyd" jdbcType="BIGINT" property="canLoginDyd" />
    <result column="can_see_salary_list" jdbcType="BIGINT" property="canSeeSalaryList" />
    <result column="can_see_yd_college" jdbcType="VARCHAR" property="canSeeYdCollege" />
+    <result column="cffp_role_code" jdbcType="VARCHAR" property="cffpRoleCode" />
    <result column="raise_id" jdbcType="BIGINT" property="raiseId" />
    <result column="s1_id" jdbcType="BIGINT" property="s1Id" />
@@ -69,7 +70,7 @@
    province_id, province_name, city_id, city_name, cert_list, bio_intro, bio_intro_two, wechat_id,
    qq_id, is_profile_show, is_name_show, is_mobile_show, education_level, graduated_university,
    mentor_id,in_mentor_id, introducer_id, gender, contract_oss_path, hiring_basic_info_id, can_login_dyd,
-    can_see_salary_list,can_see_yd_college,raise_id,s1_id,s2_id,s3_id,email,email_is_active
+    can_see_salary_list,can_see_yd_college,cffp_role_code,raise_id,s1_id,s2_id,s3_id,email,email_is_active
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
    <!--@mbg.generated-->
@@ -1518,6 +1519,7 @@
    <result column="expertType" property="expertType" />
    <result column="sfpMainId" property="sfpMainId" />
    <result column="wechatNo" property="wechatNo" />
+    <result column="returnVisitTime" property="returnVisitTime" />
  </resultMap>
  <select id="ownOpportunityQuery" resultMap="opportunityQuery">
    SELECT
@@ -1534,7 +1536,8 @@
    p.remark remark,
    p.appointment_record_id appointmentRecordId,
    p.sfp_main_id sfpMainId,
-    c.wechat_no wechatNo
+    c.wechat_no wechatNo,
+    (SELECT t.created_at from ag_mkt_leads_assigned_track t LEFT JOIN ag_md_drop_options op ON op.id = t.md_drop_option_id where t.leads_assigned_id = a.id and op.drop_option_code='returnvisit' ORDER BY t.created_at DESC LIMIT 1) returnVisitTime
    FROM
    ag_mkt_leads_assigneds a
    left join ag_mkt_leads_expert_request r on r.customer_id = a.customer_id and r.is_active =1

--- a/yd-api/src/main/resources/mapper/marketing/MktAnnouncementMapper.xml
+++ b/yd-api/src/main/resources/mapper/marketing/MktAnnouncementMapper.xml
@@ -214,7 +214,7 @@
    and
    announcement_at &lt;= #{date}
    and seq != 0
-    order by seq desc , announcement_at desc
+    order by seq asc , announcement_at desc
  </select>
  <select id="findByIsActiveAndAnnouncementAtBeforeTop" resultMap="BaseResultMap">
    select
@@ -225,6 +225,6 @@
    and 
    announcement_at &lt;= #{date}
    and seq = 0
-    order by seq desc , announcement_at desc
+    order by seq asc , announcement_at desc
  </select>
 </mapper>
\ No newline at end of file
--- a/yd-api/src/main/resources/mapper/practitioner/AgAclLifePractitionerSalaryMapper.xml
+++ b/yd-api/src/main/resources/mapper/practitioner/AgAclLifePractitionerSalaryMapper.xml
@@ -167,4 +167,18 @@
        and is_active = #{isActive,jdbcType=VARCHAR}
      </if>
    </select>
+	<delete id="deleteByPractitionerIdAndYearMonth" parameterType="com.yd.dal.entity.practitioner.payscale.AgAclLifePractitionerSalary">
+	    delete from ag_acl_life_practitioner_salary
+	    where is_basic = 1 and is_active = 0 and practitioner_id = #{practitionerId,jdbcType=BIGINT}
+	    and `year_month` = #{yearMonth,jdbcType=VARCHAR}
+	</delete>
+	<delete id="deleteSalaryTaxByPractitionerIdAndYearMonth" parameterType="com.yd.dal.entity.practitioner.payscale.AgAclLifePractitionerSalary">
+	    delete from ag_acl_life_practitioner_salary_tax
+	    where is_active = 1 and practitioner_id = #{practitionerId,jdbcType=BIGINT}
+	    and salary_year_month = #{yearMonth,jdbcType=VARCHAR}
+	</delete>
 </mapper>