分摊层级基本操作编写

src/main/java/com/imed/costaccount/mapper/CostShareLevelMapper.java

@@ -0,0 +1,16 @@
+package com.imed.costaccount.mapper;
+
+import com.imed.costaccount.model.CostShareLevel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分摊层级对照表
+ * 
+ * @author KCYG
+ * @date 2021-07-27 14:19:09
+ */
+@Mapper
+public interface CostShareLevelMapper extends BaseMapper<CostShareLevel> {
+	
+}

src/main/java/com/imed/costaccount/model/CostShareLevel.java

@@ -0,0 +1,63 @@
+package com.imed.costaccount.model;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 分摊层级对照表
+ * 
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-07-27 14:19:09
+ */
+@Data
+@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("cost_share_level")
+public class CostShareLevel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 分摊层级数名称
+	 */
+	private String shareName;
+	/**
+	 * 分摊层级序号
+	 */
+	private Integer leverSort;
+	/**
+	 * 医院Id
+	 */
+	private Integer hospId;
+	/**
+	 * 目标层级
+	 */
+	private Integer targetLevel;
+	/**
+	 * 计算方式
+	 */
+	private Integer calcType;
+	/**
+	 * 创建时间13位时间戳
+	 */
+	private Long createTime;
+	/**
+	 * 删除时间，如果存在表示已删除13位时间戳
+	 */
+	@TableLogic(value = "0",delval = "UNIX_TIMESTAMP(NOW()) * 1000")
+	private Long deleteTime;
+
+}

src/main/java/com/imed/costaccount/model/dto/CostShareLevelEditDto.java

@@ -0,0 +1,31 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.dto
+ * @date 2021-07-27 15:03
+ */
+@Data
+@ApiModel("编辑分摊层级对象")
+public class CostShareLevelEditDto {
+    @ApiModelProperty(name = "id",value = "分摊层级的Id")
+    private Integer id;
+    @ApiModelProperty(name = "shareName",value = "分摊层级数名称")
+    @NotNull(message = "层级名称不能为空")
+    private String shareName;
+    @ApiModelProperty(name = "leverSort",value = "分摊层级序号")
+    @NotNull(message = "层级序号不能为空")
+    private Integer leverSort;
+    @ApiModelProperty(name = "targetLevel",value = "目标层级")
+    @NotNull(message = "目标层级不能为空")
+    private Integer targetLevel;
+    @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
+    @NotNull(message = "计算方式不能为空")
+    private Integer calcType;
+}

src/main/java/com/imed/costaccount/model/dto/CostShareLevelSaveDto.java

@@ -0,0 +1,30 @@
+package com.imed.costaccount.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.dto
+ * @date 2021-07-27 14:54
+ */
+@Data
+@ApiModel("分摊层级新增实体类")
+public class CostShareLevelSaveDto {
+
+    @ApiModelProperty(name = "shareName",value = "分摊层级数名称")
+    @NotNull(message = "层级名称不能为空")
+    private String shareName;
+    @ApiModelProperty(name = "leverSort",value = "分摊层级序号")
+    @NotNull(message = "层级序号不能为空")
+    private Integer leverSort;
+    @ApiModelProperty(name = "targetLevel",value = "目标层级")
+    @NotNull(message = "目标层级不能为空")
+    private Integer targetLevel;
+    @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
+    @NotNull(message = "计算方式不能为空")
+    private Integer calcType;
+}

src/main/java/com/imed/costaccount/model/vo/CostShareLevelVO.java

@@ -0,0 +1,29 @@
+package com.imed.costaccount.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.model.vo
+ * @date 2021-07-27 14:33
+ */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel
+public class CostShareLevelVO {
+    @ApiModelProperty(name = "id",value = "分摊层级的Id")
+    private Integer id;
+    @ApiModelProperty(name = "shareName",value = "分摊层级数名称")
+    private String shareName;
+    @ApiModelProperty(name = "leverSort",value = "分摊层级序号")
+    private Integer leverSort;
+    @ApiModelProperty(name = "targetLevel",value = "目标层级")
+    private Integer targetLevel;
+    @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
+    private Integer calcType;
+}

src/main/java/com/imed/costaccount/service/CostShareLevelService.java

