Skip to content

GitLab

Commit ea3295ea authored by bunchaP's avatar bunchaP
Browse files

Merge branch 'dev' of https://server.b3-tech.co.th/rbl-cms/cms-backend into dev 

# Conflicts:
#	src/main/java/com/b3/rbl/compensation/service/QuarterlyBonusService.java
parents 37fdf632 20e34411
main CareerAgentBenefit Monthly-Bonus Quarterly-Bonus Yearly-Bonus dev feature/active-agent feature/convert-object feature/director-recuiting feature/download-50tawi feature/merge-service feature/reload-jbpm
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 604 additions and 654 deletions
+604 -654
src/main/java/com/b3/rbl/compensation/model/jbpm/AgentDetail.java
View file @ ea3295ea
......@@ -16,14 +16,14 @@ public class AgentDetail implements java.io.Serializable {
@org.kie.api.definition.type.Label(value = "Agent Position")
private java.lang.String agentPosition;
@org.kie.api.definition.type.Label("Detail Fyc Amount")
private java.lang.Double detailFycAmount;
@org.kie.api.definition.type.Label("Fyc Amount")
private java.lang.Double FycAmount;
@org.kie.api.definition.type.Label("Detail Policy No")
private java.lang.String detailPolicyNo;
@org.kie.api.definition.type.Label("Policy No")
private java.lang.String PolicyNo;
@org.kie.api.definition.type.Label("Detail Fyc Production")
private java.lang.Double detailFycProduction;
@org.kie.api.definition.type.Label("Fyc Production")
private java.lang.Double FycProduction;
@org.kie.api.definition.type.Label("Premium Period")
......@@ -76,28 +76,28 @@ public class AgentDetail implements java.io.Serializable {
this.agentPosition = agentPosition;
}
public java.lang.Double getDetailFycAmount() {
return this.detailFycAmount;
public java.lang.Double getFycAmount() {
return this.FycAmount;
}
public void setDetailFycAmount(java.lang.Double detailFycAmount) {
this.detailFycAmount = detailFycAmount;
public void setFycAmount(java.lang.Double FycAmount) {
this.FycAmount = FycAmount;
}
public java.lang.String getDetailPolicyNo() {
return this.detailPolicyNo;
public java.lang.String getPolicyNo() {
return this.PolicyNo;
}
public void setDetailPolicyNo(java.lang.String detailPolicyNo) {
this.detailPolicyNo = detailPolicyNo;
public void setPolicyNo(java.lang.String PolicyNo) {
this.PolicyNo = PolicyNo;
}
public java.lang.Double getDetailFycProduction() {
return this.detailFycProduction;
public java.lang.Double getFycProduction() {
return this.FycProduction;
}
public void setDetailFycProduction(java.lang.Double detailFycProduction) {
this.detailFycProduction = detailFycProduction;
public void setFycProduction(java.lang.Double FycProduction) {
this.FycProduction = FycProduction;
}
public java.lang.Integer getPremiumPeriod() {
......@@ -182,9 +182,9 @@ public class AgentDetail implements java.io.Serializable {
public AgentDetail(java.lang.String agentCode,
java.lang.String agentPosition,
java.lang.Double detailFycAmount,
java.lang.String detailPolicyNo,
java.lang.Double detailFycProduction,
java.lang.Double FycAmount,
java.lang.String PolicyNo,
java.lang.Double FycProduction,
java.lang.Integer premiumPeriod,
java.lang.String premiumYear,
java.sql.Date policyIssuesDate,
......@@ -197,9 +197,9 @@ public class AgentDetail implements java.io.Serializable {
java.lang.Integer benefitTypeRate) {
this.agentCode = agentCode;
this.agentPosition = agentPosition;
this.detailFycAmount = detailFycAmount;
this.detailPolicyNo = detailPolicyNo;
this.detailFycProduction = detailFycProduction;
this.FycAmount = FycAmount;
this.PolicyNo = PolicyNo;
this.FycProduction = FycProduction;
this.premiumPeriod = premiumPeriod;
this.premiumYear = premiumYear;
this.policyIssuesDate = policyIssuesDate;
......@@ -213,7 +213,7 @@ public class AgentDetail implements java.io.Serializable {
}
public java.lang.String toString(){
return "Agent Code : "+this.agentCode+", Position : "+this.agentPosition+", Policy No : "+this.detailPolicyNo+", Fyc :"+this.detailFycAmount+", FycProduction :"+this.detailFycProduction;
return "Agent Code : "+this.agentCode+", Position : "+this.agentPosition+", Policy No : "+this.PolicyNo+", Fyc :"+this.FycAmount+", FycProduction :"+this.FycProduction;
}
}
\ No newline at end of file
src/main/java/com/b3/rbl/compensation/rest/JbpmRestApi.java
View file @ ea3295ea
......@@ -162,7 +162,8 @@ import java.sql.Date;
String jsonResult = objectMapper.writeValueAsString(result);
log.info("json {}", jsonResult);
// log.info("json {}", jsonResult);
// Parse the JSON string to List<AgentResult>
List<AgentResult> agents;
......
src/main/java/com/b3/rbl/compensation/service/HealthInsuranceService.java
View file @ ea3295ea
......@@ -248,9 +248,9 @@ public class HealthInsuranceService {
agentResult.setBenefitCode((String) map.get("benefitCode"));
agentDetail.setAgentCode((String) map.get("agentCode"));
agentDetail.setDetailPolicyNo((String) map.get("policyNo"));
agentDetail.setDetailFycAmount(Double.valueOf(String.valueOf(map.get("fyc"))));
agentDetail.setDetailFycProduction(Double.valueOf(String.valueOf(map.get("fycProduction"))));
agentDetail.setPolicyNo((String) map.get("policyNo"));
agentDetail.setFycAmount(Double.valueOf(String.valueOf(map.get("fyc"))));
agentDetail.setFycProduction(Double.valueOf(String.valueOf(map.get("fycProduction"))));
agentDetail.setTransactionDate((Date) map.get("transactionDate"));
agentDetail.setPremiumPeriod((Integer.valueOf(String.valueOf(map.get("premiumPeriod")))));
agentDetail.setPremiumYear((String) map.get("premiumYear"));
......@@ -258,7 +258,7 @@ public class HealthInsuranceService {
// agentDetail.setBenefitTypeRate((Integer.valueOf(String.valueOf(map.get("benefitTypeRate")))));
}
log.info("obj >> {}", agentDetail.getDetailFycAmount());
log.info("obj >> {}", agentDetail.getFycAmount());
agentDetailList.add(agentDetail);
agentResult.setAgentDetail(agentDetailList);
agentResultList.add(agentResult);
......@@ -377,9 +377,9 @@ public class HealthInsuranceService {
+ concatSingleQuote(detail.getPremiumYear()) + ","
+ concatSingleQuote(detail.getTransactionDate().toString()) + ","
+ concatSingleQuote(detail.getAgentCode().toString()) + ","
+ concatSingleQuote(detail.getDetailPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycProduction()) + ","
+ concatSingleQuote(detail.getPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycProduction()) + ","
+ concatSingleQuote(benefitId)
+ "),";
......@@ -390,9 +390,9 @@ public class HealthInsuranceService {
+ concatSingleQuote(detail.getPremiumYear()) + ","
+ concatSingleQuote(detail.getTransactionDate().toString()) + ","
+ concatSingleQuote(detail.getAgentCode().toString()) + ","
+ concatSingleQuote(detail.getDetailPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycProduction()) + ","
+ concatSingleQuote(detail.getPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycProduction()) + ","
+ concatSingleQuote(benefitId)
+ "),";
}
......
src/main/java/com/b3/rbl/compensation/service/MonthlyBonusService.java
View file @ ea3295ea
......@@ -240,9 +240,9 @@ public class MonthlyBonusService {
agentDetail.setAgentCode((String) map.get("agentCode"));
//agentResult.setAgentName((String) map.get("agentName"));
//agentDetail.setAgentPosition((String) map.get("agentLevelCodeDetail"));
agentDetail.setDetailPolicyNo((String) map.get("policyNo"));
agentDetail.setDetailFycAmount(Double.valueOf(String.valueOf(map.get("fyc"))));
agentDetail.setDetailFycProduction(Double.valueOf(String.valueOf(map.get("fycProduction"))));
agentDetail.setPolicyNo((String) map.get("policyNo"));
agentDetail.setFycAmount(Double.valueOf(String.valueOf(map.get("fyc"))));
agentDetail.setFycProduction(Double.valueOf(String.valueOf(map.get("fycProduction"))));
agentDetail.setPolicyIssuesDate((Date) map.get("policyIssueDate"));
agentDetail.setTransactionDate((Date) map.get("transactionDate"));
agentDetail.setTransactionType((String) map.get("transactionType"));
......@@ -408,9 +408,9 @@ public class MonthlyBonusService {
+ concatSingleQuote(detail.getTransactionDate().toString()) + ","
+ concatSingleQuote(detail.getTransactionType()) + ","
+ concatSingleQuote(detail.getAgentCode().toString()) + ","
+ concatSingleQuote(detail.getDetailPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycProduction()) + ","
+ concatSingleQuote(detail.getPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycProduction()) + ","
+ concatSingleQuote(benefitId)
+ "),";
......@@ -426,9 +426,9 @@ public class MonthlyBonusService {
+ concatSingleQuote(detail.getTransactionDate().toString()) + ","
+ concatSingleQuote(detail.getTransactionType()) + ","
+ concatSingleQuote(detail.getAgentCode().toString()) + ","
+ concatSingleQuote(detail.getDetailPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getDetailFycProduction()) + ","
+ concatSingleQuote(detail.getPolicyNo()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycAmount()) + ","
+ jbpmService.roundingDecimalScale(detail.getFycProduction()) + ","
+ concatSingleQuote(benefitId)
+ "),";
}
......
src/main/resources/application.properties
View file @ ea3295ea
spring.application.name=compensation
server.servlet.context-path=/compensation
server.tomcat.max-swallow-size=50MB
server.tomcat.max-swallow-size=200MB
# server.tomcat.max-http-post-size=50MB
server.tomcat.max-http-form-post-size=50MB
server.undertow.max-http-post-size=50MB
server.tomcat.max-http-form-post-size=200MB
server.undertow.max-http-post-size=200MB
# server.jetty.max-http-post-size=50MB
server.jetty.max-http-form-post-size=50MB
server.jetty.max-http-form-post-size=200MB
report.onedrive.path.statement.prefix=${report.onedrive.path.statement.prefix}
report.onedrive.path.agent.payment=${report.onedrive.path.agent.payment}
......
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