增加-AGMS经纪人审批流程

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

@@ -6,14 +6,13 @@ import com.yd.api.agms.service.AgmsHiringService;
 import com.yd.api.agms.vo.dashboard.*;
 import com.yd.api.agms.vo.dashboard.*;
 import com.yd.api.agms.service.AgmsStatisticsService;
 import com.yd.api.agms.service.AgmsStatisticsService;
 import com.yd.api.agms.vo.fortune.*;
 import com.yd.api.agms.vo.fortune.*;
-import com.yd.api.agms.vo.hiring.PractitionerHiringDetailRequestVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringDetailResponseVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringListResponseVO;
+import com.yd.api.agms.vo.hiring.*;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.FinancialStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsRequestVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsResponseVO;
 import com.yd.api.agms.vo.statistics.LeadsStatisticsResponseVO;
+import com.yd.api.practitioner.vo.hiring.HiringApproveRequestVO;
+import com.yd.api.practitioner.vo.hiring.HiringApproveResponseVO;
 import com.yd.api.result.JsonResult;
 import com.yd.api.result.JsonResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
@@ -245,4 +244,18 @@ public class AgmsController {
         result.addResult(responseVO);
         result.addResult(responseVO);
         return result;
         return result;
     }
     }
+
+    /**
+     * AGMS -- 经纪人审批
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    @RequestMapping("/practitionerHiringApprove")
+    public Object practitionerHiringApprove(@RequestBody PractitionerHiringApproveRequestVO requestVO){
+        JsonResult result = new JsonResult();
+        PractitionerHiringApproveResponseVO responseVO = agmsHiringService.practitionerHiringApprove(requestVO);
+        result.addResult(responseVO);
+        result.setData(responseVO);
+        return result;
+    }
 }
 }

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

 package com.yd.api.agms.service;
 package com.yd.api.agms.service;
 
 
-import com.yd.api.agms.vo.hiring.PractitionerHiringDetailRequestVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringDetailResponseVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringListRequestVO;
-import com.yd.api.agms.vo.hiring.PractitionerHiringListResponseVO;
+import com.yd.api.agms.vo.hiring.*;
 
 
 /**
 /**
  * @author xxy
  * @author xxy
@@ -22,4 +19,11 @@ public interface AgmsHiringService {
      * @return 响应数据
      * @return 响应数据
      */
      */
     PractitionerHiringListResponseVO practitionerHiringList(PractitionerHiringListRequestVO requestVO);
     PractitionerHiringListResponseVO practitionerHiringList(PractitionerHiringListRequestVO requestVO);
+
+    /**
+     * AGMS -- 经纪人审批
+     * @param requestVO 请求数据
+     * @return 响应数据
+     */
+    PractitionerHiringApproveResponseVO practitionerHiringApprove(PractitionerHiringApproveRequestVO requestVO);
 }
 }

yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringApproveRequestVO.java