@@ -0,0 +1,39 @@
+package com.imed.costaccount.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.imed.costaccount.model.CostShareLevel;
+import com.imed.costaccount.model.dto.CostShareLevelEditDto;
+import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
+import com.imed.costaccount.utils.PageUtils;
+
+/**
+ * 分摊层级对照表
+ *
+ * @author KCYG
+ * @email KCYG@xinxicom
+ * @date 2021-07-27 14:19:09
+ */
+public interface CostShareLevelService extends IService<CostShareLevel> {
+    /**
+     * 分页查询相关分摊层级信息
+     * @param page
+     * @param pageSize
+     * @param name
+     * @param hospId
+     * @return
+     */
+    PageUtils queryList(Integer page, Integer pageSize, String name, Integer hospId);
+
+    /**
+     * 保存
+     * @param costShareLevelSaveDto
+     */
+    void addCostShareLevel(CostShareLevelSaveDto costShareLevelSaveDto);
+
+    /**
+     * 修改分摊层级数据
+     * @param costShareLevelEditDto
+     */
+    void updateByCostShareLevel(CostShareLevelEditDto costShareLevelEditDto);
+}
+

src/main/java/com/imed/costaccount/service/HosptailService.java → src/main/java/com/imed/costaccount/service/HospitalService.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @email KCYG@xinxicom
  * @date 2021-07-26 08:52:56
  */
