chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

财务数据

This commit is contained in:
Chujinwang 2024-07-29 10:54:31 +08:00
parent 3f82ff3ff1
commit a995005fe7
7 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/vo/WrkProjectPaymentVO.java Normal file
View File

@ -0,0 +1,69 @@
package com.chushang.inspection.project.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class WrkProjectPaymentVO {
/**
* 回款id
*/
private Long paymentId;
/**
* 项目id
*/
private Long projectId;
/**
* 回款合同id
*/
private Long contractId;
/**
* 项目名称
*/
private String projectName;
/**
* 所属部门id
*/
private Long deptId;
/**
* 所属部门名称
*/
private Long deptName;
/**
* 项目联系人
*/
private String projectConcat;
/**
* 项目联系人电话
*/
private String projectPhone;
/**
* 回款金额
*/
private BigDecimal paymentAmount;
/**
* 应汇款金额
*/
private BigDecimal contractAmount;
/**
* 回款日期
*/
private String paymentDate;
/**
* 回款月份
*/
private String paymentMonth;
}

17
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
View File

@ -12,8 +12,10 @@ import com.chushang.inspection.project.dto.ContractDTO;
import com.chushang.inspection.project.dto.ProjectDTO;
import com.chushang.inspection.project.po.WrkProject;
import com.chushang.inspection.project.po.WrkProjectContract;
import com.chushang.inspection.project.po.WrkProjectPayment;
import com.chushang.inspection.project.query.ProjectQuery;
import com.chushang.inspection.project.service.WrkProjectContractService;
import com.chushang.inspection.project.service.WrkProjectPaymentService;
import com.chushang.inspection.project.service.WrkProjectService;
import com.chushang.security.annotation.RequiresPermissions;
import lombok.extern.slf4j.Slf4j;
@ -35,6 +37,8 @@ public class WrkProjectController {
WrkProjectService projectService;
@Resource
WrkProjectContractService contractService;
@Resource
WrkProjectPaymentService paymentService;
/**
* 获取项目详细信息
@ -137,6 +141,19 @@ public class WrkProjectController {
CommonParam commonParam = CommonParam.buildPageRequest();
return AjaxResult.success(contractService.pageList(contract, commonParam));
}
/**
* 财务数据
* 根据 项目Id 获取
*/
@GetMapping(value = "/payMentData")
@RequiresPermissions("inspection:contract:list")
public AjaxResult payMentData(WrkProjectPayment query)
{
CommonParam commonParam = CommonParam.buildPageRequest();
return AjaxResult.success(paymentService.payMentData(query, commonParam));
}
/**
* 待审核 合同 列表 -->
*/

10
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectPaymentMapper.java
View File

@ -1,11 +1,21 @@
package com.chushang.inspection.project.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chushang.inspection.project.po.WrkProjectPayment;
import com.chushang.inspection.project.vo.WrkProjectPaymentVO;
import com.chushang.inspection.terminal.po.Store;
import com.chushang.inspection.terminal.query.StoreQuery;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @auther: zhao
* @date: 2024/6/15 10:51
*/
public interface WrkProjectPaymentMapper extends BaseMapper<WrkProjectPayment> {
List<WrkProjectPaymentVO> payMentData(@Param("query") WrkProjectPayment query,
Page<Store> page);
}

10
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectPaymentService.java
View File

@ -3,6 +3,7 @@ package com.chushang.inspection.project.service;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chushang.common.core.exception.ResultException;
import com.chushang.common.core.exception.utils.AssertUtil;
@ -14,6 +15,8 @@ import com.chushang.common.mybatis.utils.WrapperUtils;
import com.chushang.inspection.project.dto.PaymentDTO;
import com.chushang.inspection.project.po.WrkProject;
import com.chushang.inspection.project.po.WrkProjectContract;
import com.chushang.inspection.project.vo.WrkProjectPaymentVO;
import com.chushang.inspection.terminal.po.Store;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -23,6 +26,7 @@ import com.chushang.inspection.project.mapper.WrkProjectPaymentMapper;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
/**
* @auther: zhao
@ -36,6 +40,12 @@ public class WrkProjectPaymentService extends ServiceImpl<WrkProjectPaymentMappe
@Resource
WrkProjectContractService contractService;
public List<WrkProjectPaymentVO> payMentData(WrkProjectPayment query, CommonParam commonParam)
{
Page<Store> page = new Page<>(commonParam.getPage(), commonParam.getLimit());
return baseMapper.payMentData(query,page);
}
/**
* 保存回款
*/

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -59,6 +59,7 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
@DataScope
public PageResult pageList(WrkProject project, CommonParam commonParam) {
LambdaQueryWrapper<WrkProject> queryWrapper = WrapperUtils.builder(project, commonParam);
queryWrapper.orderByDesc(WrkProject::getCreateTime);
IPage<WrkProject> page = this.page(
new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()),
queryWrapper

8
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java
View File

@ -33,7 +33,7 @@ public class WrkAuditRuleController {
*/
@GetMapping ("/page")
@RequiresPermissions("wrk:aduit:page")
@SysLog(value = "工单审核", businessType = BusinessType.AUDIT)
@SysLog(value = "审核规则列表", businessType = BusinessType.AUDIT)
public AjaxResult page(@Validated WrkAuditRuleQuery query) {
return AjaxResult.success(wrkAuditRuleService.queryRulePage(query));
}
@ -44,17 +44,17 @@ public class WrkAuditRuleController {
*/
@PostMapping ("/saveOrUpdate")
@RequiresPermissions("wrk:aduit:su")
@SysLog(value = "工单审核", businessType = BusinessType.AUDIT)
@SysLog(value = "审核规则新增和修改", businessType = BusinessType.AUDIT)
public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) {
return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto));
}
/**
* 删除字典类型
* 审核规则
*/
@RequiresPermissions("wrk:aduit:remove")
@SysLog(value = "字典类型", businessType = BusinessType.DELETE)
@SysLog(value = "审核规则删除", businessType = BusinessType.DELETE)
@DeleteMapping("del/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{

37
chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/WrkProjectPaymentMapper.xml Normal file
View File

@ -0,0 +1,37 @@
<?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.chushang.inspection.project.mapper.WrkProjectPaymentMapper">
<select id="payMentData" resultType="com.chushang.inspection.project.vo.WrkProjectPaymentVO">
select
t2.project_name as projectName,
t2.project_id as projectId,
t2.project_concat as projectConcat,
t2.project_phone as projectPhone,
t2.dept_name as deptName,
t1.contract_amount as contractAmount,
t2.dept_id as deptId,
t1.payment_amount as paymentAmount,
from
wrk_project_contract t1 inner join wrk_project t2 on t1.project_id = t2.project_id
<where>
<if test="query.projectName != null and query.projectName != ''">
AND t2.project_name like concat('%', #{query.projectName}, '%')
</if>
<if test="query.projectConcat != null">
AND t2.project_concat = #{query.projectConcat}
</if>
<if test="query.projectPhone != null">
AND t2.project_phone = #{query.projectPhone}
</if>
<if test="query.deptId != null">
AND t2.dept_id = #{query.deptId}
</if>
<if test="1 == 1">
${query.sqlParam.get('dataScope')}
</if>
ORDER BY t.create_time DESC
</where>
</select>
</mapper>