费用结算

account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java

@@ -83,7 +83,7 @@ public class AccountController {
      * @return 返回机构结当月算详情
      */
     @GetMapping("/expenseSettlement")
-    public Result<List<ExpenseSettlementVo>> expenseSettlement(ExpenseSettlementReq req) {
+    public Result<ExpenseVo> expenseSettlement(ExpenseSettlementReq req) {
         if (null == req.getSrvOrganId() || null == req.getAccountsTime()) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }

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

@@ -36,13 +36,13 @@ public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
             "  LEFT JOIN ch_srv_task_detail t2 ON t1.srv_task_id = t2.srv_task_id " +
             "  LEFT JOIN ch_disable_info t3 ON t1.disab_info_id = t3.disab_info_id  " +
             "  LEFT JOIN ch_srv_program t4 ON t1.program_id = t4.program_id" +
-            "  LEFT JOIN ch_fnd_srv_mode t5 ON t4.srv_mode_id = t4.srv_mode_id" +
-            "  LEFT JOIN ch_apr_report t6 ON t5.task_id = t1.srv_task_id" +
+            "  LEFT JOIN ch_fnd_srv_mode t5 ON t4.srv_mode_id = t5.srv_mode_id" +
+            "  LEFT JOIN ch_apr_report t6 ON t6.task_id = t1.srv_task_id" +
             "  LEFT JOIN ch_srv_program_set t7 ON t7.set_id = t4.program_id and t7.is_conf = 1" +
             "  LEFT JOIN ch_cfg_srv_item t8 ON t8.item_id = t7.item_id" +
             "  LEFT JOIN ch_srv_organ t9 ON t9.srv_organ_id = t4.srv_organ_id" +
             "<where> " +
-            " t4.srv_organ_id = #{req.srvOrganId} AND t4.PROG_STATUS = '1' AND t2.srv_start_time &lt;= #{req.accountsTime} AND t2.srv_end_time &gt;= #{req.accountsTime}" +
+            " t4.srv_organ_id = #{req.srvOrganId} AND t4.PROG_STATUS = 1 AND (t2.srv_start_time &lt;= to_date(#{req.accountsTime},'yyyy-MM') or t2.srv_end_time &gt;= to_date(#{req.accountsTime},'yyyy-MM'))" +
             "</where></script>")
     Page<ExpenseSettlementInfoBo> getExpenseSettlementInfo(Page<ExpenseSettlementInfoBo> page, ExpenseSettlementReq req);