+package com.yd.api.agms.vo.hiring;
+
+/**
+ * @author xxy
+ */
+public class PractitionerHiringApproveRequestVO {
+    /**
+     * AGMS登入者id
+     */
+    private Long loginId;
+    /**
+     * 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
+     */
+    private Long hiringBasicInfoId;
+    /**
+     * 审批步骤经行到哪一步了
+     */
+    private Integer hiringApproveStepsSeq;
+    /**
+     * 1：通过，0：驳回
+     */
+    private Long approvingStatus;
+    /**
+     * 备注，驳回原因
+     */
+    private String rejectNote;
+
+
+    /**
+     * 获取 AGMS登入者id
+     *
+     * @return loginId AGMS登入者id
+     */
+    public Long getLoginId() {
+        return this.loginId;
+    }
+
+    /**
+     * 设置 AGMS登入者id
+     *
+     * @param loginId AGMS登入者id
+     */
+    public void setLoginId(Long loginId) {
+        this.loginId = loginId;
+    }
+
+    /**
+     * 获取 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
+     *
+     * @return hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
+     */
+    public Long getHiringBasicInfoId() {
+        return this.hiringBasicInfoId;
+    }
+
+    /**
+     * 设置 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
+     *
+     * @param hiringBasicInfoId 经纪人基本信息id  ag_acl_practitioner_hiring_basic_info.id
+     */
+    public void setHiringBasicInfoId(Long hiringBasicInfoId) {
+        this.hiringBasicInfoId = hiringBasicInfoId;
+    }
+
+    /**
+     * 获取 审批步骤经行到哪一步了
+     *
+     * @return hiringApproveStepsSeq 审批步骤经行到哪一步了
+     */
+    public Integer getHiringApproveStepsSeq() {
+        return this.hiringApproveStepsSeq;
+    }
+
+    /**
+     * 设置 审批步骤经行到哪一步了
+     *
+     * @param hiringApproveStepsSeq 审批步骤经行到哪一步了
+     */
+    public void setHiringApproveStepsSeq(Integer hiringApproveStepsSeq) {
+        this.hiringApproveStepsSeq = hiringApproveStepsSeq;
+    }
+
+    /**
+     * 获取 1：通过，0：驳回
+     *
+     * @return approvingStatus 1：通过，0：驳回
+     */
+    public Long getApprovingStatus() {
+        return this.approvingStatus;
+    }
+
+    /**
+     * 设置 1：通过，0：驳回
+     *
+     * @param approvingStatus 1：通过，0：驳回
+     */
+    public void setApprovingStatus(Long approvingStatus) {
+        this.approvingStatus = approvingStatus;
+    }
+
+    /**
+     * 获取 备注，驳回原因
+     *
+     * @return rejectNote 备注，驳回原因
+     */
+    public String getRejectNote() {
+        return this.rejectNote;
+    }
+
+    /**
+     * 设置 备注，驳回原因
+     *
+     * @param rejectNote 备注，驳回原因
+     */
+    public void setRejectNote(String rejectNote) {
+        this.rejectNote = rejectNote;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerHiringApproveRequestVO{" +
+                "loginId='" + loginId + '\'' +
+                ", hiringBasicInfoId=" + hiringBasicInfoId +
+                ", hiringApproveStepsSeq=" + hiringApproveStepsSeq +
+                ", approvingStatus=" + approvingStatus +
+                ", rejectNote='" + rejectNote + '\'' +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/agms/vo/hiring/PractitionerHiringApproveResponseVO.java

+package com.yd.api.agms.vo.hiring;
+
+import com.yd.api.result.CommonResult;
+
+/**
+ * @author xxy
+ */
+public class PractitionerHiringApproveResponseVO {
+
+    /**
+     * 经纪人基本信息id
+     */
+    private Long hiringBasicInfoId;
+
+    private CommonResult commonResult;
+
+
+    /**
+     * 获取 经纪人基本信息id
+     *
+     * @return hiringBasicInfoId 经纪人基本信息id
+     */
+    public Long getHiringBasicInfoId() {
+        return this.hiringBasicInfoId;
+    }
+
+    /**
+     * 设置 经纪人基本信息id
+     *
+     * @param hiringBasicInfoId 经纪人基本信息id
+     */
+    public void setHiringBasicInfoId(Long hiringBasicInfoId) {
+        this.hiringBasicInfoId = hiringBasicInfoId;
+    }
+
+    /**
+     * 获取
+     *
+     * @return commonResult
+     */
+    public CommonResult getCommonResult() {
+        return this.commonResult;
+    }
+
+    /**
+     * 设置
+     *
+     * @param commonResult
+     */
+    public void setCommonResult(CommonResult commonResult) {
+        this.commonResult = commonResult;
+    }
+
+    @Override
+    public String toString() {
+        return "PractitionerHiringApproveResponseVO{" +
+                "hiringBasicInfoId=" + hiringBasicInfoId +
+                ", commonResult=" + commonResult +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/dal/entity/meta/MdPractitionerHiringApproveSteps.java

 package com.yd.dal.entity.meta;
 package com.yd.dal.entity.meta;
 
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 import lombok.Data;
 import lombok.Data;
 
 
 /**
 /**
  * 報聘经纪人報聘审批步骤设置
  * 報聘经纪人報聘审批步骤设置
+ * @author xxy
  */
  */
 @Data
 @Data
-public class MdPractitionerHiringApproveSteps {
+public class MdPractitionerHiringApproveSteps  implements Serializable {
     /**
     /**
      * serial id
      * serial id
      */
      */

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

@@ -181,4 +181,6 @@ public interface AclPractitionerDALService {
     List<Long> queryTeamAllPractitionerId(Long practitionerId);
     List<Long> queryTeamAllPractitionerId(Long practitionerId);
 
 
     List<Long> queryMentoredByPractitionerId(Long practitionerId);
     List<Long> queryMentoredByPractitionerId(Long practitionerId);
+
+    void save(AclPractitioner practitioner);
 }
 }

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

@@ -9,4 +9,5 @@ import java.util.List;
  */
  */
 public interface AclPractitionerHiringApproveRecordsDALService {
 public interface AclPractitionerHiringApproveRecordsDALService {
     void save(List<AclPractitionerHiringApproveRecords> hiringApproveRecordsList);
     void save(List<AclPractitionerHiringApproveRecords> hiringApproveRecordsList);
+    void save(AclPractitionerHiringApproveRecords hiringApproveRecords);
 }
 }

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

 package com.yd.dal.service.customer;
 package com.yd.dal.service.customer;
 
 
+import com.yd.dal.entity.customer.AclPractitionerHiringBasicInfo;
+
 public interface AclPractitionerHiringBasicInfoDALService {
 public interface AclPractitionerHiringBasicInfoDALService {
+    AclPractitionerHiringBasicInfo findById(Long hiringBasicInfoId);
 }
 }

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

 package com.yd.dal.service.customer;
 package com.yd.dal.service.customer;
 
 
+import com.yd.dal.entity.customer.AclPractitionerHiringMembership;
+
 public interface AclPractitionerHiringMembershipDALService {
 public interface AclPractitionerHiringMembershipDALService {
+    AclPractitionerHiringMembership findByBasicInfoId(Long hiringBasicInfoId);
 }
 }

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

@@ -8,4 +8,6 @@ import java.util.List;
 @Service("aclPractitionerSettingDALService")
 @Service("aclPractitionerSettingDALService")
 public interface AclPractitionerSettingDALService {
 public interface AclPractitionerSettingDALService {
     List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds);
     List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds);
+
+    void save(AclPractitionerSetting setting);
 }
 }

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

@@ -23,4 +23,6 @@ public interface AclPractitionerSubordinateSystemDALService {
     List<SubordinateSystemMemberInfoE> findStatisticsE(String subordinateIdForEGolden, Integer time);
     List<SubordinateSystemMemberInfoE> findStatisticsE(String subordinateIdForEGolden, Integer time);
 
 
     List<SubordinateSystemMemberInfoE> findStatisticsEBymobileList(List<String> mobileNoList, Integer time);
     List<SubordinateSystemMemberInfoE> findStatisticsEBymobileList(List<String> mobileNoList, Integer time);
+
+    AclPractitionerSubordinateSystem findById(Long subsystemId);
 }
 }

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

@@ -180,4 +180,9 @@ public class AclPractitionerDALServiceImpl implements AclPractitionerDALService
     public List<Long> queryMentoredByPractitionerId(Long practitionerId) {
     public List<Long> queryMentoredByPractitionerId(Long practitionerId) {
         return aclPractitionerMapper.queryMentoredByPractitionerId(practitionerId);
         return aclPractitionerMapper.queryMentoredByPractitionerId(practitionerId);
     }
     }
+
+    @Override
+    public void save(AclPractitioner practitioner) {
+        aclPractitionerMapper.insert(practitioner);
+    }
 }
 }

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

@@ -16,4 +16,9 @@ public class AclPractitionerHiringApproveRecordsDALServiceImpl implements AclPra
     public void save(List<AclPractitionerHiringApproveRecords> hiringApproveRecordsList) {
     public void save(List<AclPractitionerHiringApproveRecords> hiringApproveRecordsList) {
         mapper.batchInsert(hiringApproveRecordsList);
         mapper.batchInsert(hiringApproveRecordsList);
     }
     }
+
+    @Override
+    public void save(AclPractitionerHiringApproveRecords hiringApproveRecords) {
+        mapper.insert(hiringApproveRecords);
+    }
 }
 }

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

 package com.yd.dal.service.customer.impl;
 package com.yd.dal.service.customer.impl;
 
 
