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

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
czx 2020-12-08 18:14:39 +08:00
commit 32f30e6e57
11 changed files with 252 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-prop.yml
View File

@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://120.77.157.122:3306/fantang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
url: jdbc:mysql:///fantang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
username: fantang
password: HdfzaPE8YbdWdjCw
# 从库数据源

107
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtInvoiceDaoController.java Normal file
View File

@ -0,0 +1,107 @@
package com.ruoyi.system.fantang.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import java.util.List;
import java.util.Arrays;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.fantang.domain.FtInvoiceDao;
import com.ruoyi.system.fantang.service.IFtInvoiceDaoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 财务收费开票Controller
*
* @author ft
* @date 2020-12-08
*/
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/fantang/invoice" )
public class FtInvoiceDaoController extends BaseController {
private final IFtInvoiceDaoService iFtInvoiceDaoService;
/**
* 查询财务收费开票列表
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:list')")
@GetMapping("/list")
public TableDataInfo list(FtInvoiceDao ftInvoiceDao)
{
startPage();
LambdaQueryWrapper<FtInvoiceDao> lqw = Wrappers.lambdaQuery(ftInvoiceDao);
List<FtInvoiceDao> list = iFtInvoiceDaoService.list(lqw);
return getDataTable(list);
}
/**
* 导出财务收费开票列表
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:export')" )
@Log(title = "财务收费开票" , businessType = BusinessType.EXPORT)
@GetMapping("/export" )
public AjaxResult export(FtInvoiceDao ftInvoiceDao) {
LambdaQueryWrapper<FtInvoiceDao> lqw = new LambdaQueryWrapper<FtInvoiceDao>(ftInvoiceDao);
List<FtInvoiceDao> list = iFtInvoiceDaoService.list(lqw);
ExcelUtil<FtInvoiceDao> util = new ExcelUtil<FtInvoiceDao>(FtInvoiceDao. class);
return util.exportExcel(list, "invoice" );
}
/**
* 获取财务收费开票详细信息
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:query')" )
@GetMapping(value = "/{id}" )
public AjaxResult getInfo(@PathVariable("id" ) Long id) {
return AjaxResult.success(iFtInvoiceDaoService.getById(id));
}
/**
* 新增财务收费开票
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:add')" )
@Log(title = "财务收费开票" , businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody FtInvoiceDao ftInvoiceDao) {
return toAjax(iFtInvoiceDaoService.save(ftInvoiceDao) ? 1 : 0);
}
/**
* 修改财务收费开票
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:edit')" )
@Log(title = "财务收费开票" , businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody FtInvoiceDao ftInvoiceDao) {
return toAjax(iFtInvoiceDaoService.updateById(ftInvoiceDao) ? 1 : 0);
}
/**
* 删除财务收费开票
*/
@PreAuthorize("@ss.hasPermi('fantang:invoice:remove')" )
@Log(title = "财务收费开票" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}" )
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(iFtInvoiceDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
}
}

62
ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtInvoiceDao.java Normal file
View File

@ -0,0 +1,62 @@
package com.ruoyi.system.fantang.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.Accessors;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 财务收费开票对象 ft_invoice
*
* @author ft
* @date 2020-12-08
*/
@Data
@ToString
@EqualsAndHashCode
@NoArgsConstructor
@Accessors(chain = true)
@TableName("ft_invoice")
public class FtInvoiceDao implements Serializable {
private static final long serialVersionUID=1L;
/** id */
@TableId(value = "id")
private Long id;
/** 发票单位 */
private String invoiceUnit;
/** 发票 id */
private Long invoiceId;
/** 日期 */
private Date createAt;
/** 开票人 */
private String drawer;
/** 收款方式 */
private Integer collectionType;
/** 应收 */
private BigDecimal payable;
/** 实收 */
private BigDecimal receipts;
/** 凭证列表 */
private String voucherList;
}

14
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtInvoiceDaoMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.ruoyi.system.fantang.mapper;
import com.ruoyi.system.fantang.domain.FtInvoiceDao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 财务收费开票Mapper接口
*
* @author ft
* @date 2020-12-08
*/
public interface FtInvoiceDaoMapper extends BaseMapper<FtInvoiceDao> {
}

14
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtInvoiceDaoService.java Normal file
View File