-public interface HosptailService extends IService<Hospital> {
+public interface HospitalService extends IService<Hospital> {
 
     /**
      * 通过医院标识获取院区下拉列表

src/main/java/com/imed/costaccount/service/impl/CostShareLevelServiceImpl.java

@@ -0,0 +1,90 @@
+package com.imed.costaccount.service.impl;
+
+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.imed.costaccount.common.exception.CostException;
+import com.imed.costaccount.mapper.CostShareLevelMapper;
+import com.imed.costaccount.model.CostShareLevel;
+import com.imed.costaccount.model.User;
+import com.imed.costaccount.model.dto.CostShareLevelEditDto;
+import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
+import com.imed.costaccount.model.vo.CostShareLevelVO;
+import com.imed.costaccount.service.CostShareLevelService;
+import com.imed.costaccount.utils.BeanUtil;
+import com.imed.costaccount.utils.PageUtils;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+
+@Service("costShareLevelService")
+public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper, CostShareLevel> implements CostShareLevelService {
+
+
+    /**
+     * 分页查询相关分摊层级信息
+     *
+     * @param page
+     * @param pageSize
+     * @param name
+     * @param hospId
+     * @return
+     */
+    @Override
+    public PageUtils queryList(Integer page, Integer pageSize, String name, Integer hospId) {
+        Page<CostShareLevel> costShareLevelPage = new Page<>(page, pageSize);
+        Page<CostShareLevel> pages = this.page(costShareLevelPage, new QueryWrapper<CostShareLevel>().lambda()
+                .eq(!StringUtils.isEmpty(hospId), CostShareLevel::getHospId, hospId)
+                .like(!StringUtils.isEmpty(name), CostShareLevel::getShareName, name)
+                .orderByDesc(CostShareLevel::getLeverSort));
+        List<CostShareLevel> costShareLevelList = pages.getRecords();
+        List<CostShareLevelVO> costShareLevelVOList = BeanUtil.convertList(costShareLevelList, CostShareLevelVO.class);
+        PageUtils pageUtils = new PageUtils(pages);
+        pageUtils.setList(costShareLevelVOList);
+        return pageUtils;
+    }
+
+    /**
+     * 保存
+     *
+     * @param costShareLevelSaveDto
+     */
+    @Override
+    public void addCostShareLevel(CostShareLevelSaveDto costShareLevelSaveDto) {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        CostShareLevel costShareLevel = BeanUtil.convertObj(costShareLevelSaveDto, CostShareLevel.class);
+        costShareLevel.setCreateTime(System.currentTimeMillis());
+        costShareLevel.setHospId(hospId);
+        baseMapper.insert(costShareLevel);
+    }
+
+    /**
+     * 修改分摊层级数据
+     *
+     * @param costShareLevelEditDto
+     */
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
+    public void updateByCostShareLevel(CostShareLevelEditDto costShareLevelEditDto) {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        Integer id = costShareLevelEditDto.getId();
+        CostShareLevel costShareLevel = baseMapper.selectById(id);
+        if (Objects.isNull(costShareLevel)){
+            throw new CostException("分摊层级数据不存在");
+        }
+        baseMapper.deleteById(id);
+        CostShareLevel costShareLevelRequest = BeanUtil.convertObj(costShareLevelEditDto, CostShareLevel.class);
+        costShareLevelRequest.setId(null);
+        costShareLevelRequest.setCreateTime(System.currentTimeMillis());
+        costShareLevelRequest.setHospId(hospId);
+        baseMapper.insert(costShareLevelRequest);
+    }
+}

src/main/java/com/imed/costaccount/service/impl/HosptailServiceImpl.java → src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -2,7 +2,9 @@ package com.imed.costaccount.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 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.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.mapper.HospitalMapper;
@@ -10,21 +12,20 @@ import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.dto.HosptailDto;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.HosptailVO;
-import com.imed.costaccount.service.HosptailService;
+import com.imed.costaccount.service.HospitalService;
 import com.imed.costaccount.utils.BeanUtil;
 import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 
 @Service("hosptailService")
-public class HosptailServiceImpl extends ServiceImpl<HospitalMapper, Hospital> implements HosptailService {
+public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> implements HospitalService {
 
     /**
      * 分页查询所有的医院信息

src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -19,7 +19,7 @@ import com.imed.costaccount.model.dto.LoginDTO;
 import com.imed.costaccount.model.dto.UserDto;
 import com.imed.costaccount.model.vo.LoginVO;
 import com.imed.costaccount.model.vo.UserVO;
-import com.imed.costaccount.service.HosptailService;
+import com.imed.costaccount.service.HospitalService;
 import com.imed.costaccount.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
@@ -29,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -44,9 +43,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     private JwtUtil jwtUtil;
 
-    private HosptailService hosptailService;
+    private HospitalService hosptailService;
 
-    public UserServiceImpl(JwtUtil jwtUtil, HosptailService hosptailService) {
+    public UserServiceImpl(JwtUtil jwtUtil, HospitalService hosptailService) {
         this.jwtUtil = jwtUtil;
         this.hosptailService = hosptailService;
     }
@@ -184,7 +183,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             log.info("得到用户输入的数据为：{}",data);
             User user = new User();
             user.setHospId(currentUser.getHospId());
-            user.setCreateTime(new Date().getTime());
+            user.setCreateTime(System.currentTimeMillis());
             int size = data.size();
             if (size != 3) {
                 // 补充读取的null问题

src/main/java/com/imed/costaccount/web/CostShareLevelController.java

@@ -0,0 +1,86 @@
+package com.imed.costaccount.web;
+
+import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.model.User;
+import com.imed.costaccount.model.dto.CostShareLevelEditDto;
+import com.imed.costaccount.model.dto.CostShareLevelSaveDto;
+import com.imed.costaccount.service.CostShareLevelService;
+import com.imed.costaccount.utils.PageUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+
+
+/**
+ * 分摊层级对照表
+ *
+ * @author KCYG
+ * @date 2021-07-27 14:19:09
+ */
+@RestController
+@RequestMapping("/costsharelevel")
+@Api(tags = "分摊层级相关操作")
+public class CostShareLevelController {
+    @Autowired
+    private CostShareLevelService costShareLevelService;
+
+    /**
+     * 分页查询列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("分页查询分摊层级数据")
+    public Result list(@RequestParam(defaultValue = "1", value = "page") Integer page,
+                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                       @RequestParam(value = "name", required = false) String name){
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        Integer hospId = user.getHospId();
+        PageUtils pageUtils= costShareLevelService.queryList(page,pageSize,name,hospId);
+        return Result.ok(pageUtils);
+    }
+
+
+//    /**
+//     * 信息
+//     */
+//    @RequestMapping("/info/{id}")
+//    public Result info(@PathVariable("id") Integer id){
+//		CostShareLevel costShareLevel = costShareLevelService.getById(id);
+//        return Result.ok(costShareLevel);
+//    }
+
+    /**
+     * 保存
+     */
+    @PostMapping("/save")
+    @ApiOperation("保存分摊层级数据")
+    public Result save(@RequestBody @Valid CostShareLevelSaveDto costShareLevelSaveDto){
+		costShareLevelService.addCostShareLevel(costShareLevelSaveDto);
+        return Result.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping("/update")
+    @ApiOperation("修改分摊层级数据")
+    public Result update(@RequestBody CostShareLevelEditDto costShareLevelEditDto){
+		costShareLevelService.updateByCostShareLevel(costShareLevelEditDto);
+        return Result.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/delete")
+    @ApiOperation("删除分摊层级数据")
+    public Result delete(@RequestBody Integer[] ids){
+		costShareLevelService.removeByIds(Arrays.asList(ids));
+        return Result.ok();
+    }
+
+}

src/main/java/com/imed/costaccount/web/HospitalController.java

@@ -1,19 +1,19 @@
 package com.imed.costaccount.web;
 
-import java.util.Arrays;
-
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.HosptailDto;
-import com.imed.costaccount.service.HosptailService;
+import com.imed.costaccount.service.HospitalService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
+
 
 /**
  * 医院表
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "医院相关操作")
 public class HospitalController {
     @Autowired
-    private HosptailService hosptailService;
+    private HospitalService hospitalService;
 
 //    /**
 //     * 列表
@@ -48,7 +48,7 @@ public class HospitalController {
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         Integer hospId = user.getHospId();
-        PageUtils pageUtils = hosptailService.queryList(page,pageSize,hospId,name);
+        PageUtils pageUtils = hospitalService.queryList(page,pageSize,hospId,name);
         return Result.ok(pageUtils);
     }
 
@@ -58,7 +58,7 @@ public class HospitalController {
     @GetMapping("/getById")
     @ApiOperation("根据Id查询医院信息")
     public Result info(Integer id){
-		Hospital hospital = hosptailService.getById(id);
+		Hospital hospital = hospitalService.getById(id);
         return Result.ok(hospital);
     }
 
@@ -68,7 +68,7 @@ public class HospitalController {
     @PostMapping("/save")
     @ApiOperation("保存医院信息")
     public Result save(@RequestBody HosptailDto hosptailDto){
-		hosptailService.saveHosptail(hosptailDto);
+        hospitalService.saveHosptail(hosptailDto);
         return Result.ok();
     }
 
@@ -80,7 +80,7 @@ public class HospitalController {
     @ApiOperation("修改医院信息")
     public Result update(@RequestBody HosptailDto hosptailDto){
         // 作废操作
-        hosptailService.updateByHosptail(hosptailDto);
+        hospitalService.updateByHosptail(hosptailDto);
         return Result.ok();
     }
 
@@ -90,7 +90,7 @@ public class HospitalController {
     @DeleteMapping("/delete")
     @ApiOperation("删除医院信息")
     public Result delete(@RequestBody Integer[] ids){
-		hosptailService.removeByIds(Arrays.asList(ids));
+        hospitalService.removeByIds(Arrays.asList(ids));
         return Result.ok();
     }
 

src/main/java/com/imed/costaccount/web/LoginController.java

@@ -4,15 +4,13 @@ import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.dto.LoginDTO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.LoginVO;
-import com.imed.costaccount.service.HosptailService;
+import com.imed.costaccount.service.HospitalService;
 import com.imed.costaccount.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.sql.ResultSet;
 import java.util.List;
 
 @Api(tags = "登录相关模块")
@@ -21,11 +19,11 @@ import java.util.List;
 public class LoginController {
 
     private UserService userService;
-    private HosptailService hosptailService;
+    private HospitalService hospitalService;
 
-    public LoginController(UserService userService, HosptailService hosptailService) {
+    public LoginController(UserService userService, HospitalService hospitalService) {
         this.userService = userService;
-        this.hosptailService = hosptailService;
+        this.hospitalService = hospitalService;
     }
 
 
@@ -49,7 +47,7 @@ public class LoginController {
     @ApiOperation("获取院区")
     @GetMapping("/getHospArea")
     public Result getHospArea(@RequestParam String sign) {
-        List<CommonVO> commonVOs = hosptailService.getHospArea(sign);
+        List<CommonVO> commonVOs = hospitalService.getHospArea(sign);
         return Result.ok(commonVOs);
     }
 }

src/main/resources/mapper/CostShareLevelMapper.xml

@@ -0,0 +1,19 @@
+<?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.imed.costaccount.mapper.CostShareLevelMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.imed.costaccount.model.CostShareLevel" id="costShareLevelMap">
+        <result property="id" column="id"/>
+        <result property="shareName" column="share_name"/>
+        <result property="leverSort" column="lever_sort"/>
+        <result property="hospId" column="hosp_id"/>
+        <result property="targetLevel" column="target_level"/>
+        <result property="calcType" column="calc_type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deleteTime" column="delete_time"/>
+    </resultMap>
+
+
+</mapper>