+import com.yd.dal.entity.customer.AclPractitionerHiringBasicInfo;
+import com.yd.dal.mapper.customer.AclPractitionerHiringBasicInfoMapper;
 import com.yd.dal.service.customer.AclPractitionerHiringBasicInfoDALService;
 import com.yd.dal.service.customer.AclPractitionerHiringBasicInfoDALService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
+
+/**
+ * @author xxy
+ */
 @Service("aclPractitionerHiringBasicInfoDALService")
 @Service("aclPractitionerHiringBasicInfoDALService")
 public class AclPractitionerHiringBasicInfoDALServiceImpl implements AclPractitionerHiringBasicInfoDALService {
 public class AclPractitionerHiringBasicInfoDALServiceImpl implements AclPractitionerHiringBasicInfoDALService {
+
+    @Resource
+    private AclPractitionerHiringBasicInfoMapper mapper;
+
+    @Override
+    public AclPractitionerHiringBasicInfo findById(Long hiringBasicInfoId) {
+        return mapper.selectByPrimaryKey(hiringBasicInfoId);
+    }
 }
 }

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

 package com.yd.dal.service.customer.impl;
 package com.yd.dal.service.customer.impl;
 
 
+import com.yd.dal.entity.customer.AclPractitionerHiringMembership;
+import com.yd.dal.mapper.customer.AclPractitionerHiringMembershipMapper;
 import com.yd.dal.service.customer.AclPractitionerHiringMembershipDALService;
 import com.yd.dal.service.customer.AclPractitionerHiringMembershipDALService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.annotation.Resource;
