零时薪资单6

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

@@ -447,17 +447,14 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             if ("1".equals(salary.getIsBasic())) {
             if ("1".equals(salary.getIsBasic())) {
                 payScaleInfo.setIsBasic(1);
                 payScaleInfo.setIsBasic(1);
             }
             }
-
+            time = payScaleInfo.getMonDtlPeriod();
+            if (StringUtils.isNotBlank(time)) {
+                payScaleInfo.setYears(time.substring(0, 4));
+                payScaleInfo.setMonth(time.substring(4));
+            }
             resultList.add(payScaleInfo);
             resultList.add(payScaleInfo);
         }
         }
 
 
-        for (PayScaleInfo info : resultList) {
-            if (StringUtils.isNotBlank(info.getMonDtlPeriod())) {
-                time = info.getMonDtlPeriod();
-                info.setYears(time.substring(0, 4));
-                info.setMonth(time.substring(4));
-            }
-        }
         return resultList;
         return resultList;
     }
     }
 
 
@@ -769,10 +766,10 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
     public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
     public QuerySalaryDetailResponseVO querySalaryDetail(QuerySalaryDetailRequestVO requestVO) {
         QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
         QuerySalaryDetailResponseVO responseVO = new QuerySalaryDetailResponseVO();
         // isBasic为0时查询N22，为1时查询本地数据库表
         // isBasic为0时查询N22，为1时查询本地数据库表
-        if ("0".equals(requestVO.getIsBasic())) {
-            this.querySalaryDetailFromN22(requestVO, responseVO);
-        } else {
+        if ("1".equals(requestVO.getIsBasic())) {
             this.querySalaryDetail(requestVO, responseVO);
             this.querySalaryDetail(requestVO, responseVO);
+        } else {
+            this.querySalaryDetailFromN22(requestVO, responseVO);
         }
         }
 
 
         return responseVO;
         return responseVO;
@@ -797,10 +794,13 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
             List<AgAclSalary> newSalaryList = agAclSalaryMapper.queryByRecord(agAclSalary);
             List<AgAclSalary> newSalaryList = agAclSalaryMapper.queryByRecord(agAclSalary);
 
 
             BigDecimal abc = BigDecimal.ZERO;
             BigDecimal abc = BigDecimal.ZERO;
+            BigDecimal d = BigDecimal.ZERO;
             for (AgAclSalary item : newSalaryList) {
             for (AgAclSalary item : newSalaryList) {
                 abc = abc.add(item.getAmount());
                 abc = abc.add(item.getAmount());
+                d = d.add(item.getTax());
             }
             }
             responseVO.setAbc(abc.toString());
             responseVO.setAbc(abc.toString());
+            responseVO.setD(d.toString());
             // list
             // list
             List<SalaryDetail> list = new ArrayList<>();
             List<SalaryDetail> list = new ArrayList<>();
             for (AgAclSalary item : newSalaryList) {
             for (AgAclSalary item : newSalaryList) {

yd-api/src/main/resources/mapper/salary/AgAclSalaryMapper.xml

@@ -237,7 +237,6 @@
   <select id="queryByRecord" parameterType="com.yd.dal.entity.salary.AgAclSalary" resultMap="BaseResultMap">
   <select id="queryByRecord" parameterType="com.yd.dal.entity.salary.AgAclSalary" resultMap="BaseResultMap">
     select * from  ag_acl_salary
     select * from  ag_acl_salary
     where 1=1
     where 1=1
-    <trim suffixOverrides=",">
       <if test="practitionerId != null">
       <if test="practitionerId != null">
         and practitioner_id = #{practitionerId,jdbcType=BIGINT}
         and practitioner_id = #{practitionerId,jdbcType=BIGINT}
       </if>
       </if>
@@ -286,6 +285,5 @@
       <if test="updatedBy != null">
       <if test="updatedBy != null">
         and updated_by = #{updatedBy,jdbcType=BIGINT}
         and updated_by = #{updatedBy,jdbcType=BIGINT}
       </if>
       </if>
-    </trim>
   </select>
   </select>
 </mapper>
 </mapper>
\ No newline at end of file