@ -0,0 +1,14 @@
package com.ruoyi.system.fantang.service;
import com.ruoyi.system.fantang.domain.FtInvoiceDao;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 财务收费开票Service接口
*
* @author ft
* @date 2020-12-08
*/
public interface IFtInvoiceDaoService extends IService<FtInvoiceDao> {
}

18
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtInvoiceDaoServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package com.ruoyi.system.fantang.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.fantang.mapper.FtInvoiceDaoMapper;
import com.ruoyi.system.fantang.domain.FtInvoiceDao;
import com.ruoyi.system.fantang.service.IFtInvoiceDaoService;
/**
* 财务收费开票Service业务层处理
*
* @author ft
* @date 2020-12-08
*/
@Service
public class FtInvoiceDaoServiceImpl extends ServiceImpl<FtInvoiceDaoMapper, FtInvoiceDao> implements IFtInvoiceDaoService {
}

20
ruoyi-system/src/main/resources/mapper/fantang/FtInvoiceDaoMapper.xml Normal file
View File

@ -0,0 +1,20 @@
<?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.ruoyi.system.fantang.mapper.FtInvoiceDaoMapper">
<resultMap type="FtInvoiceDao" id="FtInvoiceDaoResult">
<result property="id" column="id" />
<result property="invoiceUnit" column="invoice_unit" />
<result property="invoiceId" column="invoice_id" />
<result property="createAt" column="create_at" />
<result property="drawer" column="drawer" />
<result property="collectionType" column="collection_type" />
<result property="payable" column="payable" />
<result property="receipts" column="receipts" />
<result property="voucherList" column="voucher_list" />
</resultMap>
</mapper>

1
ruoyi-ui/src/views/fantang/patient/index.vue
View File

@ -209,6 +209,7 @@ export default {
/** 查询病人管理列表 */
getList() {
this.loading = true;
console.log("111------------------",this.queryParams)
listPatient(this.queryParams).then(response => {
this.patientList = response.rows;
this.total = response.total;

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

@ -29,7 +29,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="预付费时间" prop="prepaidAt">
<el-form-item label="预付费时间" prop="prepaidAt" label-width="50">
<el-date-picker clearable size="small" style="width: 200px"
v-model="queryParams.prepaidAt"
type="date"
@ -362,10 +362,11 @@
/** 查询收费管理列表 */
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.loadAll();
this.loading = false;
});
},
@ -385,7 +386,7 @@
settlementBy: null,
settlementId: null,
settlementFlag: null,
prepaid: 500,
prepaid: 700,
prepaidAt: new Date(),
hospitalId: null,
name: null,

9
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -194,15 +194,15 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="应收" prop="name">
<el-form-item label="应收" prop="price">
<el-input v-model="formAddNewSettlement.price" readonly/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="已收预付伙食费" prop="name" v-if="flagAddPrepaymentShow">
<el-form-item label="已收预付伙食费" prop="prepayment" v-if="flagAddPrepaymentShow">
<el-input v-model="formAddNewSettlement.prepayment" readonly/>
</el-form-item>
<el-form-item label="结算日期" prop="field106">
<el-form-item label="结算日期" prop="selectBillingDate">
<el-date-picker
v-model="formAddNewSettlement.selectBillingDate"
align="right"
@ -212,7 +212,7 @@
:picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
<el-form-item label="实收" prop="receipts">
<el-form-item label="实收" prop="netPeceipt">
<el-input v-model="formAddNewSettlement.netPeceipt" placeholder="请输入实收"/>
</el-form-item>
</el-form>
@ -492,6 +492,7 @@ export default {
this.settleList = response.rows;
this.total = response.total;
this.loading = false;
console.log("list-------")
});
},

7
ruoyi-ui/src/views/fantang/staffInfo/index.vue
View File

@ -91,7 +91,7 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="员工 id" align="center" prop="staffId" v-if="false"/>
<el-table-column label="姓名" align="center" prop="name"/>
<el-table-column label="性别" align="center" prop="sex"/>
<el-table-column label="性别" align="center" prop="sex" :formatter="formatSex"/>
<el-table-column label="手机号码" align="center" prop="tel"/>
<el-table-column label="岗位" align="center" prop="post"/>
<el-table-column label="补贴余额" align="center" prop="balance"/>
@ -295,6 +295,11 @@ export default {
return '禁用';
},
//回显员工性别
formatSex(row) {
return this.selectDictLabel(this.sexOptions, row.sex);
},
/** 查询员工管理列表 */
getList() {
this.loading = true;