机构和评估的详情接口

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

@@ -3,7 +3,9 @@ package com.hungraim.ltc.account.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.account.service.AccountService;
+import com.hungraim.ltc.pojo.entity.account.ChAssessDetailAccounts;
 import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
+import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
 import com.hungraim.ltc.pojo.vo.account.*;
 import com.hungraim.ltc.util.FileUtils;
 import com.hungraim.ltc.util.Result;
@@ -159,4 +161,31 @@ public class AccountController {
         // 命名表格
         String fileName = "assessAccount.xlsx";
         FileUtils.exportResponse(workbook,fileName,response);
-    }}
+    }
+
+    /**
+     * 查询结算信息列表明细
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @GetMapping("/QueryDisabOrganAccountsDetail")
+    public Result<ChAssessDetailAccounts> QueryDisabOrganAccountsDetail(int id) {
+        ChAssessDetailAccounts chAssessDetailAccounts = accountService.queryDisabOrganAccountsDetail(id);
+        return Result.success(chAssessDetailAccounts);
+    }
+
+    /**
+     * 评估人员结算列表明细
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @GetMapping("/QuerySearchAssessAccounts")
+    public Result<ChDisabDetailAccounts> QuerySearchAssessAccounts(int id) {
+        ChDisabDetailAccounts chAssessDetailAccounts = accountService.querySearchAssessAccounts(id);
+        return Result.success(chAssessDetailAccounts);
+    }
+}
+
+

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

+package com.hungraim.ltc.account.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.account.ChAssessDetailAccounts;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author mq
+ */
+@Mapper
+@Repository
+public interface ChAssessDetailAccountsMapper  extends BaseMapper<ChAssessDetailAccounts> {
+}

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

+package com.hungraim.ltc.account.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author mq
+ */
+@Mapper
+@Repository
+public interface ChDisabDetailAccountsMapper extends BaseMapper<ChDisabDetailAccounts> {
+}

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

@@ -2,7 +2,9 @@ package com.hungraim.ltc.account.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hungraim.ltc.pojo.entity.account.ChAssessDetailAccounts;
 import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
+import com.hungraim.ltc.pojo.entity.account.ChDisabDetailAccounts;
 import com.hungraim.ltc.pojo.vo.account.*;
 import org.apache.poi.ss.usermodel.Workbook;
 
@@ -32,4 +34,13 @@ public interface AccountService extends IService<ChDisabAccounts> {
     Page<AssessAccountsListResp> searchAssessAccountsList(SrvOrganListReq srvOrganListReq);
 
     Workbook assessAccountExport(String assessAccountsId);
+
+    /**
+     * 列表明细
+     * @param id
+     * @return
+     */
+    ChAssessDetailAccounts queryDisabOrganAccountsDetail(int id);
+
+    ChDisabDetailAccounts querySearchAssessAccounts(int id);
 }

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -56,6 +56,10 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
     private final ChDisabAccountsDetailMapper chDisabAccountsDetailMapper;
     private final ChAssessAccountsDetailMapper chAssessAccountsDetailMapper;
 
+    private final ChAssessDetailAccountsMapper chAssessDetailAccountsMapper;
+
+    private final ChDisabDetailAccountsMapper chDisabDetailAccountsMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addOrUpdateAccount(AccountOperVo accountOperVo) {
@@ -631,6 +635,17 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
     }
 
     @Override
+    public ChAssessDetailAccounts queryDisabOrganAccountsDetail(int id) {
+        ChAssessDetailAccounts chAssessDetailAccounts = chAssessDetailAccountsMapper.selectById(id);
+        return chAssessDetailAccounts;
+    }
+
+    @Override
+    public ChDisabDetailAccounts querySearchAssessAccounts(int id) {
+        return chDisabDetailAccountsMapper.selectById(id);
+    }
+
+    @Override
     public Page<AssessAccountsListResp> searchAssessAccountsList(SrvOrganListReq srvOrganListReq) {
         List<Long> organIds = baseAccountService.getOrganIds(srvOrganListReq.getOrganId(), srvOrganListReq.getIsInvolveChild());
         return chAssessAccountsMapper.searchAssessAccountList(new Page<>(srvOrganListReq.getPageNum(), srvOrganListReq.getPageSize()), organIds, srvOrganListReq);

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChAssessDetailAccounts.java

@@ -61,11 +61,11 @@ public class ChAssessDetailAccounts implements Serializable {
     /**
      * 费用开始日期
      */
-    private Date  accountsStartTime;
+    private Date  assessStartTime;
     /**
      * 费用结束日期
      */
-    private Date accountsEndTime;
+    private Date assessEndTime;
 
 
     private static final long serialVersionUID = 1L;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabDetailAccounts.java

@@ -25,7 +25,6 @@ public class ChDisabDetailAccounts implements Serializable {
     @TableId(value = "ACCOUNTS_DETAIL_ID", type = IdType.INPUT)
     private Long accountsDetailId;
 
-
     private Long accountsId;
 
     private String disabInfoId;
@@ -34,9 +33,6 @@ public class ChDisabDetailAccounts implements Serializable {
      */
     private String srvOrganId;
 
-
-
-
     /**
      * 创建时间
      */
@@ -55,12 +51,10 @@ public class ChDisabDetailAccounts implements Serializable {
      * 应拨总费用
      */
     private BigDecimal accountsAllCost;
-    private BigDecimal accountsOverallCost;
-    private BigDecimal accountsPersonalCost;
-
-
 
+    private BigDecimal accountsOverallCost;
 
+    private BigDecimal accountsPersonalCost;
     /**
      * 服务方式
      */