Skip to content

Y
yd-backend
Commit 2dd7e145 by jianan
Options

薪资单保单明细json问题

parent fd683c42
Showing with 333 additions and 42 deletions
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java
......@@ -662,7 +662,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
this.handleDateParams(salaryDetailsSearchRequestBody, requestVO);
salaryDetailsSearchRequestBody.setLoginName(requestVO.getAgent_id());
salaryDetailsSearchRequestBody.setSearchType("1");
salaryDetailsSearchRequestBody.setPaid_Status("1");
salaryDetailsSearchRequestBody.setPaid_Status("3");
salaryDetailsSearchRequestBody.setCheckStatus("1");
SalaryDetailsSearchResponseVO salaryDetailsSearchResponseVO = n22SalaryService.salaryDetailsSearch(salaryDetailsSearchRequestBody);
......
yd-api/src/main/java/com/yd/rmi/n22/common/pojo/ResponseHead.java
package com.yd.rmi.n22.common.pojo;
import lombok.Data;
@Data
public class ResponseHead {
private String seqNo;//请求唯一编码
private String code;//保险经纪接口错误返回代码
......@@ -12,4 +12,71 @@ public class ResponseHead {
private String appCode;//app接口错误返回代码，无app对接则无需解析
private String appMessage;//app接口错误返回信息，无app对接则无需解析
private String status;
public ResponseHead() {
}
public String getSeqNo() {
return seqNo;
}
public void setSeqNo(String seqNo) {
this.seqNo = seqNo;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getEsbCode() {
return esbCode;
}
public void setEsbCode(String esbCode) {
this.esbCode = esbCode;
}
public String getEsbMessage() {
return esbMessage;
}
public void setEsbMessage(String esbMessage) {
this.esbMessage = esbMessage;
}
public String getAppCode() {
return appCode;
}
public void setAppCode(String appCode) {
this.appCode = appCode;
}
public String getAppMessage() {
return appMessage;
}
public void setAppMessage(String appMessage) {
this.appMessage = appMessage;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/Commission.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
public class Commission {
......@@ -34,10 +34,14 @@ public class Commission {
private String Comments;
public Commission() {
}
public String getCustomer() {
return Customer;
}
@JsonProperty("Customer")
public void setCustomer(String customer) {
Customer = customer;
}
......@@ -46,6 +50,7 @@ public class Commission {
return Policyno;
}
@JsonProperty("Policyno")
public void setPolicyno(String policyno) {
Policyno = policyno;
}
......@@ -54,6 +59,7 @@ public class Commission {
return Pol_name_chn;
}
@JsonProperty("Pol_name_chn")
public void setPol_name_chn(String pol_name_chn) {
Pol_name_chn = pol_name_chn;
}
......@@ -62,6 +68,7 @@ public class Commission {
return EffectiveDate;
}
@JsonProperty("EffectiveDate")
public void setEffectiveDate(String effectiveDate) {
EffectiveDate = effectiveDate;
}
......@@ -69,7 +76,7 @@ public class Commission {
public String getInsurance_Cust() {
return Insurance_Cust;
}
@JsonProperty("Insurance_Cust")
public void setInsurance_Cust(String insurance_Cust) {
Insurance_Cust = insurance_Cust;
}
......@@ -77,7 +84,7 @@ public class Commission {
public int getYear() {
return Year;
}
@JsonProperty("Year")
public void setYear(int year) {
Year = year;
}
......@@ -85,7 +92,7 @@ public class Commission {
public int getYearPREMIUM() {
return YearPREMIUM;
}
@JsonProperty("YearPREMIUM")
public void setYearPREMIUM(int yearPREMIUM) {
YearPREMIUM = yearPREMIUM;
}
......@@ -93,7 +100,7 @@ public class Commission {
public double getSalesCommissionRate() {
return SalesCommissionRate;
}
@JsonProperty("SalesCommissionRate")
public void setSalesCommissionRate(double salesCommissionRate) {
SalesCommissionRate = salesCommissionRate;
}
......@@ -102,7 +109,7 @@ public class Commission {
return FYC_RYC;
}
@JSONField(name="FYC/RYC")
@JsonProperty("FYC/RYC")
public void setFYC_RYC(double FYC_RYC) {
this.FYC_RYC = FYC_RYC;
}
......@@ -110,7 +117,7 @@ public class Commission {
public String getLevel() {
return Level;
}
@JsonProperty("Level")
public void setLevel(String level) {
Level = level;
}
......@@ -118,7 +125,7 @@ public class Commission {
public int getRate() {
return Rate;
}
@JsonProperty("Rate")
public void setRate(int rate) {
Rate = rate;
}
......@@ -126,7 +133,7 @@ public class Commission {
public double getCommission() {
return Commission;
}
@JsonProperty("Commission")
public void setCommission(double commission) {
Commission = commission;
}
......@@ -134,7 +141,7 @@ public class Commission {
public String getSalestaff() {
return Salestaff;
}
@JsonProperty("Salestaff")
public void setSalestaff(String salestaff) {
Salestaff = salestaff;
}
......@@ -142,7 +149,7 @@ public class Commission {
public String getSaleSystem() {
return SaleSystem;
}
@JsonProperty("SaleSystem")
public void setSaleSystem(String saleSystem) {
SaleSystem = saleSystem;
}
......@@ -150,7 +157,7 @@ public class Commission {
public String getComments() {
return Comments;
}
@JsonProperty("Comments")
public void setComments(String comments) {
Comments = comments;
}
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/FirstYearPerformanceCommission.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
public class FirstYearPerformanceCommission {
private String SaleSystem; //销售当前体系
......@@ -11,10 +12,13 @@ public class FirstYearPerformanceCommission {
private String Commission;//首年度绩效奖金
private String Comments; //备注
public FirstYearPerformanceCommission() {
}
public String getSaleSystem() {
return SaleSystem;
}
@JsonProperty("SaleSystem")
public void setSaleSystem(String saleSystem) {
SaleSystem = saleSystem;
}
......@@ -23,7 +27,7 @@ public class FirstYearPerformanceCommission {
return FYC_RYC;
}
@JSONField(name="FYC/RYC")
@JsonProperty("FYC/RYC")
public void setFYC_RYC(String FYC_RYC) {
this.FYC_RYC = FYC_RYC;
}
......@@ -31,7 +35,7 @@ public class FirstYearPerformanceCommission {
public String getBackCommission() {
return BackCommission;
}
@JsonProperty("BackCommission")
public void setBackCommission(String backCommission) {
BackCommission = backCommission;
}
......@@ -39,7 +43,7 @@ public class FirstYearPerformanceCommission {
public String getT_BackCommission() {
return T_BackCommission;
}
@JsonProperty("T_BackCommission")
public void setT_BackCommission(String t_BackCommission) {
T_BackCommission = t_BackCommission;
}
......@@ -47,7 +51,7 @@ public class FirstYearPerformanceCommission {
public String getRate() {
return Rate;
}
@JsonProperty("Rate")
public void setRate(String rate) {
Rate = rate;
}
......@@ -55,7 +59,7 @@ public class FirstYearPerformanceCommission {
public String getCommission() {
return Commission;
}
@JsonProperty("Commission")
public void setCommission(String commission) {
Commission = commission;
}
......@@ -63,7 +67,7 @@ public class FirstYearPerformanceCommission {
public String getComments() {
return Comments;
}
@JsonProperty("Comments")
public void setComments(String comments) {
Comments = comments;
}
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/OtherCommission.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import lombok.Data;
@Data
import com.fasterxml.jackson.annotation.JsonProperty;
public class OtherCommission {
private String CommissionName;//奖金名称
private String Commission; //奖金金额
private String Comments;//备注
public OtherCommission() {
}
public String getCommissionName() {
return CommissionName;
}
@JsonProperty("CommissionName")
public void setCommissionName(String commissionName) {
CommissionName = commissionName;
}
public String getCommission() {
return Commission;
}
@JsonProperty("Commission")
public void setCommission(String commission) {
Commission = commission;
}
public String getComments() {
return Comments;
}
@JsonProperty("Comments")
public void setComments(String comments) {
Comments = comments;
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RecommendSystemCommission.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
public class RecommendSystemCommission {
private String SaleSystem;
......@@ -9,10 +9,13 @@ public class RecommendSystemCommission {
private String Commission;
private String Comments;
public RecommendSystemCommission() {
}
public String getSaleSystem() {
return SaleSystem;
}
@JsonProperty("SaleSystem")
public void setSaleSystem(String saleSystem) {
SaleSystem = saleSystem;
}
......@@ -21,7 +24,7 @@ public class RecommendSystemCommission {
return FYC_RYC;
}
@JSONField(name="FYC/RYC")
@JsonProperty("FYC/RYC")
public void setFYC_RYC(String FYC_RYC) {
this.FYC_RYC = FYC_RYC;
}
......@@ -29,7 +32,7 @@ public class RecommendSystemCommission {
public String getRate() {
return Rate;
}
@JsonProperty("Rate")
public void setRate(String rate) {
Rate = rate;
}
......@@ -37,7 +40,7 @@ public class RecommendSystemCommission {
public String getCommission() {
return Commission;
}
@JsonProperty("Commission")
public void setCommission(String commission) {
Commission = commission;
}
......@@ -45,7 +48,7 @@ public class RecommendSystemCommission {
public String getComments() {
return Comments;
}
@JsonProperty("Comments")
public void setComments(String comments) {
Comments = comments;
}
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/RenewalYearPerformanceCommission.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
public class RenewalYearPerformanceCommission {
private String SaleSystem;
......@@ -9,10 +9,13 @@ public class RenewalYearPerformanceCommission {
private String Commission;
private String Comments;
public RenewalYearPerformanceCommission() {
}
public String getSaleSystem() {
return SaleSystem;
}
@JsonProperty("SaleSystem")
public void setSaleSystem(String saleSystem) {
SaleSystem = saleSystem;
}
......@@ -20,7 +23,8 @@ public class RenewalYearPerformanceCommission {
public String getFYC_RYC() {
return FYC_RYC;
}
@JSONField(name="FYC/RYC")
@JsonProperty("FYC/RYC")
public void setFYC_RYC(String FYC_RYC) {
this.FYC_RYC = FYC_RYC;
}
......@@ -28,7 +32,7 @@ public class RenewalYearPerformanceCommission {
public String getRate() {
return Rate;
}
@JsonProperty("Rate")
public void setRate(String rate) {
Rate = rate;
}
......@@ -36,7 +40,7 @@ public class RenewalYearPerformanceCommission {
public String getCommission() {
return Commission;
}
@JsonProperty("Commission")
public void setCommission(String commission) {
Commission = commission;
}
......@@ -44,7 +48,7 @@ public class RenewalYearPerformanceCommission {
public String getComments() {
return Comments;
}
@JsonProperty("Comments")
public void setComments(String comments) {
Comments = comments;
}
......
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseBody.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yd.api.result.CommonResult;
import lombok.Data;
import java.util.List;
@Data
public class SearchStaffSalaryDetailsResponseBody {
private CommonResult commonResult;
......@@ -38,4 +39,128 @@ public class SearchStaffSalaryDetailsResponseBody {
private List<RenewalYearPerformanceCommission> RenewalYearPerformanceCommissionList;
private List<OtherCommission> OtherCommissionList;
public SearchStaffSalaryDetailsResponseBody() {
}
public CommonResult getCommonResult() {
return commonResult;
}
public void setCommonResult(CommonResult commonResult) {
this.commonResult = commonResult;
}
public String getAgent_id() {
return agent_id;
}
public void setAgent_id(String agent_id) {
this.agent_id = agent_id;
}
public String getStaffname() {
return staffname;
}
public void setStaffname(String staffname) {
this.staffname = staffname;
}
public String getYears() {
return years;
}
public void setYears(String years) {
this.years = years;
}
public String getMonth() {
return month;
}
public void setMonth(String month) {
this.month = month;
}
public List<Commission> getFristYearCommissionList() {
return FristYearCommissionList;
}
@JsonProperty("FristYearCommissionList")
public void setFristYearCommissionList(List<Commission> fristYearCommissionList) {
FristYearCommissionList = fristYearCommissionList;
}
public List<Commission> getRenewalYearCommissionList() {
return RenewalYearCommissionList;
}
@JsonProperty("RenewalYearCommissionList")
public void setRenewalYearCommissionList(List<Commission> renewalYearCommissionList) {
RenewalYearCommissionList = renewalYearCommissionList;
}
public List<Commission> getFristYearCoachCommissionList() {
return FristYearCoachCommissionList;
}
@JsonProperty("FristYearCoachCommissionList")
public void setFristYearCoachCommissionList(List<Commission> fristYearCoachCommissionList) {
FristYearCoachCommissionList = fristYearCoachCommissionList;
}
public List<Commission> getRenewalYearCoachCommissionList() {
return RenewalYearCoachCommissionList;
}
@JsonProperty("RenewalYearCoachCommissionList")
public void setRenewalYearCoachCommissionList(List<Commission> renewalYearCoachCommissionList) {
RenewalYearCoachCommissionList = renewalYearCoachCommissionList;
}
public List<Commission> getSpecialManagementCommissionList() {
return SpecialManagementCommissionList;
}
@JsonProperty("SpecialManagementCommissionList")
public void setSpecialManagementCommissionList(List<Commission> specialManagementCommissionList) {
SpecialManagementCommissionList = specialManagementCommissionList;
}
public List<Commission> getRecommendCommissionList() {
return RecommendCommissionList;
}
@JsonProperty("RecommendCommissionList")
public void setRecommendCommissionList(List<Commission> recommendCommissionList) {
RecommendCommissionList = recommendCommissionList;
}
public List<RecommendSystemCommission> getRecommendSystemCommissionList() {
return RecommendSystemCommissionList;
}
@JsonProperty("RecommendSystemCommissionList")
public void setRecommendSystemCommissionList(List<RecommendSystemCommission> recommendSystemCommissionList) {
RecommendSystemCommissionList = recommendSystemCommissionList;
}
public List<FirstYearPerformanceCommission> getFirstYearPerformanceCommissionList() {
return FirstYearPerformanceCommissionList;
}
@JsonProperty("FirstYearPerformanceCommissionList")
public void setFirstYearPerformanceCommissionList(List<FirstYearPerformanceCommission> firstYearPerformanceCommissionList) {
FirstYearPerformanceCommissionList = firstYearPerformanceCommissionList;
}
public List<RenewalYearPerformanceCommission> getRenewalYearPerformanceCommissionList() {
return RenewalYearPerformanceCommissionList;
}
@JsonProperty("RenewalYearPerformanceCommissionList")
public void setRenewalYearPerformanceCommissionList(List<RenewalYearPerformanceCommission> renewalYearPerformanceCommissionList) {
RenewalYearPerformanceCommissionList = renewalYearPerformanceCommissionList;
}
public List<OtherCommission> getOtherCommissionList() {
return OtherCommissionList;
}
@JsonProperty("OtherCommissionList")
public void setOtherCommissionList(List<OtherCommission> otherCommissionList) {
OtherCommissionList = otherCommissionList;
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/pojo/searchstaffsalarydetails/SearchStaffSalaryDetailsResponseVO.java
package com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails;
import com.yd.rmi.n22.common.pojo.ResponseHead;
import lombok.Data;
@Data
public class SearchStaffSalaryDetailsResponseVO {
private String errorMessage;
private ResponseHead responseHead;
private SearchStaffSalaryDetailsResponseBody responseBody;
public SearchStaffSalaryDetailsResponseVO() {
}
public ResponseHead getResponseHead() {
return responseHead;
}
public void setResponseHead(ResponseHead responseHead) {
this.responseHead = responseHead;
}
public SearchStaffSalaryDetailsResponseBody getResponseBody() {
return responseBody;
}
public void setResponseBody(SearchStaffSalaryDetailsResponseBody responseBody) {
this.responseBody = responseBody;
}
public String getErrorMessage() {
return errorMessage;
}
public void setErrorMessage(String errorMessage) {
this.errorMessage = errorMessage;
}
}
yd-api/src/main/java/com/yd/rmi/n22/salary/service/impl/N22SalaryServiceImpl.java
......@@ -7,6 +7,7 @@ import com.yd.rmi.n22.salary.pojo.*;
import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsRequestBody;
import com.yd.rmi.n22.salary.pojo.searchstaffsalarydetails.SearchStaffSalaryDetailsResponseVO;
import com.yd.rmi.n22.salary.service.N22SalaryService;
import com.yd.util.JsonUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -77,7 +78,7 @@ public class N22SalaryServiceImpl implements N22SalaryService {
String url = systemConfigService.getSingleConfigValue("N22_URL_Search_Staff_Salary_Details");
String result = N22Utils.postTransaction(url, obj.toString());
SearchStaffSalaryDetailsResponseVO response = JSONObject.parseObject(result, SearchStaffSalaryDetailsResponseVO.class);
SearchStaffSalaryDetailsResponseVO response = JsonUtil.readValue(result, SearchStaffSalaryDetailsResponseVO.class);
return response;
}
......
yd-api/src/main/java/com/yd/util/JsonUtil.java
......@@ -78,4 +78,29 @@ public class JsonUtil {
}
return levelStr.toString();
}
/**
* 使用泛型方法，把json字符串转换为相应的JavaBean对象。
* (1)转换为普通JavaBean：readValue(json,Student.class)
* (2)转换为List,如List<Student>,将第二个参数传递为Student
* [].class.然后使用Arrays.asList();方法把得到的数组转换为特定类型的List
*
* @param jsonStr
* @param valueType
* @return
*/
public static <T> T readValue(String jsonStr, Class<T> valueType) {
if (mapper == null) {
mapper = new ObjectMapper();
}
try {
return mapper.readValue(jsonStr, valueType);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}
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