Skip to content

D
dsk-operate-sys-cscec
Commit 13d86181 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys... 

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 1640fc82 8510c161
Show whitespace changes
Inline Side-by-side
Showing with 410 additions and 262 deletions
dsk-admin/src/main/resources/application.yml
View file @ 13d86181
...@@ -200,6 +200,7 @@ tenant: ...@@ -200,6 +200,7 @@ tenant:
- cb_scene_expense_children - cb_scene_expense_children
- cb_scene_expense_month - cb_scene_expense_month
- cb_subject - cb_subject
- cb_project_other
# MyBatisPlus配置 # MyBatisPlus配置
# https://baomidou.com/config/ # https://baomidou.com/config/
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/component/CbProjectOtherAnalysisComponent.java deleted 100644 → 0
View file @ 1640fc82
package com.dsk.component;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsk.common.excel.ExcelUtils;
import com.dsk.common.exception.ServiceException;
import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectOther;
import com.dsk.cscec.domain.bo.CbProjectBaseBo;
import com.dsk.cscec.service.CbProjectFileService;
import com.dsk.cscec.service.CbProjectOtherService;
import com.dsk.system.service.ISysOssService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* 其他费用数据解析组件
*
* @Author lcl
* @Data 2024/2/7 17:43
*/
@Slf4j
@Component
public class CbProjectOtherAnalysisComponent {
@Resource
private CbProjectOtherService projectOtherService;
@Resource
private CbProjectFileService projectFileService;
@Resource
private ISysOssService ossService;
@Resource
private TransactionTemplate transactionTemplate;
/**
* 其他费用数据解析
*/
@Async
public void projectOtherDataAnalysis(CbProjectBaseBo bo) throws Exception {
//查询其他费用导入文件
List<CbProjectFile> fileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery()
.eq(CbProjectFile::getProjectId, bo.getProjectId())
.eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_OTHER_PROJECT)
.eq(CbProjectFile::getCbStage, bo.getCbStage())
.in(CbProjectFile::getFileParseStatus, Arrays.asList(1, 3)));
if (ObjectUtils.isEmpty(fileList)) {
return;
}
//文件处理
for (CbProjectFile file : fileList) {
if (file.getDelFlag() == 0) {
//文件下载
InputStream inputStream = ossService.downFileIO(file.getFileOssId());
if (ObjectUtil.isNull(inputStream)) {
file.setFileParseStatus(3);
file.setFailRemark("文件数据不存在");
projectFileService.updateById(file);
break;
}
//解析数据
List<CbProjectOther> importList = new ExcelUtils<>(CbProjectOther.class).importExcelAllSheet(inputStream, 1);
if (importList.isEmpty()) {
file.setFileParseStatus(3);
file.setFailRemark("表格中不存在待导入数据!");
projectFileService.updateById(file);
break;
}
List<CbProjectOther> projectOtherList = importList.stream().parallel()
.peek(item -> {
item.setProjectId(bo.getProjectId());
item.setCbStage(bo.getCbStage());
item.setCbProjectFileId(file.getId());
}).collect(Collectors.toList());
if (projectOtherList.isEmpty()) {
throw new ServiceException("表格中不存在有效数据数据!");
}
transactionTemplate.execute(status -> {
try {
//分批次插入
if (projectOtherList.size() > 1000) {
int index = 0;
int sum = projectOtherList.size();
while (index < sum) {
List<CbProjectOther> divideList = projectOtherList.subList(index, Math.max((index + 1) * 1000, sum));
boolean b = projectOtherService.saveBatch(divideList);
if (!b) {
throw new ServiceException("数据插入失败！");
}
index += 1000;
}
} else {
boolean b = projectOtherService.saveBatch(projectOtherList);
if (!b) {
throw new ServiceException("数据插入失败！");
}
}
file.setFileParseStatus(2);
boolean b = projectFileService.updateById(file);
if (!b) {
throw new ServiceException("文件状态更新失败！");
}
} catch (Exception e) {
status.setRollbackOnly();
file.setFileParseStatus(3);
file.setFailRemark(e.getMessage());
projectFileService.updateById(file);
}
return Boolean.TRUE;
});
} else {
projectOtherService.remove(Wrappers.<CbProjectOther>lambdaQuery().eq(CbProjectOther::getCbProjectFileId, file.getId()));
projectFileService.removeById(file);
}
}
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectExpenseSummaryController.java 0 → 100644
View file @ 13d86181
package com.dsk.cscec.controller;
import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.R;
import com.dsk.common.helper.LoginHelper;
import com.dsk.cscec.domain.CbProjectExpenseSummary;
import com.dsk.cscec.service.CbProjectExpenseSummaryService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Objects;
/**
* 项目费用汇总表(CbProjectExpenseSummary)表控制层
*
* @author sxk
* @since 2024-02-22 09:59:28
*/
@RestController
@RequestMapping("CbProjectExpenseSummary")
public class CbProjectExpenseSummaryController extends BaseController {
/**
* 服务对象
*/
@Resource
private CbProjectExpenseSummaryService baseService;
/**
* 现场经费汇总数据解析
*/
@GetMapping("/parseCbSceneExpenseData/{projectId}")
public R<Void> parseCbSceneExpenseData(@PathVariable Long projectId) throws Exception {
String username = Objects.requireNonNull(LoginHelper.getLoginUser()).getUsername();
baseService.parseSceneExpenseSummaryData(projectId, 1, username);
return R.ok();
}
/**
* 获取现场经费汇总数据
*/
@GetMapping("/getCbSceneExpenseSummaryData/{projectId}")
public R<List<CbProjectExpenseSummary>> getCbSceneExpenseSummaryData(@NotNull(message = "项目ID不能为空") @PathVariable Long projectId) {
return R.ok(baseService.getCbSceneExpenseSummaryData(projectId));
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectOtherController.java
View file @ 13d86181
...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsk.common.annotation.Log; import com.dsk.common.annotation.Log;
import com.dsk.common.core.domain.R; import com.dsk.common.core.domain.R;
import com.dsk.common.enums.BusinessType; import com.dsk.common.enums.BusinessType;
import com.dsk.component.CbProjectOtherAnalysisComponent;
import com.dsk.cscec.domain.CbProjectExpenseSummary; import com.dsk.cscec.domain.CbProjectExpenseSummary;
import com.dsk.cscec.domain.bo.CbProjectBaseBo; import com.dsk.cscec.domain.bo.CbProjectBaseBo;
import com.dsk.cscec.domain.bo.CbProjectOtherBo; import com.dsk.cscec.domain.bo.CbProjectOtherBo;
...@@ -41,12 +40,9 @@ public class CbProjectOtherController { ...@@ -41,12 +40,9 @@ public class CbProjectOtherController {
@Resource @Resource
private CbProjectExpenseSummaryService cbProjectExpenseSummaryService; private CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
@Resource
private CbProjectOtherAnalysisComponent otherAnalysisComponent;
@GetMapping(value = "/projectOther/dataAnalysis") @GetMapping(value = "/projectOther/dataAnalysis")
public R<List<CbProjectExpenseSummary>> projectOtherDataAnalysis(CbProjectBaseBo baseBo) throws Exception{ public R<List<CbProjectExpenseSummary>> projectOtherDataAnalysis(CbProjectBaseBo baseBo) throws Exception{
otherAnalysisComponent.projectOtherDataAnalysis(baseBo); projectOtherService.projectOtherDataAnalysis(baseBo);
return R.ok(); return R.ok();
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java
View file @ 13d86181
...@@ -7,6 +7,7 @@ import com.dsk.common.core.domain.R; ...@@ -7,6 +7,7 @@ import com.dsk.common.core.domain.R;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.CbProjectRecord; import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.*; import com.dsk.cscec.domain.bo.*;
import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo; import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
import com.dsk.cscec.service.CbProjectRecordService; import com.dsk.cscec.service.CbProjectRecordService;
import com.dsk.cscec.service.IDProjectService; import com.dsk.cscec.service.IDProjectService;
...@@ -108,7 +109,7 @@ public class CbProjectRecordController extends BaseController { ...@@ -108,7 +109,7 @@ public class CbProjectRecordController extends BaseController {
* 即查询当前项目非草稿的成本阶段 * 即查询当前项目非草稿的成本阶段
*/ */
@GetMapping("/getProjectCbStageNotDraft/{relatedId}") @GetMapping("/getProjectCbStageNotDraft/{relatedId}")
public R<List<Integer>> getProjectCbStageNotDraft(@PathVariable Long relatedId) { public R<List<CbProjectCbStageNotDraftVo>> getProjectCbStageNotDraft(@PathVariable Long relatedId) {
return R.ok(baseService.getProjectCbStageNotDraft(relatedId)); return R.ok(baseService.getProjectCbStageNotDraft(relatedId));
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectExpenseSummary.java
View file @ 13d86181
package com.dsk.cscec.domain; package com.dsk.cscec.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import com.dsk.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import lombok.Data; import lombok.Data;
import java.util.Date;
/** /**
* 项目费用汇总表 * 项目费用汇总表
*/ */
...@@ -25,6 +24,11 @@ public class CbProjectExpenseSummary { ...@@ -25,6 +24,11 @@ public class CbProjectExpenseSummary {
@TableField(value = "project_id") @TableField(value = "project_id")
private Long projectId; private Long projectId;
/**
* 项目文件ID
*/
private Long projectFileId;
/** /**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本) * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/ */
...@@ -34,11 +38,11 @@ public class CbProjectExpenseSummary { ...@@ -34,11 +38,11 @@ public class CbProjectExpenseSummary {
/** /**
* 序号 * 序号
*/ */
@TableField(value = "`number`") @TableField(value = "number")
private String number; private String number;
/** /**
* 数据类型(0:现场经费、1:其他费用) * 数据类型(2:措施项目、3:其他项目、4:现场经费)
*/ */
@TableField(value = "data_type") @TableField(value = "data_type")
private Integer dataType; private Integer dataType;
...@@ -47,24 +51,28 @@ public class CbProjectExpenseSummary { ...@@ -47,24 +51,28 @@ public class CbProjectExpenseSummary {
* 名称 * 名称
*/ */
@TableField(value = "expense_name") @TableField(value = "expense_name")
@Excel(name = "名称")
private String expenseName; private String expenseName;
/** /**
* 数值 * 数值
*/ */
@TableField(value = "expense_value") @TableField(value = "expense_value")
@Excel(name = "数值")
private String expenseValue; private String expenseValue;
/** /**
* 占比 * 占比
*/ */
@TableField(value = "proportion") @TableField(value = "proportion")
@Excel(name = "占比")
private String proportion; private String proportion;
/** /**
* 删除状态(0:否、2:是) * 删除状态(0:否、2:是)
*/ */
@TableField(value = "del_flag") @TableField(value = "del_flag")
@TableLogic(value = "0", delval = "2")
private Integer delFlag; private Integer delFlag;
/** /**
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbProjectCbStageNotDraftVo.java 0 → 100644
View file @ 13d86181
package com.dsk.cscec.domain.vo;
import lombok.Data;
/**
* @author sxk
* @date 2024.02.26
* @time 15:27
*/
@Data
public class CbProjectCbStageNotDraftVo {
/**
* 项目ID
*/
private Long id;
/**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbProjectOtherImportVo.java
View file @ 13d86181
...@@ -113,4 +113,9 @@ public class CbProjectOtherImportVo { ...@@ -113,4 +113,9 @@ public class CbProjectOtherImportVo {
* 处理后序号 * 处理后序号
*/ */
private String dealWithNumber; private String dealWithNumber;
/**
* 项目成本文件id
*/
private Long cbProjectFileId;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSceneExpenseMenuVo.java 0 → 100644
View file @ 13d86181
package com.dsk.cscec.domain.vo;
import lombok.Data;
/**
* @author sxk
* @date 2024.02.22
* @time 11:06
*/
@Data
public class CbSceneExpenseMenuVo {
/**
* 项目文件ID
*/
private Long fileId;
/**
* 菜单名称
*/
private String menuName;
/**
* 菜单层级
*/
private Integer menuLevel;
/**
* 菜单来源
*/
private Integer menuSource;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbProjectExpenseSummaryImportListener.java
View file @ 13d86181
...@@ -36,15 +36,16 @@ public class CbProjectExpenseSummaryImportListener extends AnalysisEventListener ...@@ -36,15 +36,16 @@ public class CbProjectExpenseSummaryImportListener extends AnalysisEventListener
@Override @Override
public void invoke(CbProjectExpenseSummaryImportVo importVo, AnalysisContext context) { public void invoke(CbProjectExpenseSummaryImportVo importVo, AnalysisContext context) {
Integer rowIndex = context.readRowHolder().getRowIndex(); Integer rowIndex = context.readRowHolder().getRowIndex();
if (StrUtil.isEmpty(importVo.getExpenseName())) { // if (StrUtil.isEmpty(importVo.getExpenseName())) {
failureNum++; // failureNum++;
failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空"); // failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空");
} // }
String number = importVo.getNumber(); // String number = importVo.getNumber();
if (StrUtil.isEmpty(number)) { // if (StrUtil.isEmpty(number)) {
failureNum++; // failureNum++;
failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空"); // failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
} // }
dataList.add(importVo);
} }
@Override @Override
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbProjectOtherImportListener.java
View file @ 13d86181
...@@ -24,31 +24,32 @@ import java.util.regex.Pattern; ...@@ -24,31 +24,32 @@ import java.util.regex.Pattern;
public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjectOtherImportVo> implements ExcelListener<CbProjectOtherImportVo> { public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjectOtherImportVo> implements ExcelListener<CbProjectOtherImportVo> {
private final Long projectId; private final Long projectId;
private final Integer cbStage; private final Long fileId;
private List<CbProjectOtherImportVo> dataList = new ArrayList<>(); private List<CbProjectOtherImportVo> dataList = new ArrayList<>();
private int successNum = 0; private int successNum = 0;
private int failureNum = 0; private int failureNum = 0;
private final StringBuilder successMsg = new StringBuilder(); private final StringBuilder successMsg = new StringBuilder();
private final StringBuilder failureMsg = new StringBuilder(); private final StringBuilder failureMsg = new StringBuilder();
public CbProjectOtherImportListener(Long projectId, Integer cbStage) { public CbProjectOtherImportListener(Long projectId, Long fileId) {
this.cbStage = cbStage; this.fileId = fileId;
this.projectId = projectId; this.projectId = projectId;
} }
@Override @Override
public void invoke(CbProjectOtherImportVo importVo, AnalysisContext context) { public void invoke(CbProjectOtherImportVo importVo, AnalysisContext context) {
Integer rowIndex = context.readRowHolder().getRowIndex(); Integer rowIndex = context.readRowHolder().getRowIndex();
if (StrUtil.isEmpty(importVo.getItemContent())) { // if (StrUtil.isEmpty(importVo.getItemContent())) {
failureNum++; // failureNum++;
failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空"); // failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空");
} // }
String number = importVo.getNumber(); String number = importVo.getNumber();
if (StrUtil.isEmpty(number)) { if (StrUtil.isEmpty(number)) {
failureNum++; failureNum++;
failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空"); failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
} }
importVo.setCbProjectFileId(fileId);
Boolean numberMatch = false; Boolean numberMatch = false;
String regex = "[\\(（]*[一|二|三|四|五|六|七|八|九|十]+[\\)）]*"; String regex = "[\\(（]*[一|二|三|四|五|六|七|八|九|十]+[\\)）]*";
Pattern pattern = Pattern.compile("^\\d+(\\.\\d+)*$"); Pattern pattern = Pattern.compile("^\\d+(\\.\\d+)*$");
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectFileMapper.java
View file @ 13d86181
...@@ -2,6 +2,7 @@ package com.dsk.cscec.mapper; ...@@ -2,6 +2,7 @@ package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.CbProjectFile; import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.vo.CbSceneExpenseMenuVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -13,8 +14,18 @@ import java.util.List; ...@@ -13,8 +14,18 @@ import java.util.List;
* @since 2024-02-05 14:01:03 * @since 2024-02-05 14:01:03
*/ */
public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> { public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> {
/**
* 获取现场经费菜单
*
* @param projectId 项目ID
* @return 该项目在项目文件表中所有解析完成的现场经费文件名
*/
List<CbSceneExpenseMenuVo> getSceneExpenseMenuFromFile(@Param("projectId") Long projectId,
@Param("deleteFlagExist") Integer deleteFlagExist,
@Param("cbTypeSceneExpense") Integer cbTypeSceneExpense,
@Param("projectFileStatusParseSuccess") Integer projectFileStatusParseSuccess);
List<CbProjectFile> selectAnalysisList(@Param("projectId") Long projectId,@Param("cbType") Integer cbType,@Param("cbStage") Integer cbStage); List<CbProjectFile> selectAnalysisList(@Param("projectId") Long projectId, @Param("cbType") Integer cbType, @Param("cbStage") Integer cbStage);
int removeById(@Param("id") Long id); int removeById(@Param("id") Long id);
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectExpenseSummaryService.java
View file @ 13d86181
package com.dsk.cscec.service; package com.dsk.cscec.service;
import com.dsk.cscec.domain.CbProjectExpenseSummary;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
public interface CbProjectExpenseSummaryService extends IService<CbProjectExpenseSummary>{ import com.dsk.cscec.domain.CbProjectExpenseSummary;
import java.util.List;
public interface CbProjectExpenseSummaryService extends IService<CbProjectExpenseSummary> {
/**
* 现场经费汇总数据解析
*
* @param projectId 项目ID
* @param cbStage 成本阶段
* @param username 用户名
*/
void parseSceneExpenseSummaryData(Long projectId, Integer cbStage,String username) throws Exception;
/**
* 获取现场经费汇总数据
*
* @param projectId 项目ID
* @return 现场经费汇总数据
*/
List<CbProjectExpenseSummary> getCbSceneExpenseSummaryData(Long projectId);
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectOtherService.java
View file @ 13d86181
...@@ -2,6 +2,7 @@ package com.dsk.cscec.service; ...@@ -2,6 +2,7 @@ package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.CbProjectOther; import com.dsk.cscec.domain.CbProjectOther;
import com.dsk.cscec.domain.bo.CbProjectBaseBo;
import com.dsk.cscec.domain.bo.CbProjectOtherBo; import com.dsk.cscec.domain.bo.CbProjectOtherBo;
import com.dsk.cscec.domain.vo.CbProjectOtherVo; import com.dsk.cscec.domain.vo.CbProjectOtherVo;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -22,5 +23,7 @@ public interface CbProjectOtherService extends IService<CbProjectOther> { ...@@ -22,5 +23,7 @@ public interface CbProjectOtherService extends IService<CbProjectOther> {
List<Map<String, Object>> listByLevel(Long projectId, int i); List<Map<String, Object>> listByLevel(Long projectId, int i);
List<CbProjectOtherVo> selectDataList(CbProjectOtherBo projectOtherBo); List<CbProjectOtherVo> selectDataList(CbProjectOtherBo projectOtherBo);
void projectOtherDataAnalysis(CbProjectBaseBo baseBo) throws Exception;
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectRecordService.java
View file @ 13d86181
...@@ -5,6 +5,7 @@ import com.dsk.common.core.domain.PageQuery; ...@@ -5,6 +5,7 @@ import com.dsk.common.core.domain.PageQuery;
import com.dsk.common.core.page.TableDataInfo; import com.dsk.common.core.page.TableDataInfo;
import com.dsk.cscec.domain.CbProjectRecord; import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.*; import com.dsk.cscec.domain.bo.*;
import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo; import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
import java.util.List; import java.util.List;
...@@ -78,7 +79,7 @@ public interface CbProjectRecordService extends IService<CbProjectRecord> { ...@@ -78,7 +79,7 @@ public interface CbProjectRecordService extends IService<CbProjectRecord> {
* @param relatedId 关联ID * @param relatedId 关联ID
* @return 已有数据的成本阶段 * @return 已有数据的成本阶段
*/ */
List<Integer> getProjectCbStageNotDraft(Long relatedId); List<CbProjectCbStageNotDraftVo> getProjectCbStageNotDraft(Long relatedId);
/** /**
* 批量删除项目 * 批量删除项目
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectExpenseSummaryServiceImpl.java
View file @ 13d86181
package com.dsk.cscec.service.impl; package com.dsk.cscec.service.impl;
import org.springframework.stereotype.Service; import cn.hutool.core.lang.Assert;
import javax.annotation.Resource; import cn.hutool.core.util.ObjectUtil;
import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.common.excel.ExcelUtils;
import com.dsk.common.utils.StringUtils;
import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectExpenseSummary; import com.dsk.cscec.domain.CbProjectExpenseSummary;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.mapper.CbProjectExpenseSummaryMapper; import com.dsk.cscec.mapper.CbProjectExpenseSummaryMapper;
import com.dsk.cscec.mapper.CbProjectFileMapper;
import com.dsk.cscec.mapper.CbProjectRecordMapper;
import com.dsk.cscec.service.CbProjectExpenseSummaryService; import com.dsk.cscec.service.CbProjectExpenseSummaryService;
import com.dsk.system.service.ISysOssService;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.support.TransactionTemplate;
import javax.annotation.Resource;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service @Service
public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExpenseSummaryMapper, CbProjectExpenseSummary> implements CbProjectExpenseSummaryService{ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExpenseSummaryMapper, CbProjectExpenseSummary> implements CbProjectExpenseSummaryService {
@Resource
private CbProjectExpenseSummaryMapper baseMapper;
@Resource
private CbProjectRecordMapper projectRecordMapper;
@Resource
private CbProjectFileMapper projectFileMapper;
@Resource
private ISysOssService ossService;
@Resource
private TransactionTemplate transactionTemplate;
/**
* 现场经费汇总数据解析
*
* @param projectId 项目ID
* @param cbStage 成本阶段
* @param username 用户名
*/
@Override
@Async
public void parseSceneExpenseSummaryData(Long projectId, Integer cbStage, String username) throws Exception {
//查找该项目下所有相关文件
List<CbProjectFile> projectFileList = projectFileMapper.selectAnalysisList(projectId, CbProjectConstants.CB_TYPE_SCENE_EXPENSE, cbStage);
//待解析文件
List<CbProjectFile> waitParseList = new ArrayList<>();
//提取现场经费汇总文件,原则上该文件仅有1个
projectFileList.forEach(projectFile -> {
if (CbProjectConstants.CB_TYPE_SCENE_EXPENSE_NAME.equals(projectFile.getFileName().substring(0, projectFile.getFileName().lastIndexOf(".")))) {
//待解析文件
waitParseList.add(projectFile);
}
});
//处理待解析文件
for (CbProjectFile projectFile : waitParseList) {
if (ObjectUtil.isNull(projectFile)) {
continue;
}
//文件下载
InputStream inputStream = ossService.downFileIO(projectFile.getFileOssId());
if (ObjectUtil.isNull(inputStream)) {
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
projectFile.setFailRemark("文件数据不存在");
projectFileMapper.updateById(projectFile);
continue;
}
//解析数据
List<CbProjectExpenseSummary> importList = new ExcelUtils<>(CbProjectExpenseSummary.class).importExcelAllSheet(inputStream, 0);
if (importList.isEmpty()) {
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
projectFile.setFailRemark("表格中不存在待导入数据!");
projectFileMapper.updateById(projectFile);
continue;
}
//筛选有效数据
List<CbProjectExpenseSummary> summaryList = importList.stream().parallel()
//筛选名称列不为空数据
.filter(item -> StringUtils.isNotBlank(item.getExpenseName()))
.peek(item -> {
item.setProjectId(projectId);
item.setProjectFileId(projectFile.getId());
item.setCbStage(projectFile.getCbStage());
item.setDataType(CbProjectConstants.CB_TYPE_SCENE_EXPENSE);
item.setCreateBy(username);
item.setCreateTime(new Date());
})
.collect(Collectors.toList());
if (summaryList.size() != importList.size()) {
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
projectFile.setFailRemark("表格中存在\"名称\"列为空数据!");
projectFileMapper.updateById(projectFile);
continue;
}
transactionTemplate.execute(status -> {
try {
//批量插入数据
CbProjectExpenseSummaryServiceImpl impl = new CbProjectExpenseSummaryServiceImpl();
Assert.isTrue(impl.saveBatch(summaryList), "数据插入失败");
//更新文件状态
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");
} catch (Exception e) {
status.setRollbackOnly();
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
projectFile.setFailRemark(e.getMessage());
projectFileMapper.updateById(projectFile);
}
return Boolean.TRUE;
});
}
}
/**
* 获取现场经费汇总数据
*
* @param projectId 项目ID
* @return 现场经费汇总数据
*/
@Override
public List<CbProjectExpenseSummary> getCbSceneExpenseSummaryData(Long projectId) {
//校验项目是否存在
this.checkProjectExist(projectId);
return baseMapper.selectList(new LambdaQueryWrapper<CbProjectExpenseSummary>()
.eq(CbProjectExpenseSummary::getProjectId, projectId)
.eq(CbProjectExpenseSummary::getDataType, CbProjectConstants.CB_TYPE_SCENE_EXPENSE));
}
/**
* 校验项目是否存在
*
* @param projectId 项目ID
* @return 项目实体
*/
private CbProjectRecord checkProjectExist(Long projectId) {
CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
Assert.notNull(projectRecord, "该项目不存在");
return projectRecord;
}
} }
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectOtherServiceImpl.java
View file @ 13d86181
...@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.common.excel.ExcelResult; import com.dsk.common.excel.ExcelResult;
import com.dsk.common.excel.ExcelUtils;
import com.dsk.common.utils.poi.ExcelUtil; import com.dsk.common.utils.poi.ExcelUtil;
import com.dsk.cscec.constant.CbProjectConstants; import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.*; import com.dsk.cscec.domain.*;
...@@ -65,7 +64,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -65,7 +64,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
CbProjectRecord byId = cbProjectRecordService.getById(projectId); CbProjectRecord byId = cbProjectRecordService.getById(projectId);
Assert.notNull(byId, "项目信息不能为空"); Assert.notNull(byId, "项目信息不能为空");
Integer cbStage = byId.getCbStage(); Integer cbStage = byId.getCbStage();
CbProjectOtherImportListener importListener = new CbProjectOtherImportListener(projectId, cbStage); CbProjectOtherImportListener importListener = new CbProjectOtherImportListener(projectId, 0L);
EasyExcel.read(file.getInputStream(), CbProjectOtherImportVo.class, importListener).sheet().doRead(); EasyExcel.read(file.getInputStream(), CbProjectOtherImportVo.class, importListener).sheet().doRead();
ExcelResult<CbProjectOtherImportVo> result = importListener.getExcelResult(); ExcelResult<CbProjectOtherImportVo> result = importListener.getExcelResult();
String analysis = result.getAnalysis(); String analysis = result.getAnalysis();
...@@ -83,6 +82,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -83,6 +82,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
rootProjectOther.setParentId(0L); rootProjectOther.setParentId(0L);
rootProjectOther.setProjectId(projectId); rootProjectOther.setProjectId(projectId);
rootProjectOther.setCbStage(cbStage); rootProjectOther.setCbStage(cbStage);
rootProjectOther.setCbProjectFileId(0L);
LambdaQueryWrapper<CbProjectOther> tWrapper = Wrappers.lambdaQuery(rootProjectOther); LambdaQueryWrapper<CbProjectOther> tWrapper = Wrappers.lambdaQuery(rootProjectOther);
CbProjectOther rootOther = this.getOne(tWrapper); CbProjectOther rootOther = this.getOne(tWrapper);
...@@ -156,6 +156,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -156,6 +156,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
*@date: 2024/2/23 18:03 *@date: 2024/2/23 18:03
*/ */
@Async @Async
@Override
public void projectOtherDataAnalysis(CbProjectBaseBo baseBo) throws Exception { public void projectOtherDataAnalysis(CbProjectBaseBo baseBo) throws Exception {
// 项目Id // 项目Id
Long projectId = baseBo.getProjectId(); Long projectId = baseBo.getProjectId();
...@@ -165,9 +166,9 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -165,9 +166,9 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
// 查询其他费用导入文件 // 查询其他费用导入文件
List<CbProjectFile> projectFileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery() List<CbProjectFile> projectFileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery()
.eq(CbProjectFile::getProjectId, baseBo.getProjectId()) .eq(CbProjectFile::getProjectId, baseBo.getProjectId())
.eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_OTHER_PROJECT) .eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_SCENE_EXPENSE)
.eq(CbProjectFile::getCbStage, baseBo.getCbStage()) .eq(CbProjectFile::getCbStage, baseBo.getCbStage())
.in(CbProjectFile::getFileParseStatus, Arrays.asList(1, 3))); .in(CbProjectFile::getFileParseStatus, Arrays.asList(0)));
if (ObjectUtils.isEmpty(projectFileList)) { if (ObjectUtils.isEmpty(projectFileList)) {
return; return;
} }
...@@ -183,24 +184,18 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -183,24 +184,18 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
break; break;
} }
//解析数据
List<CbProjectOther> importList = new ExcelUtils<>(CbProjectOther.class).importExcelAllSheet(inputStream, 1);
if (importList.isEmpty()) {
file.setFileParseStatus(3);
file.setFailRemark("表格中不存在待导入数据!");
projectFileService.updateById(file);
break;
}
// 文件名称 // 文件名称
String name = file.getFileName(); String name = file.getFileName();
name = FileNameUtil.getPrefix(name);
// 文件Id
Long fileId = file.getId();
if ("其他费".equals(name)) { if ("其他费".equals(name)) {
totalDataAnalysis(inputStream, name, file, projectId, cbStage); totalDataAnalysis(inputStream, name, file, projectId, cbStage);
break;
} }
name = FileNameUtil.getPrefix(name);
//解析数据 //解析数据
ExcelResult<CbProjectOtherImportVo> importVoExcelResult = ExcelResult<CbProjectOtherImportVo> importVoExcelResult =
ExcelUtil.importExcel(inputStream, CbProjectOtherImportVo.class,new CbProjectOtherImportListener(projectId, cbStage)); ExcelUtil.importExcel(inputStream, CbProjectOtherImportVo.class,new CbProjectOtherImportListener(projectId, fileId));
log.info(importVoExcelResult.getAnalysis()); log.info(importVoExcelResult.getAnalysis());
List<CbProjectOtherImportVo> importVoList = importVoExcelResult.getList(); List<CbProjectOtherImportVo> importVoList = importVoExcelResult.getList();
if (CollectionUtil.isEmpty(importVoList)) { if (CollectionUtil.isEmpty(importVoList)) {
...@@ -217,6 +212,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -217,6 +212,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
rootProjectOther.setParentId(0L); rootProjectOther.setParentId(0L);
rootProjectOther.setProjectId(projectId); rootProjectOther.setProjectId(projectId);
rootProjectOther.setCbStage(cbStage); rootProjectOther.setCbStage(cbStage);
rootProjectOther.setCbProjectFileId(0L);
LambdaQueryWrapper<CbProjectOther> tWrapper = Wrappers.lambdaQuery(rootProjectOther); LambdaQueryWrapper<CbProjectOther> tWrapper = Wrappers.lambdaQuery(rootProjectOther);
CbProjectOther rootOther = this.getOne(tWrapper); CbProjectOther rootOther = this.getOne(tWrapper);
...@@ -282,6 +278,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper, ...@@ -282,6 +278,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
BeanUtil.copyProperties(importVo, projectExpenseSummary); BeanUtil.copyProperties(importVo, projectExpenseSummary);
projectExpenseSummary.setProjectId(projectId); projectExpenseSummary.setProjectId(projectId);
projectExpenseSummary.setCbStage(cbStage); projectExpenseSummary.setCbStage(cbStage);
projectExpenseSummary.setDataType(1);
projectExpenseSummaryService.save(projectExpenseSummary); projectExpenseSummaryService.save(projectExpenseSummary);
} }
} }
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java
View file @ 13d86181
...@@ -18,10 +18,12 @@ import com.dsk.cscec.constant.CbProjectConstants; ...@@ -18,10 +18,12 @@ import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectFile; import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectRecord; import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.*; import com.dsk.cscec.domain.bo.*;
import com.dsk.cscec.domain.vo.CbProjectCbStageNotDraftVo;
import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo; import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
import com.dsk.cscec.mapper.CbProjectFileMapper; import com.dsk.cscec.mapper.CbProjectFileMapper;
import com.dsk.cscec.mapper.CbProjectRecordMapper; import com.dsk.cscec.mapper.CbProjectRecordMapper;
import com.dsk.cscec.service.CbProjectExpenseSummaryService; import com.dsk.cscec.service.CbProjectExpenseSummaryService;
import com.dsk.cscec.service.CbProjectOtherService;
import com.dsk.cscec.service.CbProjectRecordService; import com.dsk.cscec.service.CbProjectRecordService;
import com.dsk.cscec.service.CbSummaryService; import com.dsk.cscec.service.CbSummaryService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -51,6 +53,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe ...@@ -51,6 +53,8 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
private CbSummaryService cbSummaryService; private CbSummaryService cbSummaryService;
@Resource @Resource
private CbProjectExpenseSummaryService projectExpenseSummaryService; private CbProjectExpenseSummaryService projectExpenseSummaryService;
@Resource
private CbProjectOtherService projectOtherService;
/** /**
* 新增项目 * 新增项目
...@@ -123,13 +127,13 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe ...@@ -123,13 +127,13 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
//工料汇总 //工料汇总
CbProjectBaseBo projectBaseBo = new CbProjectBaseBo(); CbProjectBaseBo projectBaseBo = new CbProjectBaseBo();
projectBaseBo.setProjectId(projectId); projectBaseBo.setProjectId(projectId);
projectBaseBo.setCbStage(cbStage); projectBaseBo.setCbStage(cbStage);
dataAnalysisComponent.quantitySummaryDataAnalysis(projectBaseBo); dataAnalysisComponent.quantitySummaryDataAnalysis(projectBaseBo);
//措施项目 //措施项目
//其他项目 //其他项目
projectOtherService.projectOtherDataAnalysis(projectBaseBo);
//现场经费 //现场经费
projectExpenseSummaryService.parseSceneExpenseData(projectId,cbStage,username); projectExpenseSummaryService.parseSceneExpenseSummaryData(projectId, cbStage, username);
//成本汇总 //成本汇总
cbSummaryService.importCbSummary(projectId); cbSummaryService.importCbSummary(projectId);
} }
...@@ -304,11 +308,11 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe ...@@ -304,11 +308,11 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
* @return 已有数据的成本阶段 * @return 已有数据的成本阶段
*/ */
@Override @Override
public List<Integer> getProjectCbStageNotDraft(Long relatedId) { public List<CbProjectCbStageNotDraftVo> getProjectCbStageNotDraft(Long relatedId) {
//通过关联ID校验项目是否存在 //通过关联ID校验项目是否存在
List<CbProjectRecord> projectRecordList = this.checkRelatedIdExist(relatedId); List<CbProjectRecord> projectRecordList = this.checkRelatedIdExist(relatedId);
ArrayList<Integer> cbStageList = new ArrayList<>(); ArrayList<CbProjectCbStageNotDraftVo> cbStageList = new ArrayList<>();
projectRecordList.forEach(projectRecord -> { projectRecordList.forEach(projectRecord -> {
//文件状态为解析成功or解析失败即为有数据 //文件状态为解析成功or解析失败即为有数据
...@@ -319,7 +323,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe ...@@ -319,7 +323,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
.eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS) .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS)
.or() .or()
.eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL))) { .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL))) {
cbStageList.add(projectRecord.getCbStage()); cbStageList.add(BeanUtil.toBean(projectRecord, CbProjectCbStageNotDraftVo.class));
} }
}); });
return cbStageList; return cbStageList;
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectFileMapper.xml
View file @ 13d86181
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsk.cscec.mapper.CbProjectFileMapper"> <mapper namespace="com.dsk.cscec.mapper.CbProjectFileMapper">
<!--获取现场经费菜单-->
<select id="getSceneExpenseMenuFromFile" resultType="com.dsk.cscec.domain.vo.CbSceneExpenseMenuVo">
select cpf.id as fileId,
cpf.file_name as menuName
from cb_project_file cpf
where cpf.project_id = #{projectId}
and cpf.del_flag = #{deleteFlagExist}
and cpf.cb_type = #{cbTypeSceneExpense}
and cpf.file_parse_status = #{projectFileStatusParseSuccess};
</select>
<select id="selectAnalysisList" resultType="com.dsk.cscec.domain.CbProjectFile"> <select id="selectAnalysisList" resultType="com.dsk.cscec.domain.CbProjectFile">
SELECT SELECT
id, project_id, cb_stage, cb_type, file_name, file_oss_id, file_oss_url, file_parse_status, fail_remark, id, project_id, cb_stage, cb_type, file_name, file_oss_id, file_oss_url, file_parse_status, fail_remark,
...@@ -11,7 +22,7 @@ ...@@ -11,7 +22,7 @@
<if test="cbStage != null"> <if test="cbStage != null">
and cb_stage =#{cbStage} and cb_stage =#{cbStage}
</if> </if>
and cb_type = #{cbType} and cb_type = #{cbType})
</select> </select>
<update id="removeById"> <update id="removeById">
......
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.xml
View file @ 13d86181
...@@ -3,8 +3,42 @@ ...@@ -3,8 +3,42 @@
<mapper namespace="com.dsk.cscec.mapper.CbProjectRecordMapper"> <mapper namespace="com.dsk.cscec.mapper.CbProjectRecordMapper">
<!--获取项目台账列表--> <!--获取项目台账列表-->
<select id="selectPageProjectRecordList" resultType="com.dsk.cscec.domain.vo.CbProjectRecordSearchVo"> <select id="selectPageProjectRecordList" resultType="com.dsk.cscec.domain.vo.CbProjectRecordSearchVo">
select <!-- select-->
cpr.id, <!-- cpr.id,-->
<!-- cpr.related_id,-->
<!-- cpr.project_name,-->
<!-- cpr.cb_stage,-->
<!-- cpr.project_file_status,-->
<!-- cpr.ipm_project_no,-->
<!-- cpr.is_get_project_detail,-->
<!-- cpr.project_file_name,-->
<!-- cpr.create_time-->
<!-- from cb_project_record cpr-->
<!-- left join cb_project_record cprr-->
<!-- on cpr.related_id = cprr.related_id-->
<!-- and cpr.cb_stage &lt; cprr.cb_stage-->
<!-- where-->
<!-- cprr.cb_stage is null-->
<!-- and-->
<!-- cpr.del_flag=#{deleteFlagExist}-->
<!-- <if test="searchBo.projectName != null and searchBo.projectName != ''">-->
<!-- and cpr.project_name like concat('%',#{searchBo.projectName},'%')-->
<!-- </if>-->
<!-- <if test="searchBo.ipmProjectNo != null and searchBo.ipmProjectNo != ''">-->
<!-- and cpr.ipm_project_no = #{searchBo.ipmProjectNo}-->
<!-- </if>-->
<!-- <if test="searchBo.cbStage != null">-->
<!-- and cpr.cb_stage = #{searchBo.cbStage}-->
<!-- </if>-->
<!-- <if test="searchBo.projectFileStatus != null">-->
<!-- and project_file_status = #{searchBo.projectFileStatus}-->
<!-- </if>-->
<!-- and-->
<!-- cpr.project_file_status != #{projectFileStatusPreparing}-->
<!-- order by cpr.create_time desc-->
select a.*
from (
select DISTINCT cpr.id,
cpr.related_id, cpr.related_id,
cpr.project_name, cpr.project_name,
cpr.cb_stage, cpr.cb_stage,
...@@ -14,13 +48,7 @@ ...@@ -14,13 +48,7 @@
cpr.project_file_name, cpr.project_file_name,
cpr.create_time cpr.create_time
from cb_project_record cpr from cb_project_record cpr
left join cb_project_record cprr where cpr.del_flag=#{deleteFlagExist}
on cpr.related_id = cprr.related_id
and cpr.cb_stage &lt; cprr.cb_stage
where
cprr.cb_stage is null
and
cpr.del_flag=#{deleteFlagExist}
<if test="searchBo.projectName != null and searchBo.projectName != ''"> <if test="searchBo.projectName != null and searchBo.projectName != ''">
and cpr.project_name like concat('%',#{searchBo.projectName},'%') and cpr.project_name like concat('%',#{searchBo.projectName},'%')
</if> </if>
...@@ -35,7 +63,9 @@ ...@@ -35,7 +63,9 @@
</if> </if>
and and
cpr.project_file_status != #{projectFileStatusPreparing} cpr.project_file_status != #{projectFileStatusPreparing}
order by cpr.create_time desc order by cpr.cb_stage desc) a
group by a.related_id
order by a.create_time desc
</select> </select>
<!--获取草稿弹窗列表--> <!--获取草稿弹窗列表-->
......
dsk-operate-ui/src/utils/index.js
View file @ 13d86181
...@@ -1082,9 +1082,9 @@ export function addTreeLevel(tree, startLevel = 1, removeEmptyChildren = true) { ...@@ -1082,9 +1082,9 @@ export function addTreeLevel(tree, startLevel = 1, removeEmptyChildren = true) {
export function addNodeParent(tree, parent = null) { export function addNodeParent(tree, parent = null) {
if (tree instanceof Array && tree?.length) { if (tree instanceof Array && tree?.length) {
tree.forEach(node => { tree.forEach(node => {
node["parent"] = parent ? parent : JSON.parse(JSON.stringify(parent)); node["parent"] = parent;
if (node.children instanceof Array && node.children.length) { if (node.children instanceof Array && node.children.length) {
addNodeParent(node.children, node); addNodeParent(node.children, JSON.parse(JSON.stringify(node)));
} }
}); });
} }
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ 13d86181
...@@ -62,67 +62,7 @@ export default { ...@@ -62,67 +62,7 @@ export default {
comProjectDetailInfo: {}, comProjectDetailInfo: {},
comProjectId: "", comProjectId: "",
defaultActive: "", defaultActive: "",
menuTreeList: [ menuTreeList: []
// {
// nodeName: "房建类成本科目",
// id: "1",
// children: [
// {
// nodeName: "劳务分包工程",
// id: "1-1",
// children: [
// {
// nodeName: "主体工程-结构劳务",
// id: "1-1-1",
// children: [
// {
// nodeName: "结构劳务分包",
// id: "1-1-1-1",
// }
// ]
// },
// {
// nodeName: "二次结构及粗装修劳务",
// id: "1-2-1",
// children: [
// {
// nodeName: "二次机构及粗装修劳务",
// id: "1-2-1",
// }
// ]
// },
// {
// nodeName: "拆除、修缮、清理、改造劳...",
// id: "1-3-1",
// children: [
// {
// nodeName: "拆除、修缮、清理、改造劳...",
// id: "1-3-1",
// }
// ]
// }
// ]
// },
// {
// nodeName: "专业分包工程",
// id: "2-1",
// },
// {
// nodeName: "实体工程材料（土建）",
// id: "3-1",
// },
// {
// nodeName: "其他直接费成本",
// id: "4-1",
// },
// ]
// },
// {
// nodeName: "未归类项目",
// id: "2",
// children: []
// }
]
}; };
}, },
//可访问data属性 //可访问data属性
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectSideMenu/index.vue
View file @ 13d86181
<template> <template>
<div class="project-side-menu-container"> <div class="project-side-menu-container">
<el-menu mode="vertical" class="project-side-menu-instance" :unique-opened="uniqueOpened" :default-active="defaultActive" @select="menuSelect" <el-menu mode="vertical" class="project-side-menu-instance" :unique-opened="uniqueOpened" :default-active="defaultActive" @select="menuSelect"
@open="subMenuOpen" @close="subMenuClose"> @open="subMenuOpen" @close="subMenuClose" ref="customElMenu">
<template v-for="(item,index) of tempMenuTree"> <template v-for="(item,index) of tempMenuTree">
<project-menu-item :menuItem="item" :key="item.nodeValue"> <project-menu-item :menuItem="item" :key="item.nodeValue">
<template :slot="`${item.nodeName}-${item.level}`" slot-scope="scope"> <template :slot="`${item.nodeName}-${item.level}`" slot-scope="scope">
...@@ -260,6 +260,7 @@ export default { ...@@ -260,6 +260,7 @@ export default {
} }
} }
} }
/* 无下级菜单 */ /* 无下级菜单 */
.project-only-menu-item { .project-only-menu-item {
height: unset; height: unset;
...@@ -271,6 +272,12 @@ export default { ...@@ -271,6 +272,12 @@ export default {
position: unset; position: unset;
white-space: unset; white-space: unset;
&.is-active,
&:hover {
/* 重置li默认样式 */
background-color: unset;
}
/* 选中 */ /* 选中 */
&.is-active { &.is-active {
.project-only-menu-title-container { .project-only-menu-title-container {
...@@ -285,6 +292,7 @@ export default { ...@@ -285,6 +292,7 @@ export default {
} }
} }
} }
.project-only-menu-title-container { .project-only-menu-title-container {
height: 32px; height: 32px;
line-height: unset; line-height: unset;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment