费用结算

account/account-service/src/main/java/com/hungraim/ltc/account/dao/SrvTaskMapper.java

@@ -28,6 +28,7 @@ public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
             "  t7.item_id " +//服务项目id
             "  t7.item_times " +//服务频次
             "  t7.planning_frequency " +//计划频次
+            "  t7.planning_frequency_type " +//计划频次类型
             "  t8.srv_level_id " +//服务等级id
             "FROM " +
             "  ch_srv_task t1 " +

account/account-service/src/main/java/com/hungraim/ltc/account/service/AccountService.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
 import com.hungraim.ltc.pojo.vo.account.*;
 
-import java.util.List;
-
 public interface AccountService extends IService<ChDisabAccounts> {
 
     /**
@@ -18,5 +16,5 @@ public interface AccountService extends IService<ChDisabAccounts> {
 
     AccountOperVo getSrvOrganDetail(Long accountsId);
 
-    List<ExpenseSettlementVo> expenseSettlement(ExpenseSettlementReq req);
+    ExpenseVo expenseSettlement(ExpenseSettlementReq req);
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/ExpenseSettlementInfoBo.java

@@ -68,6 +68,10 @@ public class ExpenseSettlementInfoBo {
      * 计划频次
      */
     private Integer planningFrequency;
+    /**
+     * 计划频次类型
+     */
+    private Integer planningFrequencyType;
 
     /**
      * 服务等级id

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/ExpenseSettlementVo.java

@@ -100,6 +100,6 @@ public class ExpenseSettlementVo {
     /**
      * 合计
      */
-    private String total;
+    private ExpenseSettlementTotalVo total;
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/ExpenseVo.java

+package com.hungraim.ltc.pojo.vo.account;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ExpenseVo {
+
+    /**
+     * 费用结算
+     */
+    private List<ExpenseSettlementVo> expenseSettlements;
+
+
+    /**
+     * 合计
+     */
+    private ExpenseSettlementTotalVo total;
+
+}