项目台账相关

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectFileController.java

@@ -23,6 +23,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 项目成本文件表(CbProjectFile)表控制层
@@ -49,6 +50,10 @@ public class CbProjectFileController extends BaseController {
     public R<Map<String, String>> uploadCbProjectFile(@Validated @ModelAttribute AddProjectFileUploadBo fileUploadBo) throws UnsupportedEncodingException {
         MultipartFile file = fileUploadBo.getFile();
         Assert.notNull(file, "上传文件不能为空");
+        //校验格式
+        String fileFormat = Objects.requireNonNull(fileUploadBo.getFile().getOriginalFilename()).substring(fileUploadBo.getFile().getOriginalFilename().lastIndexOf("."));
+        Assert.isTrue(".xlsx".equals(fileFormat) || ".xls".equals(fileFormat), "文件格式不正确");
+
         //校验同一成本类型下是否存在相同文件
         baseService.checkProjectFileExist(fileUploadBo);
         SysOssVo oss = iSysOssService.upload(file);

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java

@@ -7,7 +7,7 @@ import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.*;
-import com.dsk.cscec.domain.vo.ProjectRecordSearchVo;
+import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.service.CbProjectRecordService;
 import com.dsk.cscec.service.IDProjectService;
 import org.springframework.validation.annotation.Validated;
@@ -67,7 +67,7 @@ public class CbProjectRecordController extends BaseController {
      * 获取项目台账列表
      */
     @GetMapping("/getProjectList")
-    public TableDataInfo<ProjectRecordSearchVo> getProjectList(@RequestBody CbProjectSearchBo searchBo, PageQuery pageQuery) {
+    public TableDataInfo<CbProjectRecordSearchVo> getProjectList(@RequestBody CbProjectSearchBo searchBo, PageQuery pageQuery) {
         return baseService.getProjectList(searchBo, pageQuery);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectRecordDataVo.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbProjectRecordDataVo.java

@@ -10,7 +10,7 @@ import java.util.Date;
  * @time 15:18
  */
 @Data
-public class ProjectRecordDataVo {
+public class CbProjectRecordDataVo {
     /**
      * 项目文件状态(1:解析中、2:解析成功、3:解析失败)
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/ProjectRecordSearchVo.java → dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbProjectRecordSearchVo.java

@@ -13,7 +13,7 @@ import java.util.Date;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class ProjectRecordSearchVo extends CbProjectRecord {
+public class CbProjectRecordSearchVo extends CbProjectRecord {
     /**
      * 更新者
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectRecordMapper.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.CbProjectSearchBo;
-import com.dsk.cscec.domain.vo.ProjectRecordSearchVo;
+import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -20,10 +20,10 @@ public interface CbProjectRecordMapper extends BaseMapper<CbProjectRecord> {
     /**
      * 获取项目台账列表
      */
-    Page<ProjectRecordSearchVo> selectPageProjectRecordList(IPage<CbProjectSearchBo> build,
-                                                            @Param("searchBo") CbProjectSearchBo searchBo,
-                                                            @Param("deleteFlagExist") Integer deleteFlagExist,
-                                                            @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing);
+    Page<CbProjectRecordSearchVo> selectPageProjectRecordList(IPage<CbProjectSearchBo> build,
+                                                              @Param("searchBo") CbProjectSearchBo searchBo,
+                                                              @Param("deleteFlagExist") Integer deleteFlagExist,
+                                                              @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing);
 
     /**
      * 获取草稿弹窗列表

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/CbProjectRecordService.java

@@ -5,7 +5,7 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.*;
-import com.dsk.cscec.domain.vo.ProjectRecordSearchVo;
+import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 
 import java.util.List;
 
@@ -38,7 +38,7 @@ public interface CbProjectRecordService extends IService<CbProjectRecord> {
      * @param pageQuery 分页对象
      * @return 分页数据
      */
-    TableDataInfo<ProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery);
+    TableDataInfo<CbProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery);
 
     /**
      * 获取项目历史阶段信息(懒加载)

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -17,7 +17,7 @@ import com.dsk.cscec.constant.CbProjectConstants;
 import com.dsk.cscec.domain.CbProjectFile;
 import com.dsk.cscec.domain.CbProjectRecord;
 import com.dsk.cscec.domain.bo.*;
-import com.dsk.cscec.domain.vo.ProjectRecordSearchVo;
+import com.dsk.cscec.domain.vo.CbProjectRecordSearchVo;
 import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectRecordMapper;
 import com.dsk.cscec.service.CbProjectRecordService;
@@ -140,10 +140,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
      * @return 分页数据
      */
     @Override
-    public TableDataInfo<ProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery) {
-        Page<ProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
+    public TableDataInfo<CbProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery) {
+        Page<CbProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
 
-        for (ProjectRecordSearchVo searchVo : page.getRecords()) {
+        for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
             searchVo.setHasChildren(baseMapper.selectCount(new LambdaQueryWrapper<CbProjectRecord>()
                     .eq(CbProjectRecord::getRelatedId, searchVo.getRelatedId())) > 1);

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsk.cscec.mapper.CbProjectRecordMapper">
     <!--获取项目台账列表-->
-    <select id="selectPageProjectRecordList" resultType="com.dsk.cscec.domain.vo.ProjectRecordSearchVo">
+    <select id="selectPageProjectRecordList" resultType="com.dsk.cscec.domain.vo.CbProjectRecordSearchVo">
         select
         cpr.id,
         cpr.related_id,