Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java

@@ -3,6 +3,7 @@ package pwc.taxtech.atms.common.message;
 public class ErrorMessage {
 
     public static final String  SaveFileError = "SaveFileError";
+    public static final String  ParamError = "Param Error";
     public static final String  SystemError = "SystemError";
     public static final String  NoFile = "NoFile";
     public static final String  DidntSelectedCompany = "Didn't Selected Company";

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/ReportFileUploadEnum.java

+package pwc.taxtech.atms.constant.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ReportFileUploadEnum {
+
+    /**
+     * 报表类型
+     */
+    public enum ReportType {
+        NORMAL_DECLARATION("NORMAL_DECLARATION", "增值税纳税申报表"),
+        CORR_DECLARATION("CORR_DECLARATION", "增值税更正申报表"),
+        NORMAL_TAX_RECEIPT("NORMAL_TAX_RECEIPT", "增值税纳税税票"),
+        CORR_TAX_RECEIPT("CORR_TAX_RECEIPT", "增值税更正税票");
+        private String code;
+        private String name;
+        public static final Map<String, String> MAPPING = new HashMap<>();
+
+        ReportType(String code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (ReportFileUploadEnum.ReportType reportType : ReportFileUploadEnum.ReportType.values()) {
+                MAPPING.put(reportType.getCode(), reportType.getName());
+            }
+        }
+    }
+
+    /**
+     * 来源类型
+     */
+    public enum SuorceType {
+        VAT("VAT", "VAT"),
+        RECORD("RECORD", "档案");
+        private String code;
+        private String name;
+        public static final Map<String, String> MAPPING = new HashMap<>();
+
+        SuorceType(String code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (ReportFileUploadEnum.SuorceType suorceType : ReportFileUploadEnum.SuorceType.values()) {
+                MAPPING.put(suorceType.getCode(), suorceType.getName());
+            }
+        }
+    }
+
+
+
+}

atms-api/src/main/java/pwc/taxtech/atms/controller/ReportUploadDetailController.java

 package pwc.taxtech.atms.controller;
 
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.common.message.ErrorMessage;
+import pwc.taxtech.atms.dto.OperationResultDto;
 import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
+import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadParam;
+import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadResult;
 import pwc.taxtech.atms.dto.reportUpload.ReportUploadParam;
 import pwc.taxtech.atms.dto.reportUpload.ReportUploadResult;
+import pwc.taxtech.atms.exception.ServiceException;
+import pwc.taxtech.atms.service.impl.ReportFileUploadService;
 import pwc.taxtech.atms.service.impl.ReportUploadService;
+import pwc.taxtech.atms.vat.entity.ReportFileUpload;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/v1/reportUploadDetail")
@@ -18,10 +24,36 @@ public class ReportUploadDetailController extends BaseController {
     @Resource
     private ReportUploadService reportUploadService;
 
+
+    @Resource
+    private ReportFileUploadService reportFileUploadService;
     @PostMapping("queryPage")
     public CamelPagingResultDto<ReportUploadResult> queryPage(@RequestBody ReportUploadParam param) {
         return new CamelPagingResultDto<>(reportUploadService.queryPage(param));
     }
 
 
+    @PostMapping("queryFileUpload")
+    public List<ReportFileUploadResult> queryFileUpload(@RequestBody ReportFileUploadParam param) {
+        return reportFileUploadService.queryData(param);
+    }
+
+    @ResponseBody
+    @PostMapping("saveFileUpload")
+    public OperationResultDto saveFileUpload(@RequestParam MultipartFile file, @RequestParam String sourceType,@RequestParam String reportType,@RequestParam String projectId, @RequestParam Integer period) {
+        try {
+            ReportFileUpload data = new ReportFileUpload();
+            data.setPeriod(period);
+            data.setProjectId(projectId);
+            data.setReportType(reportType);
+            data.setSourceType(sourceType);
+            reportFileUploadService.saveData(file,data);
+            return OperationResultDto.success();
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("upload file error.", e);
+            return OperationResultDto.error(ErrorMessage.SystemError);
+        }
+    }
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/reportFileUpload/ReportFileUploadParam.java

+package pwc.taxtech.atms.dto.reportFileUpload;
+
+import java.io.Serializable;
+
+public class ReportFileUploadParam implements Serializable {
+
+
+    private static final long serialVersionUID = -7632137418761276513L;
+
+    private String projectId;
+
+    private Integer period;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public Integer getPeriod() {
+        return period;
+    }
+
+
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/reportFileUpload/ReportFileUploadResult.java

+package pwc.taxtech.atms.dto.reportFileUpload;
+
+import pwc.taxtech.atms.constant.enums.ReportFileUploadEnum;
+import pwc.taxtech.atms.vat.entity.ReportFileUpload;
+
+public class ReportFileUploadResult extends ReportFileUpload {
+
+
+    private static final long serialVersionUID = 6015878245854661752L;
+
+    public String getReportTypeStr() {
+        return ReportFileUploadEnum.ReportType.MAPPING.get(this.getReportType());
+    }
+
+    public String getSourceTypeStr() {
+        return ReportFileUploadEnum.SuorceType.MAPPING.get(this.getSourceType());
+    }
+
+    private String fileUrl;
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/service/impl/ReportFileUploadService.java

+package pwc.taxtech.atms.service.impl;
+
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.common.AuthUserHelper;
+import pwc.taxtech.atms.common.CommonUtils;
+import pwc.taxtech.atms.common.message.ErrorMessage;
+import pwc.taxtech.atms.constant.enums.ReportFileUploadEnum;
+import pwc.taxtech.atms.dao.ProjectMapper;
+import pwc.taxtech.atms.dao.UserMapper;
+import pwc.taxtech.atms.dto.didiFileUpload.DidiFileIUploadParam;
+import pwc.taxtech.atms.dto.didiFileUpload.DidiFileUploadDetailResult;
+import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadParam;
+import pwc.taxtech.atms.dto.reportFileUpload.ReportFileUploadResult;
+import pwc.taxtech.atms.entity.Project;
+import pwc.taxtech.atms.entity.User;
+import pwc.taxtech.atms.exception.ServiceException;
+import pwc.taxtech.atms.vat.dao.ReportFileUploadMapper;
+import pwc.taxtech.atms.vat.entity.FileUpload;
+import pwc.taxtech.atms.vat.entity.ReportFileUpload;
+import pwc.taxtech.atms.vat.entity.ReportFileUploadExample;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class ReportFileUploadService extends BaseService {
+
+    @Resource
+    private ReportFileUploadMapper reportFileUploadMapper;
+
+    @Autowired
+    protected AuthUserHelper authUserHelper;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private ProjectMapper projectMapper;
+
+
+    @Autowired
+    DidiFileUploadService didiFileUploadService;
+
+    public List<ReportFileUploadResult> queryData(ReportFileUploadParam param) {
+        ReportFileUploadExample example = new ReportFileUploadExample();
+        example.createCriteria().andProjectIdEqualTo(param.getProjectId()).andPeriodEqualTo(param.getPeriod());
+        List<ReportFileUpload> dataList = reportFileUploadMapper.selectByExample(example);
+        List<String> fileUploadUids = dataList.stream()
+                .map(o -> o.getFileUploadId()).collect(Collectors.toList());
+        Map<String, String> urlMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(fileUploadUids)) {
+            DidiFileIUploadParam fileParam = new DidiFileIUploadParam();
+            fileParam.setUuids(fileUploadUids);
+            PageInfo<DidiFileUploadDetailResult> uploadDetail = didiFileUploadService.queryPage(fileParam);
+            if (CollectionUtils.isNotEmpty(uploadDetail.getList())) {
+                urlMap = uploadDetail.getList().stream().collect(Collectors.toMap(DidiFileUploadDetailResult::getUid, didiFileUploadDetailResult -> didiFileUploadDetailResult.getViewHttpUrl()));
+            }
+        }
+        List<String> reportTypeList = dataList.stream()
+                .map(o -> o.getReportType()).collect(Collectors.toList());
+        if (!reportTypeList.contains(ReportFileUploadEnum.ReportType.NORMAL_DECLARATION.getCode())) {
+            ReportFileUpload upload = new ReportFileUpload();
+            upload.setReportType(ReportFileUploadEnum.ReportType.NORMAL_DECLARATION.getCode());
+            dataList.add(upload);
+        }
+        if (!reportTypeList.contains(ReportFileUploadEnum.ReportType.CORR_DECLARATION.getCode())) {
+            ReportFileUpload upload = new ReportFileUpload();
+            upload.setReportType(ReportFileUploadEnum.ReportType.CORR_DECLARATION.getCode());
+            dataList.add(upload);
+        }
+        if (!reportTypeList.contains(ReportFileUploadEnum.ReportType.NORMAL_TAX_RECEIPT.getCode())) {
+            ReportFileUpload upload = new ReportFileUpload();
+            upload.setReportType(ReportFileUploadEnum.ReportType.NORMAL_TAX_RECEIPT.getCode());
+            dataList.add(upload);
+        }
+        if (!reportTypeList.contains(ReportFileUploadEnum.ReportType.CORR_TAX_RECEIPT.getCode())) {
+            ReportFileUpload upload = new ReportFileUpload();
+            upload.setReportType(ReportFileUploadEnum.ReportType.CORR_TAX_RECEIPT.getCode());
+            dataList.add(upload);
+        }
+        List<ReportFileUploadResult> resultList = new ArrayList<ReportFileUploadResult>();
+        for (ReportFileUpload data : dataList) {
+            ReportFileUploadResult result = beanUtil.copyProperties(data, new ReportFileUploadResult());
+            result.setFileUrl(urlMap.get(data.getFileUploadId()));
+            resultList.add(result);
+        }
+        return resultList;
+    }
+
+    public void saveData(MultipartFile file, ReportFileUpload data) {
+        if (!ReportFileUploadEnum.ReportType.MAPPING.containsKey(data.getReportType())) {
+            throw new ServiceException(ErrorMessage.ParamError);
+        }
+        if (!ReportFileUploadEnum.SuorceType.MAPPING.containsKey(data.getSourceType())) {
+            throw new ServiceException(ErrorMessage.ParamError);
+        }
+        String uid = authUserHelper.getCurrentUserId();
+        User user = userMapper.selectByPrimaryKey(uid);
+        data.setCreator(user.getUserName());
+        Project project = projectMapper.selectByPrimaryKey(data.getProjectId());
+        data.setOrgId(project.getOrganizationId());
+        ReportFileUploadExample example = new ReportFileUploadExample();
+        example.createCriteria().andProjectIdEqualTo(data.getProjectId()).andPeriodEqualTo(data.getPeriod()).andReportTypeEqualTo(data.getReportType());
+        FileUpload fileUpload = didiFileUploadService.uploadFile(file, file.getOriginalFilename(), "ReportUpload");
+        data.setFileUploadId(fileUpload.getUid());
+        data.setUid(CommonUtils.getUUID());
+        data.setCreateTime(new Date());
+        data.setReportFileName(file.getOriginalFilename());
+        int updateRow = reportFileUploadMapper.updateByExample(data, example);
+        if (updateRow == 0) {
+            reportFileUploadMapper.insert(data);
+        }
+    }
+
+}

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/ReportFileUploadMapper.java

+package pwc.taxtech.atms.vat.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.entity.ReportFileUpload;
+import pwc.taxtech.atms.vat.entity.ReportFileUploadExample;
+
+@Mapper
+public interface ReportFileUploadMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    long countByExample(ReportFileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(ReportFileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    int insert(ReportFileUpload record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    int insertSelective(ReportFileUpload record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    List<ReportFileUpload> selectByExampleWithRowbounds(ReportFileUploadExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    List<ReportFileUpload> selectByExample(ReportFileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") ReportFileUpload record, @Param("example") ReportFileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") ReportFileUpload record, @Param("example") ReportFileUploadExample example);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ReportFileUpload.java

+package pwc.taxtech.atms.vat.entity;
+
+import pwc.taxtech.atms.entity.BaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table report_file_upload
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class ReportFileUpload extends BaseEntity implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.uid
+     *
+     * @mbg.generated
+     */
+    private String uid;
+
+    /**
+     * Database Column Remarks:
+     *   组织id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.org_id
+     *
+     * @mbg.generated
+     */
+    private String orgId;
+
+    /**
+     * Database Column Remarks:
+     *   项目id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   期数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * Database Column Remarks:
+     *   创建人
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.creator
+     *
+     * @mbg.generated
+     */
+    private String creator;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   报表名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.report_file_name
+     *
+     * @mbg.generated
+     */
+    private String reportFileName;
+
+    /**
+     * Database Column Remarks:
+     *   文件上传表id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.file_upload_id
+     *
+     * @mbg.generated
+     */
+    private String fileUploadId;
+
+    /**
+     * Database Column Remarks:
+     *   报表类型:normal_declaration|corr_declaration|normal_tax_receipt|corr_tax_receipt
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.report_type
+     *
+     * @mbg.generated
+     */
+    private String reportType;
+
+    /**
+     * Database Column Remarks:
+     *   来源类型:vat|record
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column report_file_upload.source_type
+     *
+     * @mbg.generated
+     */
+    private String sourceType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.uid
+     *
+     * @return the value of report_file_upload.uid
+     *
+     * @mbg.generated
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.uid
+     *
+     * @param uid the value for report_file_upload.uid
+     *
+     * @mbg.generated
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.org_id
+     *
+     * @return the value of report_file_upload.org_id
+     *
+     * @mbg.generated
+     */
+    public String getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.org_id
+     *
+     * @param orgId the value for report_file_upload.org_id
+     *
+     * @mbg.generated
+     */
+    public void setOrgId(String orgId) {
+        this.orgId = orgId == null ? null : orgId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.project_id
+     *
+     * @return the value of report_file_upload.project_id
+     *
+     * @mbg.generated
+     */
+    public String getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.project_id
+     *
+     * @param projectId the value for report_file_upload.project_id
+     *
+     * @mbg.generated
+     */
+    public void setProjectId(String projectId) {
+        this.projectId = projectId == null ? null : projectId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.period
+     *
+     * @return the value of report_file_upload.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.period
+     *
+     * @param period the value for report_file_upload.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.creator
+     *
+     * @return the value of report_file_upload.creator
+     *
+     * @mbg.generated
+     */
+    public String getCreator() {
+        return creator;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.creator
+     *
+     * @param creator the value for report_file_upload.creator
+     *
+     * @mbg.generated
+     */
+    public void setCreator(String creator) {
+        this.creator = creator == null ? null : creator.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.create_time
+     *
+     * @return the value of report_file_upload.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.create_time
+     *
+     * @param createTime the value for report_file_upload.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.report_file_name
+     *
+     * @return the value of report_file_upload.report_file_name
+     *
+     * @mbg.generated
+     */
+    public String getReportFileName() {
+        return reportFileName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.report_file_name
+     *
+     * @param reportFileName the value for report_file_upload.report_file_name
+     *
+     * @mbg.generated
+     */
+    public void setReportFileName(String reportFileName) {
+        this.reportFileName = reportFileName == null ? null : reportFileName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.file_upload_id
+     *
+     * @return the value of report_file_upload.file_upload_id
+     *
+     * @mbg.generated
+     */
+    public String getFileUploadId() {
+        return fileUploadId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.file_upload_id
+     *
+     * @param fileUploadId the value for report_file_upload.file_upload_id
+     *
+     * @mbg.generated
+     */
+    public void setFileUploadId(String fileUploadId) {
+        this.fileUploadId = fileUploadId == null ? null : fileUploadId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.report_type
+     *
+     * @return the value of report_file_upload.report_type
+     *
+     * @mbg.generated
+     */
+    public String getReportType() {
+        return reportType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.report_type
+     *
+     * @param reportType the value for report_file_upload.report_type
+     *
+     * @mbg.generated
+     */
+    public void setReportType(String reportType) {
+        this.reportType = reportType == null ? null : reportType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column report_file_upload.source_type
+     *
+     * @return the value of report_file_upload.source_type
+     *
+     * @mbg.generated
+     */
+    public String getSourceType() {
+        return sourceType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column report_file_upload.source_type
+     *
+     * @param sourceType the value for report_file_upload.source_type
+     *
+     * @mbg.generated
+     */
+    public void setSourceType(String sourceType) {
+        this.sourceType = sourceType == null ? null : sourceType.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", uid=").append(uid);
+        sb.append(", orgId=").append(orgId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", period=").append(period);
+        sb.append(", creator=").append(creator);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", reportFileName=").append(reportFileName);
+        sb.append(", fileUploadId=").append(fileUploadId);
+        sb.append(", reportType=").append(reportType);
+        sb.append(", sourceType=").append(sourceType);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ReportFileUploadExample.java

+package pwc.taxtech.atms.vat.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ReportFileUploadExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public ReportFileUploadExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("`uid` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("`uid` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("`uid` =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("`uid` <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("`uid` >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("`uid` >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("`uid` <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("`uid` <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("`uid` like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("`uid` not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("`uid` in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("`uid` not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("`uid` between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("`uid` not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(String value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(String value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(String value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(String value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(String value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLike(String value) {
+            addCriterion("org_id like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotLike(String value) {
+            addCriterion("org_id not like", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<String> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<String> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(String value1, String value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(String value1, String value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIsNull() {
+            addCriterion("creator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIsNotNull() {
+            addCriterion("creator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorEqualTo(String value) {
+            addCriterion("creator =", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotEqualTo(String value) {
+            addCriterion("creator <>", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorGreaterThan(String value) {
+            addCriterion("creator >", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorGreaterThanOrEqualTo(String value) {
+            addCriterion("creator >=", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorLessThan(String value) {
+            addCriterion("creator <", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorLessThanOrEqualTo(String value) {
+            addCriterion("creator <=", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorLike(String value) {
+            addCriterion("creator like", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotLike(String value) {
+            addCriterion("creator not like", value, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorIn(List<String> values) {
+            addCriterion("creator in", values, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotIn(List<String> values) {
+            addCriterion("creator not in", values, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorBetween(String value1, String value2) {
+            addCriterion("creator between", value1, value2, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatorNotBetween(String value1, String value2) {
+            addCriterion("creator not between", value1, value2, "creator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameIsNull() {
+            addCriterion("report_file_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameIsNotNull() {
+            addCriterion("report_file_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameEqualTo(String value) {
+            addCriterion("report_file_name =", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameNotEqualTo(String value) {
+            addCriterion("report_file_name <>", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameGreaterThan(String value) {
+            addCriterion("report_file_name >", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameGreaterThanOrEqualTo(String value) {
+            addCriterion("report_file_name >=", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameLessThan(String value) {
+            addCriterion("report_file_name <", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameLessThanOrEqualTo(String value) {
+            addCriterion("report_file_name <=", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameLike(String value) {
+            addCriterion("report_file_name like", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameNotLike(String value) {
+            addCriterion("report_file_name not like", value, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameIn(List<String> values) {
+            addCriterion("report_file_name in", values, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameNotIn(List<String> values) {
+            addCriterion("report_file_name not in", values, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameBetween(String value1, String value2) {
+            addCriterion("report_file_name between", value1, value2, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportFileNameNotBetween(String value1, String value2) {
+            addCriterion("report_file_name not between", value1, value2, "reportFileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdIsNull() {
+            addCriterion("file_upload_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdIsNotNull() {
+            addCriterion("file_upload_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdEqualTo(String value) {
+            addCriterion("file_upload_id =", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdNotEqualTo(String value) {
+            addCriterion("file_upload_id <>", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdGreaterThan(String value) {
+            addCriterion("file_upload_id >", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdGreaterThanOrEqualTo(String value) {
+            addCriterion("file_upload_id >=", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdLessThan(String value) {
+            addCriterion("file_upload_id <", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdLessThanOrEqualTo(String value) {
+            addCriterion("file_upload_id <=", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdLike(String value) {
+            addCriterion("file_upload_id like", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdNotLike(String value) {
+            addCriterion("file_upload_id not like", value, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdIn(List<String> values) {
+            addCriterion("file_upload_id in", values, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdNotIn(List<String> values) {
+            addCriterion("file_upload_id not in", values, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdBetween(String value1, String value2) {
+            addCriterion("file_upload_id between", value1, value2, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUploadIdNotBetween(String value1, String value2) {
+            addCriterion("file_upload_id not between", value1, value2, "fileUploadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIsNull() {
+            addCriterion("report_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIsNotNull() {
+            addCriterion("report_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeEqualTo(String value) {
+            addCriterion("report_type =", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotEqualTo(String value) {
+            addCriterion("report_type <>", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeGreaterThan(String value) {
+            addCriterion("report_type >", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("report_type >=", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLessThan(String value) {
+            addCriterion("report_type <", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLessThanOrEqualTo(String value) {
+            addCriterion("report_type <=", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeLike(String value) {
+            addCriterion("report_type like", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotLike(String value) {
+            addCriterion("report_type not like", value, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeIn(List<String> values) {
+            addCriterion("report_type in", values, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotIn(List<String> values) {
+            addCriterion("report_type not in", values, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeBetween(String value1, String value2) {
+            addCriterion("report_type between", value1, value2, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotBetween(String value1, String value2) {
+            addCriterion("report_type not between", value1, value2, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeIsNull() {
+            addCriterion("source_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeIsNotNull() {
+            addCriterion("source_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeEqualTo(String value) {
+            addCriterion("source_type =", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeNotEqualTo(String value) {
+            addCriterion("source_type <>", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeGreaterThan(String value) {
+            addCriterion("source_type >", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("source_type >=", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeLessThan(String value) {
+            addCriterion("source_type <", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeLessThanOrEqualTo(String value) {
+            addCriterion("source_type <=", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeLike(String value) {
+            addCriterion("source_type like", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeNotLike(String value) {
+            addCriterion("source_type not like", value, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeIn(List<String> values) {
+            addCriterion("source_type in", values, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeNotIn(List<String> values) {
+            addCriterion("source_type not in", values, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeBetween(String value1, String value2) {
+            addCriterion("source_type between", value1, value2, "sourceType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceTypeNotBetween(String value1, String value2) {
+            addCriterion("source_type not between", value1, value2, "sourceType");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table report_file_upload
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table report_file_upload
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/ReportFileUploadMapper.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="pwc.taxtech.atms.vat.dao.ReportFileUploadMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.ReportFileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="org_id" jdbcType="VARCHAR" property="orgId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="creator" jdbcType="VARCHAR" property="creator" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="report_file_name" jdbcType="VARCHAR" property="reportFileName" />
+    <result column="file_upload_id" jdbcType="VARCHAR" property="fileUploadId" />
+    <result column="report_type" jdbcType="VARCHAR" property="reportType" />
+    <result column="source_type" jdbcType="VARCHAR" property="sourceType" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    `uid`, org_id, project_id, period, creator, create_time, report_file_name, file_upload_id, 
+    report_type, source_type
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUploadExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from report_file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUploadExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from report_file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into report_file_upload (`uid`, org_id, project_id, 
+      period, creator, create_time, 
+      report_file_name, file_upload_id, report_type, 
+      source_type)
+    values (#{uid,jdbcType=VARCHAR}, #{orgId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
+      #{period,jdbcType=INTEGER}, #{creator,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{reportFileName,jdbcType=VARCHAR}, #{fileUploadId,jdbcType=VARCHAR}, #{reportType,jdbcType=VARCHAR}, 
+      #{sourceType,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into report_file_upload
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+      <if test="creator != null">
+        creator,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="reportFileName != null">
+        report_file_name,
+      </if>
+      <if test="fileUploadId != null">
+        file_upload_id,
+      </if>
+      <if test="reportType != null">
+        report_type,
+      </if>
+      <if test="sourceType != null">
+        source_type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+      <if test="creator != null">
+        #{creator,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="reportFileName != null">
+        #{reportFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileUploadId != null">
+        #{fileUploadId,jdbcType=VARCHAR},
+      </if>
+      <if test="reportType != null">
+        #{reportType,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceType != null">
+        #{sourceType,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUploadExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from report_file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update report_file_upload
+    <set>
+      <if test="record.uid != null">
+        `uid` = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+      <if test="record.creator != null">
+        creator = #{record.creator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.reportFileName != null">
+        report_file_name = #{record.reportFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileUploadId != null">
+        file_upload_id = #{record.fileUploadId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportType != null">
+        report_type = #{record.reportType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourceType != null">
+        source_type = #{record.sourceType,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update report_file_upload
+    set `uid` = #{record.uid,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      period = #{record.period,jdbcType=INTEGER},
+      creator = #{record.creator,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      report_file_name = #{record.reportFileName,jdbcType=VARCHAR},
+      file_upload_id = #{record.fileUploadId,jdbcType=VARCHAR},
+      report_type = #{record.reportType,jdbcType=VARCHAR},
+      source_type = #{record.sourceType,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.ReportFileUploadExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from report_file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -2221,5 +2221,9 @@
     "RepUploadDtlColCreator": "存档用户",
     "RepUploadDtlColFileName": "计算表名称-系统生成",
     "RepUploadDtlColDownload": "下载",
+    "RepUploadDtlColUpload": "上传",
+    "RepUploadDtlColReportType": "申报表类型",
+    "RepUploadDtlColTaxType": "税票类型",
+    "RepUploadDtlColSourceType": "来源",
     "~MustBeEndOneApp": "我必须是最后一个！"
 }

atms-web/src/main/webapp/app/common/controls/ack-pagination/ack-pagination.ctrl.js

@@ -9,7 +9,8 @@ controller('ackPaginationController', ['SweetAlert', '$scope', '$log', '$transla
             totalPages: $scope.pageOptions.totalPages || 0,//总页数
             maxSize: $scope.pageOptions.maxSize || 10, //分页数字的限制。
             pageSize: $scope.pageOptions.pageSize || constant.page.pageSizeArrary[1],  //每页多少条数据 
-            pageSizeString: constant.page.pageSizeArrary[1].toString(),
+            pageSizeString: $scope.pageOptions.pageSizeString||constant.page.pageSizeArrary[1].toString(),
+            pagingSelection: $scope.pageOptions.pagingSelection||[],
             firstPage: '<<', //$translate.instant('PagingFirstPage'),
             previousPage: '<', //$translate.instant('PagingPreviousPage'),
             nextPage:'>',// $translate.instant('PagingNextPage'),
@@ -31,13 +32,15 @@ controller('ackPaginationController', ['SweetAlert', '$scope', '$log', '$transla
         $scope.pagingService = {
             //分页下拉组装
             populatePagingSelection: function () {
-                var pagingSelection = [];
-                var pageArray = constant.page.pageSizeArrary;
-                for (var i = 0 ; i < pageArray.length; i++) {
-                    var selection = { id: pageArray[i], value: pageArray[i] };
-                    pagingSelection.push(selection);
+                if($scope.pageOptions.pagingSelection.length==0){
+                    var pagingSelection = [];
+                    var pageArray = constant.page.pageSizeArrary;
+                    for (var i = 0 ; i < pageArray.length; i++) {
+                        var selection = { id: pageArray[i], value: pageArray[i] };
+                        pagingSelection.push(selection);
+                    }
+                    $scope.pageOptions.pagingSelection = pagingSelection;
                 }
-                $scope.pageOptions.pagingSelection = pagingSelection;
             },
 
             //分页的时候改变数字

atms-web/src/main/webapp/app/common/controls/vat-report-upload-view/vat-report-upload-detail.ctrl.js

-vatModule.controller('vatReportUploadDetailController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q',
-    '$interval', 'dxDataGridService', '$http', 'apiConfig', 'vatSessionService',
-    function ($scope, $log, $translate, $timeout, SweetAlert, $q, $interval, dxDataGridService, $http, apiConfig, vatSessionService) {
+commonModule.controller('vatReportUploadDetailController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q',
+    '$interval', 'dxDataGridService', '$http', 'apiConfig', 'vatSessionService', 'Upload', 'apiInterceptor',
+    function ($scope, $log, $translate, $timeout, SweetAlert, $q, $interval, dxDataGridService, $http, apiConfig, vatSessionService, Upload, apiInterceptor) {
         'use strict';
         $log.debug('vatReportUploadDetailController.ctor()...');
 
         //表格配置
-        $scope.revenueGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
+        $scope.reportOneGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
             columns: [
 
                 {
@@ -36,7 +36,7 @@
                     allowHeaderFiltering: true
                 },
                 {
-                    dataField: 'reportName',
+                    dataField: 'reportFileName',
                     caption: $translate.instant('RepUploadDtlColFileName'),
                     fixed: true,
                     allowHeaderFiltering: true
@@ -48,7 +48,7 @@
                     allowHeaderFiltering: true,
                     cellTemplate: function (container, options) {
                         try {
-                            $("<a href='"+options.data.fileUrl+"'>下载</a>")
+                            $("<a href='" + options.data.fileUrl + "'>下载</a>")
                                 .appendTo(container);
                         } catch (e) {
                             $log.error(e);
@@ -57,10 +57,227 @@
                 }
             ],
             bindingOptions: {
-                dataSource: 'pageConfDataSource'
+                dataSource: 'reportOneDataSource'
             }
         });
 
+
+        $scope.reportTwoGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
+            columns: [
+
+                {
+                    caption: $translate.instant('RepUploadDtlColSerialNo'),
+                    fixed: true,
+                    width: '5%',
+                    allowHeaderFiltering: true, cellTemplate: function (container, options) {
+                        try {
+                            $("<span>" + (options.rowIndex + 1) + "</span>")
+                                .appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+                {
+                    dataField: 'reportTypeStr',
+                    width: '20%',
+                    caption: $translate.instant('RepUploadDtlColReportType'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'createTime',
+                    width: '10%',
+                    caption: $translate.instant('RepUploadDtlColCreateTime'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    dataType: "date",
+                    format: "yyyy-MM-dd HH:mm:ss",
+                },
+                {
+                    dataField: 'creator',
+                    width: '10%',
+                    caption: $translate.instant('RepUploadDtlColCreator'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'reportFileName',
+                    width: '30%',
+                    caption: $translate.instant('RepUploadDtlColFileName'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    caption: $translate.instant('RepUploadDtlColUpload'),
+                    fixed: true,
+                    width: '8%',
+                    allowHeaderFiltering: true,
+                    cellTemplate: function (container, options) {
+                        try {
+                                $("<a href='javascript:void(0)'>上传</a>").on('click', function () {
+                                    $('#uploadBut' + options.rowIndex).click();
+                                }).appendTo(container);
+                                $('<input type="file"  style="display:none;"  id="uploadBut' + options.rowIndex + '" />').on('change', function () {
+                                    console.log($('#uploadBut' + options.rowIndex)[0].files[0]);
+                                    uploadFile($('#uploadBut' + options.rowIndex)[0].files[0], options.data.reportType);
+                                }).appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+                {
+                    dataField: 'fileUrl',
+                    width: '8%',
+                    caption: $translate.instant('RepUploadDtlColDownload'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    cellTemplate: function (container, options) {
+                        if (options.data.fileUrl && "" != options.data.fileUrl) {
+                            try {
+                                $("<a href='" + options.data.fileUrl + "'>下载</a>")
+                                    .appendTo(container);
+                            } catch (e) {
+                                $log.error(e);
+                            }
+                        }
+                    }
+                },
+                {
+                    dataField: 'sourceTypeStr',
+                    width: '8%',
+                    caption: $translate.instant('RepUploadDtlColSourceType'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+            ],
+            bindingOptions: {
+                dataSource: 'reportTwoDataSource'
+            }
+        });
+
+
+        $scope.reportThreeGridOptions = $.extend(true, {}, dxDataGridService.BASIC_GRID_OPTIONS, {
+            columns: [
+
+                {
+                    caption: $translate.instant('RepUploadDtlColSerialNo'),
+                    fixed: true,
+                    width: '5%',
+                    allowHeaderFiltering: true, cellTemplate: function (container, options) {
+                        try {
+                            $("<span>" + (options.rowIndex + 1) + "</span>")
+                                .appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+                {
+                    dataField: 'reportTypeStr',
+                    width: '20%',
+                    caption: $translate.instant('RepUploadDtlColTaxType'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'createTime',
+                    width: '10%',
+                    caption: $translate.instant('RepUploadDtlColCreateTime'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    dataType: "date",
+                    format: "yyyy-MM-dd HH:mm:ss",
+                },
+                {
+                    dataField: 'creator',
+                    width: '10%',
+                    caption: $translate.instant('RepUploadDtlColCreator'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    dataField: 'reportFileName',
+                    width: '30%',
+                    caption: $translate.instant('RepUploadDtlColFileName'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+                {
+                    caption: $translate.instant('RepUploadDtlColUpload'),
+                    fixed: true,
+                    width: '8%',
+                    allowHeaderFiltering: true,
+                    cellTemplate: function (container, options) {
+                        try {
+                            $("<a href='javascript:void(0)'>上传</a>").on('click', function () {
+                                $('#uploadBut' + options.rowIndex).click();
+                            }).appendTo(container);
+                            $('<input type="file"  style="display:none;"  id="uploadBut' + options.rowIndex + '" />').on('change', function () {
+                                console.log($('#uploadBut' + options.rowIndex)[0].files[0]);
+                                uploadFile($('#uploadBut' + options.rowIndex)[0].files[0], options.data.reportType);
+                            }).appendTo(container);
+                        } catch (e) {
+                            $log.error(e);
+                        }
+                    }
+                },
+                {
+                    dataField: 'fileUrl',
+                    width: '8%',
+                    caption: $translate.instant('RepUploadDtlColDownload'),
+                    fixed: true,
+                    allowHeaderFiltering: true,
+                    cellTemplate: function (container, options) {
+                        if (options.data.fileUrl && "" != options.data.fileUrl) {
+                            try {
+                                $("<a href='" + options.data.fileUrl + "'>下载</a>")
+                                    .appendTo(container);
+                            } catch (e) {
+                                $log.error(e);
+                            }
+                        }
+                    }
+                },
+                {
+                    dataField: 'sourceTypeStr',
+                    width: '8%',
+                    caption: $translate.instant('RepUploadDtlColSourceType'),
+                    fixed: true,
+                    allowHeaderFiltering: true
+                },
+            ],
+            bindingOptions: {
+                dataSource: 'reportThreeDataSource'
+            }
+        });
+
+        var uploadFile = function (file, reportType) {
+            var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
+            Upload.upload({
+                url: apiInterceptor.webApiHostUrl + '/reportUploadDetail/saveFileUpload',
+                data: {
+                    projectId: vatSessionService.project.id,
+                    period: "" + vatSessionService.year + month,
+                    reportType: reportType,
+                    sourceType: "VAT"
+                },
+                file: file,
+                headers: {
+                    'Access-Control-Allow-Origin': '*',
+                    Authorization: apiInterceptor.tokenType + ' ' + apiInterceptor.apiToken(),
+                    withCredentials: true
+                },
+                withCredentials: true
+            }).then(function (resp) {
+                $scope.getReportFileUpload();
+            }, function (resp) {
+
+            }, function (evt) {
+
+            });
+        }
         //刷新页面
         $scope.refreshGrid = function () {
             $scope.searchParam.projectId = vatSessionService.project.id;
@@ -74,7 +291,7 @@
             $http.post('/reportUploadDetail/queryPage', $scope.searchParam, apiConfig.createVat())
                 .success(function (res) {
                     if (res && res.list) {
-                        $scope.pageConfDataSource = res.list;
+                        $scope.reportOneDataSource = res.list;
                         $scope.pagingOptions.totalItems = res.pageInfo.totalCount;
                     } else {
                         SweetAlert.error($translate.instant('SystemError'));
@@ -82,6 +299,31 @@
                 })
         };
 
+        //获取申报表或税票上传数据
+        $scope.getReportFileUpload = function () {
+            var month = vatSessionService.month < 10 ? ("0" + vatSessionService.month) : vatSessionService.month;
+            $http.post('/reportUploadDetail/queryFileUpload', {
+                projectId: vatSessionService.project.id,
+                period: "" + vatSessionService.year + month
+            }, apiConfig.createVat())
+                .success(function (res) {
+                    if (res) {
+                        $scope.reportTwoDataSource = [];
+                        $scope.reportThreeDataSource = [];
+                        angular.forEach(res, function (data) {
+                            if ("NORMAL_DECLARATION" === data.reportType || "CORR_DECLARATION" === data.reportType) {
+                                $scope.reportTwoDataSource.push(data);
+                            }
+                            if ("NORMAL_TAX_RECEIPT" === data.reportType || "CORR_TAX_RECEIPT" === data.reportType) {
+                                $scope.reportThreeDataSource.push(data);
+                            }
+                        });
+                    } else {
+                        SweetAlert.error($translate.instant('SystemError'));
+                    }
+                })
+        };
+
 
         (function initialize() {
 
@@ -89,17 +331,20 @@
             $scope.pagingOptions = {
                 pageIndex: 1,  //当前页码
                 totalItems: 0,  //总数据
-                pageSize: 20  //每页多少条数据
+                pageSize: 10,  //每页多少条数据
+                pagingSelection: [{id: 5, value: 5}, {id: 10, value: 10}],
+                pageSizeString: '10',
             };
 
             $scope.searchParam = {};
 
-
             function init() {
                 $scope.refreshGrid();
+                $scope.getReportFileUpload();
+
             }
 
-            init()
+            init();
 
         })();
     }

atms-web/src/main/webapp/app/common/controls/vat-report-upload-view/vat-report-upload-detail.js

-vatModule.directive('vatReportUploadDetail', ['$log', 'browserService', '$translate', 'region', '$timeout',
+commonModule.directive('vatReportUploadDetail', ['$log', 'browserService', '$translate', 'region', '$timeout',
     function ($log, browserService, $translate, region, $timeout) {
         $log.debug('vatReportUploadDetail.ctor()...');
 

atms-web/src/main/webapp/app/common/controls/vat-report-upload-view/vat-report-upload-detail.less

@@ -315,6 +315,70 @@
     }
   }
 
+  .content-container-other {
+    height: calc(~'100% - 40px');
+    position: relative;
+
+    .body {
+
+      .buttom-row {
+        padding: 15px;
+        display: inline-block;
+        width: 100%;
+
+        .left-side {
+          display: inline-block;
+          /*padding-left:5px;*/
+          .select-title {
+            margin-left: 20px;
+          }
+
+          .select-number {
+            padding: 0 1px;
+            color: red;
+          }
+        }
+
+        .right-side {
+          float: right;
+          display: inline-block;
+          /*padding-right:5px;*/
+          .btn {
+            margin-left: 20px;
+          }
+        }
+      }
+
+      .grid-container {
+        padding: 0px 15px;
+        /*height: 350px;*/
+        /*height:100%;*/
+        #invoiceGridContainer {
+          max-height: 100%;
+        }
+
+
+        .dx-datagrid-rowsview .dx-row > .dx-master-detail-cell {
+          padding: 0px !important;
+        }
+
+        .dx-datagrid-nowrap.dx-datagrid-headers .dx-header-row > td > .dx-datagrid-text-content {
+          white-space: normal !important;
+        }
+
+        .internal-grid-container {
+          padding: 10px 10px 10px 0;
+
+
+          & > div:first-child {
+            padding: 0 0 5px 10px;
+            font-size: 13px;
+            /*font-weight: bold;*/
+          }
+        }
+      }
+    }
+  }
   .importVerifyInvoiceModal {
     .modal-dialog {
       height: 200px;

atms-web/src/main/webapp/app/common/controls/vat-report-upload-view/vat-report-upload.html

@@ -2,12 +2,12 @@
     <div class="header-title">
         <div style="display:inline-block"><span class="title-name">{{'ReportUploadDetail' | translate }}</span></div>
     </div>
-    <div class="content-container">
+    <div class="content-container" style="height: 60%">
 
         <div class="body">
 
             <div class="grid-container">
-                <div id="invoiceGridContainer" dx-data-grid="revenueGridOptions">
+                <div id="invoiceGridContainer" dx-data-grid="reportOneGridOptions">
                     <div data-options="dxTemplate:{ name:'editCellTemplate' }">
 
                     </div>
@@ -22,6 +22,41 @@
 
     </div>
 
+    <div style="height: 40%">
+        <div class="content-container-other" style="float:left;width:49%;">
+
+            <div class="body">
+
+                <div class="grid-container">
+                    <div id="invoiceGridContainer1" dx-data-grid="reportTwoGridOptions">
+                        <div data-options="dxTemplate:{ name:'editCellTemplate' }">
+
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+
+        </div>
+
+        <div class="content-container-other" style="float:right;width:49%;">
+
+            <div class="body">
+
+                <div class="grid-container">
+                    <div id="invoiceGridContainer2" dx-data-grid="reportThreeGridOptions">
+                        <div data-options="dxTemplate:{ name:'editCellTemplate' }">
+
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+
+        </div>
+    </div>
 
 </div>