创建结算管理服务、机构结算相关接口

96123d3a · zhangch · 90d78660 · 96123d3a · 96123d3a · 96123d3a
Commit 96123d3a authored Nov 05, 2021 by zhangch
23 changed files
--- a/account/account-api/pom.xml
+++ b/account/account-api/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>account</artifactId>
+        <groupId>com.hungraim.ltc</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>account-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>common-core</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+    </dependencies>
+
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://121.5.28.27:9091/nexus/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://121.5.28.27:9091/nexus/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+
+</project>
\ No newline at end of file
--- a/account/account-service/DOCKERFILE
+++ b/account/account-service/DOCKERFILE
+#指定依赖的镜像
+FROM localhost:9999/library/java:8
+#springboot
+VOLUME /tmp
+#容器使用端口
+EXPOSE 8002
+#添加jar包入容器
+ADD apply/apply-service/target/system-user-0.0.1.jar app.jar
+#改名
+RUN sh -c 'touch /app.jar'
+#容器启动java
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
--- a/account/account-service/deployment.yaml
+++ b/account/account-service/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: account-service
+  namespace: ltc-service
+  labels:
+    app: account-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: account-service
+  template:
+    metadata:
+      labels:
+        app: account-service
+    spec:
+      imagePullSecrets:
+        - name: ltc-harbor
+      containers:
+        - name: account                          #TODO:pod的名称，必须字段，名称唯一且对象创建后不可以被修改
+          image: localhost:9999/ltc/ltc-system-user-service:latest  #TODO:镜像仓库的路径/镜像的名称:镜像的标签,
+          imagePullPolicy: Always                         #Always(总是去仓库下载),Never(从不去仓库下载),IfNotPresent(如果本地没有就去仓库下载),默认是"IfNotPresent"
+          ports:
+            - containerPort: 8001                       #TODO:containerPort是pod内部容器的端口，targetPort映射到containerPort;例如，mysql服务需要暴露3306端口，redis暴露6379端口
--- a/account/account-service/pom.xml
+++ b/account/account-service/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>account</artifactId>
+        <groupId>com.hungraim.ltc</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>account-service</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-config -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2.2.5.RELEASE</version>
+        </dependency>
+
+        <!--feign服务调用-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!--系统服务api-->
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>system-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>apply-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+
+        <!--基础包-->
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>common-core</artifactId>
+            <version>0.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-config</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-oauth2-jose</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.tomcat.embed</groupId>
+                    <artifactId>tomcat-embed-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>common-mybatis</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.hungraim.ltc</groupId>
+            <artifactId>common-redis</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <!--基础包 end-->
+
+        <!-- spring boot web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <fork>true</fork> <!--重要-->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
--- a/account/account-service/src/main/java/com/hungraim/ltc/AccountApplication.java
+++ b/account/account-service/src/main/java/com/hungraim/ltc/AccountApplication.java
+package com.hungraim.ltc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * 结算服务
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableTransactionManagement
+@EnableFeignClients
+public class AccountApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(AccountApplication.class, args);
+    }
+}
--- a/account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java
+++ b/account/account-service/src/main/java/com/hungraim/ltc/account/controller/AccountController.java
+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.ChDisabAccounts;
+import com.hungraim.ltc.pojo.vo.account.AccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
+import com.hungraim.ltc.util.Result;
+import com.hungraim.ltc.util.ResultCode;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 结算管理控制层
+ */
+@RestController
+@RequestMapping("/api.account/account")
+@AllArgsConstructor
+@Slf4j
+public class AccountController {
+
+    private final AccountService accountService;
+
+    /**
+     * 添加或修改结算记录
+     *
+     * @return 返回状态
+     */
+    @PostMapping("/addOrUpdateAccount")
+    public Result addOrUpdateAccount(AccountOperVo accountOperVo) {
+        if (null == accountOperVo.getSrvOrganId() || null == accountOperVo.getAccountsTime() || StringUtils.isBlank(accountOperVo.getTotalExpensesPayable()) || null == accountOperVo.getAccountsStatus()) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        Date accountsTime = accountOperVo.getAccountsTime();
+        Long srvOrganId = accountOperVo.getSrvOrganId();
+        List<ChDisabAccounts> list = accountService.list(new LambdaQueryWrapper<ChDisabAccounts>().eq(ChDisabAccounts::getAccountsTime, accountsTime).eq(ChDisabAccounts::getSrvOrganId, srvOrganId));
+        if (null != list && list.size() > 0) {
+            return Result.failed("当前机构当月已存在结算数据");
+        }
+        accountService.addOrUpdateAccount(accountOperVo);
+        return Result.success();
+    }
+
+    /**
+     * 查询结算信息列表
+     *
+     * @param srvOrganListReq 请求参数对象
+     * @return 返回雷彪
+     */
+    @GetMapping("/searchSrvOrganList")
+    public Result<Page<SrvOrganListResp>> searchSrvOrganList(SrvOrganListReq srvOrganListReq) {
+        return Result.success(accountService.searchSrvOrganList(srvOrganListReq));
+    }
+
+    /**
+     * 获取结算详情
+     *
+     * @param accountsId 结算id
+     * @return 返回机构结算详情
+     */
+    @GetMapping("/srvOrganDetail")
+    public Result<AccountOperVo> getSrvOrganDetail(Long accountsId) {
+        if (null == accountsId) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        return Result.success(accountService.getSrvOrganDetail(accountsId));
+    }
+}
--- a/account/account-service/src/main/java/com/hungraim/ltc/account/dao/ChDisabAccountsMapper.java
+++ b/account/account-service/src/main/java/com/hungraim/ltc/account/dao/ChDisabAccountsMapper.java
+package com.hungraim.ltc.account.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
+import com.hungraim.ltc.pojo.vo.account.AccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface ChDisabAccountsMapper extends BaseMapper<ChDisabAccounts> {
+
+    @Select("<script>" +
+            "SELECT " +
+            "  t1.ACCOUNTS_ID, " +
+            "  t3.ORGAN_ID, " +
+            "  t3.ORGAN_NAME, " +
+            "  t2.SRV_ORGAN_ID, " +
+            "  t2.SRV_ORGAN_NAME, " +
+            "  t1.ACCOUNTS_TIME, " +
+            "  t1.ACCOUNTS_STATUS, " +
+            "  t1.TOTAL_EXPENSES_PAYABLE, " +
+            "  t1.TOTAL_ALLOCATED_EXPENSES  " +
+            "FROM " +
+            "  CH_DISAB_ACCOUNTS t1 " +
+            "  LEFT JOIN CH_SRV_ORGAN t2 ON t1.SRV_ORGAN_ID = t2.SRV_ORGAN_ID " +
+            "  LEFT JOIN CH_FND_ORGAN t3 ON t2.ORGAN_ID = t3.ORGAN_ID  " +
+            "<where> " +
+            " <if test='organIds != null and organIds.size()>0'>  t3.ORGAN_ID IN  <foreach collection=\"organIds\" open=\"(\" close=\")\" item=\"organId\" separator=\",\">#{organId}</foreach> </if>" +
+            "  " +
+            "  <if test='req.srvOrganId != null'> AND t2.SRV_ORGAN_ID = #{req.srvOrganId} </if>   " +
+            "  <if test='req.accountsTime != null'> AND t1.ACCOUNTS_TIME = #{req.accountsTime} </if>" +
+            "</where></script>")
+    Page<SrvOrganListResp> searchSrvOrganList(Page page, List<Long> organIds, SrvOrganListReq req);
+
+    @Select("SELECT    " +
+            "t1.*,    " +
+            "t3.ORGAN_ID    " +
+            " FROM    " +
+            "    CH_DISAB_ACCOUNTS t1    " +
+            "    LEFT JOIN CH_SRV_ORGAN t2 ON t1.SRV_ORGAN_ID = t2.SRV_ORGAN_ID    " +
+            "    LEFT JOIN CH_FND_ORGAN t3 ON t2.ORGAN_ID = t3.ORGAN_ID     " +
+            "WHERE    " +
+            "    t1.ACCOUNTS_ID = #{accountsId}")
+    AccountOperVo getDetailById(Long accountsId);
+}
\ No newline at end of file
--- a/account/account-service/src/main/java/com/hungraim/ltc/account/service/AccountService.java
+++ b/account/account-service/src/main/java/com/hungraim/ltc/account/service/AccountService.java
+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.ChDisabAccounts;
+import com.hungraim.ltc.pojo.vo.account.AccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
+
+public interface AccountService extends IService<ChDisabAccounts> {
+
+    /**
+     * 添加或修改结算记录
+     */
+    void addOrUpdateAccount(AccountOperVo accountOperVo);
+
+    Page<SrvOrganListResp> searchSrvOrganList(SrvOrganListReq srvOrganListReq);
+
+    AccountOperVo getSrvOrganDetail(Long accountsId);
+}
--- a/account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java
+++ b/account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java
+package com.hungraim.ltc.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hungraim.ltc.account.dao.ChDisabAccountsMapper;
+import com.hungraim.ltc.account.service.AccountService;
+import com.hungraim.ltc.api.AttachFeignService;
+import com.hungraim.ltc.api.OrganFeignService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
+import com.hungraim.ltc.pojo.vo.account.AccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvOrganListResp;
+import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
+import com.hungraim.ltc.util.AttachType;
+import com.hungraim.ltc.util.Result;
+import com.hungraim.ltc.util.ResultCode;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDisabAccounts> implements AccountService {
+
+    private final AttachFeignService attachFeignService;
+    private final ChDisabAccountsMapper disabAccountsMapper;
+    private final OrganFeignService organFeignService;
+
+    @Override
+    public void addOrUpdateAccount(AccountOperVo accountOperVo) {
+        ChDisabAccounts chDisabAccounts = new ChDisabAccounts();
+        BeanUtils.copyProperties(accountOperVo, chDisabAccounts);
+        chDisabAccounts.setChooseSettle((short) 0); // 是否结算(0未结算，1已结算)
+        this.saveOrUpdate(chDisabAccounts);
+        accountOperVo.setAccountsId(chDisabAccounts.getAccountsId());
+        this.updateAttachs(chDisabAccounts.getAccountsId(), accountOperVo.getFileDataList(), AttachType.SRV_ORGAN_ACCOUNT);
+    }
+
+    @Override
+    public Page<SrvOrganListResp> searchSrvOrganList(SrvOrganListReq srvOrganListReq) {
+        List<Long> organIds = null;
+        if (srvOrganListReq.getOrganId() != null) {
+            try {
+
+                Result<List<Long>> result = organFeignService.getOrganChild(srvOrganListReq.getOrganId(), srvOrganListReq.getIsInvolveChild());
+                if (ResultCode.SUCCESS.getCode().equals(result.getCode())) {
+                    organIds = result.getData();
+                } else {
+                    log.error("请求获取适用机构子机构失败：{}", result.getMsg());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("请求获取适用机构子机构失败：{}", e.getMessage());
+            }
+        }
+        return disabAccountsMapper.searchSrvOrganList(new Page(srvOrganListReq.getPageNum(), srvOrganListReq.getPageSize()), organIds, srvOrganListReq);
+    }
+
+    @Override
+    public AccountOperVo getSrvOrganDetail(Long accountsId) {
+        AccountOperVo accountOperVo = disabAccountsMapper.getDetailById(accountsId);
+        try {
+            Result<List<ChFndAttach>> result = attachFeignService.selectAttachs(accountOperVo.getAccountsId(), AttachType.SRV_ORGAN_ACCOUNT.getUploadType());
+            if (ResultCode.SUCCESS.getCode().equals(result.getCode())) {
+                accountOperVo.setFileDataList(result.getData());
+            } else {
+                log.error("获取机构结算资料失败：{}", result.getMsg());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取机构结算资料失败：{}", e.getMessage());
+        }
+        return accountOperVo;
+    }
+
+    /**
+     * 调用feign api来修改附件数据
+     */
+    private void updateAttachs(Long ctrlId, List<ChFndAttach> fileDataList, AttachType attachType) {
+        AttachUpdateVo attachUpdateVo = new AttachUpdateVo();
+        attachUpdateVo.setCtrlId(ctrlId);
+        attachUpdateVo.setAttachType(attachType.getUploadType());
+        attachUpdateVo.setChFndAttachs(fileDataList);
+        attachFeignService.updateAttachs(attachUpdateVo);
+    }
+}
--- a/account/account-service/src/main/resources/bootstrap.yml
+++ b/account/account-service/src/main/resources/bootstrap.yml
+
+spring:
+  main:
+    #允许存在多个Feign调用相同Service的接口
+    allow-bean-definition-overriding: true
+  devtools:
+    restart:
+      enabled: true
+      additional-paths: src/main/java
+  application:
+    name: LTC-ACCOUNT-SERVICE
+  cloud:
+    nacos:
+      discovery:
+        server-addr: qw.hungraim.com:31158
+        namespace: 587caa07-922e-4bb1-b9ad-61807110a2ad
+      config:
+        namespace: 0e0f834a-a665-4d27-ae04-9d53c2e02140
+        server-addr: qw.hungraim.com:31158
+        file-extension: yaml  # 必须修改成yaml
+        extension-configs:
+          - data-id: ltc-database.yaml
+            group: common
+            refresh: true
+          - data-id: ltc-basic.yaml
+            group: common
+            refresh: true
+          - data-id: thread-config.yaml
+            group: system
+            refresh: true
+server:
+  port: 8010
+
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/*Mapper.xml
+
--- a/account/account-service/src/main/resources/mapper/ChDisabAccountsMapper.xml
+++ b/account/account-service/src/main/resources/mapper/ChDisabAccountsMapper.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hungraim.ltc.account.dao.ChDisabAccountsMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.account.ChDisabAccounts">
+    <id column="ACCOUNTS_ID" jdbcType="DECIMAL" property="accountsId" />
+    <result column="SRV_ORGAN_ID" jdbcType="DECIMAL" property="srvOrganId" />
+    <result column="TOTAL_ALLOCATED_EXPENSES" jdbcType="VARCHAR" property="totalAllocatedExpenses" />
+    <result column="CREATION_TIME" jdbcType="TIMESTAMP" property="creationTime" />
+    <result column="ACCOUNTS_TIME" jdbcType="TIMESTAMP" property="accountsTime" />
+    <result column="TOTAL_EXPENSES_PAYABLE" jdbcType="VARCHAR" property="totalExpensesPayable" />
+    <result column="CHOOSE_SETTLE" jdbcType="DECIMAL" property="chooseSettle" />
+    <result column="ACCOUNTS_STATUS" jdbcType="DECIMAL" property="accountsStatus" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    ACCOUNTS_ID, SRV_ORGAN_ID, TOTAL_ALLOCATED_EXPENSES, CREATION_TIME, ACCOUNTS_TIME, 
+    TOTAL_EXPENSES_PAYABLE, CHOOSE_SETTLE, ACCOUNTS_STATUS
+  </sql>
+  <select id="a">
+    select  * from disable
+<where>
+    <if test="req.sxxx != null and req.sxxx !=''">
+      <foreach collection="organIds" open="(" close=")" item="organId" separator=","></foreach>
+    </if>
+  </where>
+  </select>
+</mapper>
\ No newline at end of file
--- a/account/pom.xml
+++ b/account/pom.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ltc</artifactId>
+        <groupId>com.hungraim.ltc</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>account</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>account-service</module>
+        <module>account-api</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <distributionManagement>
+        <repository>
+            <id>releases</id>
+            <name>Nexus Release Repository</name>
+            <url>http://121.5.28.27:9091/nexus/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://121.5.28.27:9091/nexus/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+</project>
\ No newline at end of file
--- a/apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java
+++ b/apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java
@@ -90,13 +90,33 @@ public class DisableController {
    }

    /**
-     * 查询机构下所有护理机构
+     * 查询机构(不包含子机构)下所有护理机构
     *
     * @param organId 机构id
     */
    @RequestMapping("/srvOrganList")
    public Result<List<ChSrvOrgan>> srvOrganList(String organId) {
-        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(organId);
+        if (StringUtils.isBlank(organId)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(organId, false);
+        return Result.success(chFndSrvModes);
+    }
+
+    /**
+     * 查询机构下或者包含子机构下的所有护理机构
+     *
+     * @param organId 机构id
+     */
+    @RequestMapping("/srvOrganListByIsInvolveChild")
+    public Result<List<ChSrvOrgan>> srvOrganListByIsInvolveChild(String organId, Boolean isInvolveChild) {
+        if (StringUtils.isBlank(organId)) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        if (null == isInvolveChild) {
+            isInvolveChild = false;
+        }
+        List<ChSrvOrgan> chFndSrvModes = disableService.srvOrganList(organId, isInvolveChild);
        return Result.success(chFndSrvModes);
    }


--- a/apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java
+++ b/apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java
@@ -61,8 +61,9 @@ public interface DisableService {
     * 查询机构下所有护理机构
     *
     * @param organId 机构id
+     * @param isInvolveChild 是否包含子机构
     */
-    List<ChSrvOrgan> srvOrganList(String organId);
+    List<ChSrvOrgan> srvOrganList(String organId, Boolean isInvolveChild);

    /**
     * 查询疾病类型
@@ -111,6 +112,7 @@ public interface DisableService {

    /**
     * 失能人员信息变更表-新增
+     *
     * @param disableUpdateDetailVO
     */
    Result addOrUpdateDisInfoChange(DisableUpdateDetailVO disableUpdateDetailVO);

--- a/apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java
+++ b/apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java
@@ -300,8 +300,10 @@ public class DisableServiceImpl implements DisableService {
    }

    @Override
-    public List<ChSrvOrgan> srvOrganList(String organId) {
-        return srvOrganMapper.selectList(new QueryWrapper<ChSrvOrgan>().eq("organ_id", organId).eq("STATUS", (short) 0));
+    public List<ChSrvOrgan> srvOrganList(String organId, Boolean isInvolveChild) {
+        // zhangch 2021-11-04 修改查询条件 new QueryWrapper<ChSrvOrgan>().eq("organ_id", organId).eq("STATUS", (short) 0)
+        List<Long> organIds = organService.getOrganIds(Long.valueOf(organId), isInvolveChild);
+        return srvOrganMapper.selectList(new LambdaQueryWrapper<ChSrvOrgan>().eq(ChSrvOrgan::getStatus, (short) 0).in(ChSrvOrgan::getOrganId, organIds));
    }

    @Override

--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabAccounts.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabAccounts.java
+package com.hungraim.ltc.pojo.entity.account;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_DISAB_ACCOUNTS
+ * @author zhangch
+ */
+@Data
+@TableName("CH_DISAB_ACCOUNTS")
+@KeySequence("SEQ_CH_DISAB_ACCOUNTS")
+public class ChDisabAccounts implements Serializable {
+    /**
+     * 结算id
+     */
+    @TableId(value = "ACCOUNTS_ID", type = IdType.INPUT)
+    private Long accountsId;
+
+    /**
+     * 护理机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 实拨总费用
+     */
+    private String totalAllocatedExpenses;
+
+    /**
+     * 创建时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date creationTime;
+
+    /**
+     * 结算月份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM",timezone = "GMT+8")
+    private Date accountsTime;
+
+    /**
+     * 应拨总费用
+     */
+    private String totalExpensesPayable;
+
+    /**
+     * 是否结算(0未结算，1已结算)
+     */
+    private Short chooseSettle;
+
+    /**
+     * 状态（0-待提交；1-待审核；2-已审核；3-已失效；）
+     */
+    private Short accountsStatus;
+
+    /**
+     * 审核人姓名
+     */
+    private String checkName;
+
+    /**
+     * 审核备注
+     */
+    private String checkRemark;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/BaseReq.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/BaseReq.java
+package com.hungraim.ltc.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class BaseReq {
+
+    /**
+     * 页码
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页大小
+     */
+    private Integer pageSize;
+
+}
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/AccountOperVo.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/AccountOperVo.java
+package com.hungraim.ltc.pojo.vo.account;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.account.ChDisabAccounts;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AccountOperVo extends ChDisabAccounts {
+
+    /**
+     * 适用机构id
+     */
+    private String organId;
+
+    /**
+     * 文件列表数据对象
+     */
+    private List<ChFndAttach> fileDataList;
+}
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListReq.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListReq.java
+package com.hungraim.ltc.pojo.vo.account;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.hungraim.ltc.pojo.vo.BaseReq;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class SrvOrganListReq extends BaseReq {
+
+    /**
+     * 适用机构id
+     */
+    private Long organId;
+
+
+    /**
+     * 是否包含下级机构
+     */
+    private Boolean isInvolveChild;
+
+    /**
+     * 护理机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 结算月份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date accountsTime;
+
+}
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListResp.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvOrganListResp.java
+package com.hungraim.ltc.pojo.vo.account;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+public class SrvOrganListResp {
+
+    /**
+     * 结算id
+     */
+    private Long accountsId;
+
+    /**
+     * 适用机构id
+     */
+    private Long organId;
+
+    /**
+     * 适用机构名称
+     */
+    private String organName;
+
+    /**
+     * 护理机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 护理机构名称
+     */
+    private String srvOrganName;
+
+    /**
+     * 结算月份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM",timezone = "GMT+8")
+    private Date accountsTime;
+
+    /**
+     * 状态（0-待提交；1-待审核；2-已审核；3-已失效；）
+     */
+    private Short accountsStatus;
+
+    /**
+     * 应拨总费用
+     */
+    private String totalExpensesPayable;
+
+    /**
+     * 实拨总费用
+     */
+    private String totalAllocatedExpenses;
+
+}
--- a/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/system/AttachUpdateVo.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/system/AttachUpdateVo.java
@@ -14,7 +14,7 @@ public class AttachUpdateVo {
    private Long ctrlId;

    /**
-     * 附件类型(1:失能人员附件;2:鉴定任务附件;3:服务方案附件;4:稽核巡查;5:护理机构基金结算申请新增;6:无锡长护保险自评申请;7:失能信息变更附件;8:评估结论书;9:参保人员及家属;10:评定人员1;11:评定人员2;12:鉴定机构附件;13:护理机构附件;14:鉴定人员附件;15:护理人员附件 16-护理人员服务项目结束附件，17:建床，18：撤床)
+     * 附件类型(1:失能人员附件;2:鉴定任务附件;3:服务方案附件;4:稽核巡查;5:护理机构基金结算申请新增;6:无锡长护保险自评申请;7:失能信息变更附件;8:评估结论书;9:参保人员及家属;10:评定人员1;11:评定人员2;12:鉴定机构附件;13:护理机构附件;14:鉴定人员附件;15:护理人员附件 16-护理人员服务项目结束附件，17:建床，18：撤床；19：护理机构结算附件；20：护理人员结算附件；)
     */
    private Short attachType;


--- a/common/common-core/src/main/java/com/hungraim/ltc/util/AttachType.java
+++ b/common/common-core/src/main/java/com/hungraim/ltc/util/AttachType.java
@@ -12,7 +12,7 @@ public enum AttachType {

    /**
     * 附件类型(1:失能人员附件;2:鉴定任务附件;3:服务方案附件;4:稽核巡查;5:护理机构基金结算申请新增;6:无锡长护保险自评申请;7:失能信息变更附件;
-     * 8:评估结论书;9:参保人员及家属;10:评定人员1;11:评定人员2;12:鉴定机构附件;13:护理机构附件;14:鉴定人员附件;15:护理人员附件 16-护理人员服务项目结束附件，17:建床，18：撤床)
+     * 8:评估结论书;9:参保人员及家属;10:评定人员1;11:评定人员2;12:鉴定机构附件;13:护理机构附件;14:鉴定人员附件;15:护理人员附件 16-护理人员服务项目结束附件，17:建床，18：撤床；19：护理机构结算附件；20：护理人员结算附件；)
     */
    /**
     * 1:失能人员附件;
@@ -71,7 +71,16 @@ public enum AttachType {
    /**
     * 18:撤床;
     */
-    REMOVE_BED((short) 18);
+    REMOVE_BED((short) 18),
+
+    /**
+     * 19：护理机构结算附件；
+     */
+    SRV_ORGAN_ACCOUNT((short) 19),
+    /**
+     * 19：护理人员结算附件；
+     */
+    SRV_EMP_ACCOUNT((short) 20);

    private Short uploadType;


--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
        <module>apply</module>
        <module>governance</module>
        <module>assessment</module>
+        <module>account</module>
    </modules>
    <parent>
        <groupId>org.springframework.boot</groupId>