DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
刘宗坤
2024-11-02 17:51:07 +08:00
parent 00e2056fa1 090728452f
commit c449f51d05
17 changed files with 1088 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-framework/src/main/java/com/ruoyi/framework/webSocket/WebSocketServer.java
View File

@@ -69,12 +69,9 @@ public class WebSocketServer {
*/
@OnMessage
public void onMessage(String message) throws IOException {
System.out.println("-------------------------------------------------------------------");
JSONObject jsonObject = JSONObject.parseObject(message);
String userId = jsonObject.getString("userId");
String type = jsonObject.getString("type");
System.out.println(type);
System.out.println(message);
if (type.equals(MessageType.CHAT.getType())) {
log.debug("聊天消息推送");
sendToUser(userId, JSONObject.toJSONString(jsonObject));

102
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaReceiveAccountController.java Normal file
View File

@@ -0,0 +1,102 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import com.ruoyi.oa.domain.bo.SysOaReceiveAccountBo;
import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
import com.ruoyi.oa.service.ISysOaReceiveAccountService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 付款账户管理
*
* @author hdka
* @date 2024-11-02
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oaReceiveAccount")
public class SysOaReceiveAccountController extends BaseController {
private final ISysOaReceiveAccountService iSysOaReceiveAccountService;
/**
* 查询付款账户管理列表
*/
@GetMapping("/list")
public R<List<SysOaReceiveAccountVo>> list(SysOaReceiveAccountBo bo) {
return R.ok(iSysOaReceiveAccountService.queryPageList(bo));
}
/**
* 导出付款账户管理列表
*/
@Log(title = "付款账户管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaReceiveAccountBo bo, HttpServletResponse response) {
List<SysOaReceiveAccountVo> list = iSysOaReceiveAccountService.queryList(bo);
ExcelUtil.exportExcel(list, "付款账户管理", SysOaReceiveAccountVo.class, response);
}
/**
* 获取付款账户管理详细信息
*
* @param receiveAccountId 主键
*/
@GetMapping("/{receiveAccountId}")
public R<SysOaReceiveAccountVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long receiveAccountId) {
return R.ok(iSysOaReceiveAccountService.queryById(receiveAccountId));
}
/**
* 新增付款账户管理
*/
@Log(title = "付款账户管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<SysOaReceiveAccountVo> add(@Validated(AddGroup.class) @RequestBody SysOaReceiveAccountBo bo) {
return R.ok(iSysOaReceiveAccountService.insertByBo(bo));
}
/**
* 修改付款账户管理
*/
@Log(title = "付款账户管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaReceiveAccountBo bo) {
return toAjax(iSysOaReceiveAccountService.updateByBo(bo));
}
/**
* 删除付款账户管理
*
* @param receiveAccountIds 主键串
*/
@Log(title = "付款账户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{receiveAccountIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] receiveAccountIds) {
return toAjax(iSysOaReceiveAccountService.deleteWithValidByIds(Arrays.asList(receiveAccountIds), true));
}
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java
View File

@@ -91,6 +91,11 @@ public class SysOaFinance extends BaseEntity {
*/
private SysOaProject project;
/**
* 收款账户id
*/
private Long receiveAccountId;
/**
* 一对多关联进出账明细
*/

50
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaReceiveAccount.java Normal file
View File

@@ -0,0 +1,50 @@
package com.ruoyi.oa.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.List;
/**
* 付款账户管理对象 sys_oa_receive_account
*
* @author hdka
* @date 2024-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_receive_account")
public class SysOaReceiveAccount extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "receive_account_id")
private Long receiveAccountId;
/**
* 收款账户名
*/
private String receiveAccountName;
/**
* 备注
*/
private String remark;
/**
* 父节点
*/
@ExcelProperty(value = "父节点")
private Long parentId;
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java
View File

@@ -104,6 +104,11 @@ public class SysOaFinanceBo extends BaseEntity {
*/
private SysOaProject project;
/**
* 收款账户id
*/
private Long receiveAccountId;
/**
* 进出账明细
*/

49
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaReceiveAccountBo.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 付款账户管理业务对象 sys_oa_receive_account
*
* @author hdka
* @date 2024-11-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaReceiveAccountBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long receiveAccountId;
/**
* 收款账户名
*/
@NotBlank(message = "收款账户名不能为空", groups = { AddGroup.class, EditGroup.class })
private String receiveAccountName;
/**
* 备注
*/
private String remark;
/**
* 父节点
*/
@ExcelProperty(value = "父节点")
private Long parentId;
}

10
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
View File

@@ -117,6 +117,16 @@ public class SysOaFinanceVo {
*/
private SysOaProject project;
/**
* 收款账户id
*/
private Long receiveAccountId;
/**
* 收款账户id
*/
private String receiveAccountName;
/**
* 一对多关联进出账明细
*/

58
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaReceiveAccountVo.java Normal file
View File

@@ -0,0 +1,58 @@
package com.ruoyi.oa.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.util.List;
/**
* 付款账户管理视图对象 sys_oa_receive_account
*
* @author hdka
* @date 2024-11-02
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaReceiveAccountVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long receiveAccountId;
/**
* 收款账户名
*/
@ExcelProperty(value = "收款账户名")
private String receiveAccountName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 父节点
*/
@ExcelProperty(value = "父节点")
private Long parentId;
/**
* 子节点
*/
@ExcelProperty(value = "子节点")
private List<SysOaReceiveAccountVo> children;
/**
* 前端树节点需要这个
*/
private String label;
}

16
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaReceiveAccountMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import com.ruoyi.oa.domain.SysOaReceiveAccount;
import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
/**
* 付款账户管理Mapper接口
*
* @author hdka
* @date 2024-11-02
*/
public interface SysOaReceiveAccountMapper extends BaseMapperPlus<SysOaReceiveAccountMapper, SysOaReceiveAccount, SysOaReceiveAccountVo> {
}

47
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaReceiveAccountService.java Normal file
View File

@@ -0,0 +1,47 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.bo.SysOaReceiveAccountBo;
import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
import java.util.Collection;
import java.util.List;
/**
* 付款账户管理Service接口
*
* @author hdka
* @date 2024-11-02
*/
public interface ISysOaReceiveAccountService {
/**
* 查询付款账户管理
*/
SysOaReceiveAccountVo queryById(Long receiveAccountId);
/**
* 查询付款账户管理列表
*/
List<SysOaReceiveAccountVo> queryPageList(SysOaReceiveAccountBo bo);
/**
* 查询付款账户管理列表
*/
List<SysOaReceiveAccountVo> queryList(SysOaReceiveAccountBo bo);
/**
* 新增付款账户管理
*/
SysOaReceiveAccountVo insertByBo(SysOaReceiveAccountBo bo);
/**
* 修改付款账户管理
*/
Boolean updateByBo(SysOaReceiveAccountBo bo);
/**
* 校验并批量删除付款账户管理信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

6
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java
View File

@@ -25,10 +25,7 @@ import com.ruoyi.oa.mapper.SysOaFinanceMapper;
import com.ruoyi.oa.service.ISysOaFinanceService;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
@@ -187,6 +184,7 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
lqw.like(StringUtils.isNotBlank(bo.getFinanceTitle()), "a.finance_title", bo.getFinanceTitle());
lqw.like(StringUtils.isNotBlank(bo.getFinanceParties()), "a.finance_parties", bo.getFinanceParties());
lqw.eq(StringUtils.isNotBlank(bo.getFinanceType()), "a.finance_type", bo.getFinanceType());
lqw.eq(Objects.nonNull(bo.getReceiveAccountId()) && bo.getReceiveAccountId()!=-1L, "a.receive_account_id", bo.getReceiveAccountId());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
"a.create_time", params.get("beginCreateTime"), params.get("endCreateTime"));
lqw.orderByDesc("create_time");

119
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaReceiveAccountServiceImpl.java Normal file
View File

@@ -0,0 +1,119 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.oa.domain.SysOaReceiveAccount;
import com.ruoyi.oa.domain.bo.SysOaReceiveAccountBo;
import com.ruoyi.oa.domain.vo.SysOaReceiveAccountVo;
import com.ruoyi.oa.mapper.SysOaReceiveAccountMapper;
import com.ruoyi.oa.service.ISysOaReceiveAccountService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 付款账户管理Service业务层处理
*
* @author hdka
* @date 2024-11-02
*/
@RequiredArgsConstructor
@Service
public class SysOaReceiveAccountServiceImpl implements ISysOaReceiveAccountService {
private final SysOaReceiveAccountMapper baseMapper;
/**
* 查询付款账户管理
*/
@Override
public SysOaReceiveAccountVo queryById(Long receiveAccountId){
return baseMapper.selectVoById(receiveAccountId);
}
/**
* 查询付款账户管理列表
*/
@Override
public List<SysOaReceiveAccountVo> queryPageList(SysOaReceiveAccountBo bo) {
LambdaQueryWrapper<SysOaReceiveAccount> sysOaReceiveAccountLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysOaReceiveAccountLambdaQueryWrapper.eq(SysOaReceiveAccount::getReceiveAccountId,-1L);
SysOaReceiveAccountVo sysOaReceiveAccountVo = baseMapper.selectVoOne(sysOaReceiveAccountLambdaQueryWrapper);
LambdaQueryWrapper<SysOaReceiveAccount> sysOaReceiveAccountLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
List<SysOaReceiveAccountVo> sysOaReceiveAccountVos = baseMapper.selectVoList(sysOaReceiveAccountLambdaQueryWrapper1.eq(SysOaReceiveAccount::getParentId, -1L));
for (SysOaReceiveAccountVo oaReceiveAccountVo : sysOaReceiveAccountVos) {
oaReceiveAccountVo.setLabel(oaReceiveAccountVo.getReceiveAccountName());
}
sysOaReceiveAccountVo.setLabel(sysOaReceiveAccountVo.getReceiveAccountName());
sysOaReceiveAccountVo.setChildren(sysOaReceiveAccountVos);
ArrayList<SysOaReceiveAccountVo> list = new ArrayList<>();
list.add(sysOaReceiveAccountVo);
return list;
}
/**
* 查询付款账户管理列表
*/
@Override
public List<SysOaReceiveAccountVo> queryList(SysOaReceiveAccountBo bo) {
LambdaQueryWrapper<SysOaReceiveAccount> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaReceiveAccount> buildQueryWrapper(SysOaReceiveAccountBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaReceiveAccount> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getReceiveAccountName()), SysOaReceiveAccount::getReceiveAccountName, bo.getReceiveAccountName());
return lqw;
}
/**
* 新增付款账户管理
*/
@Override
public SysOaReceiveAccountVo insertByBo(SysOaReceiveAccountBo bo) {
SysOaReceiveAccount add = BeanUtil.toBean(bo, SysOaReceiveAccount.class);
validEntityBeforeSave(add);
Long receiveAccountId = System.currentTimeMillis()/1000%1000000000;
add.setReceiveAccountId(receiveAccountId);
baseMapper.insert(add);
return BeanUtil.copyProperties(add, SysOaReceiveAccountVo.class);
}
/**
* 修改付款账户管理
*/
@Override
public Boolean updateByBo(SysOaReceiveAccountBo bo) {
SysOaReceiveAccount update = BeanUtil.toBean(bo, SysOaReceiveAccount.class);
validEntityBeforeSave(update);
System.out.println(bo);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysOaReceiveAccount entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除付款账户管理
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

19
ruoyi-oa/src/main/resources/mapper/oa/SysOaReceiveAccountMapper.xml Normal file
View File

@@ -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.ruoyi.oa.mapper.SysOaReceiveAccountMapper">
<resultMap type="com.ruoyi.oa.domain.SysOaReceiveAccount" id="SysOaReceiveAccountResult">
<result property="receiveAccountId" column="receive_account_id"/>
<result property="receiveAccountName" column="receive_account_name"/>
<result property="parentId" column="parent_id"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

44
ruoyi-ui/src/api/oa/oaReceiveAccount.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询付款账户管理列表
export function listOaReceiveAccount(query) {
return request({
url: '/system/oaReceiveAccount/list',
method: 'get',
params: query
})
}
// 查询付款账户管理详细
export function getOaReceiveAccount(receiveAccountId) {
return request({
url: '/system/oaReceiveAccount/' + receiveAccountId,
method: 'get'
})
}
// 新增付款账户管理
export function addOaReceiveAccount(data) {
return request({
url: '/system/oaReceiveAccount',
method: 'post',
data: data
})
}
// 修改付款账户管理
export function updateOaReceiveAccount(data) {
return request({
url: '/system/oaReceiveAccount',
method: 'put',
data: data
})
}
// 删除付款账户管理
export function delOaReceiveAccount(receiveAccountId) {
return request({
url: '/system/oaReceiveAccount/' + receiveAccountId,
method: 'delete'
})
}

947
ruoyi-ui/src/views/oa/finance/index.vue
View File

File diff suppressed because it is too large Load Diff

6
ruoyi-ui/src/views/oa/proContract/index.vue
View File

@@ -98,6 +98,7 @@
</el-table-column>
<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@@ -106,8 +107,11 @@
v-hasPermi="['oa:project:edit']"
>合同管理
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
@@ -813,6 +817,7 @@ export default {
}
listProject(this.queryParams).then(response => {
this.projectList = response.rows;
console.log(this.projectList)
//项目周期
this.total = response.total;
this.loading = false;
@@ -1041,6 +1046,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const contractIds = row.contractId || this.ids;
console.log(row)
this.$modal.confirm('是否确认删除合同管理编号为"' + contractIds + '"的数据项？').then(() => {
this.loading = true;
return delOaContract(contractIds);

9
ruoyi-ui/src/views/oa/project/index.vue
View File

@@ -341,7 +341,10 @@
<el-tab-pane label="项目修改" name="two">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<!-- TODO 删除必填规则 -->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">-->
<el-form ref="form" :model="form" label-width="120px">
<el-divider content-position="center">基本信息</el-divider>
<el-row>
<el-col :span="12">
@@ -870,7 +873,9 @@
<el-dialog :title="title" :visible.sync="addShow" width="76%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<!-- TODO 删除规则<el-form ref="form" :model="form" :rules="rules" label-width="110px">-->
<el-form ref="form" :model="form" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">