+
+/**
+ * @author xxy
+ */
 @Service("aclPractitionerHiringMembershipDALService")
 @Service("aclPractitionerHiringMembershipDALService")
 public class AclPractitionerHiringMembershipDALServiceImpl implements AclPractitionerHiringMembershipDALService {
 public class AclPractitionerHiringMembershipDALServiceImpl implements AclPractitionerHiringMembershipDALService {
+    @Resource
+    private AclPractitionerHiringMembershipMapper mapper;
+    @Override
+    public AclPractitionerHiringMembership findByBasicInfoId(Long hiringBasicInfoId) {
+        return mapper.selectByHiringBasicInfoId(hiringBasicInfoId);
+    }
 }
 }

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

@@ -16,4 +16,9 @@ public class AclPractitionerSettingDALServiceImpl implements AclPractitionerSett
     public List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds) {
     public List<AclPractitionerSetting> findByPractitionerIdList(List<Long> practitionerIds) {
         return aclPractitionerSettingMapper.findByPractitionerIdList(practitionerIds);
         return aclPractitionerSettingMapper.findByPractitionerIdList(practitionerIds);
     }
     }
+
+    @Override
+    public void save(AclPractitionerSetting setting) {
+        aclPractitionerSettingMapper.insert(setting);
+    }
 }
 }

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

@@ -22,6 +22,7 @@ public class AclPractitionerSubordinateSystemDALServiceImpl implements AclPracti
      * @param subordinateId 体系ID
      * @param subordinateId 体系ID
      * @return
      * @return
      */
      */
+    @Override
     public PractitionerSubordinateInfo findSubordinateInfo(Long subordinateId) {
     public PractitionerSubordinateInfo findSubordinateInfo(Long subordinateId) {
         PractitionerSubordinateInfo subordinateInfo = null;
         PractitionerSubordinateInfo subordinateInfo = null;
         if(subordinateId != null){
         if(subordinateId != null){
@@ -61,4 +62,9 @@ public class AclPractitionerSubordinateSystemDALServiceImpl implements AclPracti
     public List<SubordinateSystemMemberInfoE> findStatisticsEBymobileList(List<String> mobileNoList, Integer time) {
     public List<SubordinateSystemMemberInfoE> findStatisticsEBymobileList(List<String> mobileNoList, Integer time) {
         return aclPractitionerSubordinateSystemMapper.findStatisticsEBymobileList(mobileNoList, time);
         return aclPractitionerSubordinateSystemMapper.findStatisticsEBymobileList(mobileNoList, time);
     }
     }
+
+    @Override
+    public AclPractitionerSubordinateSystem findById(Long subsystemId) {
+        return aclPractitionerSubordinateSystemMapper.selectByPrimaryKey(subsystemId);
+    }
 }
 }