lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11-4-修改

Browse Source
This commit is contained in:
青云
2025-11-04 19:16:01 +08:00
parent a663e30759
commit 4b2b68d9ef
11 changed files with 93 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/PersonalHomeController.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.bigscreen.domain.dto.TaskInfoDto;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.core.enums.BusinessStatusEnum;
@ -25,6 +26,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
/**
@ -43,13 +47,15 @@ public class PersonalHomeController extends BaseController {
private SysUserServiceImpl userService;
@GetMapping("/getTaskList")
public R<List<FlowTaskVo>> getTaskList(FlowTaskBo flowTaskBo) {
public R<TaskInfoDto> getTaskList(String projectId) {
TaskInfoDto taskInfoDto = new TaskInfoDto();
QueryWrapper<FlowTaskBo> queryWrapper = new QueryWrapper<>();
List<Long> definitionIds = new ArrayList<>();
if (!"0".equals(flowTaskBo.getProjectId())){
if (!"0".equals(projectId)){
List<FlowDefinition> flowDefinitions = flowDefinitionMapper.selectList(new LambdaQueryWrapper<FlowDefinition>()
.select(FlowDefinition::getId)
.like(FlowDefinition::getFlowCode, flowTaskBo.getProjectId()));
.like(FlowDefinition::getFlowCode, projectId));
if (flowDefinitions != null && !flowDefinitions.isEmpty()) {
flowDefinitions.forEach(flowDefinition -> {
definitionIds.add(flowDefinition.getId());
@ -63,7 +69,30 @@ public class PersonalHomeController extends BaseController {
queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr());
queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus());
List<FlowTaskVo> page = this.getFlowTaskDefinitionIdsVoPage(definitionIds, queryWrapper);
return R.ok(page);
//根据createTime过滤出本周数据
// 获取本周一和本周日
LocalDate today = LocalDate.now();
LocalDate monday = today.with(DayOfWeek.MONDAY);
LocalDate sunday = today.with(DayOfWeek.SUNDAY);
// 筛选本周数据
List<FlowTaskVo> weeklyTasks = page.stream()
.filter(task -> {
Date createTime = task.getCreateTime(); // 假设字段名为createTime
if (createTime != null) {
LocalDate createLocalDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
return !createLocalDate.isBefore(monday) && !createLocalDate.isAfter(sunday);
}
return false;
})
.toList();
taskInfoDto.setList(page);
taskInfoDto.setTotal((long) page.size());
taskInfoDto.setWeekCount((long) weeklyTasks.size());
return R.ok(taskInfoDto);
}
private List<FlowTaskVo> getFlowTaskDefinitionIdsVoPage(List<Long> definitionIds, QueryWrapper<FlowTaskBo> queryWrapper) {

27
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/TaskInfoDto.java Normal file
View File

@ -0,0 +1,27 @@
package org.dromara.bigscreen.domain.dto;
import lombok.Data;
import org.dromara.workflow.domain.vo.FlowTaskVo;
import java.io.Serializable;
import java.util.List;
@Data
public class TaskInfoDto implements Serializable {
/**
* 列表对象
*/
private List<FlowTaskVo> list;
/**
* 总数
*/
private Long total;
/**
* 本周数
*/
private Long weekCount;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractSkxx.java
View File

@ -58,12 +58,12 @@ public class XzdContractSkxx extends BaseEntity {
/**
* 本期申请金额
*/
private Long bqsqje;
private BigDecimal bqsqje;
/**
* 本期审批金额
*/
private Long bqspje;
private BigDecimal bqspje;
/**
* 收款账龄

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractSkxxVo.java
View File

@ -65,13 +65,13 @@ public class XzdContractSkxxVo implements Serializable {
* 本期申请金额
*/
@ExcelProperty(value = "本期申请金额")
private Long bqsqje;
private BigDecimal bqsqje;
/**
* 本期审批金额
*/
@ExcelProperty(value = "本期审批金额")
private Long bqspje;
private BigDecimal bqspje;
/**
* 收款账龄

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdProjectVo.java
View File

@ -43,7 +43,7 @@ public class XzdProjectVo implements Serializable {
/**
* 父级项目
*/
private Long fjxm;
private String fjxm;
/**
* 区域码

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractChangeServiceImpl.java
View File

@ -391,10 +391,6 @@ public class XzdContractChangeServiceImpl extends ServiceImpl<XzdContractChangeM
if (vo.getContractCodeId() != null){
XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractCodeId());
if (xzdContractDetailsVo != null) {
List<XzdContractDetailsVo> xzdContractDetailsVo1 = List.of(xzdContractDetailsVo);
xzdContractDetailsService.setValue(xzdContractDetailsVo1);
xzdContractDetailsVo = xzdContractDetailsVo1.getFirst();
vo.setContract(xzdContractDetailsVo);
}
}

19
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractSkxxServiceImpl.java
View File

@ -1,24 +1,24 @@
package org.dromara.xzd.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.xzd.domain.XzdContractSkxx;
import org.dromara.xzd.domain.bo.XzdContractSkxxBo;
import org.dromara.xzd.domain.vo.XzdContractSkxxVo;
import org.dromara.xzd.domain.XzdContractSkxx;
import org.dromara.xzd.mapper.XzdContractSkxxMapper;
import org.dromara.xzd.service.IXzdContractSkxxService;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 收款信息Service业务层处理
@ -73,6 +73,7 @@ public class XzdContractSkxxServiceImpl extends ServiceImpl<XzdContractSkxxMappe
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<XzdContractSkxx> lqw = Wrappers.lambdaQuery();
lqw.orderByDesc(XzdContractSkxx::getId);
lqw.eq(bo.getMainId() != null, XzdContractSkxx::getMainId, bo.getMainId());
lqw.eq(StringUtils.isNotBlank(bo.getType()), XzdContractSkxx::getType, bo.getType());
lqw.eq(StringUtils.isNotBlank(bo.getFx()), XzdContractSkxx::getFx, bo.getFx());
lqw.eq(StringUtils.isNotBlank(bo.getKxlb()), XzdContractSkxx::getKxlb, bo.getKxlb());

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
View File

@ -99,8 +99,6 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
*/
@Override
public TableDataInfo<XzdProjectVo> queryPageList(XzdProjectBo bo, PageQuery pageQuery) {
// LambdaQueryWrapper<XzdProject> lqw = buildQueryWrapper(bo);
// Page<XzdProjectVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
if(pageQuery.getPageNum() != null && pageQuery.getPageSize() != null) {
bo.setPageNum(pageQuery.getPageNum());
bo.setPageSize(pageQuery.getPageSize());

41
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/skyfk/cbhtsc/service/impl/XzdContractPaymentServiceImpl.java
View File

@ -14,13 +14,11 @@ import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.ctr.domain.vo.ContractPaymentClauseVo;
import org.dromara.ctr.service.impl.ContractPaymentClauseServiceImpl;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.xzd.domain.XzdContractDetails;
import org.dromara.xzd.domain.XzdContractSkxx;
import org.dromara.xzd.domain.bo.XzdContractSkxxBo;
import org.dromara.xzd.domain.vo.XzdContractDetailsVo;
import org.dromara.xzd.domain.vo.XzdContractSkxxVo;
import org.dromara.xzd.domain.vo.XzdProjectVo;
import org.dromara.xzd.domain.vo.XzdSupplierOpenBankVo;
import org.dromara.xzd.paymentsReceipts.domain.XzdSfkFapiao;
@ -293,9 +291,9 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
public void setValue(List<XzdContractPaymentVo> vos){
for (XzdContractPaymentVo vo : vos) {
if (vo.getContractId() != null){
XzdContractDetailsVo xzdContractDetailsVo = xzdContractDetailsService.queryById(vo.getContractId());
XzdContractDetails xzdContractDetailsVo = xzdContractDetailsService.getBaseMapper().selectById(vo.getContractId());
if (xzdContractDetailsVo != null){
vo.setContract(xzdContractDetailsVo);
// vo.setContract(xzdContractDetailsVo);
//合同编码
vo.setContractCode(xzdContractDetailsVo.getContractCode());
//合同名称
@ -317,31 +315,22 @@ public class XzdContractPaymentServiceImpl extends ServiceImpl<XzdContractPaymen
//收款信息
XzdContractSkxxBo bo = new XzdContractSkxxBo();
bo.setMainId(vo.getId());
List<XzdContractSkxxVo> skxxVos = xzdContractSkxxService.queryList(bo);
if (skxxVos != null && !skxxVos.isEmpty()){
for (XzdContractSkxxVo skxxVo : skxxVos) {
if (skxxVo.getZftkId() != null){
ContractPaymentClauseVo clauseVo = contractPaymentClauseService.queryById(skxxVo.getZftkId());
if (clauseVo != null){
skxxVo.setZftkLb(clauseVo.getClauseType());
}
}
}
}
vo.setSkxx(skxxVos);
// List<XzdContractSkxxVo> skxxVos = xzdContractSkxxService.queryList(bo);
// if (skxxVos != null && !skxxVos.isEmpty()){
// for (XzdContractSkxxVo skxxVo : skxxVos) {
// if (skxxVo.getZftkId() != null){
// ContractPaymentClauseVo clauseVo = contractPaymentClauseService.queryById(skxxVo.getZftkId());
// if (clauseVo != null){
// skxxVo.setZftkLb(clauseVo.getClauseType());
// }
// }
// }
// }
vo.setSkxx(xzdContractSkxxService.queryList(bo));
//发票信息
XzdSfkFapiaoBo fapiaoBo = new XzdSfkFapiaoBo();
fapiaoBo.setMainDocumentId(vo.getId());
vo.setFpxx(sfkFapiaoService.queryList(fapiaoBo));
//付款单位
// if (vo.getPayer() != null){
// R<QuerCorrespondentDto> byid = iXzdCorrespondentList.getCustomerByid(vo.getPayer());
// if (byid != null) {
// if (byid.getData().getXzdCustomerinformation() != null) {
// vo.setPayerName(byid.getData().getXzdCustomerinformation().getUnitName());
// }
// }
// }
}
}

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/spykp/sjsqd/service/impl/XzdSpykpSjsqdServiceImpl.java
View File

@ -100,7 +100,7 @@ public class XzdSpykpSjsqdServiceImpl extends ServiceImpl<XzdSpykpSjsqdMapper, X
public TableDataInfo<XzdSpykpSjsqdVo> queryPageList(XzdSpykpSjsqdBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdSpykpSjsqd> lqw = buildQueryWrapper(bo);
Page<XzdSpykpSjsqdVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
setValue(result.getRecords());
// setValue(result.getRecords());
return TableDataInfo.build(result);
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml
View File

@ -9,7 +9,8 @@
project.id,
project.city_code as cityCode,
project.shzt as shzt,
profile.parent_project_id as fjxm,
# profile.parent_project_id as fjxm,
(SELECT project_name FROM xzd_project WHERE id = profile.parent_project_id) as fjxm,
project.project_attribute as projectAttribute,
project.project_number as projectNumber,
project.project_name as projectName,