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-中建一局二公司

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

+package com.dsk.cscec.controller;
+
+import com.dsk.cscec.service.CbProjectFileService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目成本文件表(CbProjectFile)表控制层
+ *
+ * @author sxk
+ * @since 2024-02-05 14:01:03
+ */
+@RestController
+@RequestMapping("cbProjectFile")
+public class CbProjectFileController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CbProjectFileService baseService;
+
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectFile.java

+package com.dsk.cscec.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 项目成本文件表(CbProjectFile)实体类
+ *
+ * @author sxk
+ * @since 2024-02-05 14:01:05
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CbProjectFile extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 290150095443621411L;
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+    /**
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     */
+    private Integer cbStage;
+    /**
+     * 成本类型（0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总）
+     */
+    private Integer cbType;
+    /**
+     * 文件名称
+     */
+    private String fileName;
+    /**
+     * OSS文件ID
+     */
+    private String fileOssId;
+    /**
+     * OSS文件路径
+     */
+    private String fileOssUrl;
+    /**
+     * 文件解析状态（0:待解析、1:解析中、2:解析成功、3:解析失败）
+     */
+    private Integer fileParseStatus;
+    /**
+     * 失败备注
+     */
+    private String failRemark;
+    /**
+     * 删除状态(0:否、2:是)
+     */
+    private Integer delFlag;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbProjectRecord.java

@@ -5,7 +5,6 @@ import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -47,20 +46,4 @@ public class CbProjectRecord extends BaseEntity implements Serializable {
      * 删除状态(0:否、2:是)
      */
     private Integer delFlag;
-    /**
-     * 创建者
-     */
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-    /**
-     * 更新者
-     */
-    private String updateBy;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
 }

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

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.CbProjectFile;
+
+/**
+ * 项目成本文件表(CbProjectFile)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-02-05 14:01:03
+ */
+public interface CbProjectFileMapper extends BaseMapper<CbProjectFile> {
+
+
+}
+

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

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.CbProjectFile;
+
+/**
+ * 项目成本文件表(CbProjectFile)表服务接口
+ *
+ * @author sxk
+ * @since 2024-02-05 14:01:06
+ */
+public interface CbProjectFileService extends IService<CbProjectFile> {
+
+}

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

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.CbProjectFile;
+import com.dsk.cscec.mapper.CbProjectFileMapper;
+import com.dsk.cscec.service.CbProjectFileService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 项目成本文件表(CbProjectFile)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-02-05 14:01:06
+ */
+@Service("cbProjectFileService")
+public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, CbProjectFile> implements CbProjectFileService {
+    @Resource
+    private CbProjectFileMapper baseMapper;
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.CbProjectFileMapper">
+
+
+</mapper>
+