Merge remote-tracking branch 'origin/dev_20230128_mq' into dev-20230128

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,65 @@ public class AccountController {
         // 命名表格
         String fileName = "assessAccount.xlsx";
         FileUtils.exportResponse(workbook,fileName,response);
-    }}
+    }
+
+    /**
+     * 评估人员结算列表明细
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @GetMapping("/QueryDisabOrganAccountsDetail")
+    public Result<List<ChAssessDetailAccounts>> QueryDisabOrganAccountsDetail(int id) {
+        List<ChAssessDetailAccounts> chAssessDetailAccounts = accountService.queryDisabOrganAccountsDetail(id);
+        return Result.success(chAssessDetailAccounts);
+    }
+
+    /**
+     * 查询机构结算信息列表明细
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @GetMapping("/QuerySearchAssessAccounts")
+    public Result<List<ChDisabDetailAccounts>> QuerySearchAssessAccounts(int id) {
+        List<ChDisabDetailAccounts> chAssessDetailAccounts = accountService.querySearchAssessAccounts(id);
+        return Result.success(chAssessDetailAccounts);
+    }
+
+    /**
+     * 机构结算管理提交复核
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @PostMapping("/updatechDisabAccounts")
+    public Result updateChDisabAccounts(int id) {
+        int bl = accountService.updateChDisabAccounts(id);
+        if(bl>0){
+            return Result.success();
+        }else{
+            return Result.failed();
+        }
+
+    }
+
+    /**
+     * 评估人员结算提交复核
+     *
+     * @param id 结算id
+     * @return 返回雷彪
+     */
+    @PostMapping("/updateChAssessAccounts")
+    public Result updateChAssessAccounts(int id) {
+        int bl = accountService.updateChAssessAccounts(id);
+        if(bl>0){
+            return Result.success();
+        }else{
+            return Result.failed();
+        }
+
+    }
+}
+
+

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,11 +2,14 @@ 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;
 
 import java.text.ParseException;
+import java.util.List;
 
 public interface AccountService extends IService<ChDisabAccounts> {
 
@@ -32,4 +35,17 @@ public interface AccountService extends IService<ChDisabAccounts> {
     Page<AssessAccountsListResp> searchAssessAccountsList(SrvOrganListReq srvOrganListReq);
 
     Workbook assessAccountExport(String assessAccountsId);
+
+    /**
+     * 列表明细
+     * @param id
+     * @return
+     */
+    List<ChAssessDetailAccounts> queryDisabOrganAccountsDetail(int id);
+
+    List<ChDisabDetailAccounts> querySearchAssessAccounts(int id);
+
+    int updateChDisabAccounts(int id);
+
+    int updateChAssessAccounts(int id);
 }

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

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.account.dao.*;
@@ -56,6 +57,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) {
@@ -648,6 +653,40 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
     }
 
     @Override
+    public List<ChAssessDetailAccounts> queryDisabOrganAccountsDetail(int id) {
+        QueryWrapper<ChAssessDetailAccounts> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ASSESS_ACCOUNTS_ID",id);
+        return chAssessDetailAccountsMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<ChDisabDetailAccounts> querySearchAssessAccounts(int id) {
+        QueryWrapper<ChDisabDetailAccounts> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACCOUNTS_ID",id);
+        return chDisabDetailAccountsMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateChDisabAccounts(int id) {
+        ChDisabAccounts ca = new ChDisabAccounts();
+        ca.setAccountsId(Long.valueOf(id));
+        ca.setAccountsStatus((short) 2);
+        return disabAccountsMapper.updateById(ca);
+
+
+    }
+
+    @Override
+    @Transactional(rollbackFor=Exception.class)
+    public int updateChAssessAccounts(int id) {
+        ChAssessAccounts ca = new ChAssessAccounts();
+        ca.setAssessAccountsId(Long.valueOf(id));
+        ca.setAccountsStatus((short) 2);
+        return chAssessAccountsMapper.updateById(ca);
+    }
+
+    @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/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;
     /**
      * 服务方式
      */