个人结算管理模块相关后台功能

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

@@ -41,12 +41,15 @@ public class AccountController {
         if (null == accountOperVo.getSrvOrganId() || null == accountOperVo.getAccountsTime() || StringUtils.isBlank(accountOperVo.getTotalExpensesPayable()) || null == accountOperVo.getAccountsStatus()) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
+        Long accountsId = accountOperVo.getAccountsId();
         Date accountsTime = accountOperVo.getAccountsTime();
         Long srvOrganId = accountOperVo.getSrvOrganId();
+        if (null == accountsId) {
             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();
     }

account/account-service/src/main/java/com/hungraim/ltc/account/controller/EmpAccountController.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.EmpAccountService;
+import com.hungraim.ltc.pojo.entity.account.ChDisabEmpAccounts;
+import com.hungraim.ltc.pojo.vo.account.EmpAccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListResp;
+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/empAccount")
+@AllArgsConstructor
+@Slf4j
+public class EmpAccountController {
+
+    private final EmpAccountService empAccountService;
+
+    /**
+     * 添加或修改结算记录
+     *
+     * @return 返回状态
+     */
+    @PostMapping("/addOrUpdateEmpAccount")
+    public Result addOrUpdateEmpAccount(EmpAccountOperVo empAccountOperVo) {
+        if (null == empAccountOperVo.getSrvOrganId() || null == empAccountOperVo.getAccountsTime() || StringUtils.isBlank(empAccountOperVo.getTotalExpensesPayable()) || null == empAccountOperVo.getAccountsStatus()) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        Long empAccountsId = empAccountOperVo.getEmpAccountsId();
+        Date accountsTime = empAccountOperVo.getAccountsTime();
+        if (null == empAccountsId) {
+            List<ChDisabEmpAccounts> list = empAccountService.list(new LambdaQueryWrapper<ChDisabEmpAccounts>().eq(ChDisabEmpAccounts::getAccountsTime, accountsTime).eq(ChDisabEmpAccounts::getSrvEmpId, empAccountOperVo.getSrvEmpId()));
+            if (null != list && list.size() > 0) {
+                return Result.failed("当前人员当月已存在结算数据");
+            }
+        }
+        empAccountService.addOrUpdateEmpAccount(empAccountOperVo);
+        return Result.success();
+    }
+
+    /**
+     * 查询结算信息列表
+     *
+     * @param srvEmpListReq 请求参数对象
+     * @return 返回列表
+     */
+    @GetMapping("/searchSrvEmpList")
+    public Result<Page<SrvEmpListResp>> searchSrvEmpList(SrvEmpListReq srvEmpListReq) {
+        return Result.success(empAccountService.searchSrvEmpList(srvEmpListReq));
+    }
+
+    /**
+     * 获取结算详情
+     *
+     * @param empAccountsId 结算id
+     * @return 返回机构结算详情
+     */
+    @GetMapping("/srvEmpDetail")
+    public Result<EmpAccountOperVo> getSrvEmpDetail(Long empAccountsId) {
+        if (null == empAccountsId) {
+            return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
+        }
+        return Result.success(empAccountService.getSrvEmpDetail(empAccountsId));
+    }
+}

account/account-service/src/main/java/com/hungraim/ltc/account/dao/ChDisabEmpAccountsMapper.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.ChDisabEmpAccounts;
+import com.hungraim.ltc.pojo.vo.account.EmpAccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListResp;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+@Mapper
+public interface ChDisabEmpAccountsMapper extends BaseMapper<ChDisabEmpAccounts> {
+
+    @Select("<script>" +
+            "SELECT " +
+            "  t1.EMP_ACCOUNTS_ID, " +
+            "  t3.ORGAN_ID, " +
+            "  t3.ORGAN_NAME, " +
+            "  t2.SRV_ORGAN_ID, " +
+            "  t2.SRV_ORGAN_NAME, " +
+            "  t1.ACCOUNTS_TIME, " +
+            "  t4.EMP_NAME," +
+            "  t4.CERTIF_NUM," +
+            "  t1.ACCOUNTS_STATUS, " +
+            "  t1.TOTAL_EXPENSES_PAYABLE, " +
+            "  t1.TOTAL_ALLOCATED_EXPENSES  " +
+            "FROM " +
+            "  CH_DISAB_EMP_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  " +
+            "  LEFT JOIN CH_SRV_ORGAN_EMP t4 ON t1.SRV_EMP_ID = t4.EMP_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>" +
+            "  <if test='req.empName != null and req.empName !=\"\"'> AND t4.EMP_NAME LIKE CONCAT(CONCAT('%',#{req.empName}),'%')  </if>" +
+            "  <if test='req.certifNum != null and req.certifNum !=\"\"'> AND t4.CERTIF_NUM = #{req.certifNum} </if>" +
+            "</where></script>")
+    Page<SrvEmpListResp> searchSrvEmpList(Page<SrvEmpListResp> page, List<Long> organIds, SrvEmpListReq req);
+
+    @Select("SELECT    " +
+            "t1.*,    " +
+            "t4.EMP_NAME," +
+            "t4.CERTIF_NUM," +
+            "t3.ORGAN_ID    " +
+            " FROM    " +
+            "    CH_DISAB_EMP_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     " +
+            "    LEFT JOIN CH_SRV_ORGAN_EMP t4 ON t1.SRV_EMP_ID = t4.EMP_ID     " +
+            "WHERE    " +
+            "    t1.EMP_ACCOUNTS_ID = #{empAccountsId}")
+    EmpAccountOperVo getDetailById(Long empAccountsId);
+}
\ No newline at end of file

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

+package com.hungraim.ltc.account.service;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.util.AttachType;
+
+import java.util.List;
+
+public interface BaseAccountService {
+
+    void updateAttachs(Long ctrlId, List<ChFndAttach> fileDataList, AttachType attachType);
+
+    List<Long> getOrganIds(Long organId, Boolean isInvolveChild);
+}

account/account-service/src/main/java/com/hungraim/ltc/account/service/EmpAccountService.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.ChDisabEmpAccounts;
+import com.hungraim.ltc.pojo.vo.account.EmpAccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListResp;
+
+public interface EmpAccountService extends IService<ChDisabEmpAccounts>{
+    void addOrUpdateEmpAccount(EmpAccountOperVo empAccountOperVo);
+
+    Page<SrvEmpListResp> searchSrvEmpList(SrvEmpListReq srvEmpListReq);
+
+    EmpAccountOperVo getSrvEmpDetail(Long empAccountsId);
+
+}

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

@@ -4,14 +4,13 @@ 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.account.service.BaseAccountService;
 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;
@@ -19,6 +18,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -28,37 +28,24 @@ import java.util.List;
 public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDisabAccounts> implements AccountService {
 
     private final AttachFeignService attachFeignService;
+    private final BaseAccountService baseAccountService;
     private final ChDisabAccountsMapper disabAccountsMapper;
-    private final OrganFeignService organFeignService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     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);
+        baseAccountService.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);
+        List<Long> organIds = baseAccountService.getOrganIds(srvOrganListReq.getOrganId(), srvOrganListReq.getIsInvolveChild());
+        return disabAccountsMapper.searchSrvOrganList(new Page<>(srvOrganListReq.getPageNum(), srvOrganListReq.getPageSize()), organIds, srvOrganListReq);
     }
 
     @Override
