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/constant/Constant.java

 package pwc.taxtech.atms.constant;
 
 import java.io.File;
-import java.text.DecimalFormat;
-import java.util.Locale;
 import java.util.UUID;
 
 public final class Constant {
@@ -123,6 +121,7 @@ public final class Constant {
         public static final String DEFAULT = "yyyy-MM-dd";
         public static final String YEAR_MONTH = "yyyy-MM";
         public static final String YYYYMM = "yyyyMM";
+        public static final String YYYYMMDD = "yyyyMMdd";
         public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     }
 

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

+package pwc.taxtech.atms.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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.exception.ServiceException;
+import pwc.taxtech.atms.service.impl.DidiFileUploadService;
+
+@RestController
+@RequestMapping("/api/v1/DidiFileUpload")
+public class DidiFileUploadController {
+    private static final Logger logger = LoggerFactory.getLogger(DidiFileUploadController.class);
+    @Autowired
+    private DidiFileUploadService didiFileUploadService;
+
+
+    @ResponseBody
+//    @ApiOperation(value = "导入模板")
+    @RequestMapping(value = "importTemplateGroupExcelFile", method = RequestMethod.POST)
+    public OperationResultDto uploadFile(@RequestParam MultipartFile file) {
+        try {
+            if (null == file) {
+                return OperationResultDto.error(ErrorMessage.NoFile);
+            }
+
+            return OperationResultDto.success();
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("uploadFile error.", e);
+        }
+        return OperationResultDto.error(ErrorMessage.SystemError);
+    }
+//    @PostMapping("queryPage")
+//    public CamelPagingResultDto<DidiFileUploadDetailResult> queryPage(@RequestBody DidiFileIUploadParam param) {
+//        return new CamelPagingResultDto<>(revenueDetailService.queryPage(param));
+//    }
+}

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

@@ -143,4 +143,19 @@ public class EbsApiController {
         return ApiResultDto.fail();
     }
 
+    @RequestMapping(value = "/updateOrg", method = RequestMethod.POST)
+    public ApiResultDto updateOrg(@RequestBody List<OrganizationQueryDto> items) {
+        if (CollectionUtils.isEmpty(items)) {
+            logger.debug("the updateOrg return items is empty");
+            return ApiResultDto.success(Collections.emptyList());
+        }
+        try {
+            ebsApiService.queryRemoteServerThenUpdateOrg(items);
+            return ApiResultDto.success();
+        } catch (Exception e) {
+            logger.error("updateOrg error.", e);
+        }
+        return ApiResultDto.fail();
+    }
+
 }

atms-api/src/main/java/pwc/taxtech/atms/dto/didiFileUpload/DidiFileIUploadParam.java

