薪资单调整，1，AGMS可以预览,预览标志调整

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

@@ -392,7 +392,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         List<PayScaleInfo> resultList = new ArrayList<>();
 
         //如果是预览薪资单，则跳过权限校验
-        if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0){
+        if("AGMS".equals(requestVO.getPreFlag())){
             //等保调整
             List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
             if(null == findByObjSortable ){
@@ -425,7 +425,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
         // 1.先查本地新基本法的薪资
         List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerIdAndIsbasic(requestVO.getPractitionerId(), 1,requestVO.getIsActive());
-        List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list);
+        List<PayScaleInfo> salaryList = this.translateAgAclLifePractitionerSalaryToPayScaleInfo(list,requestVO.getPreFlag());
 
         // 2.再查N22
         List<PayScaleInfo> listN22 = this.queryPayScaleListFromN22(requestVO);
@@ -458,7 +458,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return resultList;
     }
 
-    private List<PayScaleInfo> translateAgAclLifePractitionerSalaryToPayScaleInfo(List<AgAclLifePractitionerSalary> newSalaryList) {
+    private List<PayScaleInfo> translateAgAclLifePractitionerSalaryToPayScaleInfo(List<AgAclLifePractitionerSalary> newSalaryList,String preFlag) {
         List<PayScaleInfo> resultList = new ArrayList<>();
         PayScaleInfo payScaleInfo;
         String time;
@@ -470,7 +470,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
             payScaleInfo.setIsBasic(salary.getIsBasic());
             payScaleInfo.setIsActive(salary.getIsActive());
-
+            payScaleInfo.setPreFlag(preFlag);//AGMS预览标志
             time = payScaleInfo.getMonDtlPeriod();
             if (StringUtils.isNotBlank(time)) {
                 payScaleInfo.setYears(time.substring(0, 4));
@@ -644,7 +644,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
 
         // 加入临时薪资表的数据
         List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId,requestVO.getIsActive());
-        translateObj(list, resultList);
+        translateObj(list, resultList,requestVO.getPreFlag());
 
         // 排序
         resultList.sort(Comparator.comparing(PayScaleInfo :: getMonDtlPeriod).reversed());
@@ -673,7 +673,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         return result;
     }
 
-    private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList) {
+    private void translateObj(List<AgAclLifePractitionerSalary> list, List<PayScaleInfo> resultList,String preFlag) {
         PayScaleInfo payScaleInfo;
         String time;
         for (AgAclLifePractitionerSalary salary : list) {
@@ -684,7 +684,8 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             payScaleInfo.setMonDtlAmount(salary.getPayableAmount().doubleValue());
             payScaleInfo.setMonDtlRAmount(salary.getNetAmount().doubleValue());
             payScaleInfo.setIsBasic(salary.getIsBasic());
-
+            payScaleInfo.setIsActive(salary.getIsActive());
+            payScaleInfo.setPreFlag(preFlag);
             resultList.add(payScaleInfo);
         }
 
@@ -948,7 +949,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
         QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
         //如果是预览薪资单，则跳过权限校验
-        if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0){
+        if("AGMS".equals(requestVO.getPreFlag())){
             //等保调整
             Long practitionerId = requestVO.getPractitionerId();
             if (null != practitionerId) {
@@ -1093,7 +1094,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             return responseBody;
         }
         //如果是预览薪资单，则跳过权限校验
-        if(null == requestVO.getIsActive() || requestVO.getIsActive().intValue() != 0) {
+        if("AGMS".equals(requestVO.getPreFlag())){
             //等保调整
             List<AclCustomer> findByObjSortable = aclPractitionerDALService.getAclCustomers(requestVO.getPractitionerId(),null);
             if(null == findByObjSortable ){

yd-api/src/main/java/com/yd/api/practitioner/vo/n22/QuerySalaryDetailRequestVO.java

@@ -19,4 +19,8 @@ public class QuerySalaryDetailRequestVO {
      * 0,预览薪资单，1，经纪人查看薪资单
      */
     private Integer isActive;
+    /**
+     * AGMS 预览
+     */
+    private String preFlag;
 }

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleInfo.java

@@ -27,8 +27,15 @@ public class PayScaleInfo {
     public void setIsActive(Integer isActive) {
         this.isActive = isActive;
     }
+    private String preFlag;
 
+    public String getPreFlag() {
+        return preFlag;
+    }
 
+    public void setPreFlag(String preFlag) {
+        this.preFlag = preFlag;
+    }
 
     public Long getMonShId() {
         return monShId;

yd-api/src/main/java/com/yd/api/practitioner/vo/payscale/PayScaleQueryRequestVO.java

@@ -13,6 +13,10 @@ public class PayScaleQueryRequestVO {
      * 0,预览薪资单，1，经纪人查看薪资单
      */
     private Integer isActive;
+    /**
+     * AGMS 预览
+     */
+    private String preFlag;
 
     public String getPractitionerIdEG() {
         return practitionerIdEG;
@@ -45,4 +49,12 @@ public class PayScaleQueryRequestVO {
     public void setIsActive(Integer isActive) {
         this.isActive = isActive;
     }
+
+    public String getPreFlag() {
+        return preFlag;
+    }
+
+    public void setPreFlag(String preFlag) {
+        this.preFlag = preFlag;
+    }
 }

yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsRequestBody.java

@@ -19,4 +19,6 @@ public class SearchStaffSalaryDetailsRequestBody {
 
     private String isBasic;
     private Integer isActive;
+    private String preFlag;
+
 }