Commit 2ec1a50e authored by gary's avatar gary

1、trialbalance 加tmsPeriod字段

2、orgInit更新
parent 06dfa4a5
package pwc.taxtech.atms.common.util;
import java.io.IOException;
import java.net.SocketTimeoutException;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.config.RequestConfig.Builder;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustStrategy;
import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.message.BasicNameValuePair;
/**
* 依赖的jar包有:commons-lang-2.6.jar、httpclient-4.3.2.jar、httpcore-4.3.1.jar、commons-io-2.4.jar
* @author zhaoyb
*
*/
public class HttpUtil {
public static final int connTimeout=10000;
public static final int readTimeout=10000;
public static final String charset="UTF-8";
private static HttpClient client = null;
static {
PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager();
cm.setMaxTotal(128);
cm.setDefaultMaxPerRoute(128);
client = HttpClients.custom().setConnectionManager(cm).build();
}
public static String postParameters(String url, String parameterStr) throws ConnectTimeoutException, SocketTimeoutException, Exception{
return post(url,parameterStr,"application/x-www-form-urlencoded",charset,connTimeout,readTimeout);
}
public static String postParameters(String url, String parameterStr,String charset, Integer connTimeout, Integer readTimeout) throws ConnectTimeoutException, SocketTimeoutException, Exception{
return post(url,parameterStr,"application/x-www-form-urlencoded",charset,connTimeout,readTimeout);
}
public static String postParameters(String url, Map<String, String> params) throws ConnectTimeoutException,
SocketTimeoutException, Exception {
return postForm(url, params, null, connTimeout, readTimeout);
}
public static String postParameters(String url, Map<String, String> params, Integer connTimeout,Integer readTimeout) throws ConnectTimeoutException,
SocketTimeoutException, Exception {
return postForm(url, params, null, connTimeout, readTimeout);
}
public static String get(String url) throws Exception {
return get(url, charset, null, null);
}
public static String get(String url, String charset) throws Exception {
return get(url, charset, connTimeout, readTimeout);
}
/**
* 发送一个 Post 请求, 使用指定的字符集编码.
*
* @param url
* @param body RequestBody
* @param mimeType 例如 application/xml "application/x-www-form-urlencoded" a=1&b=2&c=3
* @param charset 编码
* @param connTimeout 建立链接超时时间,毫秒.
* @param readTimeout 响应超时时间,毫秒.
* @return ResponseBody, 使用指定的字符集编码.
* @throws ConnectTimeoutException 建立链接超时异常
* @throws SocketTimeoutException 响应超时
* @throws Exception
*/
public static String post(String url, String body, String mimeType,String charset, Integer connTimeout, Integer readTimeout)
throws ConnectTimeoutException, SocketTimeoutException, Exception {
HttpClient client = null;
HttpPost post = new HttpPost(url);
String result = "";
try {
if (StringUtils.isNotBlank(body)) {
HttpEntity entity = new StringEntity(body, ContentType.create(mimeType, charset));
post.setEntity(entity);
}
// 设置参数
Builder customReqConf = RequestConfig.custom();
if (connTimeout != null) {
customReqConf.setConnectTimeout(connTimeout);
}
if (readTimeout != null) {
customReqConf.setSocketTimeout(readTimeout);
}
post.setConfig(customReqConf.build());
HttpResponse res;
if (url.startsWith("https")) {
// 执行 Https 请求.
client = createSSLInsecureClient();
res = client.execute(post);
} else {
// 执行 Http 请求.
client = HttpUtil.client;
res = client.execute(post);
}
result = IOUtils.toString(res.getEntity().getContent(), charset);
} finally {
post.releaseConnection();
if (url.startsWith("https") && client != null&& client instanceof CloseableHttpClient) {
((CloseableHttpClient) client).close();
}
}
return result;
}
/**
* 提交form表单
*
* @param url
* @param params
* @param connTimeout
* @param readTimeout
* @return
* @throws ConnectTimeoutException
* @throws SocketTimeoutException
* @throws Exception
*/
public static String postForm(String url, Map<String, String> params, Map<String, String> headers, Integer connTimeout,Integer readTimeout) throws ConnectTimeoutException,
SocketTimeoutException, Exception {
HttpClient client = null;
HttpPost post = new HttpPost(url);
try {
if (params != null && !params.isEmpty()) {
List<NameValuePair> formParams = new ArrayList<org.apache.http.NameValuePair>();
Set<Entry<String, String>> entrySet = params.entrySet();
for (Entry<String, String> entry : entrySet) {
formParams.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
}
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formParams, Consts.UTF_8);
post.setEntity(entity);
}
if (headers != null && !headers.isEmpty()) {
for (Entry<String, String> entry : headers.entrySet()) {
post.addHeader(entry.getKey(), entry.getValue());
}
}
// 设置参数
Builder customReqConf = RequestConfig.custom();
if (connTimeout != null) {
customReqConf.setConnectTimeout(connTimeout);
}
if (readTimeout != null) {
customReqConf.setSocketTimeout(readTimeout);
}
post.setConfig(customReqConf.build());
HttpResponse res = null;
if (url.startsWith("https")) {
// 执行 Https 请求.
client = createSSLInsecureClient();
res = client.execute(post);
} else {
// 执行 Http 请求.
client = HttpUtil.client;
res = client.execute(post);
}
return IOUtils.toString(res.getEntity().getContent(), "UTF-8");
} finally {
post.releaseConnection();
if (url.startsWith("https") && client != null
&& client instanceof CloseableHttpClient) {
((CloseableHttpClient) client).close();
}
}
}
/**
* 发送一个 GET 请求
*
* @param url
* @param charset
* @param connTimeout 建立链接超时时间,毫秒.
* @param readTimeout 响应超时时间,毫秒.
* @return
* @throws ConnectTimeoutException 建立链接超时
* @throws SocketTimeoutException 响应超时
* @throws Exception
*/
public static String get(String url, String charset, Integer connTimeout,Integer readTimeout)
throws ConnectTimeoutException,SocketTimeoutException, Exception {
HttpClient client = null;
HttpGet get = new HttpGet(url);
String result = "";
try {
// 设置参数
Builder customReqConf = RequestConfig.custom();
if (connTimeout != null) {
customReqConf.setConnectTimeout(connTimeout);
}
if (readTimeout != null) {
customReqConf.setSocketTimeout(readTimeout);
}
get.setConfig(customReqConf.build());
HttpResponse res = null;
if (url.startsWith("https")) {
// 执行 Https 请求.
client = createSSLInsecureClient();
res = client.execute(get);
} else {
// 执行 Http 请求.
client = HttpUtil.client;
res = client.execute(get);
}
result = IOUtils.toString(res.getEntity().getContent(), charset);
} finally {
get.releaseConnection();
if (url.startsWith("https") && client != null && client instanceof CloseableHttpClient) {
((CloseableHttpClient) client).close();
}
}
return result;
}
/**
* 从 response 里获取 charset
*
* @param ressponse
* @return
*/
@SuppressWarnings("unused")
private static String getCharsetFromResponse(HttpResponse ressponse) {
// Content-Type:text/html; charset=GBK
if (ressponse.getEntity() != null && ressponse.getEntity().getContentType() != null && ressponse.getEntity().getContentType().getValue() != null) {
String contentType = ressponse.getEntity().getContentType().getValue();
if (contentType.contains("charset=")) {
return contentType.substring(contentType.indexOf("charset=") + 8);
}
}
return null;
}
/**
* 创建 SSL连接
* @return
* @throws GeneralSecurityException
*/
private static CloseableHttpClient createSSLInsecureClient() throws GeneralSecurityException {
try {
SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
public boolean isTrusted(X509Certificate[] chain,String authType) throws CertificateException {
return true;
}
}).build();
SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new X509HostnameVerifier() {
@Override
public boolean verify(String arg0, SSLSession arg1) {
return true;
}
@Override
public void verify(String host, SSLSocket ssl)
throws IOException {
}
@Override
public void verify(String host, X509Certificate cert)
throws SSLException {
}
@Override
public void verify(String host, String[] cns,
String[] subjectAlts) throws SSLException {
}
});
return HttpClients.custom().setSSLSocketFactory(sslsf).build();
} catch (GeneralSecurityException e) {
throw e;
}
}
public static void main(String[] args) {
try {
String str= post("https://localhost:443/ssl/test.shtml","name=12&page=34","application/x-www-form-urlencoded", "UTF-8", 10000, 10000);
//String str= get("https://localhost:443/ssl/test.shtml?name=12&page=34","GBK");
/*Map<String,String> map = new HashMap<String,String>();
map.put("name", "111");
map.put("page", "222");
String str= postForm("https://localhost:443/ssl/test.shtml",map,null, 10000, 10000);*/
System.out.println(str);
} catch (ConnectTimeoutException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (SocketTimeoutException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
\ No newline at end of file
......@@ -27,6 +27,8 @@ public class TrialBalanceDto implements Serializable {
private String source;
private Integer tmsPeriod;
private Integer period;
private String ledgerId;
......@@ -253,6 +255,14 @@ public class TrialBalanceDto implements Serializable {
this.source = source == null ? null : source.trim();
}
public Integer getTmsPeriod() {
return tmsPeriod;
}
public void setTmsPeriod(Integer tmsPeriod) {
this.tmsPeriod = tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column trial_balance.period
......
......@@ -50,6 +50,27 @@ public class DataInitTest extends CommonIT {
@Resource
private OrganizationEmployeeMapper organizationEmployeeMapper;
@Resource
private OrganizationAccountingRateMapper organizationAccountingRateMapper;
@Resource
private OrganizationApprovedLevyInfoMapper organizationApprovedLevyInfoMapper;
@Resource
private OrganizationInvoiceMapper organizationInvoiceMapper;
@Resource
private OrganizationReturnRateMapper organizationReturnRateMapper;
@Resource
private OrganizationTaxOfficerMapper organizationTaxOfficerMapper;
@Resource
private OrganizationTaxRuleMapper organizationTaxRuleMapper;
@Resource
private OrganizationTaxpayerQualificationMapper organizationTaxpayerQualificationMapper;
@Resource
private EquityInformationMapper equityInformationMapper;
......@@ -151,9 +172,9 @@ public class DataInitTest extends CommonIT {
}
equityInfos.forEach(ei -> {
// 逐条insert 失败的记录
if (equityInformationMapper.insertSelective(ei) < 1) {
/*if (equityInformationMapper.insertSelective(ei) < 1) {
failList.putIfAbsent(orgK, orgV);
}
}*/
});
}
} else if ("股东信息".equals(infoK) && equityInfos.isEmpty()) {
......@@ -223,9 +244,9 @@ public class DataInitTest extends CommonIT {
}
equityInfos1.forEach(ei -> {
// 逐条insert 失败的记录
if (equityInformationMapper.insertSelective(ei) < 1) {
/* if (equityInformationMapper.insertSelective(ei) < 1) {
failList.putIfAbsent(orgK, orgV);
}
}*/
});
}
} else if ("变更记录".equals(infoK)) {
......@@ -251,9 +272,9 @@ public class DataInitTest extends CommonIT {
});
logs.forEach(l -> {
// 逐条insert 失败的记录
if (operationLogEquityMapper.insertSelective(l) < 1) {
/* if (operationLogEquityMapper.insertSelective(l) < 1) {
failList.putIfAbsent(orgK, orgV);
}
}*/
});
}
......@@ -264,6 +285,7 @@ public class DataInitTest extends CommonIT {
OrganizationExtra orgEx = new OrganizationExtra();
OrganizationEmployee orgEmp = new OrganizationEmployee();
org.setId(orgId);
org.setName(orgName);
......@@ -323,7 +345,7 @@ public class DataInitTest extends CommonIT {
}
}
});
if (organizationMapper.insertSelective(org) < 0) {
/* if (organizationMapper.insertSelective(org) < 0) {
failList.putIfAbsent(orgK, orgV);
}
if (organizationExtraMapper.insertSelective(orgEx) < 0) {
......@@ -331,7 +353,8 @@ public class DataInitTest extends CommonIT {
}
if (organizationEmployeeMapper.insertSelective(orgEmp) < 0) {
failList.putIfAbsent(orgK, orgV);
}
}*/
insertExtraList(orgId);
}
});
} catch (Exception e) {
......@@ -363,6 +386,16 @@ public class DataInitTest extends CommonIT {
System.out.println(String.format("失败条数[%s]", failList.size()));
}
private void insertExtraList(String orgId) {
organizationAccountingRateMapper.insertSelective(new OrganizationAccountingRate(idService.nextId(),orgId));
organizationApprovedLevyInfoMapper.insertSelective(new OrganizationApprovedLevyInfo(idService.nextId(),orgId));
organizationInvoiceMapper.insertSelective(new OrganizationInvoice(idService.nextId(),orgId));
organizationReturnRateMapper.insertSelective(new OrganizationReturnRate(idService.nextId(),orgId));
organizationTaxOfficerMapper.insertSelective(new OrganizationTaxOfficer(idService.nextId(),orgId));
organizationTaxRuleMapper.insertSelective(new OrganizationTaxRule(idService.nextId(),orgId));
organizationTaxpayerQualificationMapper.insertSelective(new OrganizationTaxpayerQualification(idService.nextId(),orgId));
}
@Test
public void syncOrg(){
List<String> taxPayNums= organizationMapper.selectByExample(new OrganizationExample()).stream().map(Organization::getTaxPayerNumber).collect(Collectors.toList());
......
......@@ -480,6 +480,14 @@ public class OrganizationAccountingRate extends BaseEntity implements Serializab
*
* @mbg.generated
*/
public OrganizationAccountingRate(){}
public OrganizationAccountingRate(Long id,String orgId){
this.id = id;
this.organizationId = orgId;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
......
......@@ -118,6 +118,15 @@ public class OrganizationApprovedLevyInfo extends BaseEntity implements Serializ
*/
private static final long serialVersionUID = 1L;
public OrganizationApprovedLevyInfo() {
}
public OrganizationApprovedLevyInfo(long id, String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_approved_levy_info.id
......
......@@ -129,6 +129,13 @@ public class OrganizationInvoice extends BaseEntity implements Serializable {
*/
private static final long serialVersionUID = 1L;
public OrganizationInvoice(){}
public OrganizationInvoice(long id, String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_invoice.id
......
......@@ -96,6 +96,14 @@ public class OrganizationReturnRate extends BaseEntity implements Serializable {
*/
private static final long serialVersionUID = 1L;
public OrganizationReturnRate() {
}
public OrganizationReturnRate(long id, String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_return_rate.id
......
......@@ -96,6 +96,15 @@ public class OrganizationTaxOfficer extends BaseEntity implements Serializable {
*/
private static final long serialVersionUID = 1L;
public OrganizationTaxOfficer() {
}
public OrganizationTaxOfficer(long id ,String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_tax_officer.id
......
......@@ -96,6 +96,14 @@ public class OrganizationTaxRule extends BaseEntity implements Serializable {
*/
private static final long serialVersionUID = 1L;
public OrganizationTaxRule() {
}
public OrganizationTaxRule(long id,String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_tax_rule.id
......
......@@ -107,6 +107,14 @@ public class OrganizationTaxpayerQualification extends BaseEntity implements Ser
*/
private static final long serialVersionUID = 1L;
public OrganizationTaxpayerQualification() {
}
public OrganizationTaxpayerQualification(long id, String orgId) {
this.id = id;
this.organizationId = orgId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column organization_taxpayer_qualification.id
......
......@@ -68,6 +68,17 @@ public class TrialBalance extends BaseEntity implements Serializable {
*/
private String source;
/**
* Database Column Remarks:
* 税务系统期间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column trial_balance.tms_period
*
* @mbg.generated
*/
private Integer tmsPeriod;
/**
* Database Column Remarks:
* 期间 yyyymm
......@@ -735,6 +746,30 @@ public class TrialBalance extends BaseEntity implements Serializable {
this.source = source == null ? null : source.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column trial_balance.tms_period
*
* @return the value of trial_balance.tms_period
*
* @mbg.generated
*/
public Integer getTmsPeriod() {
return tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column trial_balance.tms_period
*
* @param tmsPeriod the value for trial_balance.tms_period
*
* @mbg.generated
*/
public void setTmsPeriod(Integer tmsPeriod) {
this.tmsPeriod = tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column trial_balance.period
......@@ -1928,6 +1963,7 @@ public class TrialBalance extends BaseEntity implements Serializable {
sb.append(", projectId=").append(projectId);
sb.append(", date=").append(date);
sb.append(", source=").append(source);
sb.append(", tmsPeriod=").append(tmsPeriod);
sb.append(", period=").append(period);
sb.append(", ledgerId=").append(ledgerId);
sb.append(", ledgerName=").append(ledgerName);
......
......@@ -526,6 +526,66 @@ public class TrialBalanceExample {
return (Criteria) this;
}
public Criteria andTmsPeriodIsNull() {
addCriterion("tms_period is null");
return (Criteria) this;
}
public Criteria andTmsPeriodIsNotNull() {
addCriterion("tms_period is not null");
return (Criteria) this;
}
public Criteria andTmsPeriodEqualTo(Integer value) {
addCriterion("tms_period =", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotEqualTo(Integer value) {
addCriterion("tms_period <>", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThan(Integer value) {
addCriterion("tms_period >", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("tms_period >=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThan(Integer value) {
addCriterion("tms_period <", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThanOrEqualTo(Integer value) {
addCriterion("tms_period <=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodIn(List<Integer> values) {
addCriterion("tms_period in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotIn(List<Integer> values) {
addCriterion("tms_period not in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodBetween(Integer value1, Integer value2) {
addCriterion("tms_period between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("tms_period not between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
......
......@@ -68,6 +68,17 @@ public class TrialBalanceFinal extends BaseEntity implements Serializable {
*/
private String source;
/**
* Database Column Remarks:
* 税务系统期间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column trial_balance_final.tms_period
*
* @mbg.generated
*/
private Integer tmsPeriod;
/**
* Database Column Remarks:
* 期间 yyyymm
......@@ -735,6 +746,30 @@ public class TrialBalanceFinal extends BaseEntity implements Serializable {
this.source = source == null ? null : source.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column trial_balance_final.tms_period
*
* @return the value of trial_balance_final.tms_period
*
* @mbg.generated
*/
public Integer getTmsPeriod() {
return tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column trial_balance_final.tms_period
*
* @param tmsPeriod the value for trial_balance_final.tms_period
*
* @mbg.generated
*/
public void setTmsPeriod(Integer tmsPeriod) {
this.tmsPeriod = tmsPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column trial_balance_final.period
......@@ -1928,6 +1963,7 @@ public class TrialBalanceFinal extends BaseEntity implements Serializable {
sb.append(", projectId=").append(projectId);
sb.append(", date=").append(date);
sb.append(", source=").append(source);
sb.append(", tmsPeriod=").append(tmsPeriod);
sb.append(", period=").append(period);
sb.append(", ledgerId=").append(ledgerId);
sb.append(", ledgerName=").append(ledgerName);
......
......@@ -526,6 +526,66 @@ public class TrialBalanceFinalExample {
return (Criteria) this;
}
public Criteria andTmsPeriodIsNull() {
addCriterion("tms_period is null");
return (Criteria) this;
}
public Criteria andTmsPeriodIsNotNull() {
addCriterion("tms_period is not null");
return (Criteria) this;
}
public Criteria andTmsPeriodEqualTo(Integer value) {
addCriterion("tms_period =", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotEqualTo(Integer value) {
addCriterion("tms_period <>", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThan(Integer value) {
addCriterion("tms_period >", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("tms_period >=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThan(Integer value) {
addCriterion("tms_period <", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodLessThanOrEqualTo(Integer value) {
addCriterion("tms_period <=", value, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodIn(List<Integer> values) {
addCriterion("tms_period in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotIn(List<Integer> values) {
addCriterion("tms_period not in", values, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodBetween(Integer value1, Integer value2) {
addCriterion("tms_period between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andTmsPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("tms_period not between", value1, value2, "tmsPeriod");
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
......
......@@ -11,6 +11,7 @@
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="date" jdbcType="TIMESTAMP" property="date" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="ledger_id" jdbcType="VARCHAR" property="ledgerId" />
<result column="ledger_name" jdbcType="VARCHAR" property="ledgerName" />
......@@ -132,14 +133,14 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, `date`, `source`, period, ledger_id, ledger_name,
currency_code, `status`, category, account_category, acct_code1, acct_name1, acct_name2,
acct_name3, segment1, segment2, segment3, segment4, segment5, segment6, segment7,
segment8, segment9, segment10, segment1_name, segment2_name, segment3_name, segment4_name,
segment5_name, segment6_name, segment7_name, segment8_name, segment9_name, segment10_name,
beg_bal, period_dr, period_cr, end_bal, qtd_dr, qtd_cr, ytd_dr, ytd_cr, beg_bal_beq,
period_dr_beq, period_cr_beq, end_bal_beq, qtd_dr_beq, qtd_cr_beq, ytd_dr_beq, ytd_cr_beq,
create_time, update_time
id, organization_id, project_id, `date`, `source`, tms_period, period, ledger_id,
ledger_name, currency_code, `status`, category, account_category, acct_code1, acct_name1,
acct_name2, acct_name3, segment1, segment2, segment3, segment4, segment5, segment6,
segment7, segment8, segment9, segment10, segment1_name, segment2_name, segment3_name,
segment4_name, segment5_name, segment6_name, segment7_name, segment8_name, segment9_name,
segment10_name, beg_bal, period_dr, period_cr, end_bal, qtd_dr, qtd_cr, ytd_dr, ytd_cr,
beg_bal_beq, period_dr_beq, period_cr_beq, end_bal_beq, qtd_dr_beq, qtd_cr_beq, ytd_dr_beq,
ytd_cr_beq, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceFinalExample" resultMap="BaseResultMap">
<!--
......@@ -193,43 +194,43 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into trial_balance_final (id, organization_id, project_id,
`date`, `source`, period,
ledger_id, ledger_name, currency_code,
`status`, category, account_category,
acct_code1, acct_name1, acct_name2,
acct_name3, segment1, segment2,
segment3, segment4, segment5,
segment6, segment7, segment8,
segment9, segment10, segment1_name,
segment2_name, segment3_name, segment4_name,
segment5_name, segment6_name, segment7_name,
segment8_name, segment9_name, segment10_name,
beg_bal, period_dr, period_cr,
end_bal, qtd_dr, qtd_cr,
ytd_dr, ytd_cr, beg_bal_beq,
period_dr_beq, period_cr_beq, end_bal_beq,
qtd_dr_beq, qtd_cr_beq, ytd_dr_beq,
ytd_cr_beq, create_time, update_time
)
`date`, `source`, tms_period,
period, ledger_id, ledger_name,
currency_code, `status`, category,
account_category, acct_code1, acct_name1,
acct_name2, acct_name3, segment1,
segment2, segment3, segment4,
segment5, segment6, segment7,
segment8, segment9, segment10,
segment1_name, segment2_name, segment3_name,
segment4_name, segment5_name, segment6_name,
segment7_name, segment8_name, segment9_name,
segment10_name, beg_bal, period_dr,
period_cr, end_bal, qtd_dr,
qtd_cr, ytd_dr, ytd_cr,
beg_bal_beq, period_dr_beq, period_cr_beq,
end_bal_beq, qtd_dr_beq, qtd_cr_beq,
ytd_dr_beq, ytd_cr_beq, create_time,
update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER},
#{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR}, #{currencyCode,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{accountCategory,jdbcType=VARCHAR},
#{acctCode1,jdbcType=VARCHAR}, #{acctName1,jdbcType=VARCHAR}, #{acctName2,jdbcType=VARCHAR},
#{acctName3,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR}, #{segment2,jdbcType=VARCHAR},
#{segment3,jdbcType=VARCHAR}, #{segment4,jdbcType=VARCHAR}, #{segment5,jdbcType=VARCHAR},
#{segment6,jdbcType=VARCHAR}, #{segment7,jdbcType=VARCHAR}, #{segment8,jdbcType=VARCHAR},
#{segment9,jdbcType=VARCHAR}, #{segment10,jdbcType=VARCHAR}, #{segment1Name,jdbcType=VARCHAR},
#{segment2Name,jdbcType=VARCHAR}, #{segment3Name,jdbcType=VARCHAR}, #{segment4Name,jdbcType=VARCHAR},
#{segment5Name,jdbcType=VARCHAR}, #{segment6Name,jdbcType=VARCHAR}, #{segment7Name,jdbcType=VARCHAR},
#{segment8Name,jdbcType=VARCHAR}, #{segment9Name,jdbcType=VARCHAR}, #{segment10Name,jdbcType=VARCHAR},
#{begBal,jdbcType=DECIMAL}, #{periodDr,jdbcType=DECIMAL}, #{periodCr,jdbcType=DECIMAL},
#{endBal,jdbcType=DECIMAL}, #{qtdDr,jdbcType=DECIMAL}, #{qtdCr,jdbcType=DECIMAL},
#{ytdDr,jdbcType=DECIMAL}, #{ytdCr,jdbcType=DECIMAL}, #{begBalBeq,jdbcType=DECIMAL},
#{periodDrBeq,jdbcType=DECIMAL}, #{periodCrBeq,jdbcType=DECIMAL}, #{endBalBeq,jdbcType=DECIMAL},
#{qtdDrBeq,jdbcType=DECIMAL}, #{qtdCrBeq,jdbcType=DECIMAL}, #{ytdDrBeq,jdbcType=DECIMAL},
#{ytdCrBeq,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
#{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER},
#{period,jdbcType=INTEGER}, #{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR},
#{currencyCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR},
#{accountCategory,jdbcType=VARCHAR}, #{acctCode1,jdbcType=VARCHAR}, #{acctName1,jdbcType=VARCHAR},
#{acctName2,jdbcType=VARCHAR}, #{acctName3,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR},
#{segment2,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, #{segment4,jdbcType=VARCHAR},
#{segment5,jdbcType=VARCHAR}, #{segment6,jdbcType=VARCHAR}, #{segment7,jdbcType=VARCHAR},
#{segment8,jdbcType=VARCHAR}, #{segment9,jdbcType=VARCHAR}, #{segment10,jdbcType=VARCHAR},
#{segment1Name,jdbcType=VARCHAR}, #{segment2Name,jdbcType=VARCHAR}, #{segment3Name,jdbcType=VARCHAR},
#{segment4Name,jdbcType=VARCHAR}, #{segment5Name,jdbcType=VARCHAR}, #{segment6Name,jdbcType=VARCHAR},
#{segment7Name,jdbcType=VARCHAR}, #{segment8Name,jdbcType=VARCHAR}, #{segment9Name,jdbcType=VARCHAR},
#{segment10Name,jdbcType=VARCHAR}, #{begBal,jdbcType=DECIMAL}, #{periodDr,jdbcType=DECIMAL},
#{periodCr,jdbcType=DECIMAL}, #{endBal,jdbcType=DECIMAL}, #{qtdDr,jdbcType=DECIMAL},
#{qtdCr,jdbcType=DECIMAL}, #{ytdDr,jdbcType=DECIMAL}, #{ytdCr,jdbcType=DECIMAL},
#{begBalBeq,jdbcType=DECIMAL}, #{periodDrBeq,jdbcType=DECIMAL}, #{periodCrBeq,jdbcType=DECIMAL},
#{endBalBeq,jdbcType=DECIMAL}, #{qtdDrBeq,jdbcType=DECIMAL}, #{qtdCrBeq,jdbcType=DECIMAL},
#{ytdDrBeq,jdbcType=DECIMAL}, #{ytdCrBeq,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceFinal">
<!--
......@@ -253,6 +254,9 @@
<if test="source != null">
`source`,
</if>
<if test="tmsPeriod != null">
tms_period,
</if>
<if test="period != null">
period,
</if>
......@@ -417,6 +421,9 @@
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
#{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
......@@ -598,6 +605,9 @@
<if test="record.source != null">
`source` = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.tmsPeriod != null">
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
......@@ -761,6 +771,7 @@
project_id = #{record.projectId,jdbcType=VARCHAR},
`date` = #{record.date,jdbcType=TIMESTAMP},
`source` = #{record.source,jdbcType=VARCHAR},
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
period = #{record.period,jdbcType=INTEGER},
ledger_id = #{record.ledgerId,jdbcType=VARCHAR},
ledger_name = #{record.ledgerName,jdbcType=VARCHAR},
......@@ -833,6 +844,9 @@
<if test="source != null">
`source` = #{source,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
tms_period = #{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
......@@ -993,6 +1007,7 @@
project_id = #{projectId,jdbcType=VARCHAR},
`date` = #{date,jdbcType=TIMESTAMP},
`source` = #{source,jdbcType=VARCHAR},
tms_period = #{tmsPeriod,jdbcType=INTEGER},
period = #{period,jdbcType=INTEGER},
ledger_id = #{ledgerId,jdbcType=VARCHAR},
ledger_name = #{ledgerName,jdbcType=VARCHAR},
......
......@@ -11,6 +11,7 @@
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="date" jdbcType="TIMESTAMP" property="date" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="ledger_id" jdbcType="VARCHAR" property="ledgerId" />
<result column="ledger_name" jdbcType="VARCHAR" property="ledgerName" />
......@@ -132,14 +133,14 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, `date`, `source`, period, ledger_id, ledger_name,
currency_code, `status`, category, account_category, acct_code1, acct_name1, acct_name2,
acct_name3, segment1, segment2, segment3, segment4, segment5, segment6, segment7,
segment8, segment9, segment10, segment1_name, segment2_name, segment3_name, segment4_name,
segment5_name, segment6_name, segment7_name, segment8_name, segment9_name, segment10_name,
beg_bal, period_dr, period_cr, end_bal, qtd_dr, qtd_cr, ytd_dr, ytd_cr, beg_bal_beq,
period_dr_beq, period_cr_beq, end_bal_beq, qtd_dr_beq, qtd_cr_beq, ytd_dr_beq, ytd_cr_beq,
create_time, update_time
id, organization_id, project_id, `date`, `source`, tms_period, period, ledger_id,
ledger_name, currency_code, `status`, category, account_category, acct_code1, acct_name1,
acct_name2, acct_name3, segment1, segment2, segment3, segment4, segment5, segment6,
segment7, segment8, segment9, segment10, segment1_name, segment2_name, segment3_name,
segment4_name, segment5_name, segment6_name, segment7_name, segment8_name, segment9_name,
segment10_name, beg_bal, period_dr, period_cr, end_bal, qtd_dr, qtd_cr, ytd_dr, ytd_cr,
beg_bal_beq, period_dr_beq, period_cr_beq, end_bal_beq, qtd_dr_beq, qtd_cr_beq, ytd_dr_beq,
ytd_cr_beq, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.TrialBalanceExample" resultMap="BaseResultMap">
<!--
......@@ -193,43 +194,43 @@
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into trial_balance (id, organization_id, project_id,
`date`, `source`, period,
ledger_id, ledger_name, currency_code,
`status`, category, account_category,
acct_code1, acct_name1, acct_name2,
acct_name3, segment1, segment2,
segment3, segment4, segment5,
segment6, segment7, segment8,
segment9, segment10, segment1_name,
segment2_name, segment3_name, segment4_name,
segment5_name, segment6_name, segment7_name,
segment8_name, segment9_name, segment10_name,
beg_bal, period_dr, period_cr,
end_bal, qtd_dr, qtd_cr,
ytd_dr, ytd_cr, beg_bal_beq,
period_dr_beq, period_cr_beq, end_bal_beq,
qtd_dr_beq, qtd_cr_beq, ytd_dr_beq,
ytd_cr_beq, create_time, update_time
)
`date`, `source`, tms_period,
period, ledger_id, ledger_name,
currency_code, `status`, category,
account_category, acct_code1, acct_name1,
acct_name2, acct_name3, segment1,
segment2, segment3, segment4,
segment5, segment6, segment7,
segment8, segment9, segment10,
segment1_name, segment2_name, segment3_name,
segment4_name, segment5_name, segment6_name,
segment7_name, segment8_name, segment9_name,
segment10_name, beg_bal, period_dr,
period_cr, end_bal, qtd_dr,
qtd_cr, ytd_dr, ytd_cr,
beg_bal_beq, period_dr_beq, period_cr_beq,
end_bal_beq, qtd_dr_beq, qtd_cr_beq,
ytd_dr_beq, ytd_cr_beq, create_time,
update_time)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER},
#{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR}, #{currencyCode,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{accountCategory,jdbcType=VARCHAR},
#{acctCode1,jdbcType=VARCHAR}, #{acctName1,jdbcType=VARCHAR}, #{acctName2,jdbcType=VARCHAR},
#{acctName3,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR}, #{segment2,jdbcType=VARCHAR},
#{segment3,jdbcType=VARCHAR}, #{segment4,jdbcType=VARCHAR}, #{segment5,jdbcType=VARCHAR},
#{segment6,jdbcType=VARCHAR}, #{segment7,jdbcType=VARCHAR}, #{segment8,jdbcType=VARCHAR},
#{segment9,jdbcType=VARCHAR}, #{segment10,jdbcType=VARCHAR}, #{segment1Name,jdbcType=VARCHAR},
#{segment2Name,jdbcType=VARCHAR}, #{segment3Name,jdbcType=VARCHAR}, #{segment4Name,jdbcType=VARCHAR},
#{segment5Name,jdbcType=VARCHAR}, #{segment6Name,jdbcType=VARCHAR}, #{segment7Name,jdbcType=VARCHAR},
#{segment8Name,jdbcType=VARCHAR}, #{segment9Name,jdbcType=VARCHAR}, #{segment10Name,jdbcType=VARCHAR},
#{begBal,jdbcType=DECIMAL}, #{periodDr,jdbcType=DECIMAL}, #{periodCr,jdbcType=DECIMAL},
#{endBal,jdbcType=DECIMAL}, #{qtdDr,jdbcType=DECIMAL}, #{qtdCr,jdbcType=DECIMAL},
#{ytdDr,jdbcType=DECIMAL}, #{ytdCr,jdbcType=DECIMAL}, #{begBalBeq,jdbcType=DECIMAL},
#{periodDrBeq,jdbcType=DECIMAL}, #{periodCrBeq,jdbcType=DECIMAL}, #{endBalBeq,jdbcType=DECIMAL},
#{qtdDrBeq,jdbcType=DECIMAL}, #{qtdCrBeq,jdbcType=DECIMAL}, #{ytdDrBeq,jdbcType=DECIMAL},
#{ytdCrBeq,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
#{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER},
#{period,jdbcType=INTEGER}, #{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR},
#{currencyCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR},
#{accountCategory,jdbcType=VARCHAR}, #{acctCode1,jdbcType=VARCHAR}, #{acctName1,jdbcType=VARCHAR},
#{acctName2,jdbcType=VARCHAR}, #{acctName3,jdbcType=VARCHAR}, #{segment1,jdbcType=VARCHAR},
#{segment2,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, #{segment4,jdbcType=VARCHAR},
#{segment5,jdbcType=VARCHAR}, #{segment6,jdbcType=VARCHAR}, #{segment7,jdbcType=VARCHAR},
#{segment8,jdbcType=VARCHAR}, #{segment9,jdbcType=VARCHAR}, #{segment10,jdbcType=VARCHAR},
#{segment1Name,jdbcType=VARCHAR}, #{segment2Name,jdbcType=VARCHAR}, #{segment3Name,jdbcType=VARCHAR},
#{segment4Name,jdbcType=VARCHAR}, #{segment5Name,jdbcType=VARCHAR}, #{segment6Name,jdbcType=VARCHAR},
#{segment7Name,jdbcType=VARCHAR}, #{segment8Name,jdbcType=VARCHAR}, #{segment9Name,jdbcType=VARCHAR},
#{segment10Name,jdbcType=VARCHAR}, #{begBal,jdbcType=DECIMAL}, #{periodDr,jdbcType=DECIMAL},
#{periodCr,jdbcType=DECIMAL}, #{endBal,jdbcType=DECIMAL}, #{qtdDr,jdbcType=DECIMAL},
#{qtdCr,jdbcType=DECIMAL}, #{ytdDr,jdbcType=DECIMAL}, #{ytdCr,jdbcType=DECIMAL},
#{begBalBeq,jdbcType=DECIMAL}, #{periodDrBeq,jdbcType=DECIMAL}, #{periodCrBeq,jdbcType=DECIMAL},
#{endBalBeq,jdbcType=DECIMAL}, #{qtdDrBeq,jdbcType=DECIMAL}, #{qtdCrBeq,jdbcType=DECIMAL},
#{ytdDrBeq,jdbcType=DECIMAL}, #{ytdCrBeq,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.TrialBalance">
<!--
......@@ -253,6 +254,9 @@
<if test="source != null">
`source`,
</if>
<if test="tmsPeriod != null">
tms_period,
</if>
<if test="period != null">
period,
</if>
......@@ -417,6 +421,9 @@
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
#{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
......@@ -598,6 +605,9 @@
<if test="record.source != null">
`source` = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.tmsPeriod != null">
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
......@@ -761,6 +771,7 @@
project_id = #{record.projectId,jdbcType=VARCHAR},
`date` = #{record.date,jdbcType=TIMESTAMP},
`source` = #{record.source,jdbcType=VARCHAR},
tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
period = #{record.period,jdbcType=INTEGER},
ledger_id = #{record.ledgerId,jdbcType=VARCHAR},
ledger_name = #{record.ledgerName,jdbcType=VARCHAR},
......@@ -833,6 +844,9 @@
<if test="source != null">
`source` = #{source,jdbcType=VARCHAR},
</if>
<if test="tmsPeriod != null">
tms_period = #{tmsPeriod,jdbcType=INTEGER},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
......@@ -993,6 +1007,7 @@
project_id = #{projectId,jdbcType=VARCHAR},
`date` = #{date,jdbcType=TIMESTAMP},
`source` = #{source,jdbcType=VARCHAR},
tms_period = #{tmsPeriod,jdbcType=INTEGER},
period = #{period,jdbcType=INTEGER},
ledger_id = #{ledgerId,jdbcType=VARCHAR},
ledger_name = #{ledgerName,jdbcType=VARCHAR},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment