Skip to content

D
dsk-operate-sys-cscec
Commit 6ca2e394 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 abcc0e70 5ca4821e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1610 additions and 167 deletions
dsk-admin/src/main/resources/application.yml
View file @ 6ca2e394
......@@ -186,16 +186,14 @@ tenant:
- d_customer_tax_certificate
- f_supplier_limited
- f_ads_bsi_kpi_proj_two
- cb_account_summary
- cb_account_summary_actual
- cb_summary
- cb_summary_actual
- cb_cost_measure
- cb_cost_measure_actual
- cb_direct_expense
- cb_project_expense_summary
- cb_project_file
- cb_project_record
- cb_project_summary
- cb_project_summary_actual
- cb_quantity_summary
- cb_quantity_summary_actual
- cb_scene_expense_children
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/component/DataAnalysisComponent.java
View file @ 6ca2e394
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;
......@@ -8,16 +9,20 @@ import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbQuantitySummary;
import com.dsk.cscec.domain.bo.CbProjectBaseBo;
import com.dsk.cscec.service.CbProjectFileService;
import com.dsk.cscec.service.ICbQuantitySummaryActualService;
import com.dsk.cscec.service.ICbQuantitySummaryService;
import com.dsk.oss.factory.OssFactory;
import com.dsk.system.domain.vo.SysOssVo;
import com.dsk.system.service.ISysOssService;
import org.apache.el.stream.Stream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.ObjectUtils;
import java.io.FileInputStream;
import javax.annotation.Resource;
import java.io.InputStream;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
......@@ -32,6 +37,12 @@ public class DataAnalysisComponent {
@Autowired
private ICbQuantitySummaryService quantitySummaryService;
@Autowired
private CbProjectFileService projectFileService;
@Autowired
private ISysOssService ossService;
@Resource
private TransactionTemplate transactionTemplate;
/**
* 工料汇总数据解析
......@@ -42,52 +53,76 @@ public class DataAnalysisComponent {
List<CbProjectFile> fileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery()
.eq(CbProjectFile::getProjectId, bo.getProjectId())
.eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY)
.eq(CbProjectFile::getCbStage, bo.getCbStage()));
.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) {
if (file.getFileParseStatus() == 3) break;
//文件下载
InputStream inputStream = ossService.downFileIO(file.getFileOssId());
if (ObjectUtil.isNull(inputStream)) {
file.setFileParseStatus(3);
file.setFailRemark("文件数据不存在");
projectFileService.updateById(file);
break;
}
//解析数据
List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(new FileInputStream(""), 1);
List<CbQuantitySummary> importList = new ExcelUtils<>(CbQuantitySummary.class).importExcelAllSheet(inputStream, 1);
if (importList.isEmpty()) {
throw new ServiceException("表格中不存在待导入数据!");
file.setFileParseStatus(3);
file.setFailRemark("表格中不存在待导入数据!");
projectFileService.updateById(file);
break;
}
importList = importList.stream().parallel()
List<CbQuantitySummary> quantitySummaryList = importList.stream().parallel()
.filter(item -> !ObjectUtils.isEmpty(item.getCbName()))
.peek(item -> {
item.setProjectId(1L);
item.setCbStage(0);
item.setCbProjectFileId(1L);
}).collect(Collectors.toList());
if (importList.isEmpty()) {
if (quantitySummaryList.isEmpty()) {
throw new ServiceException("表格中不存在有效数据数据!");
}
//分批次插入
if (importList.size() > 1000) {
int index = 0;
int sum = importList.size();
while (index < sum) {
List<CbQuantitySummary> divideList = importList.subList(index, Math.max((index + 1) * 1000, sum));
boolean b = quantitySummaryService.saveBatch(divideList);
transactionTemplate.execute(status -> {
try {
//分批次插入
if (quantitySummaryList.size() > 1000) {
int index = 0;
int sum = quantitySummaryList.size();
while (index < sum) {
List<CbQuantitySummary> divideList = quantitySummaryList.subList(index, Math.max((index + 1) * 1000, sum));
boolean b = quantitySummaryService.saveBatch(divideList);
if (!b) {
throw new ServiceException("数据插入失败！");
}
index += 1000;
}
} else {
boolean b = quantitySummaryService.saveBatch(quantitySummaryList);
if (!b) {
throw new ServiceException("数据插入失败！");
}
}
file.setFileParseStatus(2);
boolean b = projectFileService.updateById(file);
if (!b) {
throw new ServiceException("数据插入失败！");
throw new ServiceException("文件状态更新失败！");
}
index += 1000;
}
} else {
boolean b = quantitySummaryService.saveBatch(importList);
if (!b) {
throw new ServiceException("数据插入失败！");
} catch (Exception e) {
status.setRollbackOnly();
file.setFileParseStatus(3);
file.setFailRemark(e.getMessage());
projectFileService.updateById(file);
}
}
return Boolean.TRUE;
});
} else {
quantitySummaryService.remove(Wrappers.<CbQuantitySummary>lambdaQuery().eq(CbQuantitySummary::getCbProjectFileId, file.getId()));
projectFileService.removeById(file);
}
}
}
@Autowired
private CbProjectFileService projectFileService;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/CbProjectConstants.java
View file @ 6ca2e394
......@@ -21,9 +21,9 @@ public interface CbProjectConstants {
*/
Integer CB_STAGE_TO_SOLID = 2;
/**
* 项目文件状态:待解析
* 项目文件状态:准备中
*/
Integer PROJECT_FILE_STATUS_WAIT_PARSE = 0;
Integer PROJECT_FILE_STATUS_PREPARING = 0;
/**
* 项目文件状态:解析中
*/
......@@ -58,25 +58,31 @@ public interface CbProjectConstants {
* 成本类型:直接费成本
*/
Integer CB_TYPE_DIRECT_EXPENSE = 0;
String CB_TYPE_DIRECT_EXPENSE_NAME = "直接费成本";
/**
* 成本类型:工料汇总
*/
Integer CB_TYPE_QUANTITY_SUMMARY = 1;
String CB_TYPE_QUANTITY_SUMMARY_NAME = "工料汇总";
/**
* 成本类型:措施项目
*/
Integer CB_TYPE_MEASURE_PROJECT = 2;
String CB_TYPE_MEASURE_PROJECT_NAME = "措施项目";
/**
* 成本类型:其他项目
*/
Integer CB_TYPE_OTHER_PROJECT = 3;
String CB_TYPE_OTHER_PROJECT_NAME = "其他项目";
/**
* 成本类型:现场经费
*/
Integer CB_TYPE_SCENE_EXPENSE = 4;
String CB_TYPE_SCENE_EXPENSE_NAME = "现场经费";
/**
* 成本类型:成本汇总
*/
Integer CB_TYPE_ACCOUNT_SUMMARY = 5;
Integer CB_TYPE_SUMMARY = 5;
String CB_TYPE_SUMMARY_NAME = "成本汇总";
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectFileController.java
View file @ 6ca2e394
......@@ -6,9 +6,9 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.R;
import com.dsk.common.enums.BusinessType;
import com.dsk.common.exception.ServiceException;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.bo.ProjectFileUploadBo;
import com.dsk.cscec.domain.bo.QueryCbProjectFileDetailBo;
import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
import com.dsk.cscec.service.CbProjectFileService;
import com.dsk.system.domain.vo.SysOssVo;
import com.dsk.system.service.ISysOssService;
......@@ -22,7 +22,6 @@ import javax.validation.constraints.NotNull;
import java.io.UnsupportedEncodingException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -47,7 +46,7 @@ public class CbProjectFileController extends BaseController {
*/
@Log(title = "项目台账上传OSS对象存储", businessType = BusinessType.INSERT)
@PostMapping(value = "/uploadCbProjectFile", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Map<String, String>> uploadCbProjectFile(@Validated @ModelAttribute ProjectFileUploadBo fileUploadBo) throws UnsupportedEncodingException {
public R<Map<String, String>> uploadCbProjectFile(@Validated @ModelAttribute AddProjectFileUploadBo fileUploadBo) throws UnsupportedEncodingException {
MultipartFile file = fileUploadBo.getFile();
if (ObjectUtil.isNull(file)) {
return R.fail("上传文件不能为空");
......@@ -76,11 +75,11 @@ public class CbProjectFileController extends BaseController {
return toAjax(baseService.deleteProjectFile(fileId));
}
///**
// * 根据项目ID获取项目文件详情
// */
//@GetMapping("/getProjectFileDetail")
//public R<List<CbProjectFile>> getProjectFileDetail(@Validated @RequestBody QueryCbProjectFileDetailBo queryBo) {
// return R.ok(baseService.getProjectFileDetail(queryBo));
//}
/**
* 获取项目文件上传详情
*/
@GetMapping("/getProjectFileUploadDetail")
public R<QueryProjectFileUploadDetailVo> getProjectFileUploadDetail(@Validated @RequestBody QueryProjectFileUploadDetailBo uploadDetailBo) {
return R.ok(baseService.getProjectFileUploadDetail(uploadDetailBo));
}
}
\ No newline at end of file
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java
View file @ 6ca2e394
......@@ -5,6 +5,8 @@ import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.R;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.AddCbProjectBo;
import com.dsk.cscec.domain.bo.EditProjectInfoBo;
import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
import com.dsk.cscec.service.CbProjectRecordService;
import com.dsk.cscec.service.IDProjectService;
import org.springframework.validation.annotation.Validated;
......@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* 项目台账表(CbProjectRecord)表控制层
......@@ -48,13 +51,43 @@ public class CbProjectRecordController extends BaseController {
return R.ok(projectRecord);
}
/**
* 根据项目文件导入数据
*/
@PostMapping("/importData")
public R<Void> importData(@Validated @RequestBody ImportCbProjectDataBo importDataBo) {
baseService.importData(importDataBo);
return R.ok("已开始解析成本数据,过程需3~10分钟,稍后可到项目列表查看导入结果");
}
/**
* 修改项目信息
*/
@PutMapping("/editProjectInfo")
public R<Void> editProjectInfo(@Validated @RequestBody EditProjectInfoBo editBo) {
return toAjax(baseService.editProjectInfo(editBo));
}
///**
// * 根据项目文件导入数据
// * 获取项目台账列表
// */
//@PostMapping("/importData")
//public R<Void> importData(@Validated @RequestBody ImportCbProjectDataBo importDataBo){
// return toAjax(baseService.importData(importDataBo));
//@GetMapping("/getProjectList")
//public R<List<CbProjectRecord>> getProjectList() {
// List<CbProjectRecord> projectList = baseService.getProjectList();
// return R.ok(projectList);
//}
/**
* 获取草稿弹窗列表
*/
@GetMapping("/getDraftDialogList")
public R<List<CbProjectRecord>> getDraftDialogList() {
List<CbProjectRecord> draftList = baseService.getDraftDialogList();
if (draftList.isEmpty()) {
return R.ok("暂无草稿记录");
}
return R.ok(draftList);
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbQuantitySummaryController.java
View file @ 6ca2e394
......@@ -11,7 +11,6 @@ import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
import com.dsk.cscec.service.ICbQuantitySummaryService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbSummaryController.java
View file @ 6ca2e394
package com.dsk.cscec.controller;
import cn.hutool.core.bean.BeanUtil;
import com.dsk.common.core.controller.BaseController;
import com.dsk.common.core.domain.R;
import com.dsk.common.utils.poi.ExcelUtil;
import com.dsk.cscec.domain.bo.CbSummaryActualBo;
import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
import com.dsk.cscec.domain.bo.CbSummaryBo;
import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
import com.dsk.cscec.domain.vo.CbSummaryCostAccountExportVo;
import com.dsk.cscec.domain.vo.CbSummaryProjectExportVo;
import com.dsk.cscec.service.CbSummaryService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 成本汇总(CbSummary)表控制层
......@@ -24,4 +36,71 @@ public class CbSummaryController extends BaseController {
private CbSummaryService cbSummaryService;
/**
* 成本汇总左侧一级数据列表
*
* @param bo
* @return
*/
@GetMapping("/cbNameList")
public R<List<Map<String, Object>>> getCbNameList(CbSummaryBo bo) {
return R.ok(cbSummaryService.getCbNameList(bo));
}
/**
* 成本汇总数据列表
* @param bo
* @return
*/
@GetMapping("/list")
public R<List<CbSummaryActualListVo>> getList(CbSummaryActualListBo bo) {
return R.ok(cbSummaryService.getActualList(bo));
}
/**
* 已添加成本月份
*
* @param bo
* @return
*/
@GetMapping("/expenseDateList")
public R<List<String>> getExpenseDateList(@Validated CbSummaryBo bo) {
return R.ok(cbSummaryService.getExpenseDateList(bo));
}
/**
* 编辑成本
*
* @param boList
* @return
*/
@PutMapping("/editActual")
public R editActual(@RequestBody List<CbSummaryActualBo> boList) {
return cbSummaryService.insertOrUpdateActual(boList) == true ? R.ok() : R.fail();
}
//锁定成本前提示未填项（按一级大类）
//锁定成本
/**
* 导出excel-按月导出所有
* @param bo
* @param response
*/
@PostMapping("/export")
public void export(CbSummaryActualListBo bo, HttpServletResponse response) {
List<CbSummaryActualListVo> actualListVoList = cbSummaryService.getAll(bo);
if(bo.getCbType()==1){
List<CbSummaryProjectExportVo> list = BeanUtil.copyToList(actualListVoList,CbSummaryProjectExportVo.class);
ExcelUtil.exportExcel(list, "成本汇总按项目汇总"+bo.getExpenseDate(), CbSummaryProjectExportVo.class, response);
}else {
List<CbSummaryCostAccountExportVo> list = BeanUtil.copyToList(actualListVoList,CbSummaryCostAccountExportVo.class);
ExcelUtil.exportExcel(list, "成本汇总按成本科目汇总"+bo.getExpenseDate(), CbSummaryCostAccountExportVo.class, response);
}
}
//导入
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectFile.java
View file @ 6ca2e394
package com.dsk.cscec.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -41,7 +42,7 @@ public class CbProjectFile extends BaseEntity implements Serializable {
/**
* OSS文件ID
*/
private String fileOssId;
private Long fileOssId;
/**
* OSS文件路径
*/
......@@ -57,5 +58,6 @@ public class CbProjectFile extends BaseEntity implements Serializable {
/**
* 删除状态(0:否、2:是)
*/
@TableLogic(value = "0", delval = "2")
private Integer delFlag;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectRecord.java
View file @ 6ca2e394
package com.dsk.cscec.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -23,15 +24,19 @@ public class CbProjectRecord extends BaseEntity implements Serializable {
@TableId(value = "id")
private Long id;
/**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
* 关联ID(关联多个阶段)
*/
private Integer cbStage;
private Long relatedId;
/**
* 项目名称
*/
private String projectName;
/**
* 项目文件状态(0:待解析、1:解析中、2:解析成功、3:解析失败)
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
/**
* 项目文件状态(0:准备中、1:解析中、2:解析成功、3:解析失败)
*/
private Integer projectFileStatus;
/**
......@@ -49,5 +54,6 @@ public class CbProjectRecord extends BaseEntity implements Serializable {
/**
* 删除状态(0:否、2:是)
*/
@TableLogic(value = "0", delval = "2")
private Integer delFlag;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbSummaryActual.java
View file @ 6ca2e394
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -27,11 +28,11 @@ public class CbSummaryActual implements Serializable {
/**
* 本月费用（含税）
*/
private Double taxInclusiveExpense;
private BigDecimal taxInclusiveExpense;
/**
* 本月费用（不含税）
*/
private Double taxExclusiveExpense;
private BigDecimal taxExclusiveExpense;
/**
* 费用日期
*/
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ProjectFileUploadBo.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddProjectFileUploadBo.java
View file @ 6ca2e394
......@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
* @time 16:07
*/
@Data
public class ProjectFileUploadBo {
public class AddProjectFileUploadBo {
private MultipartFile file;
@NotNull(message = "项目ID不能为空")
private Long projectId;
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSummaryActualBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* 成本汇总-每月费用Bo
*
* @author cyf
* @since 2024-02-06
*/
@Data
public class CbSummaryActualBo extends BaseEntity {
/**
* 费用id
*/
private Long id;
/**
* 成本汇总id
*/
@NotNull(message = "成本汇总id不能为空")
private Long cbSummaryId;
/**
* 本月费用（含税）
*/
private BigDecimal taxInclusiveExpense;
/**
* 本月费用（不含税）
*/
private BigDecimal taxExclusiveExpense;
/**
* 费用日期
*/
@NotEmpty(message = "费用日期不能为空")
private String expenseDate;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSummaryActualListBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 成本汇总-列表查询Bo
*
* @author cyf
* @since 2024-02-06
*/
@Data
public class CbSummaryActualListBo extends BaseEntity {
/**
* 主键id
*/
private Long id;
/**
* 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
/**
* 成本类型（1项目汇总，2成本科目汇总）
*/
private Integer cbType;
/**
* 费用日期
*/
private String expenseDate;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbSummaryBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 成本汇总Bo
*
* @author cyf
* @since 2024-02-06
*/
@Data
public class CbSummaryBo extends BaseEntity {
/**
* 主键id
*/
private Long id;
/**
* 父级id
*/
private Long parentId;
/**
* 层级
*/
private Integer level;
/**
* 项目id
*/
private Long projectId;
/**
* 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
/**
* 项目成本文件id
*/
private Long cbProjectFileId;
/**
* 成本类型（1项目汇总，2成本科目汇总）
*/
private Integer cbType;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/EditProjectInfoBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author sxk
* @date 2024.02.08
* @time 16:07
*/
@Data
public class EditProjectInfoBo {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空")
private Long projectId;
/**
* 项目名称
*/
private String projectName;
/**
* IPM项目编码
*/
private String ipmProjectNo;
/**
* 是否获取项目详情(0:否、1:是)
*/
@NotNull(message = "是否获取项目详情不能为空")
private Integer isGetProjectDetail;
/**
* 文件名称
*/
private String projectFileName;
/**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/ImportCbProjectDataBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author sxk
* @date 2024.02.07
* @time 11:28
*/
@Data
public class ImportCbProjectDataBo {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空")
private Long projectId;
/**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/
@NotNull(message = "成本阶段不能为空")
private Integer cbStage;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/QueryProjectFileUploadDetailBo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.bo;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author sxk
* @date 2024.02.06
* @time 14:17
*/
@Data
public class QueryProjectFileUploadDetailBo {
/**
* 项目ID
*/
@NotNull(message = "项目ID不能为空")
private Long projectId;
/**
* 成本阶段(0:标前成本、1:标后成本、2:转固成本)
*/
@NotNull(message = "成本阶段不能为空")
private Integer cbStage;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryActualListVo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.vo;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 成本汇总Bo
*
* @author cyf
* @since 2024-02-06
*/
@Data
public class CbSummaryActualListVo extends BaseEntity {
/**
* 主键id
*/
private Long id;
/**
* 项目id
*/
private Long projectId;
/**
* 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
*/
private Integer cbStage;
/**
* 序号
*/
private String number;
/**
* 名称/成本科目
*/
private String cbName;
/**
* 不含税成本合价
*/
private String taxExclusiveTotal;
/**
* 成本税金合价
*/
private String cbTaxesTotal;
/**
* 含税成本合价
*/
private String taxInclusiveTotal;
/**
* 成本占比
*/
private String cbProportion;
/**
* 含税成本平米指标
*/
private String taxInclusivePmTarget;
/**
* 备注
*/
private String remark;
/**
* 费用id
*/
private Long actualId;
/**
* 本月费用（含税）
*/
private BigDecimal taxInclusiveExpense;
/**
* 本月费用（不含税）
*/
private BigDecimal taxExclusiveExpense;
/**
* 截至本月费用（含税）
*/
private BigDecimal taxInclusiveExpenseTotal;
/**
* 截至本月费用（不含税）
*/
private BigDecimal taxExclusiveExpenseTotal;
/**
* 费用日期
*/
private String expenseDate;
/**
* 是否锁定（0否，1是）
*/
private Integer lockStatus;
private List<CbSummaryActualListVo> children;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryCostAccountExportVo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 成本汇总(CbSummary)-成本科目汇总导出Vo
*
* @author cyf
* @since 2024-02-06
*/
@Data
@NoArgsConstructor
public class CbSummaryCostAccountExportVo implements Serializable {
private static final long serialVersionUID = -20126964599875841L;
/**
* 序号
*/
@ExcelProperty(value = "序号")
private String number;
/**
* 成本科目
*/
@ExcelProperty(value = "成本科目")
private String cbName;
/**
* 不含税成本合价
*/
@ExcelProperty(value = "不含税成本合价")
private String taxExclusiveTotal;
/**
* 成本税金合价
*/
@ExcelProperty(value = "成本税金合价")
private String cbTaxesTotal;
/**
* 含税成本合价
*/
@ExcelProperty(value = "含税成本合价")
private String taxInclusiveTotal;
/**
* 成本占比
*/
@ExcelProperty(value = "成本占比")
private String cbProportion;
/**
* 含税成本平米指标
*/
@ExcelProperty(value = "含税成本平米指标")
private String taxInclusivePmTarget;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 本月费用（含税）
*/
@ExcelProperty(value = "本月费用（含税）")
private BigDecimal taxInclusiveExpense;
/**
* 本月费用（不含税）
*/
@ExcelProperty(value = "本月费用（不含税）")
private BigDecimal taxExclusiveExpense;
/**
* 截至本月费用（含税）
*/
@ExcelProperty(value = "截至本月费用（含税）")
private BigDecimal taxInclusiveExpenseTotal;
/**
* 截至本月费用（不含税）
*/
@ExcelProperty(value = "截至本月费用（不含税）")
private BigDecimal taxExclusiveExpenseTotal;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryProjectExportVo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 成本汇总(CbSummary)-项目汇总导出Vo
*
* @author cyf
* @since 2024-02-06
*/
@Data
@NoArgsConstructor
public class CbSummaryProjectExportVo implements Serializable {
private static final long serialVersionUID = -20126964599875841L;
/**
* 序号
*/
@ExcelProperty(value = "序号")
private String number;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String cbName;
/**
* 不含税成本合价
*/
@ExcelProperty(value = "不含税成本合价")
private String taxExclusiveTotal;
/**
* 成本税金合价
*/
@ExcelProperty(value = "成本税金合价")
private String cbTaxesTotal;
/**
* 含税成本合价
*/
@ExcelProperty(value = "含税成本合价")
private String taxInclusiveTotal;
/**
* 成本占比
*/
@ExcelProperty(value = "成本占比")
private String cbProportion;
/**
* 含税成本平米指标
*/
@ExcelProperty(value = "含税成本平米指标")
private String taxInclusivePmTarget;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
/**
* 本月费用（含税）
*/
@ExcelProperty(value = "本月费用（含税）")
private BigDecimal taxInclusiveExpense;
/**
* 本月费用（不含税）
*/
@ExcelProperty(value = "本月费用（不含税）")
private BigDecimal taxExclusiveExpense;
/**
* 截至本月费用（含税）
*/
@ExcelProperty(value = "截至本月费用（含税）")
private BigDecimal taxInclusiveExpenseTotal;
/**
* 截至本月费用（不含税）
*/
@ExcelProperty(value = "截至本月费用（不含税）")
private BigDecimal taxExclusiveExpenseTotal;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryProjectImportVo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* 成本汇总(CbSummary)-项目汇总导入Vo
*
* @author cyf
* @since 2024-02-06
*/
@Data
@NoArgsConstructor
public class CbSummaryProjectImportVo implements Serializable {
private static final long serialVersionUID = -20126964599875841L;
/**
* 序号
*/
@ExcelProperty(value = "序号")
private String number;
/**
* 名称
*/
@ExcelProperty(value = "名称")
private String cbName;
/**
* 不含税成本合价
*/
@ExcelProperty(value = "不含税成本合价")
private String taxExclusiveTotal;
/**
* 成本税金合价
*/
@ExcelProperty(value = "成本税金合价")
private String cbTaxesTotal;
/**
* 含税成本合价
*/
@ExcelProperty(value = "含税成本合价")
private String taxInclusiveTotal;
/**
* 成本占比
*/
@ExcelProperty(value = "成本占比")
private String cbProportion;
/**
* 含税成本平米指标
*/
@ExcelProperty(value = "含税成本平米指标")
private String taxInclusivePmTarget;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/QueryProjectFileUploadDetailVo.java 0 → 100644
View file @ 6ca2e394
package com.dsk.cscec.domain.vo;
import com.dsk.cscec.domain.CbProjectFile;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author sxk
* @date 2024.02.08
* @time 10:24
*/
@Data
public class QueryProjectFileUploadDetailVo {
/**
* 项目ID
*/
private Long projectId;
/**
* 直接费成本
*/
private List<CbProjectFile> directExpense = new ArrayList<>();
/**
* 工料汇总
*/
private List<CbProjectFile> quantitySummary = new ArrayList<>();
/**
* 措施项目
*/
private List<CbProjectFile> measureProject = new ArrayList<>();
/**
* 其他项目
*/
private List<CbProjectFile> otherProject = new ArrayList<>();
/**
* 现场经费
*/
private List<CbProjectFile> sceneExpense = new ArrayList<>();
/**
* 成本汇总
*/
private List<CbProjectFile> cbSummary = new ArrayList<>();
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectFileMapper.java
View file @ 6ca2e394
......@@ -11,6 +11,5 @@ import com.dsk.cscec.domain.CbProjectFile;
*/
public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> {
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbSummaryActualMapper.java
View file @ 6ca2e394
......@@ -2,6 +2,9 @@ package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.CbSummaryActual;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 成本汇总-每月费用(CbSummaryActual)表数据库访问层
......@@ -10,5 +13,12 @@ import com.dsk.cscec.domain.CbSummaryActual;
* @since 2024-02-06
*/
public interface CbSummaryActualMapper extends BaseMapper<CbSummaryActual> {
/**
* 批量新增或按主键更新数据（MyBatis原生foreach方法）
*
* @param entities List<CbSummaryActual> 实例对象列表
* @return 影响行数
*/
int insertOrUpdateBatch(@Param("entities") List<CbSummaryActual> entities);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbSummaryMapper.java
View file @ 6ca2e394
......@@ -2,6 +2,13 @@ package com.dsk.cscec.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsk.cscec.domain.CbSummary;
import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
import com.dsk.cscec.domain.bo.CbSummaryBo;
import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 成本汇总(CbSummary)表数据库访问层
......@@ -11,4 +18,39 @@ import com.dsk.cscec.domain.CbSummary;
*/
public interface CbSummaryMapper extends BaseMapper<CbSummary> {
List<CbSummaryActualListVo> getByParentId(@Param("parentId") Long parentId, @Param("expenseDate") String expenseDate);
CbSummaryActualListVo getById(@Param("id") Long id, @Param("expenseDate") String expenseDate);
/**
* 根据月份获取所有项目汇总数据
*
* @param bo
* @return
*/
List<CbSummaryActualListVo> getProjectAll(@Param("bo") CbSummaryActualListBo bo);
/**
* 根据月份获取所有成本科目汇总数据
*
* @param bo
* @return
*/
List<CbSummaryActualListVo> getCostAccountAll(@Param("bo") CbSummaryActualListBo bo);
/**
* 获取已添加成本月份
*
* @param bo
* @return
*/
List<String> getExpenseDateList(@Param("bo") CbSummaryBo bo);
/**
* 根据level获取名称/成本科目
*
* @param bo
* @return
*/
List<Map<String, Object>> selectByLevel(@Param("bo") CbSummaryBo bo);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectFileService.java
View file @ 6ca2e394
......@@ -2,12 +2,11 @@ package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.bo.QueryCbProjectFileDetailBo;
import com.dsk.cscec.domain.bo.ProjectFileUploadBo;
import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
import com.dsk.system.domain.vo.SysOssVo;
import java.util.List;
/**
* 项目成本文件表(CbProjectFile)表服务接口
*
......@@ -21,7 +20,7 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
* @param fileUploadBo 上传信息
* @param oss oss信息
*/
void addProjectFile(ProjectFileUploadBo fileUploadBo, SysOssVo oss);
void addProjectFile(AddProjectFileUploadBo fileUploadBo, SysOssVo oss);
/**
* 逻辑删除项目上传文件记录
......@@ -31,12 +30,12 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
*/
Integer deleteProjectFile(Long fileId);
///**
// * 根据项目ID获取项目文件详情
// *
// * @param queryBo 查询体
// * @return 文件详情列表
// */
//List<CbProjectFile> getProjectFileDetail(QueryCbProjectFileDetailBo queryBo);
/**
* 获取项目文件上传详情
*
* @param uploadDetailBo 查询信息
* @return 文件列表
*/
QueryProjectFileUploadDetailVo getProjectFileUploadDetail(QueryProjectFileUploadDetailBo uploadDetailBo);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectRecordService.java
View file @ 6ca2e394
......@@ -3,6 +3,10 @@ package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.AddCbProjectBo;
import com.dsk.cscec.domain.bo.EditProjectInfoBo;
import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
import java.util.List;
/**
* 项目台账表(CbProjectRecord)表服务接口
......@@ -19,11 +23,25 @@ public interface CbProjectRecordService extends IService<CbProjectRecord> {
*/
CbProjectRecord addProject(AddCbProjectBo addCbProjectBo);
///**
// * 根据项目文件导入数据
// *
// * @param importDataBo 导入对象
// * @return 导入结果
// */
//Boolean importData(ImportCbProjectDataBo importDataBo);
/**
* 根据项目文件导入数据
*
* @param importDataBo 导入对象
*/
void importData(ImportCbProjectDataBo importDataBo);
/**
* 修改项目信息
*
* @param editBo 修改对象
* @return 修改结果
*/
Integer editProjectInfo(EditProjectInfoBo editBo);
/**
* 获取草稿弹窗列表
*
* @return 草稿弹窗列表
*/
List<CbProjectRecord> getDraftDialogList();
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbSummaryService.java
View file @ 6ca2e394
......@@ -2,6 +2,13 @@ package com.dsk.cscec.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsk.cscec.domain.CbSummary;
import com.dsk.cscec.domain.bo.CbSummaryActualBo;
import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
import com.dsk.cscec.domain.bo.CbSummaryBo;
import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
import java.util.List;
import java.util.Map;
/**
......@@ -12,4 +19,45 @@ import com.dsk.cscec.domain.CbSummary;
*/
public interface CbSummaryService extends IService<CbSummary> {
//项目汇总导入 todo
void importCbProject(Long projectId, Integer cbStage);
/**
* 获取一级名称/成本科目列表
*
* @param bo
* @return
*/
List<Map<String, Object>> getCbNameList(CbSummaryBo bo);
/**
* 根据父级id获取子级数据
*
* @param bo
* @return
*/
List<CbSummaryActualListVo> getActualList(CbSummaryActualListBo bo);
/**
* 获取已添加成本月份
*
* @param bo
* @return
*/
List<String> getExpenseDateList(CbSummaryBo bo);
/**
* 新增/更新每月费用
*
* @param boList
* @return
*/
boolean insertOrUpdateActual(List<CbSummaryActualBo> boList);
/**
* 导出列表获取
* @param bo
* @return
*/
List<CbSummaryActualListVo> getAll(CbSummaryActualListBo bo);
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectFileServiceImpl.java
View file @ 6ca2e394
package com.dsk.cscec.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Assert;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.common.exception.ServiceException;
import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.QueryCbProjectFileDetailBo;
import com.dsk.cscec.domain.bo.ProjectFileUploadBo;
import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
import com.dsk.cscec.domain.bo.QueryProjectFileUploadDetailBo;
import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
import com.dsk.cscec.mapper.CbProjectFileMapper;
import com.dsk.cscec.mapper.CbProjectRecordMapper;
import com.dsk.cscec.service.CbProjectFileService;
......@@ -19,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
/**
* 项目成本文件表(CbProjectFile)表服务实现类
......@@ -41,19 +43,16 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void addProjectFile(ProjectFileUploadBo fileUploadBo, SysOssVo oss) {
public void addProjectFile(AddProjectFileUploadBo fileUploadBo, SysOssVo oss) {
//校验项目是否存在
if (!projectRecordMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
.eq(CbProjectRecord::getId, fileUploadBo.getProjectId())
.eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST))) {
throw new ServiceException("项目ID无效,该项目不存在");
}
this.checkProjectExist(fileUploadBo.getProjectId());
CbProjectFile projectFile = BeanUtil.toBean(fileUploadBo, CbProjectFile.class);
projectFile.setFileName(oss.getOriginalName());
projectFile.setFileOssId(oss.getOssId().toString());
projectFile.setFileOssId(oss.getOssId());
projectFile.setFileOssUrl(oss.getUrl());
//项目文件状态:解析中
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
//项目文件状态:准备中
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
//删除状态:未删除
projectFile.setDelFlag(CbProjectConstants.DELETE_FLAG_EXIST);
baseMapper.insert(projectFile);
......@@ -68,30 +67,73 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
@Override
public Integer deleteProjectFile(Long fileId) {
CbProjectFile projectFile = baseMapper.selectById(fileId);
Assert.notNull(projectFile,"该文件不存在");
Assert.notNull(projectFile, "该文件不存在");
projectFile.setDelFlag(CbProjectConstants.DELETE_FLAG_NOT_EXIST);
return baseMapper.updateById(projectFile);
}
///**
// * 根据项目ID获取项目文件详情
// *
// * @param queryBo 查询体
// * @return 文件详情列表
// */
//@Override
//public List<CbProjectFile> getProjectFileDetail(QueryCbProjectFileDetailBo queryBo) {
// return baseMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
// .eq(CbProjectFile::getProjectId, queryBo.getProjectId())
// .eq(CbProjectFile::getCbStage, queryBo.getCbStage())
// //成本类型:未确定,即创建项目后未上传任何文件
// .ne(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_NOT_CONFIRM)
// .eq(CbProjectFile::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST)
// //项目文件状态:未上传
// .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_NOT_UPLOAD)
// .or()
// //项目文件状态:待解析
// .eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_WAIT_PARSE));
//}
/**
* 获取项目文件上传详情
*
* @param uploadDetailBo 查询信息
* @return 文件列表
*/
@Override
public QueryProjectFileUploadDetailVo getProjectFileUploadDetail(QueryProjectFileUploadDetailBo uploadDetailBo) {
Long projectId = uploadDetailBo.getProjectId();
//校验项目是否存在
this.checkProjectExist(projectId);
List<CbProjectFile> projectFileList = baseMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
.eq(CbProjectFile::getProjectId, projectId)
//成本阶段
.eq(CbProjectFile::getCbStage, uploadDetailBo.getCbStage())
//删除状态:否
.eq(CbProjectFile::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST));
QueryProjectFileUploadDetailVo draftDetailVo = new QueryProjectFileUploadDetailVo();
draftDetailVo.setProjectId(projectId);
if (projectFileList.isEmpty()) {
return draftDetailVo;
}
//按照成本类型分类填充
projectFileList.forEach(fileList -> {
//TODO:此写法太丑陋,待优化
if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_DIRECT_EXPENSE)) {
//直接费成本
draftDetailVo.getDirectExpense().add(fileList);
} else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY)) {
//工料汇总
draftDetailVo.getQuantitySummary().add(fileList);
} else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_MEASURE_PROJECT)) {
//措施项目
draftDetailVo.getMeasureProject().add(fileList);
} else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_OTHER_PROJECT)) {
//其他项目
draftDetailVo.getOtherProject().add(fileList);
} else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_SCENE_EXPENSE)) {
//现场经费
draftDetailVo.getSceneExpense().add(fileList);
} else if (Objects.equals(fileList.getCbType(), CbProjectConstants.CB_TYPE_SUMMARY)) {
//成本汇总
draftDetailVo.getCbSummary().add(fileList);
}
});
return draftDetailVo;
}
/**
* 校验项目是否存在
*
* @param projectId 项目ID
*/
private void checkProjectExist(Long projectId) {
//校验项目是否存在
if (!projectRecordMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
.eq(CbProjectRecord::getId, projectId)
.eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST))) {
throw new ServiceException("该项目不存在");
}
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java
View file @ 6ca2e394
package com.dsk.cscec.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.bo.AddCbProjectBo;
import com.dsk.cscec.domain.bo.EditProjectInfoBo;
import com.dsk.cscec.domain.bo.ImportCbProjectDataBo;
import com.dsk.cscec.mapper.CbProjectFileMapper;
import com.dsk.cscec.mapper.CbProjectRecordMapper;
import com.dsk.cscec.service.CbProjectRecordService;
......@@ -13,6 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* 项目台账表(CbProjectRecord)表服务实现类
......@@ -37,42 +42,110 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
@Transactional(rollbackFor = Exception.class)
public CbProjectRecord addProject(AddCbProjectBo addCbProjectBo) {
CbProjectRecord projectRecord = BeanUtil.toBean(addCbProjectBo, CbProjectRecord.class);
//项目文件状态:待解析
projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_WAIT_PARSE);
//项目文件状态:准备中
projectRecord.setProjectFileStatus(CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
//删除状态:否
projectRecord.setDelFlag(CbProjectConstants.DELETE_FLAG_EXIST);
if (baseMapper.insert(projectRecord) > 0) {
CbProjectFile projectFile = new CbProjectFile();
projectFile.setProjectId(projectRecord.getId());
projectFile.setCbStage(projectRecord.getCbStage());
//项目文件状态:未上传
projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_NOT_UPLOAD);
//成本类型:未确定
projectFile.setCbType(CbProjectConstants.CB_TYPE_NOT_CONFIRM);
projectFile.setDelFlag(CbProjectConstants.DELETE_FLAG_EXIST);
projectFileMapper.insert(projectFile);
return projectRecord;
}
return null;
}
///**
// * 根据项目文件导入数据
// *
// * @param importDataBo 导入对象
// * @return 导入结果
// */
//@Override
//public Boolean importData(ImportCbProjectDataBo importDataBo) {
// Long projectId = importDataBo.getProjectId();
// Integer cbStage = importDataBo.getCbStage();
// //校验项目是否存在
// Assert.isTrue(baseMapper.exists(new LambdaQueryWrapper<CbProjectRecord>()
// .eq(CbProjectRecord::getId, projectId)
// .eq(CbProjectRecord::getCbStage, cbStage)
// .eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST)), "该项目不存在");
// //TODO:调各个成本类型的导入文件方法
//
// return null;
//}
/**
* 根据项目文件导入数据
*
* @param importDataBo 导入对象
*/
@Override
public void importData(ImportCbProjectDataBo importDataBo) {
Long projectId = importDataBo.getProjectId();
Integer cbStage = importDataBo.getCbStage();
//校验项目是否存在
this.checkProjectExist(projectId);
//校验各个成本类型是否至少有1个文件
//直接费成本
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_DIRECT_EXPENSE, CbProjectConstants.CB_TYPE_DIRECT_EXPENSE_NAME);
//工料汇总
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY, CbProjectConstants.CB_TYPE_QUANTITY_SUMMARY_NAME);
//措施项目
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_MEASURE_PROJECT, CbProjectConstants.CB_TYPE_MEASURE_PROJECT_NAME);
//其他项目
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_OTHER_PROJECT, CbProjectConstants.CB_TYPE_OTHER_PROJECT_NAME);
//现场经费
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_SCENE_EXPENSE, CbProjectConstants.CB_TYPE_SCENE_EXPENSE_NAME);
//成本汇总
this.checkCbTypeExistFile(importDataBo, CbProjectConstants.CB_TYPE_SUMMARY, CbProjectConstants.CB_TYPE_SUMMARY_NAME);
//TODO:调各个成本类型的解析文件方法
//直接费成本
//工料汇总
//措施项目
//其他项目
//现场经费
//成本汇总
}
/**
* 校验各个成本类型是否至少有1个文件
*
* @param importDataBo 导入对象
* @param cbType 成本类型字典（0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总）
* @param cbTypeName 成本类型名称
*/
private void checkCbTypeExistFile(ImportCbProjectDataBo importDataBo, Integer cbType, String cbTypeName) {
boolean isExist = projectFileMapper.exists(new LambdaQueryWrapper<CbProjectFile>()
.eq(CbProjectFile::getProjectId, importDataBo.getProjectId())
.eq(CbProjectFile::getCbStage, importDataBo.getCbStage())
.eq(CbProjectFile::getCbType, cbType)
//项目文件状态:准备中
.eq(CbProjectFile::getFileParseStatus, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
//删除状态:否
.eq(CbProjectFile::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST));
Assert.isTrue(isExist, cbTypeName + "至少需要上传1个文件");
}
/**
* 修改项目信息
*
* @param editBo 修改对象
* @return 修改结果
*/
@Override
public Integer editProjectInfo(EditProjectInfoBo editBo) {
//校验项目是否存在
this.checkProjectExist(editBo.getProjectId());
CbProjectRecord projectRecord = baseMapper.selectById(editBo.getProjectId());
projectRecord.setProjectName(editBo.getProjectName());
projectRecord.setIpmProjectNo(editBo.getIpmProjectNo());
projectRecord.setIsGetProjectDetail(editBo.getIsGetProjectDetail());
projectRecord.setProjectFileName(editBo.getProjectFileName());
return baseMapper.updateById(projectRecord);
}
/**
* 校验项目是否存在
*
* @param projectId 项目ID
*/
private void checkProjectExist(Long projectId) {
CbProjectRecord projectRecord = baseMapper.selectOne(new LambdaQueryWrapper<CbProjectRecord>()
.eq(CbProjectRecord::getId, projectId)
.eq(CbProjectRecord::getDelFlag, CbProjectConstants.DELETE_FLAG_EXIST));
Assert.notNull(projectRecord, "该项目不存在");
}
/**
* 获取草稿弹窗列表
*
* @return 草稿弹窗列表
*/
@Override
public List<CbProjectRecord> getDraftDialogList() {
return baseMapper.selectList(new LambdaQueryWrapper<CbProjectRecord>()
.eq(CbProjectRecord::getProjectFileStatus,CbProjectConstants.PROJECT_FILE_STATUS_PREPARING));
}
}
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbQuantitySummaryServiceImpl.java
View file @ 6ca2e394
......@@ -2,31 +2,23 @@ package com.dsk.cscec.service.impl;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.CbQuantitySummary;
import com.dsk.cscec.domain.CbQuantitySummaryActual;
import com.dsk.cscec.domain.bo.CbProjectBaseBo;
import com.dsk.cscec.domain.bo.CbQuantitySummaryListBo;
import com.dsk.cscec.domain.vo.CbQuantitySummaryListVo;
import com.dsk.cscec.mapper.CbQuantitySummaryMapper;
import com.dsk.cscec.service.CbProjectFileService;
import com.dsk.cscec.service.ICbQuantitySummaryActualService;
import com.dsk.cscec.service.ICbQuantitySummaryService;
import jodd.bean.BeanException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.io.FileInputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbSummaryServiceImpl.java
View file @ 6ca2e394
package com.dsk.cscec.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsk.cscec.mapper.CbSummaryMapper;
import com.dsk.common.exception.ServiceException;
import com.dsk.cscec.constant.CbProjectConstants;
import com.dsk.cscec.domain.CbProjectFile;
import com.dsk.cscec.domain.CbProjectRecord;
import com.dsk.cscec.domain.CbSummary;
import com.dsk.cscec.domain.CbSummaryActual;
import com.dsk.cscec.domain.bo.CbSummaryActualBo;
import com.dsk.cscec.domain.bo.CbSummaryActualListBo;
import com.dsk.cscec.domain.bo.CbSummaryBo;
import com.dsk.cscec.domain.vo.CbSummaryActualListVo;
import com.dsk.cscec.mapper.CbProjectFileMapper;
import com.dsk.cscec.mapper.CbProjectRecordMapper;
import com.dsk.cscec.mapper.CbSummaryActualMapper;
import com.dsk.cscec.mapper.CbSummaryMapper;
import com.dsk.cscec.service.CbSummaryService;
import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 成本汇总(CbSummary)表服务实现类
......@@ -14,5 +41,162 @@ import org.springframework.stereotype.Service;
*/
@Service
public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary> implements CbSummaryService {
@Autowired
private CbProjectFileMapper cbProjectFileMapper;
@Autowired
private CbSummaryActualMapper cbSummaryActualMapper;
@Autowired
private CbProjectRecordMapper cbProjectRecordMapper;
@Override
public void importCbProject(Long projectId, Integer cbStage) {
//获取文件信息
List<CbProjectFile> cbProjectFiles = cbProjectFileMapper.selectList(new LambdaQueryWrapper<CbProjectFile>()
.eq(CbProjectFile::getProjectId, projectId)
.eq(CbProjectFile::getCbStage, cbStage)
.eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_SUMMARY)
);
//解析数据
cbProjectFiles.forEach(cbProjectFile -> {
MultipartFile file = null;//todo
if (cbProjectFile.getFileName().contains("项目")) {
} else if (cbProjectFile.getFileName().contains("项目")) {
} else {
//修改文件状态
cbProjectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
cbProjectFile.setFailRemark("文件名错误！");
cbProjectFileMapper.updateById(cbProjectFile);
}
});
}
@Override
public List<Map<String, Object>> getCbNameList(CbSummaryBo bo) {
Assert.notNull(bo.getProjectId(), "项目id不能为空");
Assert.notNull(bo.getCbStage(), "成本阶段不能为空");
Assert.notNull(bo.getCbType(), "成本类型不能为空");
List<Map<String, Object>> resultList = new ArrayList<>();
bo.setLevel(0);
List<Map<String, Object>> cbNameTop = baseMapper.selectByLevel(bo);
bo.setLevel(1);
List<Map<String, Object>> cbNames = baseMapper.selectByLevel(bo);
resultList.addAll(cbNameTop);
resultList.addAll(cbNames);
return resultList;
}
@Override
public List<CbSummaryActualListVo> getActualList(CbSummaryActualListBo bo) {
Assert.notNull(bo.getId(),"id不能为空");
Assert.notNull(bo.getCbType(),"成本类型不能为空");
if (StringUtil.isBlank(bo.getExpenseDate())) {
//默认当前月
bo.setExpenseDate(DatePattern.SIMPLE_MONTH_FORMAT.format(new Date()));
}
CbSummary cbSummary = baseMapper.selectById(bo.getId());
if (ObjectUtil.isEmpty(cbSummary)) {
return null;
}
List<CbSummaryActualListVo> childrenList = baseMapper.getByParentId(bo.getId(), bo.getExpenseDate());
if (0 == cbSummary.getLevel() && 1 == bo.getCbType()) {
//项目汇总
return childrenList;
}else if(0 == cbSummary.getLevel() && 2 == bo.getCbType()) {
//成本科目汇总
CbSummaryActualListVo cbSummaryActualListVo = baseMapper.getById(bo.getId(), bo.getExpenseDate());
cbSummaryActualListVo.setChildren(childrenList);
List<CbSummaryActualListVo> list = new ArrayList<>();
list.add(cbSummaryActualListVo);
return list;
}else {
childrenList = getProjectSumList(bo);
CbSummaryActualListVo cbSummaryActualListVo = baseMapper.getById(bo.getId(),bo.getExpenseDate());
cbSummaryActualListVo.setChildren(childrenList);
List<CbSummaryActualListVo> list = new ArrayList<>();
list.add(cbSummaryActualListVo);
return list;
}
}
/**
* 成本汇总列表
*
* @param bo
* @return
*/
private List<CbSummaryActualListVo> getProjectSumList(CbSummaryActualListBo bo) {
List<CbSummaryActualListVo> childrenList = baseMapper.getByParentId(bo.getId(), bo.getExpenseDate());
childrenList.forEach(children -> {
CbSummaryActualListBo childBo = new CbSummaryActualListBo();
childBo.setId(children.getId());
childBo.setExpenseDate(bo.getExpenseDate());
children.setChildren(getProjectSumList(childBo));
});
return childrenList;
}
@Override
public List<String> getExpenseDateList(CbSummaryBo bo) {
Assert.notNull(bo.getProjectId(),"项目id不能为空");
Assert.notNull(bo.getCbStage(),"成本阶段不能为空");
Assert.notNull(bo.getCbType(),"成本类型不能为空");
return baseMapper.getExpenseDateList(bo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean insertOrUpdateActual(List<CbSummaryActualBo> boList) {
if (CollectionUtil.isEmpty(boList)) {
return false;
}
boList.forEach(bo->{
Assert.notNull(bo.getCbSummaryId(),"成本汇总id不能为空");
Assert.notNull(bo.getExpenseDate(),"费用日期不能为空");
});
List<CbSummaryActual> actualList = BeanUtil.copyToList(boList, CbSummaryActual.class);
//todo
// throw new ServiceException("当前成本已锁定，不允许编辑！");
return cbSummaryActualMapper.insertOrUpdateBatch(actualList) > 0;
}
@Override
public List<CbSummaryActualListVo> getAll(CbSummaryActualListBo bo) {
Assert.notNull(bo.getId(), "项目id不能为空");
Assert.notNull(bo.getCbType(), "成本类型不能为空");
Assert.notNull(bo.getExpenseDate(), "费用日期不能为空");
//获取项目成本阶段
CbProjectRecord cbProjectRecord = cbProjectRecordMapper.selectById(bo.getId());
if (ObjectUtil.isNull(cbProjectRecord)) {
throw new ServiceException("当前项目不存在");
}
bo.setCbStage(cbProjectRecord.getCbStage());
if (bo.getCbType() == 1) {
return baseMapper.getProjectAll(bo);
} else {
return baseMapper.getCostAccountAll(bo);
}
//todo 截至本月费用汇总
}
}
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectFileMapper.xml
View file @ 6ca2e394
......@@ -2,6 +2,5 @@
<!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>
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryActualMapper.xml
View file @ 6ca2e394
......@@ -17,5 +17,15 @@
id, cb_summary_id, tax_inclusive_expense, tax_exclusive_expense, expense_date, lock_status, create_time, del_flag
</sql>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into cb_summary_actual(id,cb_summary_id, tax_inclusive_expense, tax_exclusive_expense,expense_date)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.id}, #{entity.cbSummaryId}, #{entity.taxInclusiveExpense}, #{entity.taxExclusiveExpense}, #{entity.expenseDate})
</foreach>
on duplicate key update
cb_summary_id = values(cb_summary_id) , tax_inclusive_expense = values(tax_inclusive_expense) ,
tax_exclusive_expense = values(tax_exclusive_expense) , expense_date = values(expense_date)
</insert>
</mapper>
dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbSummaryMapper.xml
View file @ 6ca2e394
......@@ -24,9 +24,88 @@
</resultMap>
<sql id="baseColumn">
id, parent_id, level, sort, project_id, cb_stage, cb_project_file_id, number, cb_name, tax_exclusive_total,
cb_taxes_total, tax_inclusive_total, cb_proportion, tax_inclusive_pm_target, remark, create_time, del_flag,
cb_type
csu.id, csu.parent_id, csu.level, csu.sort, csu.project_id, csu.cb_stage, csu.cb_project_file_id, csu.number, csu.cb_name, csu.tax_exclusive_total,
csu.cb_taxes_total, csu.tax_inclusive_total, csu.cb_proportion, csu.tax_inclusive_pm_target, csu.remark, csu.create_time, csu.del_flag,
csu.cb_type
</sql>
<select id="getByParentId" resultType="com.dsk.cscec.domain.vo.CbSummaryActualListVo">
select csu.*,csa.id actualId,csa.tax_inclusive_expense,csa.tax_exclusive_expense,csa.expense_date
from cb_summary csu
left join cb_summary_actual csa on csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate} AND csa.del_flag = 0
<where>
csu.parent_id = #{parentId}
and csu.del_flag = 0
</where>
order by csu.sort
</select>
<select id="getById" resultType="com.dsk.cscec.domain.vo.CbSummaryActualListVo">
select csu.*,csa.id actualId,csa.tax_inclusive_expense,csa.tax_exclusive_expense,csa.expense_date
from cb_summary csu
left join cb_summary_actual csa on csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate} AND csa.del_flag = 0
<where>
csu.id = #{id}
and csu.del_flag = 0
</where>
</select>
<select id="getProjectAll" resultType="com.dsk.cscec.domain.vo.CbSummaryActualListVo">
select
<include refid="baseColumn"></include>,
csa.tax_inclusive_expense,csa.tax_exclusive_expense
from cb_summary csu
left join cb_summary_actual csa on csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate} AND csa.del_flag = 0
<where>
csu.project_id = #{bo.id}
and csu.cb_stage = #{bo.cbStage}
and csu.cb_type = #{bo.cbType}
and csu.del_flag = 0
and csu.level != 0
</where>
order by csu.sort
</select>
<select id="getCostAccountAll" resultType="com.dsk.cscec.domain.vo.CbSummaryActualListVo">
select
<include refid="baseColumn"></include>,
csa.tax_inclusive_expense,csa.tax_exclusive_expense
from cb_summary csu
left join cb_summary_actual csa on csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate} AND csa.del_flag = 0
<where>
csu.project_id = #{bo.projectId}
and csu.cb_stage = #{bo.cbStage}
and csu.cb_type = #{bo.cbType}
and csu.del_flag = 0
</where>
order by csu.sort
</select>
<select id="getExpenseDateList" resultType="string">
select csa.expense_date
from cb_summary_actual csa
left join cb_summary csu on csu.id = csa.cb_summary_id
where
csu.project_id = #{bo.projectId}
and csu.cb_stage = #{bo.cbStage}
and csu.cb_type = #{bo.cbType}
and csu.del_flag = 0
and csa.del_flag = 0
group by csa.expense_date
order by csa.expense_date asc
</select>
<select id="selectByLevel" resultType="map">
select csu.id,csu.cb_name as cbName
from cb_summary csu
where
csu.del_flag = 0
and csu.project_id = #{bo.projectId}
and csu.cb_stage = #{bo.cbStage}
and csu.cb_type = #{bo.cbType}
and csu.level = #{bo.level}
order by csu.sort
</select>
</mapper>
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_1.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014428"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014428)"><g><path d="M11.015985625,1.8333282470703125L10.332685625,1.8333282470703125Q10.283435625,1.8333282470703125,10.235135625,1.8429352470703124Q10.186835625,1.8525432470703125,10.141345625,1.8713882470703125Q10.095845624999999,1.8902342470703126,10.054895625,1.9175932470703125Q10.013955625000001,1.9449532470703126,9.979125625,1.9797752470703125Q9.944305625,2.0145972470703124,9.916945625,2.0555432470703123Q9.889585624999999,2.0964892470703127,9.870745625,2.1419862470703124Q9.851895625000001,2.1874832470703125,9.842285624999999,2.2357831470703124Q9.832685625,2.2840825470703123,9.832685625,2.3333282470703125Q9.832685625,2.3825739470703127,9.842285624999999,2.4308733470703126Q9.851895625000001,2.4791732470703125,9.870745625,2.5246702470703126Q9.889585624999999,2.5701672470703123,9.916945625,2.6111132470703127Q9.944305625,2.6520592470703126,9.979125625,2.6868812470703123Q10.013955625000001,2.7217032470703124,10.054895625,2.7490632470703127Q10.095845624999999,2.7764222470703124,10.141345625,2.7952682470703127Q10.186835625,2.8141132470703125,10.235135625,2.8237212470703126Q10.283435625,2.8333282470703125,10.332685625,2.8333282470703125L12.666015625,2.8333282470703125Q12.832715625,2.8333282470703125,12.832715625,2.9999952470703124L12.832715625,14.000028247070313Q12.832715625,14.166628247070312,12.666015625,14.166628247070312L3.332682625,14.166628247070312Q3.2636436250000003,14.166628247070312,3.214829625,14.117828247070312Q3.166015625,14.069028247070312,3.166015625,14.000028247070313L3.166015625,2.9999952470703124Q3.166015625,2.8333282470703125,3.332682625,2.8333282470703125L5.332685625,2.8333282470703125L5.666015625,2.8333282470703125Q5.715265625,2.8333282470703125,5.763555625,2.8237212470703126Q5.811855625,2.8141132470703125,5.857355625,2.7952682470703127Q5.902855625,2.7764222470703124,5.943795625,2.7490632470703127Q5.984745625,2.7217032470703124,6.019565625,2.6868812470703123Q6.054385625,2.6520592470703126,6.081745625,2.6111132470703127Q6.109105625,2.5701672470703123,6.127955625,2.5246702470703126Q6.146795625,2.4791732470703125,6.156405625,2.4308733470703126Q6.166015625,2.3825739470703127,6.166015625,2.3333282470703125Q6.166015625,2.2840825470703123,6.156405625,2.2357831470703124Q6.146795625,2.1874832470703125,6.127955625,2.1419862470703124Q6.109105625,2.0964892470703127,6.081745625,2.0555432470703123Q6.054385625,2.0145972470703124,6.019565625,1.9797752470703125Q5.984745625,1.9449532470703126,5.943795625,1.9175932470703125Q5.902855625,1.8902342470703126,5.857355625,1.8713882470703125Q5.811855625,1.8525432470703125,5.763555625,1.8429352470703124Q5.715265625,1.8333282470703125,5.666015625,1.8333282470703125L5.332685625,1.8333282470703125L3.332682625,1.8333282470703125Q2.849432625,1.8333282470703125,2.507724625,2.1750372470703123Q2.166015625,2.5167452470703124,2.166015625,2.9999952470703124L2.166015625,14.000028247070313Q2.166015625,14.483228247070313,2.507725625,14.824928247070313Q2.849433625,15.166628247070312,3.332682625,15.166628247070312L12.666015625,15.166628247070312Q13.149315625,15.166628247070312,13.491015625,14.824928247070313Q13.832715625,14.483228247070313,13.832715625,14.000028247070313L13.832715625,2.9999952470703124Q13.832715625,2.5167452470703124,13.491015625,2.1750392470703126Q13.149315625,1.8333282470703125,12.666015625,1.8333282470703125L11.015985625,1.8333282470703125Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M5.166015625,3.3333282470703125L5.166015625,1.3333282470703125Q5.166015625,1.2840825470703126,5.175622625,1.2357831470703124Q5.185230625,1.1874832470703125,5.204075625,1.1419862470703124Q5.222921625,1.0964892470703125,5.250280625,1.0555432470703126Q5.277640625,1.0145972470703124,5.312462625,0.9797752470703125Q5.347284625,0.9449532470703125,5.388230625,0.9175932470703125Q5.429176625,0.8902342470703125,5.474673625,0.8713882470703125Q5.520170625,0.8525432470703125,5.568470525,0.8429352470703124Q5.616769925,0.8333282470703125,5.666015625,0.8333282470703125L10.332685625,0.8333282470703125Q10.381925625000001,0.8333282470703125,10.430225625,0.8429352470703124Q10.478525625,0.8525432470703125,10.524025625,0.8713882470703125Q10.569525625,0.8902342470703125,10.610465625,0.9175932470703125Q10.651415625,0.9449532470703125,10.686235625,0.9797752470703125Q10.721055625,1.0145972470703124,10.748415625,1.0555432470703126Q10.775775625,1.0964892470703125,10.794625625,1.1419862470703124Q10.813465625,1.1874832470703125,10.823075625000001,1.2357831470703124Q10.832685625,1.2840825470703126,10.832685625,1.3333282470703125L10.832685625,3.3333282470703125Q10.832685625,3.3825782470703123,10.823075625000001,3.4308682470703125Q10.813465625,3.4791682470703127,10.794625625,3.5246682470703123Q10.775775625,3.5701682470703124,10.748415625,3.6111082470703124Q10.721055625,3.6520582470703125,10.686235625,3.6868782470703123Q10.651415625,3.7217082470703127,10.610465625,3.7490582470703124Q10.569525625,3.7764182470703127,10.524025625,3.7952682470703123Q10.478525625,3.8141082470703127,10.430225625,3.8237182470703126Q10.381925625000001,3.8333282470703125,10.332685625,3.8333282470703125L5.666015625,3.8333282470703125Q5.616769925,3.8333282470703125,5.568470525,3.8237182470703126Q5.520170625,3.8141082470703127,5.474673625,3.7952682470703123Q5.429176625,3.7764182470703127,5.388230625,3.7490582470703124Q5.347284625,3.7217082470703127,5.312462625,3.6868782470703123Q5.277640625,3.6520582470703125,5.250280625,3.6111182470703125Q5.222921625,3.5701682470703124,5.204075625,3.5246682470703123Q5.185230625,3.4791682470703127,5.175622625,3.4308682470703125Q5.166015625,3.3825782470703123,5.166015625,3.3333282470703125ZM6.166015625,1.8333282470703125L6.166015625,2.8333282470703125L9.832685625,2.8333282470703125L9.832685625,1.8333282470703125L6.166015625,1.8333282470703125Z" fill="#232323" fill-opacity="1"/></g><g><path d="M6,10.5L10,10.5Q10.04925,10.5,10.09755,10.490393Q10.14584,10.480785000000001,10.19134,10.46194Q10.23684,10.443094,10.27778,10.415735Q10.31873,10.388375,10.35355,10.353553Q10.38837,10.318731,10.41573,10.277785Q10.44309,10.236839,10.46194,10.191342Q10.48078,10.145845,10.49039,10.0975451Q10.5,10.0492457,10.5,10Q10.5,9.9507543,10.49039,9.9024549Q10.48078,9.854155,10.46194,9.808658Q10.44309,9.763161,10.41573,9.722215Q10.38837,9.681269,10.35355,9.646447Q10.31873,9.611625,10.27778,9.584265Q10.23684,9.556906,10.19134,9.53806Q10.14584,9.519214999999999,10.09755,9.509607Q10.04925,9.5,10,9.5L6,9.5Q5.9507543,9.5,5.9024549,9.509607Q5.854155,9.519214999999999,5.808658,9.53806Q5.763161,9.556906,5.722215,9.584265Q5.681269,9.611625,5.646447,9.646447Q5.611625,9.681269,5.584265,9.722215Q5.556906,9.763161,5.53806,9.808658Q5.519215,9.854155,5.509607,9.9024549Q5.5,9.9507543,5.5,10Q5.5,10.0492457,5.509607,10.0975451Q5.519215,10.145845,5.53806,10.191342Q5.556906,10.236839,5.584265,10.277785Q5.611625,10.318731,5.646447,10.353553Q5.681269,10.388375,5.722215,10.415735Q5.763161,10.443094,5.808658,10.46194Q5.854155,10.480785000000001,5.9024549,10.490393Q5.9507543,10.5,6,10.5Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6,8.5L10,8.5Q10.04925,8.5,10.09755,8.490393Q10.14584,8.480785000000001,10.19134,8.46194Q10.23684,8.443094,10.27778,8.415735Q10.31873,8.388375,10.35355,8.353553Q10.38837,8.318731,10.41573,8.277785Q10.44309,8.236839,10.46194,8.191342Q10.48078,8.145845,10.49039,8.0975451Q10.5,8.0492457,10.5,8Q10.5,7.9507543,10.49039,7.9024549Q10.48078,7.854155,10.46194,7.808658Q10.44309,7.763161,10.41573,7.722215Q10.38837,7.681269,10.35355,7.646447Q10.31873,7.611625,10.27778,7.584265Q10.23684,7.556906,10.19134,7.53806Q10.14584,7.519215,10.09755,7.509607Q10.04925,7.5,10,7.5L6,7.5Q5.9507543,7.5,5.9024549,7.509607Q5.854155,7.519215,5.808658,7.53806Q5.763161,7.556906,5.722215,7.584265Q5.681269,7.611625,5.646447,7.646447Q5.611625,7.681269,5.584265,7.722215Q5.556906,7.763161,5.53806,7.808658Q5.519215,7.854155,5.509607,7.9024549Q5.5,7.9507543,5.5,8Q5.5,8.0492457,5.509607,8.0975451Q5.519215,8.145845,5.53806,8.191342Q5.556906,8.236839,5.584265,8.277785Q5.611625,8.318731,5.646447,8.353553Q5.681269,8.388375,5.722215,8.415735Q5.763161,8.443094,5.808658,8.46194Q5.854155,8.480785000000001,5.9024549,8.490393Q5.9507543,8.5,6,8.5Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_2.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014462"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014462)"><g><path d="M3.1666717529296875,4.666581953125L3.1666717529296875,14.666551953125Q3.1666717529296875,14.715851953125,3.1762787529296874,14.764151953125Q3.1858867529296875,14.812451953125,3.2047317529296873,14.857951953125Q3.2235777529296876,14.903451953125,3.2509367529296873,14.944351953125Q3.2782967529296876,14.985351953125,3.3131187529296877,15.020151953125Q3.3479407529296874,15.054951953125,3.3888867529296873,15.082351953125Q3.4298327529296877,15.109651953125,3.4753297529296874,15.128551953125Q3.5208267529296875,15.147351953125,3.5691266529296874,15.156951953125Q3.6174260529296873,15.166551953125,3.6666717529296875,15.166551953125L8.333341752929687,15.166551953125Q8.382581752929688,15.166551953125,8.430881752929688,15.156951953125Q8.479181752929687,15.147351953125,8.524681752929688,15.128551953125Q8.570181752929688,15.109651953125,8.611121752929687,15.082351953125Q8.652071752929688,15.054951953125,8.686891752929688,15.020151953125Q8.721711752929687,14.985351953125,8.749071752929687,14.944351953125Q8.776431752929687,14.903451953125,8.795281752929688,14.857951953125Q8.814121752929687,14.812451953125,8.823731752929689,14.764151953125Q8.833341752929687,14.715851953125,8.833341752929687,14.666551953125L8.833341752929687,1.333251953125Q8.833341752929687,1.173018953125,8.740201752929687,1.042632953125Q8.682401752929687,0.961701953125,8.598021752929688,0.9090539531249999Q8.513641752929686,0.856405953125,8.415541752929688,0.840054953125Q8.317431752929688,0.823704953125,8.220541752929687,0.8461409531249999Q8.123651752929687,0.868577953125,8.042721752929687,0.926384953125L3.3760527529296875,4.259721953125Q3.2775037529296873,4.330111953125,3.2220877529296876,4.437791953125Q3.1666717529296875,4.545481953125,3.1666717529296875,4.666581953125ZM4.1666717529296875,14.166551953125L7.833341752929687,14.166551953125L7.833341752929687,2.3048469531249998L4.1666717529296875,4.9238919531250005L4.1666717529296875,14.166551953125Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M12.499998247070312,7.9238919531250005L12.499998247070312,14.666551953125Q12.499998247070312,14.715851953125,12.509598247070311,14.764151953125Q12.519208247070313,14.812451953125,12.538058247070312,14.857951953125Q12.556898247070311,14.903451953125,12.584258247070313,14.944351953125Q12.611618247070313,14.985351953125,12.646438247070312,15.020151953125Q12.681258247070312,15.054951953125,12.722208247070313,15.082351953125Q12.763158247070312,15.109651953125,12.808648247070312,15.128551953125Q12.854148247070313,15.147351953125,12.902448247070312,15.156951953125Q12.950748247070312,15.166551953125,12.999998247070312,15.166551953125Q13.049238247070313,15.166551953125,13.097538247070313,15.156951953125Q13.145838247070312,15.147351953125,13.191338247070313,15.128551953125Q13.236838247070313,15.109651953125,13.277778247070312,15.082351953125Q13.318728247070313,15.054951953125,13.353548247070313,15.020151953125Q13.388368247070312,14.985351953125,13.415728247070312,14.944351953125Q13.443088247070312,14.903451953125,13.461938247070313,14.857951953125Q13.480778247070312,14.812451953125,13.490388247070314,14.764151953125Q13.499998247070312,14.715851953125,13.499998247070312,14.666551953125L13.499998247070312,7.666581953125Q13.499998247070312,7.545481953125,13.444578247070313,7.437791953125Q13.389158247070313,7.330111953125,13.290618247070313,7.259721953125L8.623947247070312,3.926384953125Q8.493560247070313,3.833251953125,8.333328171970212,3.833251953125Q8.317901447070312,3.833251953125,8.302503947070312,3.834202953125Q8.189746247070312,3.841167953125,8.090936247070312,3.895934953125Q7.9921262470703125,3.950702953125,7.926461247070312,4.042632953125Q7.8333282470703125,4.173018953125,7.8333282470703125,4.333251953125Q7.8333282470703125,4.348678753125,7.834279247070312,4.364076253125Q7.841244247070312,4.476833953125,7.896011247070312,4.575643953125Q7.9507792470703125,4.674453953125,8.042709247070313,4.740118953125L12.499998247070312,7.9238919531250005Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M1.3333282470703125,15.166748046875L14.666628247070312,15.166748046875Q14.715928247070313,15.166748046875,14.764228247070312,15.157141046875Q14.812528247070313,15.147533046875001,14.858028247070312,15.128688046875Q14.903528247070312,15.109842046875,14.944428247070313,15.082483046875Q14.985428247070313,15.055123046875,15.020228247070312,15.020301046875Q15.055028247070313,14.985479046875,15.082428247070313,14.944533046875Q15.109728247070313,14.903587046875,15.128628247070312,14.858090046875Q15.147428247070312,14.812593046875,15.157028247070313,14.764293146875Q15.166628247070312,14.715993746875,15.166628247070312,14.666748046875Q15.166628247070312,14.617502346875,15.157028247070313,14.569202946875Q15.147428247070312,14.520903046875,15.128628247070312,14.475406046875Q15.109728247070313,14.429909046875,15.082428247070313,14.388963046875Q15.055028247070313,14.348017046875,15.020228247070312,14.313195046875Q14.985428247070313,14.278373046875,14.944428247070313,14.251013046875Q14.903528247070312,14.223654046875,14.858028247070312,14.204808046875Q14.812528247070313,14.185963046874999,14.764228247070312,14.176355046875Q14.715928247070313,14.166748046875,14.666628247070312,14.166748046875L1.3333282470703125,14.166748046875Q1.2840825470703126,14.166748046875,1.2357831470703124,14.176355046875Q1.1874832470703125,14.185963046874999,1.1419862470703124,14.204808046875Q1.0964892470703125,14.223654046875,1.0555432470703126,14.251013046875Q1.0145972470703124,14.278373046875,0.9797752470703125,14.313195046875Q0.9449532470703125,14.348017046875,0.9175932470703125,14.388963046875Q0.8902342470703125,14.429909046875,0.8713882470703125,14.475406046875Q0.8525432470703125,14.520903046875,0.8429352470703124,14.569202946875Q0.8333282470703125,14.617502346875,0.8333282470703125,14.666748046875Q0.8333282470703125,14.715993746875,0.8429352470703124,14.764293146875Q0.8525432470703125,14.812593046875,0.8713882470703125,14.858090046875Q0.8902342470703125,14.903587046875,0.9175932470703125,14.944533046875Q0.9449532470703125,14.985479046875,0.9797752470703125,15.020301046875Q1.0145972470703124,15.055123046875,1.0555432470703126,15.082483046875Q1.0964892470703125,15.109842046875,1.1419862470703124,15.128688046875Q1.1874832470703125,15.147533046875001,1.2357831470703124,15.157141046875Q1.2840825470703126,15.166748046875,1.3333282470703125,15.166748046875Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_3.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014467"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014467)"><g><path d="M7.16667,6L7.16667,2.666667Q7.16667,2.183417,6.82496,1.841711Q6.48326,1.5,6,1.5L2.666667,1.5Q2.183417,1.5,1.841709,1.841709Q1.5,2.183417,1.5,2.666667L1.5,6Q1.5,6.48326,1.841711,6.82496Q2.183417,7.16667,2.666667,7.16667L6,7.16667Q6.48326,7.16667,6.82496,6.82496Q7.16667,6.48326,7.16667,6ZM6,2.5Q6.16667,2.5,6.16667,2.666667L6.16667,6Q6.16667,6.16667,6,6.16667L2.666667,6.16667Q2.5,6.16667,2.5,6L2.5,2.666667Q2.5,2.5,2.666667,2.5L6,2.5Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M7.16667,13.333251953125L7.16667,9.999918953125Q7.16667,9.516661953125,6.82496,9.174956953125Q6.48326,8.833251953125,6,8.833251953125L2.666667,8.833251953125Q2.183417,8.833251953125,1.841711,9.174954953125Q1.5,9.516661953125,1.5,9.999918953125L1.5,13.333251953125Q1.5,13.816511953125,1.84171,14.158211953125Q2.183417,14.499921953125,2.666667,14.499921953125L6,14.499921953125Q6.48326,14.499921953125,6.82496,14.158211953125Q7.16667,13.816511953125,7.16667,13.333251953125ZM6,9.833251953125Q6.16667,9.833251953125,6.16667,9.999918953125L6.16667,13.333251953125Q6.16667,13.499921953125,6,13.499921953125L2.666667,13.499921953125Q2.5,13.499921953125,2.5,13.333251953125L2.5,9.999918953125Q2.5,9.833251953125,2.666667,9.833251953125L6,9.833251953125Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M14.499998247070312,6L14.499998247070312,2.666667Q14.499998247070312,2.183417,14.158288247070313,1.84171Q13.816588247070312,1.5,13.333328247070312,1.5L9.999995247070313,1.5Q9.516738247070313,1.5,9.175031247070313,1.841711Q8.833328247070312,2.183417,8.833328247070312,2.666667L8.833328247070312,6Q8.833328247070312,6.48326,9.175033247070312,6.82496Q9.516738247070313,7.16667,9.999995247070313,7.16667L13.333328247070312,7.16667Q13.816588247070312,7.16667,14.158288247070313,6.82496Q14.499998247070312,6.48326,14.499998247070312,6ZM13.333328247070312,2.5Q13.499998247070312,2.5,13.499998247070312,2.666667L13.499998247070312,6Q13.499998247070312,6.16667,13.333328247070312,6.16667L9.999995247070313,6.16667Q9.833328247070312,6.16667,9.833328247070312,6L9.833328247070312,2.666667Q9.833328247070312,2.5,9.999995247070313,2.5L13.333328247070312,2.5Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M14.499998247070312,13.333251953125L14.499998247070312,9.999918953125Q14.499998247070312,9.516660953125,14.158288247070313,9.174956953125Q13.816588247070312,8.833251953125,13.333328247070312,8.833251953125L9.999995247070313,8.833251953125Q9.516738247070313,8.833251953125,9.175033247070312,9.174956953125Q8.833328247070312,9.516661953125,8.833328247070312,9.999918953125L8.833328247070312,13.333251953125Q8.833328247070312,13.816511953125,9.175033247070312,14.158211953125Q9.516737247070312,14.499921953125,9.999995247070313,14.499921953125L13.333328247070312,14.499921953125Q13.816588247070312,14.499921953125,14.158288247070313,14.158211953125Q14.499998247070312,13.816511953125,14.499998247070312,13.333251953125ZM13.333328247070312,9.833251953125Q13.499998247070312,9.833251953125,13.499998247070312,9.999918953125L13.499998247070312,13.333251953125Q13.499998247070312,13.499921953125,13.333328247070312,13.499921953125L9.999995247070313,13.499921953125Q9.833328247070312,13.499921953125,9.833328247070312,13.333251953125L9.833328247070312,9.999918953125Q9.833328247070312,9.833251953125,9.999995247070313,9.833251953125L13.333328247070312,9.833251953125Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_4.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014473"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014473)"><g><path d="M0.83331298828125,12.66679609375L0.83331298828125,3.33349609375Q0.83331298828125,2.71217609375,1.27265278828125,2.27283589375Q1.7119929882812501,1.83349609375,2.33331298828125,1.83349609375L13.66661298828125,1.83349609375Q14.28801298828125,1.83349609375,14.72731298828125,2.27283589375Q15.16661298828125,2.71217509375,15.16661298828125,3.33349609375L15.16661298828125,12.66679609375Q15.16661298828125,13.28819609375,14.72731298828125,13.72749609375Q14.28801298828125,14.16679609375,13.66661298828125,14.16679609375L2.33331298828125,14.16679609375Q1.7119929882812501,14.16679609375,1.27265278828125,13.72749609375Q0.83331298828125,13.28819609375,0.83331298828125,12.66679609375ZM1.83331298828125,12.66679609375Q1.83331298828125,12.87389609375,1.97975998828125,13.02039609375Q2.12620798828125,13.16679609375,2.33331298828125,13.16679609375L13.66661298828125,13.16679609375Q13.87371298828125,13.16679609375,14.02021298828125,13.02039609375Q14.16661298828125,12.87389609375,14.16661298828125,12.66679609375L14.16661298828125,3.33349609375Q14.16661298828125,3.12639009375,14.02021298828125,2.97994309375Q13.87371298828125,2.83349609375,13.66661298828125,2.83349609375L2.33331298828125,2.83349609375Q2.12620598828125,2.83349609375,1.97975998828125,2.97994309375Q1.83331298828125,3.12638909375,1.83331298828125,3.33349609375L1.83331298828125,12.66679609375Z" fill="#232323" fill-opacity="1"/></g><g><path d="M10.35330896484375,5.353741L10.35348896484375,5.353553Q10.42381896484375,5.283227,10.46187896484375,5.191342Q10.49993896484375,5.0994562,10.49993896484375,5Q10.49993896484375,4.9005438,10.46187896484375,4.808658Q10.42381896484375,4.716773,10.35348896484375,4.646447Q10.28316896484375,4.57612,10.19127896484375,4.53806Q10.09939896484375,4.5,9.99993896484375,4.5Q9.90047896484375,4.5,9.80859896484375,4.53806Q9.71670896484375,4.57612,9.64638896484375,4.646447L9.64619896484375,4.646634L7.99993896484375,6.29289L6.35349196484375,4.646447Q6.28316596484375,4.57612,6.19128096484375,4.53806Q6.09939516484375,4.5,5.99993896484375,4.5Q5.90048276484375,4.5,5.80859696484375,4.53806Q5.71671196484375,4.57612,5.64638596484375,4.646447Q5.57605896484375,4.716773,5.53799896484375,4.808658Q5.49993896484375,4.9005438,5.49993896484375,5Q5.49993896484375,5.0994562,5.53799896484375,5.191342Q5.57605896484375,5.283227,5.64638596484375,5.353553L7.64638896484375,7.35355Q7.71670896484375,7.4238800000000005,7.80859896484375,7.46194Q7.9004789648437495,7.5,7.99993896484375,7.5Q8.09939896484375,7.5,8.19127896484375,7.46194Q8.28316896484375,7.4238800000000005,8.35348896484375,7.35355L10.35330896484375,5.353741Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M5.6666259765625,8.16650390625L10.3332959765625,8.16650390625Q10.3825459765625,8.16650390625,10.4308459765625,8.15689690625Q10.4791459765625,8.147288906250001,10.5246459765625,8.12844390625Q10.5701359765625,8.10959790625,10.6110859765625,8.08223890625Q10.6520259765625,8.05487890625,10.6868559765625,8.02005690625Q10.7216759765625,7.98523490625,10.7490359765625,7.94428890625Q10.776395976562501,7.90334290625,10.7952359765625,7.85784590625Q10.814085976562499,7.81234890625,10.823695976562501,7.76404900625Q10.8332959765625,7.71574960625,10.8332959765625,7.66650390625Q10.8332959765625,7.61725820625,10.823695976562501,7.56895880625Q10.814085976562499,7.52065890625,10.7952359765625,7.47516190625Q10.776395976562501,7.42966490625,10.7490359765625,7.38871890625Q10.7216759765625,7.34777290625,10.6868559765625,7.31295090625Q10.6520259765625,7.27812890625,10.6110859765625,7.25076890625Q10.5701359765625,7.22340990625,10.5246459765625,7.20456390625Q10.4791459765625,7.18571890625,10.4308459765625,7.17611090625Q10.3825459765625,7.16650390625,10.3332959765625,7.16650390625L5.6666259765625,7.16650390625Q5.6173802765625,7.16650390625,5.5690808765625,7.17611090625Q5.5207809765625,7.18571890625,5.4752839765625,7.20456390625Q5.4297869765625,7.22340990625,5.3888409765625,7.25076890625Q5.3478949765625,7.27812890625,5.3130729765625,7.31295090625Q5.2782509765625,7.34777290625,5.2508909765625,7.38871890625Q5.2235319765625,7.42966490625,5.2046859765625,7.47516190625Q5.1858409765625,7.52065890625,5.1762329765625,7.56895880625Q5.1666259765625,7.61725820625,5.1666259765625,7.66650390625Q5.1666259765625,7.71574960625,5.1762329765625,7.76404900625Q5.1858409765625,7.81234890625,5.2046859765625,7.85784590625Q5.2235319765625,7.90334290625,5.2508909765625,7.94428890625Q5.2782509765625,7.98523490625,5.3130729765625,8.02005690625Q5.3478949765625,8.05487890625,5.3888409765625,8.08223890625Q5.4297869765625,8.10959790625,5.4752839765625,8.12844390625Q5.5207809765625,8.147288906250001,5.5690808765625,8.15689690625Q5.6173802765625,8.16650390625,5.6666259765625,8.16650390625Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M5.6666259765625,10.16650390625L10.3332959765625,10.16650390625Q10.3825459765625,10.16650390625,10.4308459765625,10.15689690625Q10.4791459765625,10.147288906250001,10.5246459765625,10.12844390625Q10.5701359765625,10.10959790625,10.6110859765625,10.08223890625Q10.6520259765625,10.05487890625,10.6868559765625,10.02005690625Q10.7216759765625,9.98523490625,10.7490359765625,9.94428890625Q10.776395976562501,9.90334290625,10.7952359765625,9.85784590625Q10.814085976562499,9.81234890625,10.823695976562501,9.76404900625Q10.8332959765625,9.71574960625,10.8332959765625,9.66650390625Q10.8332959765625,9.61725820625,10.823695976562501,9.56895880625Q10.814085976562499,9.52065890625,10.7952359765625,9.47516190625Q10.776395976562501,9.42966490625,10.7490359765625,9.38871890625Q10.7216759765625,9.34777290625,10.6868559765625,9.31295090625Q10.6520259765625,9.27812890625,10.6110859765625,9.25076890625Q10.5701359765625,9.22340990625,10.5246459765625,9.20456390625Q10.4791459765625,9.185718906249999,10.4308459765625,9.17611090625Q10.3825459765625,9.16650390625,10.3332959765625,9.16650390625L5.6666259765625,9.16650390625Q5.6173802765625,9.16650390625,5.5690808765625,9.17611090625Q5.5207809765625,9.185718906249999,5.4752839765625,9.20456390625Q5.4297869765625,9.22340990625,5.3888409765625,9.25076890625Q5.3478949765625,9.27812890625,5.3130729765625,9.31295090625Q5.2782509765625,9.34777290625,5.2508909765625,9.38871890625Q5.2235319765625,9.42966490625,5.2046859765625,9.47516190625Q5.1858409765625,9.52065890625,5.1762329765625,9.56895880625Q5.1666259765625,9.61725820625,5.1666259765625,9.66650390625Q5.1666259765625,9.71574960625,5.1762329765625,9.76404900625Q5.1858409765625,9.81234890625,5.2046859765625,9.85784590625Q5.2235319765625,9.90334290625,5.2508909765625,9.94428890625Q5.2782509765625,9.98523490625,5.3130729765625,10.02005690625Q5.3478949765625,10.05487890625,5.3888409765625,10.08223890625Q5.4297869765625,10.10959790625,5.4752839765625,10.12844390625Q5.5207809765625,10.147288906250001,5.5690808765625,10.15689690625Q5.6173802765625,10.16650390625,5.6666259765625,10.16650390625Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M7.49993896484375,7.66650390625L7.49993896484375,11.33317390625Q7.49993896484375,11.37904390625,7.50828596484375,11.42415390625Q7.51619796484375,11.46690390625,7.5313699648437495,11.507653906249999Q7.54654196484375,11.54839390625,7.56851896484375,11.58591390625Q7.59049696484375,11.62342390625,7.61861896484375,11.656583906249999Q7.64674196484375,11.689743906250001,7.68016596484375,11.71754390625Q7.71358996484375,11.74535390625,7.75131196484375,11.76697390625Q7.78903396484375,11.78859390625,7.82992196484375,11.80337390625Q7.87080896484375,11.81816390625,7.91363496484375,11.82566390625Q7.95646066484375,11.83317390625,7.99993896484375,11.83317390625Q8.04918466484375,11.83317390625,8.09748406484375,11.823563906250001Q8.14578396484375,11.81395390625,8.19128096484375,11.79511390625Q8.23677796484375,11.77626390625,8.27772396484375,11.74890390625Q8.31866996484375,11.72154390625,8.35349196484375,11.68672390625Q8.38831396484375,11.65190390625,8.41567396484375,11.61095390625Q8.44303296484375,11.57001390625,8.46187896484375,11.52451390625Q8.480723964843751,11.47901390625,8.49033196484375,11.43071390625Q8.49993896484375,11.382413906250001,8.49993896484375,11.33317390625L8.49993896484375,7.66650390625Q8.49993896484375,7.61725820625,8.49033196484375,7.56895880625Q8.480723964843751,7.52065890625,8.46187896484375,7.47516190625Q8.44303296484375,7.42966490625,8.41567396484375,7.38871890625Q8.38831396484375,7.34777290625,8.35349196484375,7.31295090625Q8.31866996484375,7.27812890625,8.27772396484375,7.25076890625Q8.23677796484375,7.22340990625,8.19128096484375,7.20456390625Q8.14578396484375,7.18571890625,8.09748406484375,7.17611090625Q8.04918466484375,7.16650390625,7.99993896484375,7.16650390625Q7.95069326484375,7.16650390625,7.90239386484375,7.17611090625Q7.85409396484375,7.18571890625,7.80859696484375,7.20456390625Q7.76309996484375,7.22340990625,7.72215396484375,7.25076890625Q7.68120796484375,7.27812890625,7.64638596484375,7.31295090625Q7.61156396484375,7.34777290625,7.58420396484375,7.38871890625Q7.55684496484375,7.42966490625,7.53799896484375,7.47516190625Q7.51915396484375,7.52065890625,7.50954596484375,7.56895880625Q7.49993896484375,7.61725820625,7.49993896484375,7.66650390625Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_5.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014480"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014480)"><g><path d="M4.620431088867187,4.469460875Q2.6462310888671876,6.771891875,1.2734680888671874,10.645161875Q0.6654160888671875,12.360771875000001,1.7718480888671875,13.783021875Q2.8483010888671876,15.166721875,4.673231088867187,15.166721875L11.311131088867187,15.166721875Q13.140041088867187,15.166721875,14.217941088867187,13.777651875Q15.325341088867187,12.350631875000001,14.714341088867187,10.631761874999999Q13.335341088867187,6.752011875,11.379691088867187,4.469594875Q11.329021088867188,4.410460875,11.262771088867188,4.369536875Q11.196521088867188,4.328611875,11.120961088867187,4.309773875Q11.045401088867187,4.290934875,10.967691088867188,4.295966875Q10.889981088867188,4.300998875,10.817481088867188,4.329423875Q9.532151088867188,4.833388675,8.002771088867188,4.833388675Q6.469541088867188,4.833388775,5.182311088867188,4.329342875Q5.109851088867187,4.300968875,5.0321910888671875,4.295958875Q4.954531088867188,4.290949875,4.879021088867187,4.309778875Q4.803511088867188,4.3286088750000005,4.737301088867188,4.369496875Q4.671081088867187,4.410383875,4.620431088867187,4.469460875ZM2.5611350888671875,13.168991875Q1.7908470888671875,12.178841875,2.2160190888671876,10.979221875Q3.4479610888671877,7.503301875,5.159181088867188,5.385220875Q6.479671088867187,5.833391875,8.002771088867188,5.833391875Q9.522231088867187,5.833391875,10.840701088867187,5.385410875Q12.534941088867187,7.4861618750000005,13.772141088867187,10.966681874999999Q14.199741088867187,12.169911875,13.427941088867188,13.164591875Q12.650241088867187,14.166721875,11.311131088867187,14.166721875L4.673231088867187,14.166721875Q3.3373110888671875,14.166721875,2.5611350888671875,13.168991875Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6,9.83349609375L10,9.83349609375Q10.04925,9.83349609375,10.09755,9.82388909375Q10.14584,9.814281093750001,10.19134,9.79543609375Q10.23684,9.77659009375,10.27778,9.74923109375Q10.31873,9.72187109375,10.35355,9.68704909375Q10.38837,9.65222709375,10.41573,9.61128109375Q10.44309,9.57033509375,10.46194,9.52483809375Q10.48078,9.47934109375,10.49039,9.43104119375Q10.5,9.38274179375,10.5,9.33349609375Q10.5,9.28425039375,10.49039,9.23595099375Q10.48078,9.18765109375,10.46194,9.14215409375Q10.44309,9.09665709375,10.41573,9.05571109375Q10.38837,9.01476509375,10.35355,8.97994309375Q10.31873,8.94512109375,10.27778,8.91776109375Q10.23684,8.89040209375,10.19134,8.87155609375Q10.14584,8.852711093749999,10.09755,8.84310309375Q10.04925,8.83349609375,10,8.83349609375L6,8.83349609375Q5.9507543,8.83349609375,5.9024549,8.84310309375Q5.854155,8.852711093749999,5.808658,8.87155609375Q5.763161,8.89040209375,5.722215,8.91776109375Q5.681269,8.94512109375,5.646447,8.97994309375Q5.611625,9.01476509375,5.584265,9.05571109375Q5.556906,9.09665709375,5.53806,9.14215409375Q5.519215,9.18765109375,5.509607,9.23595099375Q5.5,9.28425039375,5.5,9.33349609375Q5.5,9.38274179375,5.509607,9.43104119375Q5.519215,9.47934109375,5.53806,9.52483809375Q5.556906,9.57033509375,5.584265,9.61128109375Q5.611625,9.65222709375,5.646447,9.68704909375Q5.681269,9.72187109375,5.722215,9.74923109375Q5.763161,9.77659009375,5.808658,9.79543609375Q5.854155,9.814281093750001,5.9024549,9.82388909375Q5.9507543,9.83349609375,6,9.83349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6,11.83349609375L10,11.83349609375Q10.04925,11.83349609375,10.09755,11.82388909375Q10.14584,11.814281093750001,10.19134,11.79543609375Q10.23684,11.77659009375,10.27778,11.74923109375Q10.31873,11.72187109375,10.35355,11.68704909375Q10.38837,11.65222709375,10.41573,11.61128109375Q10.44309,11.57033509375,10.46194,11.52483809375Q10.48078,11.47934109375,10.49039,11.43104119375Q10.5,11.38274179375,10.5,11.33349609375Q10.5,11.28425039375,10.49039,11.23595099375Q10.48078,11.18765109375,10.46194,11.14215409375Q10.44309,11.09665709375,10.41573,11.05571109375Q10.38837,11.01476509375,10.35355,10.97994309375Q10.31873,10.94512109375,10.27778,10.91776109375Q10.23684,10.89040209375,10.19134,10.87155609375Q10.14584,10.852711093749999,10.09755,10.84310309375Q10.04925,10.83349609375,10,10.83349609375L6,10.83349609375Q5.9507543,10.83349609375,5.9024549,10.84310309375Q5.854155,10.852711093749999,5.808658,10.87155609375Q5.763161,10.89040209375,5.722215,10.91776109375Q5.681269,10.94512109375,5.646447,10.97994309375Q5.611625,11.01476509375,5.584265,11.05571109375Q5.556906,11.09665709375,5.53806,11.14215409375Q5.519215,11.18765109375,5.509607,11.23595099375Q5.5,11.28425039375,5.5,11.33349609375Q5.5,11.38274179375,5.509607,11.43104119375Q5.519215,11.47934109375,5.53806,11.52483809375Q5.556906,11.57033509375,5.584265,11.61128109375Q5.611625,11.65222709375,5.646447,11.68704909375Q5.681269,11.72187109375,5.722215,11.74923109375Q5.763161,11.77659009375,5.808658,11.79543609375Q5.854155,11.814281093750001,5.9024549,11.82388909375Q5.9507543,11.83349609375,6,11.83349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M7.5027618408203125,9.33349609375L7.5027618408203125,12.66682609375Q7.5027618408203125,12.71607609375,7.512368840820312,12.76437609375Q7.5219768408203125,12.81267609375,7.540821840820312,12.85816609375Q7.559667840820312,12.903666093750001,7.587026840820313,12.94461609375Q7.614386840820313,12.98555609375,7.649208840820313,13.02038609375Q7.684030840820313,13.05520609375,7.724976840820313,13.08256609375Q7.765922840820313,13.10992609375,7.811419840820313,13.12876609375Q7.856916840820313,13.147616093749999,7.905216740820313,13.15722609375Q7.953516140820312,13.16682609375,8.002761840820312,13.16682609375Q8.052007540820313,13.16682609375,8.100306940820312,13.15722609375Q8.148606840820312,13.147616093749999,8.194103840820313,13.12876609375Q8.239600840820312,13.10992609375,8.280546840820312,13.08256609375Q8.321492840820312,13.05520609375,8.356314840820312,13.02038609375Q8.391136840820312,12.98555609375,8.418496840820312,12.94461609375Q8.445855840820313,12.903666093750001,8.464701840820313,12.85816609375Q8.483546840820313,12.81267609375,8.493154840820312,12.76437609375Q8.502761840820312,12.71607609375,8.502761840820312,12.66682609375L8.502761840820312,9.33349609375Q8.502761840820312,9.28425039375,8.493154840820312,9.23595099375Q8.483546840820313,9.18765109375,8.464701840820313,9.14215409375Q8.445855840820313,9.09665709375,8.418496840820312,9.05571109375Q8.391136840820312,9.01476509375,8.356314840820312,8.97994309375Q8.321492840820312,8.94512109375,8.280546840820312,8.91776109375Q8.239600840820312,8.89040209375,8.194103840820313,8.87155609375Q8.148606840820312,8.852711093749999,8.100306940820312,8.84310309375Q8.052007540820313,8.83349609375,8.002761840820312,8.83349609375Q7.953516140820312,8.83349609375,7.905216740820313,8.84310309375Q7.856916840820313,8.852711093749999,7.811419840820313,8.87155609375Q7.765922840820313,8.89040209375,7.724976840820313,8.91776109375Q7.684030840820313,8.94512109375,7.649208840820313,8.97994309375Q7.614386840820313,9.01476509375,7.587026840820313,9.05571109375Q7.559667840820312,9.09665709375,7.540821840820312,9.14215409375Q7.5219768408203125,9.18765109375,7.512368840820312,9.23595099375Q7.5027618408203125,9.28425039375,7.5027618408203125,9.33349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6.353613,6.9800020937500005L6.353553,6.97994309375Q6.283227,6.90961609375,6.191342,6.87155609375Q6.0994562,6.83349609375,6,6.83349609375Q5.9005438,6.83349609375,5.808658,6.87155609375Q5.716773,6.90961609375,5.646447,6.97994309375Q5.57612,7.05026909375,5.53806,7.14215409375Q5.5,7.23403989375,5.5,7.33349609375Q5.5,7.43295229375,5.53806,7.52483809375Q5.57612,7.61672309375,5.646447,7.68704909375L7.64645,9.68704609375Q7.71677,9.75737609375,7.80866,9.79543609375Q7.9005399999999995,9.83349609375,8,9.83349609375Q8.09946,9.83349609375,8.19134,9.79543609375Q8.28323,9.75737609375,8.35355,9.68704609375L10.35337,7.68723709375L10.35355,7.68704909375Q10.42388,7.61672309375,10.46194,7.52483809375Q10.5,7.43295229375,10.5,7.33349609375Q10.5,7.23403989375,10.46194,7.14215409375Q10.42388,7.05026909375,10.35355,6.97994309375Q10.28323,6.90961609375,10.19134,6.87155609375Q10.09946,6.83349609375,10,6.83349609375Q9.90054,6.83349609375,9.80866,6.87155609375Q9.71677,6.90961609375,9.64645,6.97994309375L9.64626,6.98013009375L8,8.62638609375L6.353613,6.9800020937500005Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M4.726351752929688,1.46530309375Q3.1666717529296875,2.18515209375,3.1666717529296875,3.33349609375Q3.1666717529296875,4.48183609375,4.726341752929687,5.20168609375Q6.095261752929687,5.83349609375,8.000001752929688,5.83349609375Q9.904741752929688,5.83349609375,11.273661752929687,5.20168609375Q12.833341752929687,4.48183609375,12.833341752929687,3.33349609375Q12.833341752929687,2.18515309375,11.273661752929687,1.46530209375Q9.904751752929688,0.83349609375,8.000001752929688,0.83349609375Q6.095261752929687,0.83349609375,4.726351752929688,1.46530309375ZM5.145401752929688,4.29372609375Q4.1666717529296875,3.84200609375,4.1666717529296875,3.33349609375Q4.1666717529296875,2.8249860937499998,5.145401752929688,2.37326609375Q6.314901752929687,1.83349609375,8.000001752929688,1.83349609375Q9.685111752929688,1.83349609375,10.854601752929687,2.37326609375Q11.833341752929687,2.8249860937499998,11.833341752929687,3.33349609375Q11.833341752929687,3.84200609375,10.854601752929687,4.29372609375Q9.685111752929688,4.83349609375,8.000001752929688,4.83349609375Q6.314901752929687,4.83349609375,5.145401752929688,4.29372609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/assets/images/projectCostLedger/icon_cost_detail_6.svg 0 → 100644
View file @ 6ca2e394
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_962_014488"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_962_014488)"><g><path d="M2.932413505859375,2.93256609375Q0.833343505859375,5.03162609375,0.833343505859375,8.00016609375Q0.833343505859375,10.96869609375,2.932413505859375,13.06779609375Q5.031473505859375,15.16679609375,8.000013505859375,15.16679609375Q10.968543505859374,15.16679609375,13.067643505859374,13.06779609375Q15.166643505859374,10.96869609375,15.166643505859374,8.00016609375Q15.166643505859374,5.03162609375,13.067643505859374,2.93256609375Q10.968543505859374,0.83349609375,8.000013505859375,0.83349609375Q5.031483505859375,0.83349609375,2.932413505859375,2.93256609375ZM3.639513505859375,12.36069609375Q1.833343505859375,10.55447609375,1.833343505859375,8.00016609375Q1.833342505859375,5.44584609375,3.639513505859375,3.63966609375Q5.445693505859375,1.83349609375,8.000013505859375,1.83349609375Q10.554323505859376,1.83349609375,12.360543505859376,3.63966609375Q14.166643505859374,5.44584609375,14.166643505859374,8.00016609375Q14.166643505859374,10.55448609375,12.360543505859376,12.36069609375Q10.554323505859376,14.16679609375,8.000013505859375,14.16679609375Q5.445693505859375,14.16679609375,3.639513505859375,12.36069609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6,7.83349609375L10,7.83349609375Q10.04925,7.83349609375,10.09755,7.82388909375Q10.14584,7.81428109375,10.19134,7.79543609375Q10.23684,7.77659009375,10.27778,7.74923109375Q10.31873,7.72187109375,10.35355,7.68704909375Q10.38837,7.65222709375,10.41573,7.61128109375Q10.44309,7.57033509375,10.46194,7.52483809375Q10.48078,7.47934109375,10.49039,7.43104119375Q10.5,7.38274179375,10.5,7.33349609375Q10.5,7.28425039375,10.49039,7.23595099375Q10.48078,7.18765109375,10.46194,7.14215409375Q10.44309,7.09665709375,10.41573,7.05571109375Q10.38837,7.01476509375,10.35355,6.97994309375Q10.31873,6.94512109375,10.27778,6.91776109375Q10.23684,6.89040209375,10.19134,6.87155609375Q10.14584,6.85271109375,10.09755,6.84310309375Q10.04925,6.83349609375,10,6.83349609375L6,6.83349609375Q5.9507543,6.83349609375,5.9024549,6.84310309375Q5.854155,6.85271109375,5.808658,6.87155609375Q5.763161,6.89040209375,5.722215,6.91776109375Q5.681269,6.94512109375,5.646447,6.97994309375Q5.611625,7.01476509375,5.584265,7.05571109375Q5.556906,7.09665709375,5.53806,7.14215409375Q5.519215,7.18765109375,5.509607,7.23595099375Q5.5,7.28425039375,5.5,7.33349609375Q5.5,7.38274179375,5.509607,7.43104119375Q5.519215,7.47934109375,5.53806,7.52483809375Q5.556906,7.57033509375,5.584265,7.61128109375Q5.611625,7.65222709375,5.646447,7.68704909375Q5.681269,7.72187109375,5.722215,7.74923109375Q5.763161,7.77659009375,5.808658,7.79543609375Q5.854155,7.81428109375,5.9024549,7.82388909375Q5.9507543,7.83349609375,6,7.83349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6,9.83349609375L10,9.83349609375Q10.04925,9.83349609375,10.09755,9.82388909375Q10.14584,9.814281093750001,10.19134,9.79543609375Q10.23684,9.77659009375,10.27778,9.74923109375Q10.31873,9.72187109375,10.35355,9.68704909375Q10.38837,9.65222709375,10.41573,9.61128109375Q10.44309,9.57033509375,10.46194,9.52483809375Q10.48078,9.47934109375,10.49039,9.43104119375Q10.5,9.38274179375,10.5,9.33349609375Q10.5,9.28425039375,10.49039,9.23595099375Q10.48078,9.18765109375,10.46194,9.14215409375Q10.44309,9.09665709375,10.41573,9.05571109375Q10.38837,9.01476509375,10.35355,8.97994309375Q10.31873,8.94512109375,10.27778,8.91776109375Q10.23684,8.89040209375,10.19134,8.87155609375Q10.14584,8.852711093749999,10.09755,8.84310309375Q10.04925,8.83349609375,10,8.83349609375L6,8.83349609375Q5.9507543,8.83349609375,5.9024549,8.84310309375Q5.854155,8.852711093749999,5.808658,8.87155609375Q5.763161,8.89040209375,5.722215,8.91776109375Q5.681269,8.94512109375,5.646447,8.97994309375Q5.611625,9.01476509375,5.584265,9.05571109375Q5.556906,9.09665709375,5.53806,9.14215409375Q5.519215,9.18765109375,5.509607,9.23595099375Q5.5,9.28425039375,5.5,9.33349609375Q5.5,9.38274179375,5.509607,9.43104119375Q5.519215,9.47934109375,5.53806,9.52483809375Q5.556906,9.57033509375,5.584265,9.61128109375Q5.611625,9.65222709375,5.646447,9.68704909375Q5.681269,9.72187109375,5.722215,9.74923109375Q5.763161,9.77659009375,5.808658,9.79543609375Q5.854155,9.814281093750001,5.9024549,9.82388909375Q5.9507543,9.83349609375,6,9.83349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M7.502777099609375,7.33349609375L7.502777099609375,11.33349609375Q7.502777099609375,11.38274609375,7.512384099609375,11.43104609375Q7.521992099609375,11.47933609375,7.540837099609375,11.52483609375Q7.559683099609375,11.57033609375,7.587042099609375,11.61127609375Q7.614402099609375,11.65222609375,7.649224099609375,11.68704609375Q7.684046099609375,11.72186609375,7.724992099609375,11.74922609375Q7.765938099609375,11.77658609375,7.811435099609375,11.79543609375Q7.856932099609375,11.81427609375,7.905231999609375,11.82388609375Q7.953531399609375,11.83349609375,8.002777099609375,11.83349609375Q8.052022799609375,11.83349609375,8.100322199609375,11.82388609375Q8.148622099609375,11.81427609375,8.194119099609376,11.79543609375Q8.239616099609375,11.77658609375,8.280562099609375,11.74922609375Q8.321508099609375,11.72186609375,8.356330099609375,11.68704609375Q8.391152099609375,11.65222609375,8.418512099609375,11.61127609375Q8.445871099609375,11.57033609375,8.464717099609375,11.52483609375Q8.483562099609376,11.47933609375,8.493170099609374,11.43104609375Q8.502777099609375,11.38274609375,8.502777099609375,11.33349609375L8.502777099609375,7.33349609375Q8.502777099609375,7.28425039375,8.493170099609374,7.23595099375Q8.483562099609376,7.18765109375,8.464717099609375,7.14215409375Q8.445871099609375,7.09665709375,8.418512099609375,7.05571109375Q8.391152099609375,7.01476509375,8.356330099609375,6.97994309375Q8.321508099609375,6.94512109375,8.280562099609375,6.91776109375Q8.239616099609375,6.89040209375,8.194119099609376,6.87155609375Q8.148622099609375,6.85271109375,8.100322199609375,6.84310309375Q8.052022799609375,6.83349609375,8.002777099609375,6.83349609375Q7.953531399609375,6.83349609375,7.905231999609375,6.84310309375Q7.856932099609375,6.85271109375,7.811435099609375,6.87155609375Q7.765938099609375,6.89040209375,7.724992099609375,6.91776109375Q7.684046099609375,6.94512109375,7.649224099609375,6.97994309375Q7.614402099609375,7.01476509375,7.587042099609375,7.05571109375Q7.559683099609375,7.09665709375,7.540837099609375,7.14215409375Q7.521992099609375,7.18765109375,7.512384099609375,7.23595099375Q7.502777099609375,7.28425039375,7.502777099609375,7.33349609375Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g><g><path d="M6.353613,4.6465060000000005L6.353553,4.646447Q6.283227,4.57612,6.191342,4.53806Q6.0994562,4.5,6,4.5Q5.9005438,4.5,5.808658,4.53806Q5.716773,4.57612,5.646447,4.646447Q5.57612,4.716773,5.53806,4.808658Q5.5,4.9005438,5.5,5Q5.5,5.0994562,5.53806,5.191342Q5.57612,5.283227,5.646447,5.353553L7.64645,7.35355Q7.71677,7.4238800000000005,7.80866,7.46194Q7.9005399999999995,7.5,8,7.5Q8.09946,7.5,8.19134,7.46194Q8.28323,7.4238800000000005,8.35355,7.35355L10.35337,5.353741L10.35355,5.353553Q10.42388,5.283227,10.46194,5.191342Q10.5,5.0994562,10.5,5Q10.5,4.9005438,10.46194,4.808658Q10.42388,4.716773,10.35355,4.646447Q10.28323,4.57612,10.19134,4.53806Q10.09946,4.5,10,4.5Q9.90054,4.5,9.80866,4.53806Q9.71677,4.57612,9.64645,4.646447L9.64626,4.646634L8,6.29289L6.353613,4.6465060000000005Z" fill-rule="evenodd" fill="#232323" fill-opacity="1"/></g></g></svg>
\ No newline at end of file
dsk-operate-ui/src/utils/index.js
View file @ 6ca2e394
......@@ -1043,7 +1043,7 @@ export function findAncestors(data, targetId, idKey = "id", childrenKey = "child
if (data[idKey] === targetId) {
return [...ancestors, data]; // 找到目标节点，将其添加到祖先数组中并返回
}
if (data[childrenKey]?.length) {
for (const child of data[childrenKey]) {
const result = findAncestors(child, targetId, idKey, childrenKey, [...ancestors, data]); // 递归调用，将当前节点添加到祖先数组中
......@@ -1055,3 +1055,42 @@ export function findAncestors(data, targetId, idKey = "id", childrenKey = "child
return null; // 如果遍历完所有节点都没有找到目标节点，则返回null
}
/**
* 给树形添加层级
* @param {Array<any> | object} tree
* @param {number} startLevel
*/
export function addTreeLevel(tree, startLevel = 1, removeEmptyChildren = true) {
if (tree instanceof Array && tree?.length) {
tree.forEach(node => {
addTreeLevel(node, startLevel, removeEmptyChildren);
});
} else if (Object.prototype.toString.call(tree) == "[object Object]") {
tree["level"] = startLevel;
if (tree?.children) {
addTreeLevel(tree.children, startLevel + 1, removeEmptyChildren);
removeEmptyChildren && !tree.children?.length ? delete tree.children : null;
}
}
}
/**
* 给树形节点添加父节点关联
* @param {Array<any> | object} tree
* @param {object} parent
*/
export function addNodeParent(tree, parent = null) {
if (tree instanceof Array && tree?.length) {
tree.forEach(node => {
addNodeParent(node, parent);
});
} else if (Object.prototype.toString.call(tree) == "[object Object]") {
tree["parent"] = parent;
if (tree?.children?.length) {
addNodeParent(tree.children, tree);
}
}
}
\ No newline at end of file
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ 6ca2e394
......@@ -2,7 +2,7 @@
<div class="feed-summary-container">
<div class="feed-summary-inner">
<div class="left-side-menu">
<project-side-menu></project-side-menu>
<project-side-menu :menuTree="menuTreeList"></project-side-menu>
</div>
</div>
</div>
......@@ -16,12 +16,72 @@ export default {
},
data() {
return {
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",
},
{
nodeName: "实体工程材料（土建）",
id: "3",
},
{
nodeName: "其他直接费成本",
id: "4",
},
]
},
{
nodeName: "未归类项目",
id: "2",
children: []
}
]
};
},
//可访问data属性
created() {
},
//计算集
computed: {
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectBreadCrumb.vue
View file @ 6ca2e394
......@@ -19,7 +19,6 @@ export default {
name: "projectBreadCrumb",
props: {
current: String,
indexText: String,
breadCrumbTree: {
type: Array,
default: () => []
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectSideMenu/index.vue
View file @ 6ca2e394
<template>
<div class="project-side-menu-container">
<el-menu mode="vertical" class="project-side-menu-instance">
<project-menu-item></project-menu-item>
<template v-for="(item,index) of tempMenuTree">
<project-menu-item :menuItem="item" :key="item.nodeValue"></project-menu-item>
</template>
</el-menu>
</div>
</template>
<script>
import ProjectMenuItem from "@/views/projectCostLedger/detail/components/ProjectSideMenu/ProjectMenuItem";
import { addTreeLevel, addNodeParent } from "@/utils";
export default {
name: "projectSideMenu",
components: {
......@@ -15,14 +18,43 @@ export default {
props: {
// 菜单树形结构对象
menuTree: {
type: Object,
type: Array,
required: false,
default: () => ({})
default: () => ([])
},
menuOptions: {
type: Object,
default: () => ({
nodeName: "nodeName",
nodeValue: "id",
children: "children",
icon: "icon",
suffixIcon: "suffixIcon"
})
}
},
watch: {
menuTree: {
handler(newValue) {
this.comMenuTree = newValue ? newValue : [];
this.initMenuTree(this.comMenuTree);
},
deep: true,
immediate: true
}
},
data() {
return {
defaultMenuOptions: {
nodeName: "nodeName",
nodeValue: "id",
children: "children",
icon: "icon",
suffixIcon: "suffixIcon"
},
tempMenuOptions: {},
tempMenuTree: [],
comMenuTree: this.menuTree
};
},
//可访问data属性
......@@ -32,12 +64,88 @@ export default {
//计算集
computed: {
allDisabled() {
return (!this.menuTree || !Object.keys(this.menuTree)?.length) ? true : false;
return (!this.menuTree || this.menuTree?.length) ? true : false;
}
},
//方法集
methods: {
// 初始化树形结构
initMenuTree(array = []) {
if (array?.length) {
// 合并默认配置
const _options = this.mergeMenuOptions(JSON.parse(JSON.stringify(this.menuOptions)));
this.tempMenuOptions = _options;
// 映射配置
const resultData = this.mapDataByMenuOptions(JSON.parse(JSON.stringify(this.comMenuTree)), _options);
console.log(resultData);
if (resultData) {
this.tempMenuTree = resultData;
}
}
},
mergeMenuOptions(options) {
// 默认配置
const defaultOptions = JSON.parse(JSON.stringify(this.defaultMenuOptions));
// 合并配置
options = options && Object.prototype.toString.call(options) == "[object Object]" ? { ...defaultOptions, ...options } : { ...defaultOptions };
return options;
},
mapDataByMenuOptions(menuList, options) {
// 分组源数据
const _groupData = this.groupData(menuList, options);
// 映射过后的树
const _mapedData = this.mapData(_groupData, options);
// 处理层级 以及删除空children
return this.buildTree(_mapedData);
},
groupData(data, options, originData = []) {
if (data?.length) {
const { children } = options;
const len = data.length;
for (let index = 0; index < len; index++) {
const _item = data[index];
const _newItem = JSON.parse(JSON.stringify(_item));
originData.push({
originData: _newItem
});
if (_item[children] instanceof Array && _item[children].length) {
_newItem[children] = this.groupData(_item[children], options);
} else {
delete _newItem[children];
}
}
}
return originData;
},
mapData(data = [], mapOptions) {
const keys = Object.keys(mapOptions);
if (data?.length) {
data.forEach(item => {
// 循环key映射到 树
keys.forEach(key => {
const _mapKey = mapOptions[key];
const _origin = item["originData"];
if (Object.hasOwnProperty.call(_origin, _mapKey)) {
item[key] = JSON.parse(JSON.stringify(_origin[_mapKey]));
}
});
if (item?.children instanceof Array && item.children.length) {
// 递归映射
this.mapData(item?.children, mapOptions);
}
});
}
return data;
},
buildTree(mapedData) {
if (mapedData?.length) {
// 添加层级
addTreeLevel(mapedData);
addNodeParent(mapedData);
return mapedData;
}
}
},
}
</script>
......
dsk-system/src/main/java/com/dsk/system/service/ISysOssService.java
View file @ 6ca2e394
......@@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collection;
import java.util.List;
......@@ -37,4 +38,6 @@ public interface ISysOssService {
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
InputStream downFileIO(Long ossId);
}
dsk-system/src/main/java/com/dsk/system/service/impl/SysOssServiceImpl.java
View file @ 6ca2e394
......@@ -177,6 +177,16 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public InputStream downFileIO(Long ossId) {
//文件下载
SysOss sysOss = baseMapper.selectById(ossId);
if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!");
}
return OssFactory.instance(sysOss.getService()).getObjectContent(sysOss.getUrl());
}
/**
* 匹配Url
*
......
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