@@ -78,14 +65,4 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         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);
-    }
 }

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

+package com.hungraim.ltc.account.service.impl;
+
+import com.hungraim.ltc.account.service.BaseAccountService;
+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.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.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class BaseAccountServiceImpl implements BaseAccountService {
+
+    private final AttachFeignService attachFeignService;
+    private final OrganFeignService organFeignService;
+
+    /**
+     * 调用feign api来修改附件数据
+     */
+    public 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);
+    }
+
+    public List<Long> getOrganIds(Long organId, Boolean isInvolveChild) {
+        if (organId != null) {
+            try {
+                Result<List<Long>> result = organFeignService.getOrganChild(organId, isInvolveChild);
+                if (ResultCode.SUCCESS.getCode().equals(result.getCode())) {
+                    return result.getData();
+                } else {
+                    log.error("请求获取适用机构子机构失败：{}", result.getMsg());
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("请求获取适用机构子机构失败：{}", e.getMessage());
+            }
+        }
+        return null;
+    }
+}

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/EmpAccountServiceImpl.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.ChDisabEmpAccountsMapper;
+import com.hungraim.ltc.account.service.BaseAccountService;
+import com.hungraim.ltc.account.service.EmpAccountService;
+import com.hungraim.ltc.api.AttachFeignService;
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.account.ChDisabEmpAccounts;
+import com.hungraim.ltc.pojo.vo.account.EmpAccountOperVo;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListReq;
+import com.hungraim.ltc.pojo.vo.account.SrvEmpListResp;
+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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class EmpAccountServiceImpl extends ServiceImpl<ChDisabEmpAccountsMapper, ChDisabEmpAccounts> implements EmpAccountService {
+
+    private final AttachFeignService attachFeignService;
+    private final ChDisabEmpAccountsMapper chDisabEmpAccountsMapper;
+    private final BaseAccountService baseAccountService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addOrUpdateEmpAccount(EmpAccountOperVo empAccountOperVo) {
+        ChDisabEmpAccounts chDisabEmpAccounts = new ChDisabEmpAccounts();
+        BeanUtils.copyProperties(empAccountOperVo, chDisabEmpAccounts);
+        chDisabEmpAccounts.setChooseSettle((short) 0); // 是否结算(0未结算，1已结算)
+        this.saveOrUpdate(chDisabEmpAccounts);
+        empAccountOperVo.setEmpAccountsId(chDisabEmpAccounts.getEmpAccountsId());
+        baseAccountService.updateAttachs(chDisabEmpAccounts.getEmpAccountsId(), empAccountOperVo.getFileDataList(), AttachType.SRV_EMP_ACCOUNT);
+
+    }
+
+    @Override
+    public Page<SrvEmpListResp> searchSrvEmpList(SrvEmpListReq srvEmpListReq) {
+        List<Long> organIds = baseAccountService.getOrganIds(srvEmpListReq.getOrganId(), srvEmpListReq.getIsInvolveChild());
+        return chDisabEmpAccountsMapper.searchSrvEmpList(new Page<>(srvEmpListReq.getPageNum(), srvEmpListReq.getPageSize()), organIds, srvEmpListReq);
+    }
+
+
+    @Override
+    public EmpAccountOperVo getSrvEmpDetail(Long empAccountsId) {
+        EmpAccountOperVo empAccountOperVo = chDisabEmpAccountsMapper.getDetailById(empAccountsId);
+        try {
+            Result<List<ChFndAttach>> result = attachFeignService.selectAttachs(empAccountOperVo.getEmpAccountsId(), AttachType.SRV_ORGAN_ACCOUNT.getUploadType());
+            if (ResultCode.SUCCESS.getCode().equals(result.getCode())) {
+                empAccountOperVo.setFileDataList(result.getData());
+            } else {
+                log.error("获取机构结算资料失败：{}", result.getMsg());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取机构结算资料失败：{}", e.getMessage());
+        }
+        return empAccountOperVo;
+    }
+}

account/account-service/src/main/resources/mapper/ChDisabAccountsMapper.xml

@@ -15,12 +15,4 @@
     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

account/account-service/src/main/resources/mapper/ChDisabEmpAccountsMapper.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.ChDisabEmpAccountsMapper">
+  <resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.account.ChDisabEmpAccounts">
+    <id column="EMP_ACCOUNTS_ID" jdbcType="DECIMAL" property="empAccountsId" />
+    <result column="SRV_EMP_ID" jdbcType="DECIMAL" property="srvEmpId" />
+    <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" />
+    <result column="CHECK_NAME" jdbcType="VARCHAR" property="checkName" />
+    <result column="CHECK_REMARK" jdbcType="VARCHAR" property="checkRemark" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    EMP_ACCOUNTS_ID, SRV_EMP_ID, TOTAL_ALLOCATED_EXPENSES, CREATION_TIME, ACCOUNTS_TIME, 
+    TOTAL_EXPENSES_PAYABLE, CHOOSE_SETTLE, ACCOUNTS_STATUS, CHECK_NAME, CHECK_REMARK
+  </sql>
+</mapper>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/ChDisabEmpAccounts.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_EMP_ACCOUNTS
+ * @author 
+ */
+@Data
+@TableName("CH_DISAB_EMP_ACCOUNTS")
+@KeySequence("SEQ_CH_DISAB_EMP_ACCOUNTS")
+public class ChDisabEmpAccounts implements Serializable {
+    /**
+     * 护理人员结算ID
+     */
+    @TableId(value = "EMP_ACCOUNTS_ID", type = IdType.INPUT)
+    private Long empAccountsId;
+
+    /**
+     * 护理人员ID
+     */
+    private Long srvEmpId;
+
+    /**
+     * 护理机构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

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

+package com.hungraim.ltc.pojo.vo.account;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import com.hungraim.ltc.pojo.entity.account.ChDisabEmpAccounts;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class EmpAccountOperVo extends ChDisabEmpAccounts {
+
+    /**
+     * 适用机构id
+     */
+    private Long organId;
+
+    /**
+     * 护理人员姓名
+     */
+    private String empName;
+
+    /**
+     * 护理人员身份证号
+     */
+    private String certifNum;
+
+    /**
+     * 文件列表数据对象
+     */
+    private List<ChFndAttach> fileDataList;
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvEmpListReq.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 SrvEmpListReq extends BaseReq {
+
+    /**
+     * 适用机构id
+     */
+    private Long organId;
+
+
+    /**
+     * 是否包含下级机构
+     */
+    private Boolean isInvolveChild;
+
+    /**
+     * 护理机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 护理人员姓名
+     */
+    private String empName;
+
+    /**
+     * 护理人员身份证号
+     */
+    private String certifNum;
+
+    /**
+     * 结算月份
+     */
+    @DateTimeFormat(pattern = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date accountsTime;
+
+}

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvEmpListResp.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 SrvEmpListResp {
+
+    /**
+     * 结算id
+     */
+    private Long empAccountsId;
+
+    /**
+     * 适用机构id
+     */
+    private Long organId;
+
+    /**
+     * 适用机构名称
+     */
+    private String organName;
+
+    /**
+     * 护理机构id
+     */
+    private Long srvOrganId;
+
+    /**
+     * 护理机构名称
+     */
+    private String srvOrganName;
+
+    /**
+     * 护理人员姓名
+     */
+    private String empName;
+
+    /**
+     * 护理人员身份证号
+     */
+    private String certifNum;
+
+    /**
+     * 结算月份
+     */
+    @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;
+
+}