+package pwc.taxtech.atms.dto.didiFileUpload;
+
+import pwc.taxtech.atms.dto.input.CamelPagingDto;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class DidiFileIUploadParam implements Serializable {
+
+
+    private static final long serialVersionUID = -1277395668299427030L;
+    private CamelPagingDto pageInfo;
+
+    private List<String> uuids;
+
+    private List<String> bizSources;
+
+    private List<String> uploadDates;
+
+    private List<String> uploadMonths;
+
+    private List<Integer> uploadWeeks;
+
+    private List<Integer> uploadYears;
+
+    public List<String> getBizSources() {
+        return bizSources;
+    }
+
+    public void setBizSources(List<String> bizSources) {
+        this.bizSources = bizSources;
+    }
+
+    public List<String> getUploadDates() {
+        return uploadDates;
+    }
+
+    public void setUploadDates(List<String> uploadDates) {
+        this.uploadDates = uploadDates;
+    }
+
+    public List<String> getUploadMonths() {
+        return uploadMonths;
+    }
+
+    public void setUploadMonths(List<String> uploadMonths) {
+        this.uploadMonths = uploadMonths;
+    }
+
+    public List<Integer> getUploadWeeks() {
+        return uploadWeeks;
+    }
+
+    public void setUploadWeeks(List<Integer> uploadWeeks) {
+        this.uploadWeeks = uploadWeeks;
+    }
+
+    public List<Integer> getUploadYears() {
+        return uploadYears;
+    }
+
+    public void setUploadYears(List<Integer> uploadYears) {
+        this.uploadYears = uploadYears;
+    }
+
+    public CamelPagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(CamelPagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
+
+    public List<String> getUuids() {
+        return uuids;
+    }
+
+    public void setUuids(List<String> uuids) {
+        this.uuids = uuids;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/didiFileUpload/DidiFileUploadDetailResult.java

+package pwc.taxtech.atms.dto.didiFileUpload;
+
+import pwc.taxtech.atms.vat.entity.FileUpload;
+
+public class DidiFileUploadDetailResult extends FileUpload {
+
+
+    private static final long serialVersionUID = -3050146980194769766L;
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/ebsdto/OrganizationQueryDto.java

+package pwc.taxtech.atms.dto.ebsdto;
+
+import java.io.Serializable;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 04/03/2019 17:14
+ * @Description:
+ */
+public class OrganizationQueryDto implements Serializable {
+
+    private String taxPayerNumber;
+
+    private String code;
+
+    private String name;
+
+    private String enterpriseAccountCode;
+
+    private String legalPersonName;
+
+    private String registrationCapital;
+
+    private String paidInCapital;
+
+    private String legalPersonPhoneNumber;
+
+    private String legalPersonLandlineNum;
+
+    private String legalPersonEmailAddress;
+
+    private String regFinancialOfficerName;
+
+    private String regFinancialOfficerPhoneNum;
+
+    private String regFinancialOfficerLandlineNum;
+
+    private String regFinancialOfficerEmailAddress;
+
+    private String currencyCode;
+
+    private String registerAddress;
+
+    private String parentName;
+
+    private int staffSize;
+
+    public String getTaxPayerNumber() {
+        return taxPayerNumber;
+    }
+
+    public void setTaxPayerNumber(String taxPayerNumber) {
+        this.taxPayerNumber = taxPayerNumber;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEnterpriseAccountCode() {
+        return enterpriseAccountCode;
+    }
+
+    public void setEnterpriseAccountCode(String enterpriseAccountCode) {
+        this.enterpriseAccountCode = enterpriseAccountCode;
+    }
+
+    public String getLegalPersonName() {
+        return legalPersonName;
+    }
+
+    public void setLegalPersonName(String legalPersonName) {
+        this.legalPersonName = legalPersonName;
+    }
+
+    public String getRegistrationCapital() {
+        return registrationCapital;
+    }
+
+    public void setRegistrationCapital(String registrationCapital) {
+        this.registrationCapital = registrationCapital;
+    }
+
+    public String getPaidInCapital() {
+        return paidInCapital;
+    }
+
+    public void setPaidInCapital(String paidInCapital) {
+        this.paidInCapital = paidInCapital;
+    }
+
+    public String getLegalPersonPhoneNumber() {
+        return legalPersonPhoneNumber;
+    }
+
+    public void setLegalPersonPhoneNumber(String legalPersonPhoneNumber) {
+        this.legalPersonPhoneNumber = legalPersonPhoneNumber;
+    }
+
+    public String getLegalPersonLandlineNum() {
+        return legalPersonLandlineNum;
+    }
+
+    public void setLegalPersonLandlineNum(String legalPersonLandlineNum) {
+        this.legalPersonLandlineNum = legalPersonLandlineNum;
+    }
+
+    public String getLegalPersonEmailAddress() {
+        return legalPersonEmailAddress;
+    }
+
+    public void setLegalPersonEmailAddress(String legalPersonEmailAddress) {
+        this.legalPersonEmailAddress = legalPersonEmailAddress;
+    }
+
+    public String getRegFinancialOfficerName() {
+        return regFinancialOfficerName;
+    }
+
+    public void setRegFinancialOfficerName(String regFinancialOfficerName) {
+        this.regFinancialOfficerName = regFinancialOfficerName;
+    }
+
+    public String getRegFinancialOfficerPhoneNum() {
+        return regFinancialOfficerPhoneNum;
+    }
+
+    public void setRegFinancialOfficerPhoneNum(String regFinancialOfficerPhoneNum) {
+        this.regFinancialOfficerPhoneNum = regFinancialOfficerPhoneNum;
+    }
+
+    public String getRegFinancialOfficerLandlineNum() {
+        return regFinancialOfficerLandlineNum;
+    }
+
+    public void setRegFinancialOfficerLandlineNum(String regFinancialOfficerLandlineNum) {
+        this.regFinancialOfficerLandlineNum = regFinancialOfficerLandlineNum;
+    }
+
+    public String getRegFinancialOfficerEmailAddress() {
+        return regFinancialOfficerEmailAddress;
+    }
+
+    public void setRegFinancialOfficerEmailAddress(String regFinancialOfficerEmailAddress) {
+        this.regFinancialOfficerEmailAddress = regFinancialOfficerEmailAddress;
+    }
+
+    public String getCurrencyCode() {
+        return currencyCode;
+    }
+
+    public void setCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+
+    public String getRegisterAddress() {
+        return registerAddress;
+    }
+
+    public void setRegisterAddress(String registerAddress) {
+        this.registerAddress = registerAddress;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public int getStaffSize() {
+        return staffSize;
+    }
+
+    public void setStaffSize(int staffSize) {
+        this.staffSize = staffSize;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/service/EbsApiService.java

@@ -61,4 +61,11 @@ public interface EbsApiService {
      * @param items
      */
     void queryRemoteServerThenUpdateOAR(List<OrganizationAccountingRateQueryDto> items);
+
+    /**
+     * ebs 机构信息表同步更新
+     *
+     * @param items
+     */
+    void queryRemoteServerThenUpdateOrg(List<OrganizationQueryDto> items);
 }

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

+package pwc.taxtech.atms.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.ByteArrayBody;
+import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.common.CommonUtils;
+import pwc.taxtech.atms.common.config.FileServiceConfig;
+import pwc.taxtech.atms.constant.Constant;
+import pwc.taxtech.atms.dto.didiFileUpload.DidiFileIUploadParam;
+import pwc.taxtech.atms.dto.didiFileUpload.DidiFileUploadDetailResult;
+import pwc.taxtech.atms.exception.ServiceException;
+import pwc.taxtech.atms.vat.dao.FileUploadLogMapper;
+import pwc.taxtech.atms.vat.dao.FileUploadMapper;
+import pwc.taxtech.atms.vat.entity.FileUpload;
+import pwc.taxtech.atms.vat.entity.FileUploadExample;
+import pwc.taxtech.atms.vat.entity.FileUploadLog;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * version 2.0
+ * author kevin
+ */
+@Service
+public class DidiFileUploadService extends BaseService {
+    @Autowired
+    private FileServiceConfig config;
+
+    @Resource
+    private FileUploadMapper fileUploadMapper;
+
+    @Resource
+    private FileUploadLogMapper fileUploadLogMapper;
+
+    @Value("${env_type}")
+    private String evnType;
+
+    @Value("${file_upload_post_url}")
+    private String upload_post_url;
+
+    @Value("${file_upload_query_url}")
+    private String upload_query_url;
+
+    protected static char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    private static final String ENV_DEV = "dev";
+
+    private static final String HTTP_SUCCESS_CODE = "200";
+
+    private static final String PROXY_HOST = "47.94.233.173";
+
+    private static final String PROXY_PORT = "11007";
+
+    public FileUpload uploadFile(MultipartFile file, String bizSource) throws ServiceException {
+        CloseableHttpClient httpClient = null;
+        String requestKey = CommonUtils.getUUID();
+        String requestUrl = upload_post_url + "/" + requestKey;
+        FileUploadLog uploadLog = new FileUploadLog();
+        uploadLog.setRequestId(requestKey);
+        uploadLog.setRequestUrl(requestUrl);
+        uploadLog.setUid(CommonUtils.getUUID());
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpPost httpPost = new HttpPost(requestUrl);
+            String md5Str = getFileMD5String(file);
+            ByteArrayBody byteBody = new ByteArrayBody(file.getBytes(), ContentType.MULTIPART_FORM_DATA, file.getOriginalFilename());
+            StringBody md5 = new StringBody(md5Str, ContentType.create("text/plain"));
+            HttpEntity httpEntity = MultipartEntityBuilder.create().addPart("filecontent", byteBody).addPart("md5", md5).build();
+            httpPost.setEntity(httpEntity);
+            HttpResponse httpResponse = httpClient.execute(httpPost);
+            JSONObject resultDto = JSON.parseObject(IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8"));
+            uploadLog.setResponsJson(resultDto.toJSONString());
+            FileUpload fileUpload = null;
+            if (HTTP_SUCCESS_CODE.equals(resultDto.getString("status_code"))) {
+                fileUpload = new FileUpload();
+                fileUpload.setBizSource(bizSource);
+                fileUpload.setUid(CommonUtils.getUUID());
+                fileUpload.setFileName(file.getOriginalFilename());
+                fileUpload.setResourceKey(requestKey);
+                assemblyModel(resultDto, fileUpload);
+                uploadLog.setFileUploadId(fileUpload.getUid());
+                fileUploadMapper.insert(fileUpload);
+            }
+            fileUploadLogMapper.insert(uploadLog);
+            return fileUpload;
+        } catch (Exception e) {
+            uploadLog.setResponsJson(e.getMessage());
+            fileUploadLogMapper.insert(uploadLog);
+            logger.error("uploadFile error.", e);
+        } finally {
+            if (null != httpClient) {
+                try {
+                    httpClient.close();
+                } catch (IOException e) {
+                    logger.error("close httpClient error.", e);
+                }
+            }
+        }
+        throw new ServiceException("uploadFile error.");
+    }
+
+    public static String getFileMD5String(MultipartFile file) throws Exception {
+        MessageDigest messagedigest = MessageDigest.getInstance("MD5");
+        messagedigest.update(file.getBytes());
+        byte bytes[] = messagedigest.digest();
+        return bufferToHex(bytes, 0, bytes.length);
+    }
+
+    private static String bufferToHex(byte bytes[], int m, int n) {
+        StringBuffer stringbuffer = new StringBuffer(2 * n);
+        int k = m + n;
+        for (int l = m; l < k; l++) {
+            appendHexPair(bytes[l], stringbuffer);
+        }
+        return stringbuffer.toString();
+    }
+
+    private static void appendHexPair(byte bt, StringBuffer stringbuffer) {
+        char c0 = hexDigits[(bt & 0xf0) >> 4];
+        char c1 = hexDigits[bt & 0xf];
+        stringbuffer.append(c0);
+        stringbuffer.append(c1);
+    }
+
+
+    public PageInfo<DidiFileUploadDetailResult> queryPage(DidiFileIUploadParam param) {
+        Page page = null;
+        if (param.getPageInfo() != null && param.getPageInfo().getPageSize() != null && param.getPageInfo().getPageIndex() != null) {
+            page = PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+        }
+        FileUploadExample example = new FileUploadExample();
+        FileUploadExample.Criteria criteria = example.createCriteria();
+        if(CollectionUtils.isNotEmpty(param.getUuids())){
+            criteria.andUidIn(param.getUuids());
+        }
+        if(CollectionUtils.isNotEmpty(param.getBizSources())){
+            criteria.andBizSourceIn(param.getBizSources());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadMonths())){
+            criteria.andUploadMonthIn(param.getUploadMonths());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadDates())){
+            criteria.andUploadDateIn(param.getUploadDates());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadWeeks())){
+            criteria.andUploadWeekIn(param.getUploadWeeks());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadYears())){
+            criteria.andUploadYearIn(param.getUploadYears());
+        }
+        refreshViewUrl(param);
+        PageInfo<DidiFileUploadDetailResult> pageInfo = new PageInfo<>(fileUploadMapper.selectByExample(example).stream()
+                .map(o -> beanUtil.copyProperties(o, new DidiFileUploadDetailResult())).collect(Collectors.toList()));
+        if (page != null) {
+            pageInfo.setTotal(page.getTotal());
+        }
+        return pageInfo;
+    }
+
+    public FileUpload assemblyModel(JSONObject resultDto, FileUpload fileUpload) {
+        fileUpload.setFileMd5(resultDto.getString("md5"));
+        HttpPost tmpPost = new HttpPost(resultDto.getString("download_url"));
+        String downloadUrlHttp = resultDto.getString("download_url");
+        String downloadUrlHttps = resultDto.getString("download_url_https");
+        if (ENV_DEV.equals(evnType)) {
+            downloadUrlHttp = downloadUrlHttp.replace(tmpPost.getURI().getHost(), PROXY_HOST);
+            downloadUrlHttp = downloadUrlHttp.replace(String.valueOf(tmpPost.getURI().getPort()), PROXY_PORT);
+            downloadUrlHttps = downloadUrlHttps.replace(tmpPost.getURI().getHost(), PROXY_HOST);
+            downloadUrlHttps = downloadUrlHttps.replace(String.valueOf(tmpPost.getURI().getPort()), PROXY_PORT);
+        }
+        fileUpload.setViewHttpsUrl(downloadUrlHttps);
+        fileUpload.setViewHttpUrl(downloadUrlHttp);
+        Date date = new Date();
+        fileUpload.setUploadTime(date);
+        SimpleDateFormat dateFormat = new SimpleDateFormat(Constant.DateFormat.YYYYMMDD);
+        fileUpload.setUploadDate(dateFormat.format(date));
+        dateFormat = new SimpleDateFormat(Constant.DateFormat.YYYYMM);
+        fileUpload.setUploadMonth(dateFormat.format(date));
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        fileUpload.setUploadWeek(calendar.get(Calendar.WEEK_OF_YEAR));
+        fileUpload.setUploadYear(calendar.get(Calendar.YEAR));
+        String[] params = tmpPost.getURI().getQuery().split("&");
+        Long time = new Long(params[0].replace("expire=", ""));
+        Date useFullDate = new Date();
+        useFullDate.setTime(new Date().getTime() + time - 7200);
+        fileUpload.setUsefulEndTime(useFullDate);
+        return fileUpload;
+    }
+
+    public void refreshViewUrl(DidiFileIUploadParam param) throws ServiceException {
+        FileUploadExample example = new FileUploadExample();
+        FileUploadExample.Criteria criteria = example.createCriteria();
+        if(CollectionUtils.isNotEmpty(param.getUuids())){
+            criteria.andUidIn(param.getUuids());
+        }
+        if(CollectionUtils.isNotEmpty(param.getBizSources())){
+            criteria.andBizSourceIn(param.getBizSources());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadMonths())){
+            criteria.andUploadMonthIn(param.getUploadMonths());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadDates())){
+            criteria.andUploadDateIn(param.getUploadDates());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadWeeks())){
+            criteria.andUploadWeekIn(param.getUploadWeeks());
+        }
+        if(CollectionUtils.isNotEmpty(param.getUploadYears())){
+            criteria.andUploadYearIn(param.getUploadYears());
+        }
+        criteria.andUsefulEndTimeLessThan(new Date());
+        List<FileUpload> dataList = fileUploadMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(dataList)) {
+            CloseableHttpClient httpClient = null;
+            for (FileUpload data : dataList) {
+                try {
+                    httpClient = HttpClients.createDefault();
+                    HttpGet httpGet = new HttpGet(upload_query_url + "/" + data.getResourceKey());
+                    HttpResponse httpResponse = httpClient.execute(httpGet);
+                    JSONObject resultDto = JSON.parseObject(IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8"));
+                    if (HTTP_SUCCESS_CODE.equals(resultDto.getString("status_code"))) {
+                        assemblyModel(resultDto, data);
+                        fileUploadMapper.updateByPrimaryKey(data);
+                    }
+                } catch (Exception e) {
+                    logger.error("uploadFile query error.", e);
+                } finally {
+                    if (null != httpClient) {
+                        try {
+                            httpClient.close();
+                        } catch (IOException e) {
+                            logger.error("close httpClient error.", e);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public Boolean delData(String uid){
+        boolean delFlag = false;
+        FileUploadExample example = new FileUploadExample();
+        example.createCriteria().andUidEqualTo(uid);
+        List<FileUpload> dataList = fileUploadMapper.selectByExample(example);
+        if(CollectionUtils.isNotEmpty(dataList)){
+            CloseableHttpClient httpClient = null;
+            FileUploadLog uploadLog = new FileUploadLog();
+            uploadLog.setRequestId(dataList.get(0).getResourceKey());
+            uploadLog.setRequestUrl(upload_query_url + "/" + dataList.get(0).getResourceKey());
+            uploadLog.setUid(CommonUtils.getUUID());
+            uploadLog.setFileUploadId(dataList.get(0).getUid());
+            try {
+                httpClient = HttpClients.createDefault();
+                HttpDelete httpGet = new HttpDelete(upload_query_url + "/" + dataList.get(0).getResourceKey());
+                HttpResponse httpResponse = httpClient.execute(httpGet);
+                JSONObject resultDto = JSON.parseObject(IOUtils.toString(httpResponse.getEntity().getContent(), "UTF-8"));
+                if (HTTP_SUCCESS_CODE.equals(resultDto.getString("status_code"))) {
+                    fileUploadMapper.deleteByPrimaryKey(uid);
+                    delFlag = true;
+                }
+                uploadLog.setResponsJson(resultDto.toJSONString());
+                fileUploadLogMapper.insert(uploadLog);
+            } catch (Exception e) {
+                uploadLog.setResponsJson(e.getMessage());
+                fileUploadLogMapper.insert(uploadLog);
+                logger.error("uploadFile query error.", e);
+            } finally {
+                if (null != httpClient) {
+                    try {
+                        httpClient.close();
+                    } catch (IOException e) {
+                        logger.error("close httpClient error.", e);
+                    }
+                }
+            }
+        }
+        return delFlag;
+    }
+}

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

@@ -7,10 +7,9 @@ import org.nutz.lang.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.common.ServiceException;
 import pwc.taxtech.atms.common.util.BeanUtil;
-import pwc.taxtech.atms.dao.OrganizationAccountingRateMapper;
-import pwc.taxtech.atms.dao.OrganizationMapper;
-import pwc.taxtech.atms.dao.ProjectMapper;
+import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dto.ebsdto.*;
 import pwc.taxtech.atms.entity.*;
 import pwc.taxtech.atms.service.EbsApiService;
@@ -23,6 +22,7 @@ import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 @Service
 public class EbsApiServiceImpl implements EbsApiService {
@@ -42,6 +42,10 @@ public class EbsApiServiceImpl implements EbsApiService {
     @Resource
     private OrganizationMapper organizationMapper;
     @Resource
+    private OrganizationEmployeeMapper organizationEmployeeMapper;
+    @Resource
+    private OrganizationExtraMapper organizationExtraMapper;
+    @Resource
     private ProjectMapper projectMapper;
     @Resource
     private DistributedIdService distributedIdService;
@@ -210,6 +214,76 @@ public class EbsApiServiceImpl implements EbsApiService {
         logger.debug("end queryRemoteServerThenUpdateOAR 汇率表,took [{}] ms", System.currentTimeMillis() - start);
     }
 
+    @Override
+    public void queryRemoteServerThenUpdateOrg(List<OrganizationQueryDto> items) {
+        long start = System.currentTimeMillis();
+        logger.debug("start queryRemoteServerThenUpdateOrg 机构表");
+        //判断数据是否存在
+        if (items.size() == 0) {
+            logger.error("empty EBS Organization 机构表 response, skip processing");
+            return;
+        }
+        logger.debug("organization 汇率表：" + JSON.toJSONString(items));
+        for (OrganizationQueryDto a : items) {
+            try {
+                processORG(a);
+            } catch (Exception e) {
+                logger.error("break loop as catch:" + e, e);
+            }
+        }
+        logger.debug("end queryRemoteServerThenUpdateOrg 机构表,took [{}] ms", System.currentTimeMillis() - start);
+    }
+
+    private void processORG(OrganizationQueryDto a) {
+        // 机构信息
+        OrganizationExample organizationExample = new OrganizationExample();
+        organizationExample.createCriteria().andTaxPayerNumberEqualTo(a.getTaxPayerNumber());
+        List<Organization> orgs = organizationMapper.selectByExample(organizationExample);
+        Organization org = beanUtil.copyProperties(a,new Organization());
+        OrganizationExample orgExample = new OrganizationExample();
+        orgExample.createCriteria().andNameEqualTo(a.getParentName());
+        List<Organization> orgParents = organizationMapper.selectByExample(organizationExample);
+        String orgId = "";
+        if(orgParents.size()>0){
+            org.setParentId(orgParents.get(0).getId());
+        }
+
+        if(orgs.size()<1){
+            orgId = UUID.randomUUID().toString();
+            org.setId(orgId);
+            org.setApiUpdateFlag(true);
+            organizationMapper.insertSelective(org);
+        }else{
+            orgId = orgs.get(0).getId();
+            org.setId(orgs.get(0).getId());
+            org.setApiUpdateFlag(true);
+            org.setUpdateTime(new Date());
+            organizationMapper.updateByPrimaryKeySelective(org);
+        }
+        // 机构其他信息
+        OrganizationExtraExample organizationExtraExample = new OrganizationExtraExample();
+        organizationExtraExample.createCriteria().andOrganizationIdEqualTo(org.getId());
+        List<OrganizationExtra> orgExs = organizationExtraMapper.selectByExample(organizationExtraExample);
+        OrganizationExtra orgEx = beanUtil.copyProperties(a,new OrganizationExtra());
+        orgEx.setReportingCurrency(a.getCurrencyCode());
+        if(orgExs.size()<1){
+            orgEx.setId(distributedIdService.nextId());
+            orgEx.setOrganizationId(orgId);
+            organizationExtraMapper.insertSelective(orgEx);
+        }else{
+            orgEx.setId(orgExs.get(0).getId());
+            orgEx.setOrganizationId(orgId);
+            orgEx.setUpdateTime(new Date());
+            organizationExtraMapper.updateByExampleSelective(orgEx,organizationExtraExample);
+        }
+        // 雇员信息
+        OrganizationEmployee oe = new OrganizationEmployee();
+        oe.setId(distributedIdService.nextId());
+        oe.setOrganizationId(orgId);
+        oe.setEmployeesNumEnd(a.getStaffSize());
+        organizationEmployeeMapper.insertSelective(oe);
+    }
+
     private void processJE(JournalEntryQueryDto item) {
         JournalEntryExample journalEntryExample = new JournalEntryExample();
         journalEntryExample.createCriteria().andHeaderIdEqualTo(item.getHeaderId()).andLineNumEqualTo(item.getLineNum());

atms-api/src/main/resources/conf/conf.properties

@@ -42,3 +42,7 @@ longi_api_gl_balance=${longi_api_gl_balance}
 #log
 log.level=${log.level}
 log.debug=${log.debug}
+
+env_type=${env_type}
+file_upload_post_url=${file_upload_post_url}
+file_upload_query_url=${file_upload_query_url}
\ No newline at end of file

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -38,3 +38,7 @@ longi_api_gl_balance=http://39.105.197.175:13001/ETMSSB/Erp/GLBalance/ProxyServi
 #log
 log.level=DEBUG
 log.debug=true
+
+env_type=dev
+file_upload_post_url=http://47.94.233.173:11005/resource/erp_tax_system
+file_upload_query_url=http://47.94.233.173:11006/resource/erp_tax_system
\ No newline at end of file

atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java

 package pwc.taxtech.atms.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import org.junit.Test;
 import pwc.taxtech.atms.CommonIT;
 import pwc.taxtech.atms.dto.ebsdto.*;
@@ -93,6 +94,36 @@ public class EbsApiServiceImplTest extends CommonIT {
         //ebsApiService.queryRemoteServerThenUpdateJE(items);
     }
 
+    @Test
+    public void queryRemoteServerThenUpdateOrg(){
+        List<OrganizationQueryDto> items = Lists.newArrayList();
+        for(int i=0;i<2;i++){
+            OrganizationQueryDto dto = new OrganizationQueryDto();
+            dto.setTaxPayerNumber("sadsafsdf3232");
+            dto.setCode("ceshi0009");
+            dto.setName("测试成功");
+            dto.setEnterpriseAccountCode("test");
+            dto.setLegalPersonName("周杰伦");
+            dto.setRegistrationCapital("100万");
+            dto.setPaidInCapital("200万");
+            dto.setLegalPersonPhoneNumber("1239512312");
+            dto.setLegalPersonLandlineNum("1234678");
+            dto.setLegalPersonEmailAddress("didi@qq.com");
+            dto.setRegFinancialOfficerName("周杰伦");
+            dto.setRegFinancialOfficerPhoneNum("123141231");
+            dto.setRegFinancialOfficerLandlineNum("123213124");
+            dto.setRegFinancialOfficerEmailAddress("滴滴大厦");
+            dto.setCurrencyCode("CNY");
+            dto.setRegisterAddress("滴滴大厦");
+            dto.setParentName("滴滴测试");
+            dto.setStaffSize(12345);
+            items.add(dto);
+        }
+        String res=JSON.toJSONString(items);
+        System.out.println(res);
+//        ebsApiService.queryRemoteServerThenUpdateOrg(items);
+    }
+
     @Test
     public void queryRemoteServerThenUpdateTB() {
         List<TrialBalanceQueryDto> items=new ArrayList<>();

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationDto.java

@@ -111,6 +111,8 @@ public class OrganizationDto {
 
     private String regStatus;
 
+    private String enterpriseAccountCode;
+
     private Date logoutTime;
 
     private Boolean oversea;
@@ -717,6 +719,14 @@ public class OrganizationDto {
         this.taxControlDiskList = taxControlDiskList;
     }
 
+    public String getEnterpriseAccountCode() {
+        return enterpriseAccountCode;
+    }
+
+    public void setEnterpriseAccountCode(String enterpriseAccountCode) {
+        this.enterpriseAccountCode = enterpriseAccountCode;
+    }
+
     @Override
     public int hashCode() {
         final int prime = 31;

atms-dao/src/main/java/pwc/taxtech/atms/entity/Organization.java

@@ -21,6 +21,8 @@ public class Organization extends BaseEntity implements Serializable {
     private String id;
 
     /**
+     * Database Column Remarks:
+     *   目前无实际用途
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.client_code
@@ -39,6 +41,8 @@ public class Organization extends BaseEntity implements Serializable {
     private String name;
 
     /**
+     * Database Column Remarks:
+     *   机构代码/机构编码   滴滴项目机构key为这个字段或taxPayerNumber
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.code
@@ -300,6 +304,8 @@ public class Organization extends BaseEntity implements Serializable {
     private String registrationLocation;
 
     /**
+     * Database Column Remarks:
+     *   注册资本
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column organization.registration_capital
@@ -476,6 +482,8 @@ public class Organization extends BaseEntity implements Serializable {
      */
     private Boolean engageNationalProhibitIndustry;
 
+    private String  enterpriseAccountCode;
+
     /**
      * Database Column Remarks:
      *   注销时间。
@@ -1723,6 +1731,29 @@ public class Organization extends BaseEntity implements Serializable {
         this.logoutTime = logoutTime;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column organization.enterprise_account_code
+     *
+     * @return the value of organization.enterprise_account_code
+     *
+     * @mbg.generated
+     */
+    public String getEnterpriseAccountCode() {
+        return enterpriseAccountCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column organization.enterprise_account_code
+     *
+     * @param enterpriseAccountCode the value for organization.enterprise_account_code
+     *
+     * @mbg.generated
+     */
+    public void setEnterpriseAccountCode(String enterpriseAccountCode) {
+        this.enterpriseAccountCode = enterpriseAccountCode == null ? null : enterpriseAccountCode.trim();
+    }
 
 
     public Area getArea() {
@@ -1741,6 +1772,7 @@ public class Organization extends BaseEntity implements Serializable {
         this.businessUnit = businessUnit;
     }
 
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table organization
@@ -1803,6 +1835,7 @@ public class Organization extends BaseEntity implements Serializable {
         sb.append(", nationalEconomicIndustry=").append(nationalEconomicIndustry);
         sb.append(", engageNationalProhibitIndustry=").append(engageNationalProhibitIndustry);
         sb.append(", logoutTime=").append(logoutTime);
+        sb.append(", enterpriseAccountCode=").append(enterpriseAccountCode);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/entity/OrganizationExample.java

@@ -3544,6 +3544,76 @@ public class OrganizationExample {
             addCriterion("logout_time not between", value1, value2, "logoutTime");
             return (Criteria) this;
         }
+
+        public Criteria andEnterpriseAccountCodeIsNull() {
+            addCriterion("enterprise_account_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeIsNotNull() {
+            addCriterion("enterprise_account_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeEqualTo(String value) {
+            addCriterion("enterprise_account_code =", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeNotEqualTo(String value) {
+            addCriterion("enterprise_account_code <>", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeGreaterThan(String value) {
+            addCriterion("enterprise_account_code >", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("enterprise_account_code >=", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeLessThan(String value) {
+            addCriterion("enterprise_account_code <", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeLessThanOrEqualTo(String value) {
+            addCriterion("enterprise_account_code <=", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeLike(String value) {
+            addCriterion("enterprise_account_code like", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeNotLike(String value) {
+            addCriterion("enterprise_account_code not like", value, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeIn(List<String> values) {
+            addCriterion("enterprise_account_code in", values, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeNotIn(List<String> values) {
+            addCriterion("enterprise_account_code not in", values, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeBetween(String value1, String value2) {
+            addCriterion("enterprise_account_code between", value1, value2, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnterpriseAccountCodeNotBetween(String value1, String value2) {
+            addCriterion("enterprise_account_code not between", value1, value2, "enterpriseAccountCode");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/FileUploadLogMapper.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.FileUploadLog;
+import pwc.taxtech.atms.vat.entity.FileUploadLogExample;
+
+@Mapper
+public interface FileUploadLogMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    long countByExample(FileUploadLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(FileUploadLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String uid);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int insert(FileUploadLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int insertSelective(FileUploadLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    List<FileUploadLog> selectByExampleWithRowbounds(FileUploadLogExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    List<FileUploadLog> selectByExample(FileUploadLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    FileUploadLog selectByPrimaryKey(String uid);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") FileUploadLog record, @Param("example") FileUploadLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") FileUploadLog record, @Param("example") FileUploadLogExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(FileUploadLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(FileUploadLog record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/FileUploadMapper.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.FileUpload;
+import pwc.taxtech.atms.vat.entity.FileUploadExample;
+
+@Mapper
+public interface FileUploadMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    long countByExample(FileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(FileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String uid);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int insert(FileUpload record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int insertSelective(FileUpload record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    List<FileUpload> selectByExampleWithRowbounds(FileUploadExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    List<FileUpload> selectByExample(FileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    FileUpload selectByPrimaryKey(String uid);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") FileUpload record, @Param("example") FileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") FileUpload record, @Param("example") FileUploadExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(FileUpload record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(FileUpload record);
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.vat.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import pwc.taxtech.atms.entity.BaseEntity;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table file_upload
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class FileUpload extends BaseEntity implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.uid
+     *
+     * @mbg.generated
+     */
+    private String uid;
+
+    /**
+     * Database Column Remarks:
+     *   文件名
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.file_name
+     *
+     * @mbg.generated
+     */
+    private String fileName;
+
+    /**
+     * Database Column Remarks:
+     *   业务调用方Code
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.biz_source
+     *
+     * @mbg.generated
+     */
+    private String bizSource;
+
+    /**
+     * Database Column Remarks:
+     *   文件md5值
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.file_md5
+     *
+     * @mbg.generated
+     */
+    private String fileMd5;
+
+    /**
+     * Database Column Remarks:
+     *   文件访问key
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.resource_key
+     *
+     * @mbg.generated
+     */
+    private String resourceKey;
+
+    /**
+     * Database Column Remarks:
+     *   http查看路径
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.view_http_url
+     *
+     * @mbg.generated
+     */
+    private String viewHttpUrl;
+
+    /**
+     * Database Column Remarks:
+     *   https查看路径
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.view_https_url
+     *
+     * @mbg.generated
+     */
+    private String viewHttpsUrl;
+
+    /**
+     * Database Column Remarks:
+     *   上传时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.upload_time
+     *
+     * @mbg.generated
+     */
+    private Date uploadTime;
+
+    /**
+     * Database Column Remarks:
+     *   有效截至时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.useful_end_time
+     *
+     * @mbg.generated
+     */
+    private Date usefulEndTime;
+
+    /**
+     * Database Column Remarks:
+     *   上传日期 yyyymmdd
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.upload_date
+     *
+     * @mbg.generated
+     */
+    private String uploadDate;
+
+    /**
+     * Database Column Remarks:
+     *   上传月份 yyyymm
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.upload_month
+     *
+     * @mbg.generated
+     */
+    private String uploadMonth;
+
+    /**
+     * Database Column Remarks:
+     *   上传周数
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.upload_week
+     *
+     * @mbg.generated
+     */
+    private Integer uploadWeek;
+
+    /**
+     * Database Column Remarks:
+     *   上传年份
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload.upload_year
+     *
+     * @mbg.generated
+     */
+    private Integer uploadYear;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table 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 file_upload.uid
+     *
+     * @return the value of 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 file_upload.uid
+     *
+     * @param uid the value for 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 file_upload.file_name
+     *
+     * @return the value of file_upload.file_name
+     *
+     * @mbg.generated
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.file_name
+     *
+     * @param fileName the value for file_upload.file_name
+     *
+     * @mbg.generated
+     */
+    public void setFileName(String fileName) {
+        this.fileName = fileName == null ? null : fileName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.biz_source
+     *
+     * @return the value of file_upload.biz_source
+     *
+     * @mbg.generated
+     */
+    public String getBizSource() {
+        return bizSource;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.biz_source
+     *
+     * @param bizSource the value for file_upload.biz_source
+     *
+     * @mbg.generated
+     */
+    public void setBizSource(String bizSource) {
+        this.bizSource = bizSource == null ? null : bizSource.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.file_md5
+     *
+     * @return the value of file_upload.file_md5
+     *
+     * @mbg.generated
+     */
+    public String getFileMd5() {
+        return fileMd5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.file_md5
+     *
+     * @param fileMd5 the value for file_upload.file_md5
+     *
+     * @mbg.generated
+     */
+    public void setFileMd5(String fileMd5) {
+        this.fileMd5 = fileMd5 == null ? null : fileMd5.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.resource_key
+     *
+     * @return the value of file_upload.resource_key
+     *
+     * @mbg.generated
+     */
+    public String getResourceKey() {
+        return resourceKey;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.resource_key
+     *
+     * @param resourceKey the value for file_upload.resource_key
+     *
+     * @mbg.generated
+     */
+    public void setResourceKey(String resourceKey) {
+        this.resourceKey = resourceKey == null ? null : resourceKey.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.view_http_url
+     *
+     * @return the value of file_upload.view_http_url
+     *
+     * @mbg.generated
+     */
+    public String getViewHttpUrl() {
+        return viewHttpUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.view_http_url
+     *
+     * @param viewHttpUrl the value for file_upload.view_http_url
+     *
+     * @mbg.generated
+     */
+    public void setViewHttpUrl(String viewHttpUrl) {
+        this.viewHttpUrl = viewHttpUrl == null ? null : viewHttpUrl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.view_https_url
+     *
+     * @return the value of file_upload.view_https_url
+     *
+     * @mbg.generated
+     */
+    public String getViewHttpsUrl() {
+        return viewHttpsUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.view_https_url
+     *
+     * @param viewHttpsUrl the value for file_upload.view_https_url
+     *
+     * @mbg.generated
+     */
+    public void setViewHttpsUrl(String viewHttpsUrl) {
+        this.viewHttpsUrl = viewHttpsUrl == null ? null : viewHttpsUrl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.upload_time
+     *
+     * @return the value of file_upload.upload_time
+     *
+     * @mbg.generated
+     */
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.upload_time
+     *
+     * @param uploadTime the value for file_upload.upload_time
+     *
+     * @mbg.generated
+     */
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.useful_end_time
+     *
+     * @return the value of file_upload.useful_end_time
+     *
+     * @mbg.generated
+     */
+    public Date getUsefulEndTime() {
+        return usefulEndTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.useful_end_time
+     *
+     * @param usefulEndTime the value for file_upload.useful_end_time
+     *
+     * @mbg.generated
+     */
+    public void setUsefulEndTime(Date usefulEndTime) {
+        this.usefulEndTime = usefulEndTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.upload_date
+     *
+     * @return the value of file_upload.upload_date
+     *
+     * @mbg.generated
+     */
+    public String getUploadDate() {
+        return uploadDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.upload_date
+     *
+     * @param uploadDate the value for file_upload.upload_date
+     *
+     * @mbg.generated
+     */
+    public void setUploadDate(String uploadDate) {
+        this.uploadDate = uploadDate == null ? null : uploadDate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.upload_month
+     *
+     * @return the value of file_upload.upload_month
+     *
+     * @mbg.generated
+     */
+    public String getUploadMonth() {
+        return uploadMonth;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.upload_month
+     *
+     * @param uploadMonth the value for file_upload.upload_month
+     *
+     * @mbg.generated
+     */
+    public void setUploadMonth(String uploadMonth) {
+        this.uploadMonth = uploadMonth == null ? null : uploadMonth.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.upload_week
+     *
+     * @return the value of file_upload.upload_week
+     *
+     * @mbg.generated
+     */
+    public Integer getUploadWeek() {
+        return uploadWeek;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.upload_week
+     *
+     * @param uploadWeek the value for file_upload.upload_week
+     *
+     * @mbg.generated
+     */
+    public void setUploadWeek(Integer uploadWeek) {
+        this.uploadWeek = uploadWeek;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload.upload_year
+     *
+     * @return the value of file_upload.upload_year
+     *
+     * @mbg.generated
+     */
+    public Integer getUploadYear() {
+        return uploadYear;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload.upload_year
+     *
+     * @param uploadYear the value for file_upload.upload_year
+     *
+     * @mbg.generated
+     */
+    public void setUploadYear(Integer uploadYear) {
+        this.uploadYear = uploadYear;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table 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(", fileName=").append(fileName);
+        sb.append(", bizSource=").append(bizSource);
+        sb.append(", fileMd5=").append(fileMd5);
+        sb.append(", resourceKey=").append(resourceKey);
+        sb.append(", viewHttpUrl=").append(viewHttpUrl);
+        sb.append(", viewHttpsUrl=").append(viewHttpsUrl);
+        sb.append(", uploadTime=").append(uploadTime);
+        sb.append(", usefulEndTime=").append(usefulEndTime);
+        sb.append(", uploadDate=").append(uploadDate);
+        sb.append(", uploadMonth=").append(uploadMonth);
+        sb.append(", uploadWeek=").append(uploadWeek);
+        sb.append(", uploadYear=").append(uploadYear);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.vat.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class FileUploadExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    public FileUploadExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table 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 file_upload
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table 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 file_upload
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table 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 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 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 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 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 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 andFileNameIsNull() {
+            addCriterion("file_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIsNotNull() {
+            addCriterion("file_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameEqualTo(String value) {
+            addCriterion("file_name =", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotEqualTo(String value) {
+            addCriterion("file_name <>", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThan(String value) {
+            addCriterion("file_name >", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThanOrEqualTo(String value) {
+            addCriterion("file_name >=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThan(String value) {
+            addCriterion("file_name <", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThanOrEqualTo(String value) {
+            addCriterion("file_name <=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLike(String value) {
+            addCriterion("file_name like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotLike(String value) {
+            addCriterion("file_name not like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIn(List<String> values) {
+            addCriterion("file_name in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotIn(List<String> values) {
+            addCriterion("file_name not in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameBetween(String value1, String value2) {
+            addCriterion("file_name between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotBetween(String value1, String value2) {
+            addCriterion("file_name not between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceIsNull() {
+            addCriterion("biz_source is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceIsNotNull() {
+            addCriterion("biz_source is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceEqualTo(String value) {
+            addCriterion("biz_source =", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceNotEqualTo(String value) {
+            addCriterion("biz_source <>", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceGreaterThan(String value) {
+            addCriterion("biz_source >", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceGreaterThanOrEqualTo(String value) {
+            addCriterion("biz_source >=", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceLessThan(String value) {
+            addCriterion("biz_source <", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceLessThanOrEqualTo(String value) {
+            addCriterion("biz_source <=", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceLike(String value) {
+            addCriterion("biz_source like", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceNotLike(String value) {
+            addCriterion("biz_source not like", value, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceIn(List<String> values) {
+            addCriterion("biz_source in", values, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceNotIn(List<String> values) {
+            addCriterion("biz_source not in", values, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceBetween(String value1, String value2) {
+            addCriterion("biz_source between", value1, value2, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andBizSourceNotBetween(String value1, String value2) {
+            addCriterion("biz_source not between", value1, value2, "bizSource");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5IsNull() {
+            addCriterion("file_md5 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5IsNotNull() {
+            addCriterion("file_md5 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5EqualTo(String value) {
+            addCriterion("file_md5 =", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5NotEqualTo(String value) {
+            addCriterion("file_md5 <>", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5GreaterThan(String value) {
+            addCriterion("file_md5 >", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5GreaterThanOrEqualTo(String value) {
+            addCriterion("file_md5 >=", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5LessThan(String value) {
+            addCriterion("file_md5 <", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5LessThanOrEqualTo(String value) {
+            addCriterion("file_md5 <=", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5Like(String value) {
+            addCriterion("file_md5 like", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5NotLike(String value) {
+            addCriterion("file_md5 not like", value, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5In(List<String> values) {
+            addCriterion("file_md5 in", values, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5NotIn(List<String> values) {
+            addCriterion("file_md5 not in", values, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5Between(String value1, String value2) {
+            addCriterion("file_md5 between", value1, value2, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileMd5NotBetween(String value1, String value2) {
+            addCriterion("file_md5 not between", value1, value2, "fileMd5");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyIsNull() {
+            addCriterion("resource_key is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyIsNotNull() {
+            addCriterion("resource_key is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyEqualTo(String value) {
+            addCriterion("resource_key =", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyNotEqualTo(String value) {
+            addCriterion("resource_key <>", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyGreaterThan(String value) {
+            addCriterion("resource_key >", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyGreaterThanOrEqualTo(String value) {
+            addCriterion("resource_key >=", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyLessThan(String value) {
+            addCriterion("resource_key <", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyLessThanOrEqualTo(String value) {
+            addCriterion("resource_key <=", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyLike(String value) {
+            addCriterion("resource_key like", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyNotLike(String value) {
+            addCriterion("resource_key not like", value, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyIn(List<String> values) {
+            addCriterion("resource_key in", values, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyNotIn(List<String> values) {
+            addCriterion("resource_key not in", values, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyBetween(String value1, String value2) {
+            addCriterion("resource_key between", value1, value2, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceKeyNotBetween(String value1, String value2) {
+            addCriterion("resource_key not between", value1, value2, "resourceKey");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlIsNull() {
+            addCriterion("view_http_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlIsNotNull() {
+            addCriterion("view_http_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlEqualTo(String value) {
+            addCriterion("view_http_url =", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlNotEqualTo(String value) {
+            addCriterion("view_http_url <>", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlGreaterThan(String value) {
+            addCriterion("view_http_url >", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("view_http_url >=", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlLessThan(String value) {
+            addCriterion("view_http_url <", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlLessThanOrEqualTo(String value) {
+            addCriterion("view_http_url <=", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlLike(String value) {
+            addCriterion("view_http_url like", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlNotLike(String value) {
+            addCriterion("view_http_url not like", value, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlIn(List<String> values) {
+            addCriterion("view_http_url in", values, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlNotIn(List<String> values) {
+            addCriterion("view_http_url not in", values, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlBetween(String value1, String value2) {
+            addCriterion("view_http_url between", value1, value2, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpUrlNotBetween(String value1, String value2) {
+            addCriterion("view_http_url not between", value1, value2, "viewHttpUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlIsNull() {
+            addCriterion("view_https_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlIsNotNull() {
+            addCriterion("view_https_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlEqualTo(String value) {
+            addCriterion("view_https_url =", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlNotEqualTo(String value) {
+            addCriterion("view_https_url <>", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlGreaterThan(String value) {
+            addCriterion("view_https_url >", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("view_https_url >=", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlLessThan(String value) {
+            addCriterion("view_https_url <", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlLessThanOrEqualTo(String value) {
+            addCriterion("view_https_url <=", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlLike(String value) {
+            addCriterion("view_https_url like", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlNotLike(String value) {
+            addCriterion("view_https_url not like", value, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlIn(List<String> values) {
+            addCriterion("view_https_url in", values, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlNotIn(List<String> values) {
+            addCriterion("view_https_url not in", values, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlBetween(String value1, String value2) {
+            addCriterion("view_https_url between", value1, value2, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andViewHttpsUrlNotBetween(String value1, String value2) {
+            addCriterion("view_https_url not between", value1, value2, "viewHttpsUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeIsNull() {
+            addCriterion("upload_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeIsNotNull() {
+            addCriterion("upload_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeEqualTo(Date value) {
+            addCriterion("upload_time =", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeNotEqualTo(Date value) {
+            addCriterion("upload_time <>", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeGreaterThan(Date value) {
+            addCriterion("upload_time >", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("upload_time >=", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeLessThan(Date value) {
+            addCriterion("upload_time <", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeLessThanOrEqualTo(Date value) {
+            addCriterion("upload_time <=", value, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeIn(List<Date> values) {
+            addCriterion("upload_time in", values, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeNotIn(List<Date> values) {
+            addCriterion("upload_time not in", values, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeBetween(Date value1, Date value2) {
+            addCriterion("upload_time between", value1, value2, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadTimeNotBetween(Date value1, Date value2) {
+            addCriterion("upload_time not between", value1, value2, "uploadTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeIsNull() {
+            addCriterion("useful_end_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeIsNotNull() {
+            addCriterion("useful_end_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeEqualTo(Date value) {
+            addCriterion("useful_end_time =", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeNotEqualTo(Date value) {
+            addCriterion("useful_end_time <>", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeGreaterThan(Date value) {
+            addCriterion("useful_end_time >", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("useful_end_time >=", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeLessThan(Date value) {
+            addCriterion("useful_end_time <", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeLessThanOrEqualTo(Date value) {
+            addCriterion("useful_end_time <=", value, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeIn(List<Date> values) {
+            addCriterion("useful_end_time in", values, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeNotIn(List<Date> values) {
+            addCriterion("useful_end_time not in", values, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeBetween(Date value1, Date value2) {
+            addCriterion("useful_end_time between", value1, value2, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsefulEndTimeNotBetween(Date value1, Date value2) {
+            addCriterion("useful_end_time not between", value1, value2, "usefulEndTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIsNull() {
+            addCriterion("upload_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIsNotNull() {
+            addCriterion("upload_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateEqualTo(String value) {
+            addCriterion("upload_date =", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotEqualTo(String value) {
+            addCriterion("upload_date <>", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateGreaterThan(String value) {
+            addCriterion("upload_date >", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateGreaterThanOrEqualTo(String value) {
+            addCriterion("upload_date >=", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateLessThan(String value) {
+            addCriterion("upload_date <", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateLessThanOrEqualTo(String value) {
+            addCriterion("upload_date <=", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateLike(String value) {
+            addCriterion("upload_date like", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotLike(String value) {
+            addCriterion("upload_date not like", value, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateIn(List<String> values) {
+            addCriterion("upload_date in", values, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotIn(List<String> values) {
+            addCriterion("upload_date not in", values, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateBetween(String value1, String value2) {
+            addCriterion("upload_date between", value1, value2, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadDateNotBetween(String value1, String value2) {
+            addCriterion("upload_date not between", value1, value2, "uploadDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthIsNull() {
+            addCriterion("upload_month is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthIsNotNull() {
+            addCriterion("upload_month is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthEqualTo(String value) {
+            addCriterion("upload_month =", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthNotEqualTo(String value) {
+            addCriterion("upload_month <>", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthGreaterThan(String value) {
+            addCriterion("upload_month >", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthGreaterThanOrEqualTo(String value) {
+            addCriterion("upload_month >=", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthLessThan(String value) {
+            addCriterion("upload_month <", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthLessThanOrEqualTo(String value) {
+            addCriterion("upload_month <=", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthLike(String value) {
+            addCriterion("upload_month like", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthNotLike(String value) {
+            addCriterion("upload_month not like", value, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthIn(List<String> values) {
+            addCriterion("upload_month in", values, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthNotIn(List<String> values) {
+            addCriterion("upload_month not in", values, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthBetween(String value1, String value2) {
+            addCriterion("upload_month between", value1, value2, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadMonthNotBetween(String value1, String value2) {
+            addCriterion("upload_month not between", value1, value2, "uploadMonth");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekIsNull() {
+            addCriterion("upload_week is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekIsNotNull() {
+            addCriterion("upload_week is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekEqualTo(Integer value) {
+            addCriterion("upload_week =", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekNotEqualTo(Integer value) {
+            addCriterion("upload_week <>", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekGreaterThan(Integer value) {
+            addCriterion("upload_week >", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekGreaterThanOrEqualTo(Integer value) {
+            addCriterion("upload_week >=", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekLessThan(Integer value) {
+            addCriterion("upload_week <", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekLessThanOrEqualTo(Integer value) {
+            addCriterion("upload_week <=", value, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekIn(List<Integer> values) {
+            addCriterion("upload_week in", values, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekNotIn(List<Integer> values) {
+            addCriterion("upload_week not in", values, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekBetween(Integer value1, Integer value2) {
+            addCriterion("upload_week between", value1, value2, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadWeekNotBetween(Integer value1, Integer value2) {
+            addCriterion("upload_week not between", value1, value2, "uploadWeek");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearIsNull() {
+            addCriterion("upload_year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearIsNotNull() {
+            addCriterion("upload_year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearEqualTo(Integer value) {
+            addCriterion("upload_year =", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearNotEqualTo(Integer value) {
+            addCriterion("upload_year <>", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearGreaterThan(Integer value) {
+            addCriterion("upload_year >", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearGreaterThanOrEqualTo(Integer value) {
+            addCriterion("upload_year >=", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearLessThan(Integer value) {
+            addCriterion("upload_year <", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearLessThanOrEqualTo(Integer value) {
+            addCriterion("upload_year <=", value, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearIn(List<Integer> values) {
+            addCriterion("upload_year in", values, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearNotIn(List<Integer> values) {
+            addCriterion("upload_year not in", values, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearBetween(Integer value1, Integer value2) {
+            addCriterion("upload_year between", value1, value2, "uploadYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andUploadYearNotBetween(Integer value1, Integer value2) {
+            addCriterion("upload_year not between", value1, value2, "uploadYear");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table 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 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/java/pwc/taxtech/atms/vat/entity/FileUploadLog.java

+package pwc.taxtech.atms.vat.entity;
+
+import java.io.Serializable;
+import pwc.taxtech.atms.entity.BaseEntity;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table file_upload_log
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class FileUploadLog extends BaseEntity implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload_log.uid
+     *
+     * @mbg.generated
+     */
+    private String uid;
+
+    /**
+     * Database Column Remarks:
+     *   请求uuid
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload_log.request_id
+     *
+     * @mbg.generated
+     */
+    private String requestId;
+
+    /**
+     * Database Column Remarks:
+     *   请求路径
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload_log.request_url
+     *
+     * @mbg.generated
+     */
+    private String requestUrl;
+
+    /**
+     * Database Column Remarks:
+     *   请求返回json
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload_log.respons_json
+     *
+     * @mbg.generated
+     */
+    private String responsJson;
+
+    /**
+     * Database Column Remarks:
+     *   文件上传表主键id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column file_upload_log.file_upload_id
+     *
+     * @mbg.generated
+     */
+    private String fileUploadId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload_log.uid
+     *
+     * @return the value of file_upload_log.uid
+     *
+     * @mbg.generated
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload_log.uid
+     *
+     * @param uid the value for file_upload_log.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 file_upload_log.request_id
+     *
+     * @return the value of file_upload_log.request_id
+     *
+     * @mbg.generated
+     */
+    public String getRequestId() {
+        return requestId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload_log.request_id
+     *
+     * @param requestId the value for file_upload_log.request_id
+     *
+     * @mbg.generated
+     */
+    public void setRequestId(String requestId) {
+        this.requestId = requestId == null ? null : requestId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload_log.request_url
+     *
+     * @return the value of file_upload_log.request_url
+     *
+     * @mbg.generated
+     */
+    public String getRequestUrl() {
+        return requestUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload_log.request_url
+     *
+     * @param requestUrl the value for file_upload_log.request_url
+     *
+     * @mbg.generated
+     */
+    public void setRequestUrl(String requestUrl) {
+        this.requestUrl = requestUrl == null ? null : requestUrl.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload_log.respons_json
+     *
+     * @return the value of file_upload_log.respons_json
+     *
+     * @mbg.generated
+     */
+    public String getResponsJson() {
+        return responsJson;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column file_upload_log.respons_json
+     *
+     * @param responsJson the value for file_upload_log.respons_json
+     *
+     * @mbg.generated
+     */
+    public void setResponsJson(String responsJson) {
+        this.responsJson = responsJson == null ? null : responsJson.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column file_upload_log.file_upload_id
+     *
+     * @return the value of file_upload_log.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 file_upload_log.file_upload_id
+     *
+     * @param fileUploadId the value for file_upload_log.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 corresponds to the database table file_upload_log
+     *
+     * @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(", requestId=").append(requestId);
+        sb.append(", requestUrl=").append(requestUrl);
+        sb.append(", responsJson=").append(responsJson);
+        sb.append(", fileUploadId=").append(fileUploadId);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.vat.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileUploadLogExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public FileUploadLogExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table file_upload_log
+     *
+     * @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 file_upload_log
+     *
+     * @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 file_upload_log
+     *
+     * @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 file_upload_log
+     *
+     * @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 file_upload_log
+     *
+     * @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 andRequestIdIsNull() {
+            addCriterion("request_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdIsNotNull() {
+            addCriterion("request_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdEqualTo(String value) {
+            addCriterion("request_id =", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdNotEqualTo(String value) {
+            addCriterion("request_id <>", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdGreaterThan(String value) {
+            addCriterion("request_id >", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdGreaterThanOrEqualTo(String value) {
+            addCriterion("request_id >=", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdLessThan(String value) {
+            addCriterion("request_id <", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdLessThanOrEqualTo(String value) {
+            addCriterion("request_id <=", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdLike(String value) {
+            addCriterion("request_id like", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdNotLike(String value) {
+            addCriterion("request_id not like", value, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdIn(List<String> values) {
+            addCriterion("request_id in", values, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdNotIn(List<String> values) {
+            addCriterion("request_id not in", values, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdBetween(String value1, String value2) {
+            addCriterion("request_id between", value1, value2, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestIdNotBetween(String value1, String value2) {
+            addCriterion("request_id not between", value1, value2, "requestId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlIsNull() {
+            addCriterion("request_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlIsNotNull() {
+            addCriterion("request_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlEqualTo(String value) {
+            addCriterion("request_url =", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlNotEqualTo(String value) {
+            addCriterion("request_url <>", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlGreaterThan(String value) {
+            addCriterion("request_url >", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("request_url >=", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlLessThan(String value) {
+            addCriterion("request_url <", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlLessThanOrEqualTo(String value) {
+            addCriterion("request_url <=", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlLike(String value) {
+            addCriterion("request_url like", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlNotLike(String value) {
+            addCriterion("request_url not like", value, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlIn(List<String> values) {
+            addCriterion("request_url in", values, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlNotIn(List<String> values) {
+            addCriterion("request_url not in", values, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlBetween(String value1, String value2) {
+            addCriterion("request_url between", value1, value2, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andRequestUrlNotBetween(String value1, String value2) {
+            addCriterion("request_url not between", value1, value2, "requestUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonIsNull() {
+            addCriterion("respons_json is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonIsNotNull() {
+            addCriterion("respons_json is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonEqualTo(String value) {
+            addCriterion("respons_json =", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonNotEqualTo(String value) {
+            addCriterion("respons_json <>", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonGreaterThan(String value) {
+            addCriterion("respons_json >", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonGreaterThanOrEqualTo(String value) {
+            addCriterion("respons_json >=", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonLessThan(String value) {
+            addCriterion("respons_json <", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonLessThanOrEqualTo(String value) {
+            addCriterion("respons_json <=", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonLike(String value) {
+            addCriterion("respons_json like", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonNotLike(String value) {
+            addCriterion("respons_json not like", value, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonIn(List<String> values) {
+            addCriterion("respons_json in", values, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonNotIn(List<String> values) {
+            addCriterion("respons_json not in", values, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonBetween(String value1, String value2) {
+            addCriterion("respons_json between", value1, value2, "responsJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andResponsJsonNotBetween(String value1, String value2) {
+            addCriterion("respons_json not between", value1, value2, "responsJson");
+            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;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table file_upload_log
+     *
+     * @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 file_upload_log
+     *
+     * @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/dao/OrganizationMapper.xml

@@ -56,6 +56,7 @@
     <result column="national_economic_industry" jdbcType="VARCHAR" property="nationalEconomicIndustry" />
     <result column="engage_national_prohibit_industry" jdbcType="BIT" property="engageNationalProhibitIndustry" />
     <result column="logout_time" jdbcType="TIMESTAMP" property="logoutTime" />
+    <result column="enterprise_account_code" jdbcType="VARCHAR" property="enterpriseAccountCode" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -137,7 +138,7 @@
     legal_code, vehicleroutinglocation, business_scope, architecture_type, num_of_branches, 
     api_update_flag, effec_time_of_general_taxpayers, registration_location_en, paid_in_capital, 
     general_tax_payer_effective_time, oversea, reg_status, national_economic_industry, 
-    engage_national_prohibit_industry, logout_time
+    engage_national_prohibit_industry, logout_time, enterprise_account_code
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultMap="BaseResultMap">
     <!--
@@ -208,7 +209,7 @@
       registration_location_en, paid_in_capital, 
       general_tax_payer_effective_time, oversea, reg_status, 
       national_economic_industry, engage_national_prohibit_industry, 
-      logout_time)
+      logout_time, enterprise_account_code)
     values (#{id,jdbcType=VARCHAR}, #{clientCode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{code,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{taxPayerNumber,jdbcType=VARCHAR}, 
       #{regionId,jdbcType=VARCHAR}, #{structureId,jdbcType=VARCHAR}, #{industryId,jdbcType=VARCHAR}, 
@@ -227,7 +228,7 @@
       #{registrationLocationEn,jdbcType=VARCHAR}, #{paidInCapital,jdbcType=VARCHAR}, 
       #{generalTaxPayerEffectiveTime,jdbcType=TIMESTAMP}, #{oversea,jdbcType=BIT}, #{regStatus,jdbcType=VARCHAR}, 
       #{nationalEconomicIndustry,jdbcType=VARCHAR}, #{engageNationalProhibitIndustry,jdbcType=BIT}, 
-      #{logoutTime,jdbcType=TIMESTAMP})
+      #{logoutTime,jdbcType=TIMESTAMP}, #{enterpriseAccountCode,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.Organization">
     <!--
@@ -386,6 +387,9 @@
       <if test="logoutTime != null">
         logout_time,
       </if>
+      <if test="enterpriseAccountCode != null">
+        enterprise_account_code,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -538,6 +542,9 @@
       <if test="logoutTime != null">
         #{logoutTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="enterpriseAccountCode != null">
+        #{enterpriseAccountCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultType="java.lang.Long">
@@ -707,6 +714,9 @@
       <if test="record.logoutTime != null">
         logout_time = #{record.logoutTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.enterpriseAccountCode != null">
+        enterprise_account_code = #{record.enterpriseAccountCode,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -767,7 +777,8 @@
       reg_status = #{record.regStatus,jdbcType=VARCHAR},
       national_economic_industry = #{record.nationalEconomicIndustry,jdbcType=VARCHAR},
       engage_national_prohibit_industry = #{record.engageNationalProhibitIndustry,jdbcType=BIT},
-      logout_time = #{record.logoutTime,jdbcType=TIMESTAMP}
+      logout_time = #{record.logoutTime,jdbcType=TIMESTAMP},
+      enterprise_account_code = #{record.enterpriseAccountCode,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -791,9 +802,6 @@
       <if test="parentId != null">
         parent_id = #{parentId,jdbcType=VARCHAR},
       </if>
-      <if test="parentId == null">
-        parent_id = NULL,
-      </if>
       <if test="taxPayerNumber != null">
         tax_payer_number = #{taxPayerNumber,jdbcType=VARCHAR},
       </if>
@@ -929,6 +937,9 @@
       <if test="logoutTime != null">
         logout_time = #{logoutTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="enterpriseAccountCode != null">
+        enterprise_account_code = #{enterpriseAccountCode,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -986,7 +997,8 @@
       reg_status = #{regStatus,jdbcType=VARCHAR},
       national_economic_industry = #{nationalEconomicIndustry,jdbcType=VARCHAR},
       engage_national_prohibit_industry = #{engageNationalProhibitIndustry,jdbcType=BIT},
-      logout_time = #{logoutTime,jdbcType=TIMESTAMP}
+      logout_time = #{logoutTime,jdbcType=TIMESTAMP},
+      enterprise_account_code = #{enterpriseAccountCode,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.OrganizationExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/FileUploadLogMapper.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.FileUploadLogMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.FileUploadLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="request_id" jdbcType="VARCHAR" property="requestId" />
+    <result column="request_url" jdbcType="VARCHAR" property="requestUrl" />
+    <result column="respons_json" jdbcType="VARCHAR" property="responsJson" />
+    <result column="file_upload_id" jdbcType="VARCHAR" property="fileUploadId" />
+  </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`, request_id, request_url, respons_json, file_upload_id
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLogExample" 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 file_upload_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from file_upload_log
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from file_upload_log
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from file_upload_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into file_upload_log (`uid`, request_id, request_url, 
+      respons_json, file_upload_id)
+    values (#{uid,jdbcType=VARCHAR}, #{requestId,jdbcType=VARCHAR}, #{requestUrl,jdbcType=VARCHAR}, 
+      #{responsJson,jdbcType=VARCHAR}, #{fileUploadId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into file_upload_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="requestId != null">
+        request_id,
+      </if>
+      <if test="requestUrl != null">
+        request_url,
+      </if>
+      <if test="responsJson != null">
+        respons_json,
+      </if>
+      <if test="fileUploadId != null">
+        file_upload_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="requestId != null">
+        #{requestId,jdbcType=VARCHAR},
+      </if>
+      <if test="requestUrl != null">
+        #{requestUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="responsJson != null">
+        #{responsJson,jdbcType=VARCHAR},
+      </if>
+      <if test="fileUploadId != null">
+        #{fileUploadId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from file_upload_log
+    <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 file_upload_log
+    <set>
+      <if test="record.uid != null">
+        `uid` = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.requestId != null">
+        request_id = #{record.requestId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.requestUrl != null">
+        request_url = #{record.requestUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.responsJson != null">
+        respons_json = #{record.responsJson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileUploadId != null">
+        file_upload_id = #{record.fileUploadId,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 file_upload_log
+    set `uid` = #{record.uid,jdbcType=VARCHAR},
+      request_id = #{record.requestId,jdbcType=VARCHAR},
+      request_url = #{record.requestUrl,jdbcType=VARCHAR},
+      respons_json = #{record.responsJson,jdbcType=VARCHAR},
+      file_upload_id = #{record.fileUploadId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update file_upload_log
+    <set>
+      <if test="requestId != null">
+        request_id = #{requestId,jdbcType=VARCHAR},
+      </if>
+      <if test="requestUrl != null">
+        request_url = #{requestUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="responsJson != null">
+        respons_json = #{responsJson,jdbcType=VARCHAR},
+      </if>
+      <if test="fileUploadId != null">
+        file_upload_id = #{fileUploadId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update file_upload_log
+    set request_id = #{requestId,jdbcType=VARCHAR},
+      request_url = #{requestUrl,jdbcType=VARCHAR},
+      respons_json = #{responsJson,jdbcType=VARCHAR},
+      file_upload_id = #{fileUploadId,jdbcType=VARCHAR}
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.FileUploadLogExample" 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 file_upload_log
+    <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-dao/src/main/resources/pwc/taxtech/atms/vat/dao/FileUploadMapper.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.FileUploadMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.FileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="uid" jdbcType="VARCHAR" property="uid" />
+    <result column="file_name" jdbcType="VARCHAR" property="fileName" />
+    <result column="biz_source" jdbcType="VARCHAR" property="bizSource" />
+    <result column="file_md5" jdbcType="VARCHAR" property="fileMd5" />
+    <result column="resource_key" jdbcType="VARCHAR" property="resourceKey" />
+    <result column="view_http_url" jdbcType="VARCHAR" property="viewHttpUrl" />
+    <result column="view_https_url" jdbcType="VARCHAR" property="viewHttpsUrl" />
+    <result column="upload_time" jdbcType="TIMESTAMP" property="uploadTime" />
+    <result column="useful_end_time" jdbcType="TIMESTAMP" property="usefulEndTime" />
+    <result column="upload_date" jdbcType="VARCHAR" property="uploadDate" />
+    <result column="upload_month" jdbcType="VARCHAR" property="uploadMonth" />
+    <result column="upload_week" jdbcType="INTEGER" property="uploadWeek" />
+    <result column="upload_year" jdbcType="INTEGER" property="uploadYear" />
+  </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`, file_name, biz_source, file_md5, resource_key, view_http_url, view_https_url, 
+    upload_time, useful_end_time, upload_date, upload_month, upload_week, upload_year
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadExample" 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 file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from file_upload
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from file_upload
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from file_upload
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.FileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into file_upload (`uid`, file_name, biz_source, 
+      file_md5, resource_key, view_http_url, 
+      view_https_url, upload_time, useful_end_time, 
+      upload_date, upload_month, upload_week, 
+      upload_year)
+    values (#{uid,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{bizSource,jdbcType=VARCHAR}, 
+      #{fileMd5,jdbcType=VARCHAR}, #{resourceKey,jdbcType=VARCHAR}, #{viewHttpUrl,jdbcType=VARCHAR}, 
+      #{viewHttpsUrl,jdbcType=VARCHAR}, #{uploadTime,jdbcType=TIMESTAMP}, #{usefulEndTime,jdbcType=TIMESTAMP}, 
+      #{uploadDate,jdbcType=VARCHAR}, #{uploadMonth,jdbcType=VARCHAR}, #{uploadWeek,jdbcType=INTEGER}, 
+      #{uploadYear,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.FileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into file_upload
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        `uid`,
+      </if>
+      <if test="fileName != null">
+        file_name,
+      </if>
+      <if test="bizSource != null">
+        biz_source,
+      </if>
+      <if test="fileMd5 != null">
+        file_md5,
+      </if>
+      <if test="resourceKey != null">
+        resource_key,
+      </if>
+      <if test="viewHttpUrl != null">
+        view_http_url,
+      </if>
+      <if test="viewHttpsUrl != null">
+        view_https_url,
+      </if>
+      <if test="uploadTime != null">
+        upload_time,
+      </if>
+      <if test="usefulEndTime != null">
+        useful_end_time,
+      </if>
+      <if test="uploadDate != null">
+        upload_date,
+      </if>
+      <if test="uploadMonth != null">
+        upload_month,
+      </if>
+      <if test="uploadWeek != null">
+        upload_week,
+      </if>
+      <if test="uploadYear != null">
+        upload_year,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="uid != null">
+        #{uid,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null">
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="bizSource != null">
+        #{bizSource,jdbcType=VARCHAR},
+      </if>
+      <if test="fileMd5 != null">
+        #{fileMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceKey != null">
+        #{resourceKey,jdbcType=VARCHAR},
+      </if>
+      <if test="viewHttpUrl != null">
+        #{viewHttpUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="viewHttpsUrl != null">
+        #{viewHttpsUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="usefulEndTime != null">
+        #{usefulEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadDate != null">
+        #{uploadDate,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadMonth != null">
+        #{uploadMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadWeek != null">
+        #{uploadWeek,jdbcType=INTEGER},
+      </if>
+      <if test="uploadYear != null">
+        #{uploadYear,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.FileUploadExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from 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 file_upload
+    <set>
+      <if test="record.uid != null">
+        `uid` = #{record.uid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileName != null">
+        file_name = #{record.fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bizSource != null">
+        biz_source = #{record.bizSource,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileMd5 != null">
+        file_md5 = #{record.fileMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resourceKey != null">
+        resource_key = #{record.resourceKey,jdbcType=VARCHAR},
+      </if>
+      <if test="record.viewHttpUrl != null">
+        view_http_url = #{record.viewHttpUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.viewHttpsUrl != null">
+        view_https_url = #{record.viewHttpsUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uploadTime != null">
+        upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.usefulEndTime != null">
+        useful_end_time = #{record.usefulEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.uploadDate != null">
+        upload_date = #{record.uploadDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uploadMonth != null">
+        upload_month = #{record.uploadMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="record.uploadWeek != null">
+        upload_week = #{record.uploadWeek,jdbcType=INTEGER},
+      </if>
+      <if test="record.uploadYear != null">
+        upload_year = #{record.uploadYear,jdbcType=INTEGER},
+      </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 file_upload
+    set `uid` = #{record.uid,jdbcType=VARCHAR},
+      file_name = #{record.fileName,jdbcType=VARCHAR},
+      biz_source = #{record.bizSource,jdbcType=VARCHAR},
+      file_md5 = #{record.fileMd5,jdbcType=VARCHAR},
+      resource_key = #{record.resourceKey,jdbcType=VARCHAR},
+      view_http_url = #{record.viewHttpUrl,jdbcType=VARCHAR},
+      view_https_url = #{record.viewHttpsUrl,jdbcType=VARCHAR},
+      upload_time = #{record.uploadTime,jdbcType=TIMESTAMP},
+      useful_end_time = #{record.usefulEndTime,jdbcType=TIMESTAMP},
+      upload_date = #{record.uploadDate,jdbcType=VARCHAR},
+      upload_month = #{record.uploadMonth,jdbcType=VARCHAR},
+      upload_week = #{record.uploadWeek,jdbcType=INTEGER},
+      upload_year = #{record.uploadYear,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.FileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update file_upload
+    <set>
+      <if test="fileName != null">
+        file_name = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="bizSource != null">
+        biz_source = #{bizSource,jdbcType=VARCHAR},
+      </if>
+      <if test="fileMd5 != null">
+        file_md5 = #{fileMd5,jdbcType=VARCHAR},
+      </if>
+      <if test="resourceKey != null">
+        resource_key = #{resourceKey,jdbcType=VARCHAR},
+      </if>
+      <if test="viewHttpUrl != null">
+        view_http_url = #{viewHttpUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="viewHttpsUrl != null">
+        view_https_url = #{viewHttpsUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadTime != null">
+        upload_time = #{uploadTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="usefulEndTime != null">
+        useful_end_time = #{usefulEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="uploadDate != null">
+        upload_date = #{uploadDate,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadMonth != null">
+        upload_month = #{uploadMonth,jdbcType=VARCHAR},
+      </if>
+      <if test="uploadWeek != null">
+        upload_week = #{uploadWeek,jdbcType=INTEGER},
+      </if>
+      <if test="uploadYear != null">
+        upload_year = #{uploadYear,jdbcType=INTEGER},
+      </if>
+    </set>
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.FileUpload">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update file_upload
+    set file_name = #{fileName,jdbcType=VARCHAR},
+      biz_source = #{bizSource,jdbcType=VARCHAR},
+      file_md5 = #{fileMd5,jdbcType=VARCHAR},
+      resource_key = #{resourceKey,jdbcType=VARCHAR},
+      view_http_url = #{viewHttpUrl,jdbcType=VARCHAR},
+      view_https_url = #{viewHttpsUrl,jdbcType=VARCHAR},
+      upload_time = #{uploadTime,jdbcType=TIMESTAMP},
+      useful_end_time = #{usefulEndTime,jdbcType=TIMESTAMP},
+      upload_date = #{uploadDate,jdbcType=VARCHAR},
+      upload_month = #{uploadMonth,jdbcType=VARCHAR},
+      upload_week = #{uploadWeek,jdbcType=INTEGER},
+      upload_year = #{uploadYear,jdbcType=INTEGER}
+    where `uid` = #{uid,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.FileUploadExample" 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 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/basicData.json

@@ -186,12 +186,12 @@
     "EnterpriseAccountErrorCodeList": "科目代码明细",
     "EnterpriseAccountImportDataFormatError": "企业科目导入数据格式有误",
     "EnterpriseAccountList": "企业科目列表",
-    "EnterpriseAccountManage": "账套管理",
+    "EnterpriseAccountManage": "科目表管理",
     "EnterpriseAccountName": "企业科目名称",
     "EnterpriseAccountNameEmpty": "企业科目名字为空",
     "EnterpriseAccountNameMaxLength": "企业科目名称过长",
     "EnterpriseAccountNameRequired": "请输入企业科目名称",
-    "EnterpriseAccountNameShort": "账套名",
+    "EnterpriseAccountNameShort": "科目表名",
     "EnterpriseAccountParentDisable": "请先启用父节点",
     "EnterpriseAccountRepeat": "企业科目代码已经存在",
     "EnterpriseAccountSetCode": "账套代码",

atms-web/src/main/webapp/app/admin/infrastructure/organizationListView/organization-list-view.ctrl.js

@@ -847,7 +847,7 @@
                         columns: [
                         {
                             dataField: "payableShareholderName",
-                            width : "150px",
+                            width : "600px",
                             caption: $translate.instant('PayableShareholderName')
                         },
                         {

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -2134,14 +2134,14 @@
 
             // 编辑机构其他信息
             $scope.updateOrgExtra = function () {
-                $('.extra-org-info .control-label span').attr("hidden","hidden");
-                $('.extra-org-info .right-option .button2position').removeAttr("hidden");
-                $('.extra-org-info .right-option .updOrgBtn').attr("hidden","hidden");
-                for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
-                    $('.extra-org-info .control-label input')[i].style.display = "inline";
+                $('.extra-organization-info .control-label span').attr("hidden","hidden");
+                $('.extra-organization-info .right-option .button2position').removeAttr("hidden");
+                $('.extra-organization-info .right-option .updOrgBtn').attr("hidden","hidden");
+                for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) {
+                    $('.extra-organization-info .control-label input')[i].style.display = "inline";
                 }
-                for (var i = 0; i < $('.extra-org-info .control-label select').length; i++) {
-                    $('.extra-org-info .control-label select')[i].style.display = "inline";
+                for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) {
+                    $('.extra-organization-info .control-label select')[i].style.display = "inline";
                 }
                 $scope.comExtraOldData=$scope.selectCompanyExtra;
             };
@@ -2150,14 +2150,14 @@
             $scope.updateOrgExtraCancel = function () {
                 $scope.selectCompanyExtra=$scope.comExtraOldData;
                 generalSelectCompanyExtraText();
-                $('.extra-org-info .control-label span').removeAttr("hidden");
-                $('.extra-org-info .right-option .button2position').attr("hidden","hidden");
-                $('.extra-org-info .right-option .updOrgBtn').removeAttr("hidden");
-                for (var i = 0; i < $('.extra-org-info .control-label input').length; i++) {
-                    $('.extra-org-info .control-label input')[i].style.display = "none";
-                }
-                for (var i = 0; i < $('.extra-org-info .control-label select').length; i++) {
-                    $('.extra-org-info .control-label select')[i].style.display = "none";
+                $('.extra-organization-info .control-label span').removeAttr("hidden");
+                $('.extra-organization-info .right-option .button2position').attr("hidden","hidden");
+                $('.extra-organization-info .right-option .updOrgBtn').removeAttr("hidden");
+                for (var i = 0; i < $('.extra-organization-info .control-label input').length; i++) {
+                    $('.extra-organization-info .control-label input')[i].style.display = "none";
+                }
+                for (var i = 0; i < $('.extra-organization-info .control-label select').length; i++) {
+                    $('.extra-organization-info .control-label select')[i].style.display = "none";
                 }
             };
 

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.html

@@ -372,7 +372,7 @@
 
                             <div ng-show="currentNavItem==='page3'" class="org-extra-data-table">
                                 <div class="extra-org-info-wrapper">
-                                    <!--<div class="extra-org-info">-->
+                                    <div class="extra-organization-info">
                                         <!--<label class="basic-label">{{'OrganizationBasicData' | translate}}</label>-->
                                         <div class="right-option">
                                             <button type="button" style="" ng-if="!expanded" class="btn btn-in-grid" ng-click="expandOrgExtraInfoAll()">
@@ -968,7 +968,7 @@
                                                       title="{{x.right.dimensionValue}}">{{x.right.dimensionValue|limitString:maxValueLength}}</span>
                                             </div>
                                         </div>-->
-                                    <!--</div>-->
+                                    </div>
 
                                     <div class="tax-rule-info-table" ng-show="!isInternational">
                                         <div class="label-tax-info border-bottom-divide">

atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.ctrl.js

@@ -7,10 +7,17 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
             $scope.isAdd = true;
             $scope.editUserModel = {};
             $scope.editUserModel.isAdmin = false;
+
+            //按滴滴需求设置用户所属机构默认为滴滴集团
+            $scope.editUserModel.OrganizationID = "BCFA0E77-9F6B-42B3-A486-A003536832CF";
+            $scope.editUserModel.orgName = "滴滴集团";
+            
             resetErrorStatus();
             $('.edit-user-modal-wrapper .modal').modal('show');
         };
 
+
+
         // loadUser
         var loadUser = function(userId) {
             $scope.isAdd = false;
@@ -40,11 +47,11 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
                 hasError = true;
             }
 
-            if (!$scope.editUserModel.OrganizationID) {
+            /*if (!$scope.editUserModel.OrganizationID) {
                 $scope.editUserModel.organizationIDError = $translate.instant('SelectOrg');
                 $('#dropdownMenu1').addClass('error-button');
                 hasError = true;
-            }
+            }*/
 
             // if (!$scope.editUserModel.isAdmin) {
             if (!$scope.editUserModel.RoleIDs || $scope.editUserModel.RoleIDs.length === 0) {
@@ -268,6 +275,7 @@ controller('editUserModalController', ['$scope', '$log', '$translate', 'uiGridCo
 
             //Disable user
             $scope.disableUser = disableUser;
+
         })();
     }
 ]);

atms-web/src/main/webapp/app/common/controls/edit-user-modal/edit-user-modal.html

@@ -34,9 +34,10 @@
                         <div class="form-group">
                             <label class="control-label col-sm-3"><span class="red-color">*</span><span translate="Company"></label>
                             <div class="col-sm-9">
-                                <org-selector selected-org-name="editUserModel.OrgName" selected-org-id="editUserModel.OrganizationID" component-selected-org="" is-show-all="false" is-require="true"
+                                <input id="orgName" type="text" name="orgName" maxlength="100" class="form-control" style="width: 300px;"  ng-model="editUserModel.orgName" required>
+                                <!--<org-selector selected-org-name="editUserModel.OrgName" selected-org-id="editUserModel.OrganizationID" component-selected-org="" is-show-all="false" is-require="true"
                                               style="width: 300px;"></org-selector>
-                                <label class="error-label" style="font-size:12px;" ng-show="editUserModel.organizationIDError">{{editUserModel.organizationIDError}}</label>
+                                <label class="error-label" style="font-size:12px;" ng-show="editUserModel.organizationIDError">{{editUserModel.organizationIDError}}</label>-->
                             </div>
                         </div>
                         <div class="form-group">