diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 385439e21..43474c092 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -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", diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java index be77a6054..284260af9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtPrepaymentDaoController.java @@ -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 list = iFtPrepaymentDaoService.listNoPrepay(); + startPage(); + List 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 list = iFtPrepaymentDaoService.listPrepay(); + List 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 list = iFtPrepaymentDaoService.listAllPrepay(); + List 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 lqw = Wrappers.lambdaQuery(ftPrepaymentDao); + LambdaQueryWrapper 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 list = iFtPrepaymentDaoService.list(lqw); + List 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 lqw = new LambdaQueryWrapper(ftPrepaymentDao); - List list = iFtPrepaymentDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtPrepaymentVo.class); + public AjaxResult export(FtPrepaymentDao ftPrepaymentDao) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftPrepaymentDao); + List list = iFtPrepaymentDaoService.list(lqw); + ExcelUtil util = new ExcelUtil(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); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java similarity index 78% rename from ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java rename to ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java index e342b0891..ebf5bcd45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPrepaymentVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentDao.java @@ -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 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java index bb797971b..a3f2f6b21 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPrepaymentVo.java @@ -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; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java index 17b898219..cf945275c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPrepaymentDaoMapper.java @@ -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 { +public interface FtPrepaymentDaoMapper extends BaseMapper { @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 listNoPrepay(); + List 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 listPrepay(); + List 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 listAllPrepay(); + List listAllPrepay(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java index 161a0fb65..04f7d3e6e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPrepaymentDaoService.java @@ -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 { +public interface IFtPrepaymentDaoService extends IService { - List listNoPrepay(); + List listNoPrepay(); - List listPrepay(); + List listPrepay(); - List listAllPrepay(); + List listAllPrepay(); FtPrepaymentVo getCountById(Long patiendId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java index 732a74d44..e0ca476cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPrepaymentDaoServiceImpl.java @@ -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 implements IFtPrepaymentDaoService { +public class FtPrepaymentDaoServiceImpl extends ServiceImpl implements IFtPrepaymentDaoService { @Override - public List listNoPrepay() { + public List listNoPrepay() { return this.baseMapper.listNoPrepay(); } @Override - public List listPrepay() { + public List listPrepay() { return this.baseMapper.listPrepay(); } @Override - public List listAllPrepay() { + public List listAllPrepay() { return this.baseMapper.listAllPrepay(); } @Override public FtPrepaymentVo getCountById(Long patiendId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("patient_Id",patiendId); - return this.baseMapper.selectOne(queryWrapper); + FtPrepaymentDao prepaymentDao = this.baseMapper.selectOne(queryWrapper); + return (FtPrepaymentVo)prepaymentDao; } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml index 58dce5a7d..4a52fa859 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPrepaymentDaoMapper.xml @@ -15,6 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + diff --git a/ruoyi-ui/src/views/fantang/prepayment/index.vue b/ruoyi-ui/src/views/fantang/prepayment/index.vue index 04a70e8df..e5c564ced 100644 --- a/ruoyi-ui/src/views/fantang/prepayment/index.vue +++ b/ruoyi-ui/src/views/fantang/prepayment/index.vue @@ -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;