abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

预付费问题修复

Browse Source
This commit is contained in:
czx 2020-12-09 11:37:27 +08:00
parent 206fecd2b0
commit 48497f5d4b
9 changed files with 59 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
View File

@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// 过滤请求
.authorizeRequests()
// 对于登录login 验证码captchaImage 允许匿名访问
.antMatchers("/login", "/captchaImage").anonymous()
.antMatchers("/login", "/captchaImage","/client_api/**").anonymous()
.antMatchers(
HttpMethod.GET,
"/*.html",

38
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java
View File

@ -9,8 +9,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -62,7 +63,8 @@ public class FtPrepaymentDaoController extends BaseController {
@PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
@GetMapping("/listNoPrepay")
public TableDataInfo listNoPrepay() {
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> list = iFtPrepaymentDaoService.listNoPrepay();
startPage();
List<FtPrepaymentVo> list = iFtPrepaymentDaoService.listNoPrepay();
return getDataTable(list);
}
@ -70,7 +72,7 @@ public class FtPrepaymentDaoController extends BaseController {
@PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
@GetMapping("/listPrepay")
public TableDataInfo listPrepay() {
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> list = iFtPrepaymentDaoService.listPrepay();
List<FtPrepaymentVo> list = iFtPrepaymentDaoService.listPrepay();
return getDataTable(list);
}
@ -78,7 +80,7 @@ public class FtPrepaymentDaoController extends BaseController {
@PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
@GetMapping("/listAllPrepay")
public TableDataInfo listAllPrepay() {
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> list = iFtPrepaymentDaoService.listAllPrepay();
List<FtPrepaymentVo> list = iFtPrepaymentDaoService.listAllPrepay();
return getDataTable(list);
}
@ -88,28 +90,28 @@ public class FtPrepaymentDaoController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('fantang:prepayment:list')")
@GetMapping("/list")
public TableDataInfo list(FtPrepaymentVo ftPrepaymentDao) {
public TableDataInfo list(FtPrepaymentDao ftPrepaymentDao) {
startPage();
LambdaQueryWrapper<FtPrepaymentVo> lqw = Wrappers.lambdaQuery(ftPrepaymentDao);
LambdaQueryWrapper<FtPrepaymentDao> lqw = Wrappers.lambdaQuery(ftPrepaymentDao);
if (ftPrepaymentDao.getCollectAt() != null) {
lqw.eq(FtPrepaymentVo::getCollectAt, ftPrepaymentDao.getCollectAt());
lqw.eq(FtPrepaymentDao::getCollectAt, ftPrepaymentDao.getCollectAt());
}
if (ftPrepaymentDao.getSettlementAt() != null) {
lqw.eq(FtPrepaymentVo::getSettlementAt, ftPrepaymentDao.getSettlementAt());
lqw.eq(FtPrepaymentDao::getSettlementAt, ftPrepaymentDao.getSettlementAt());
}
if (ftPrepaymentDao.getSettlementFlag() != null) {
lqw.eq(FtPrepaymentVo::getSettlementFlag, ftPrepaymentDao.getSettlementFlag());
lqw.eq(FtPrepaymentDao::getSettlementFlag, ftPrepaymentDao.getSettlementFlag());
}
if (ftPrepaymentDao.getPrepaid() != null) {
lqw.eq(FtPrepaymentVo::getPrepaid, ftPrepaymentDao.getPrepaid());
lqw.eq(FtPrepaymentDao::getPrepaid, ftPrepaymentDao.getPrepaid());
}
if (ftPrepaymentDao.getPrepaidAt() != null) {
lqw.eq(FtPrepaymentVo::getPrepaidAt, ftPrepaymentDao.getPrepaidAt());
lqw.eq(FtPrepaymentDao::getPrepaidAt, ftPrepaymentDao.getPrepaidAt());
}
if (ftPrepaymentDao.getPrepaidAt() != null) {
lqw.eq(FtPrepaymentVo::getPrepaidAt, ftPrepaymentDao.getPrepaidAt());
lqw.eq(FtPrepaymentDao::getPrepaidAt, ftPrepaymentDao.getPrepaidAt());
}
List<FtPrepaymentVo> list = iFtPrepaymentDaoService.list(lqw);
List<FtPrepaymentDao> list = iFtPrepaymentDaoService.list(lqw);
return getDataTable(list);
}
@ -119,10 +121,10 @@ public class FtPrepaymentDaoController extends BaseController {
@PreAuthorize("@ss.hasPermi('fantang:prepayment:export')")
@Log(title = "收费管理", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(FtPrepaymentVo ftPrepaymentDao) {
LambdaQueryWrapper<FtPrepaymentVo> lqw = new LambdaQueryWrapper<FtPrepaymentVo>(ftPrepaymentDao);
List<FtPrepaymentVo> list = iFtPrepaymentDaoService.list(lqw);
ExcelUtil<FtPrepaymentVo> util = new ExcelUtil<FtPrepaymentVo>(FtPrepaymentVo.class);
public AjaxResult export(FtPrepaymentDao ftPrepaymentDao) {
LambdaQueryWrapper<FtPrepaymentDao> lqw = new LambdaQueryWrapper<FtPrepaymentDao>(ftPrepaymentDao);
List<FtPrepaymentDao> list = iFtPrepaymentDaoService.list(lqw);
ExcelUtil<FtPrepaymentDao> util = new ExcelUtil<FtPrepaymentDao>(FtPrepaymentDao.class);
return util.exportExcel(list, "prepayment");
}
@ -148,7 +150,7 @@ public class FtPrepaymentDaoController extends BaseController {
wrapper.eq("patient_id", patientId);
ftPrepaymentDao.setCollectAt(new Date());
ftPrepaymentDao.setSettlementFlag(0);
ftPrepaymentDao.setSettlementFlag(0L);
return toAjax(iFtPrepaymentDaoService.save(ftPrepaymentDao) ? 1 : 0);
}

19
ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java → ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.fantang.vo;
package com.ruoyi.system.fantang.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@ -26,25 +26,10 @@ import java.util.Date;
@NoArgsConstructor
@Accessors(chain = true)
@TableName("ft_prepayment")
public class FtPrepaymentVo implements Serializable {
public class FtPrepaymentDao implements Serializable {
private static final long serialVersionUID = 1L;
/**
* select a.patient_id , a.name, a.hospital_id, b.depart_name, b.depart_code from ft_patient a
* LEFT JOIN ft_depart b on a.depart_id = b.depart_id
* where a.patient_id not in (select patient_id from ft_prepayment )
*/
private String name;
private String bedId;
private String departName;
private String hospitalId;
private String departCode;
/**
* 预付费id
*/

66
ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java
View File

@ -25,68 +25,20 @@ import java.util.Date;
@EqualsAndHashCode
@NoArgsConstructor
@Accessors(chain = true)
@TableName("ft_prepayment")
public class FtPrepaymentVo implements Serializable {
private static final long serialVersionUID = 1L;
public class FtPrepaymentVo extends FtPrepaymentDao {
/**
* 预付费id
* select a.patient_id , a.name, a.hospital_id, b.depart_name, b.depart_code from ft_patient a
* LEFT JOIN ft_depart b on a.depart_id = b.depart_id
* where a.patient_id not in (select patient_id from ft_prepayment )
*/
@TableId(value = "prepayment_id")
private Long prepaymentId;
private String name;
/**
* 病人id
*/
private Long patientId;
private String bedId;
/**
* 收款时间
*/
@Excel(name = "收款时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date collectAt;
private String departName;
/**
* 收款员
*/
private String collectBy;
private String hospitalId;
/**
* 结算时间
*/
@Excel(name = "结算时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date settlementAt;
/**
* 结算员
*/
private Long settlementBy;
/**
* 结算报表id
*/
private Long settlementId;
/**
* 结算标志
*/
@Excel(name = "结算标志")
private Integer settlementFlag;
/**
* 预付费金额
*/
@Excel(name = "预付费金额")
private BigDecimal prepaid;
/**
* 预付费时间
*/
@Excel(name = "预付费时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date prepaidAt;
private String departCode;
}

9
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.system.fantang.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import org.apache.ibatis.annotations.Select;
@ -12,14 +13,14 @@ import java.util.List;
* @author ft
* @date 2020-11-19
*/
public interface FtPrepaymentDaoMapper extends BaseMapper<FtPrepaymentVo> {
public interface FtPrepaymentDaoMapper extends BaseMapper<FtPrepaymentDao> {
@Select("select a.patient_id , a.name, a.hospital_id, a.bed_id, b.depart_name, b.depart_code from ft_patient a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where a.patient_id not in (select patient_id from ft_prepayment )")
public List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listNoPrepay();
List<FtPrepaymentVo> listNoPrepay();
@Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 0")
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listPrepay();
List<FtPrepaymentVo> listPrepay();
@Select("SELECT a.*,b.hospital_id, b.name, b.bed_id, c.depart_name from ft_prepayment a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id = c.depart_id where a.settlement_flag = 1")
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listAllPrepay();
List<FtPrepaymentVo> listAllPrepay();
}

9
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.system.fantang.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import java.util.List;
@ -11,13 +12,13 @@ import java.util.List;
* @author ft
* @date 2020-11-19
*/
public interface IFtPrepaymentDaoService extends IService<FtPrepaymentVo> {
public interface IFtPrepaymentDaoService extends IService<FtPrepaymentDao> {
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listNoPrepay();
List<FtPrepaymentVo> listNoPrepay();
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listPrepay();
List<FtPrepaymentVo> listPrepay();
List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listAllPrepay();
List<FtPrepaymentVo> listAllPrepay();
FtPrepaymentVo getCountById(Long patiendId);
}

16
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java
View File

@ -2,9 +2,10 @@ package com.ruoyi.system.fantang.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import com.ruoyi.system.fantang.domain.FtPrepaymentDao;
import com.ruoyi.system.fantang.mapper.FtPrepaymentDaoMapper;
import com.ruoyi.system.fantang.service.IFtPrepaymentDaoService;
import com.ruoyi.system.fantang.domain.FtPrepaymentVo;
import org.springframework.stereotype.Service;
import java.util.List;
@ -16,28 +17,29 @@ import java.util.List;
* @date 2020-11-19
*/
@Service
public class FtPrepaymentDaoServiceImpl extends ServiceImpl<FtPrepaymentDaoMapper, FtPrepaymentVo> implements IFtPrepaymentDaoService {
public class FtPrepaymentDaoServiceImpl extends ServiceImpl<FtPrepaymentDaoMapper, FtPrepaymentDao> implements IFtPrepaymentDaoService {
@Override
public List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listNoPrepay() {
public List<FtPrepaymentVo> listNoPrepay() {
return this.baseMapper.listNoPrepay();
}
@Override
public List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listPrepay() {
public List<FtPrepaymentVo> listPrepay() {
return this.baseMapper.listPrepay();
}
@Override
public List<com.ruoyi.system.fantang.vo.FtPrepaymentVo> listAllPrepay() {
public List<FtPrepaymentVo> listAllPrepay() {
return this.baseMapper.listAllPrepay();
}
@Override
public FtPrepaymentVo getCountById(Long patiendId) {
QueryWrapper<FtPrepaymentVo> queryWrapper = new QueryWrapper<>();
QueryWrapper<FtPrepaymentDao> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("patient_Id",patiendId);
return this.baseMapper.selectOne(queryWrapper);
FtPrepaymentDao prepaymentDao = this.baseMapper.selectOne(queryWrapper);
return (FtPrepaymentVo)prepaymentDao;
}
}

5
ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml
View File

@ -15,6 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="settlementFlag" column="settlement_flag" />
<result property="prepaid" column="prepaid" />
<result property="prepaidAt" column="prepaid_at" />
<result property="name" column="name" />
<result property="bedId" column="bed_Id" />
<result property="departName" column="depart_name" />
<result property="hospitalId" column="hospital_id" />
<result property="departCode" column="depart_code" />
</resultMap>

18
ruoyi-ui/src/views/fantang/prepayment/index.vue
View File

@ -131,7 +131,7 @@
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
@pagination="getDefaultNoPrepayment"
/>
<!-- 添加或修改收费管理对话框 -->
@ -328,9 +328,8 @@
// 填充所有待缴预付伙食费的病人清单
getDefaultNoPrepayment() {
this.loading = true;
listNoPrepayment().then(response => {
listNoPrepayment(this.queryParams).then(response => {
this.NoPrepayments = response.rows;
this.prepaymentList = response.rows;
this.suggestionList = this.NoPrepayments.map(item => {
return {
"value": item.hospitalId,
@ -341,7 +340,6 @@
}
});
this.loading = false;
console.log("this.prepaymentList",this.prepaymentList);
return response.rows;
});
},
@ -359,17 +357,7 @@
handleIconClick(ev) {
console.log(ev);
},
/** 查询收费管理列表 */
getList() {
this.loading = true;
console.log("111------------------",this.queryParams)
listPrepayment(this.queryParams).then(response => {
this.prepaymentList = response.rows;
this.total = response.total;
// this.loadAll();
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;