Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwFillingbatchController.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingBatchInfoMapper.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingbatchFileMapper.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwFillingbatchProjectMapper.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwFillingbatchInfoMapper.xml
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwFillingbatchService.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwFillingbatchInfoDTO.java
#	jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwFillingbatchProjectDTO.java

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/domain/CwFillingbatchFile.java

@@ -1,38 +0,0 @@
-package com.jeeplus.finance.projectRecords.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.jeeplus.core.domain.BaseEntity;
-import lombok.Data;
-
-@Data
-@TableName("cw_fillingbatch_file")
-public class CwFillingbatchFile extends BaseEntity {
-
-    //文件类型
-    private String fileType;
-
-    //文件描述
-    private String fileRemarks;
-
-    //报告id
-    private String reportId;
-
-    //排序
-    private Integer sort;
-
-    //报告文号
-    @TableField(exist = false)
-    private String no;
-    //项目名称
-    @TableField(exist = false)
-    private String name;
-    //层级
-    @TableField(exist = false)
-    private String level;
-    //父id
-    @TableField(exist = false)
-    private String parentId;
-
-    private String projectNumber;
-}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/domain/CwFillingbatchInfo.java

@@ -1,35 +0,0 @@
-package com.jeeplus.finance.projectRecords.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jeeplus.core.domain.BaseEntity;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Data
-@TableName("cw_fillingbatch_info")
-public class CwFillingbatchInfo extends BaseEntity {
-
-    //归档批次号
-    private String no;
-
-    //归档名称
-    private String name;
-
-    //归档说明
-    private String remarks;
-
-    //流程信息
-    private String procInsId;
-    private String processDefinitionId;
-
-    //审核状态
-    private String status;
-
-    //审核通过时间
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date auditAgreeTime;
-}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/domain/CwFillingbatchProject.java

@@ -1,47 +0,0 @@
-package com.jeeplus.finance.projectRecords.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.jeeplus.core.domain.BaseEntity;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@TableName("cw_fillingbatch_project")
-public class CwFillingbatchProject extends BaseEntity {
-
-    //归档id
-    private String fillingbatchId;
-
-    //报告id
-    private String reportId;
-
-    //案卷号
-    private String achiveNo;
-
-    //状态
-    private String status;
-
-    //排序
-    private Integer sort;
-    //报告文号
-    @TableField(exist = false)
-    private String no;
-    //项目名称
-    @TableField(exist = false)
-    private String name;
-    //层级
-    @TableField(exist = false)
-    private String level;
-    @TableField(exist = false)
-    private List<CwFillingbatchFile> children;
-
-    @TableField(exist = false)
-    private String parentId;
-
-    @TableField(exist = false)
-    private String projectNumber;
-    @TableField(exist = false)
-    private String projectStatus;
-}

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -642,17 +642,4 @@
         where a.del_flag = '0'
     </select>
 
-    <select id="getInfoById" resultType="com.jeeplus.finance.projectRecords.service.dto.CwProjectRecordsDTO">
-        select
-            a.create_by_id as createId,
-            a.project_number,
-            a.project_name,
-            a.project_level,
-            prn.report_no
-        from cw_project_records a
-        left join cw_project_report pr on a.id = pr.project_id and pr.del_flag = '0'
-        left join cw_project_report_new_line prn on pr.id = prn.report_id and prn.del_flag = '0'
-         where pr.id = #{id}
-    </select>
-
 </mapper>