Skip to content

platform / finance_serv

Go to a project
Commit 1e870473 by 王军业
Options

【新加关联客户需求】

1 parent 6ddd5271
Inline Side-by-side
Showing 5 changed files with 160 additions and 13 deletions
code/finance_serv/src/main/java/com/vion/financial/entity/Contract.java
...@@ -35,6 +35,9 @@ public class Contract { ...@@ -35,6 +35,9 @@ public class Contract {
private String mainten_start_point; //质保期开始节点 private String mainten_start_point; //质保期开始节点
private String contract_note; //合同备注 private String contract_note; //合同备注
private boolean is_delete; //标示合同是否逻辑删除 private boolean is_delete; //标示合同是否逻辑删除
private String final_user; //最终用户
private String relation_customer; //关联大客户
private String industry; //行业
public String getContract_unid() { public String getContract_unid() {
return contract_unid; return contract_unid;
} }
...@@ -212,5 +215,28 @@ public class Contract { ...@@ -212,5 +215,28 @@ public class Contract {
public void setIs_delete(boolean is_delete) { public void setIs_delete(boolean is_delete) {
this.is_delete = is_delete; this.is_delete = is_delete;
} }
public String getFinal_user() {
return final_user;
}
public void setFinal_user(String final_user) {
this.final_user = final_user;
}
public String getRelation_customer() {
return relation_customer;
}
public void setRelation_customer(String relation_customer) {
this.relation_customer = relation_customer;
}
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
} }
code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java
...@@ -134,7 +134,14 @@ public class ExportModel { ...@@ -134,7 +134,14 @@ public class ExportModel {
@Excel(name="质保款条件",width=35) @Excel(name="质保款条件",width=35)
private String mainten_pay_requirement; private String mainten_pay_requirement;
@Excel(name ="最终用户",width=35)
private String final_user;
@Excel(name = "关联客户",width = 35)
private String relation_customer;
@Excel(name = "行业",width = 35)
private String industry;
public String getContract_note() { public String getContract_note() {
...@@ -465,7 +472,28 @@ public class ExportModel { ...@@ -465,7 +472,28 @@ public class ExportModel {
public void setMainten_pay_date(String mainten_pay_date) { public void setMainten_pay_date(String mainten_pay_date) {
this.mainten_pay_date = mainten_pay_date; this.mainten_pay_date = mainten_pay_date;
} }
public String getFinal_user() {
return final_user;
}
public void setFinal_user(String final_user) {
this.final_user = final_user;
}
public String getRelation_customer() {
return relation_customer;
}
public void setRelation_customer(String relation_customer) {
this.relation_customer = relation_customer;
}
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
} }
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -95,6 +95,15 @@ ...@@ -95,6 +95,15 @@
<if test="county_name !=null and county_name !=''"> <if test="county_name !=null and county_name !=''">
,county_name ,county_name
</if> </if>
<if test="final_user != null and final_user != ''">
,final_user
</if>
<if test="relation_customer != null and relation_customer != ''">
,relation_customer
</if>
<if test="industry != null and industry != ''">
,industry
</if>
) VALUES( ) VALUES(
#{contract_unid} #{contract_unid}
<if test="salesperson_unid != null and salesperson_unid != ''"> <if test="salesperson_unid != null and salesperson_unid != ''">
...@@ -188,6 +197,15 @@ ...@@ -188,6 +197,15 @@
<if test="county_name !=null and county_name !=''"> <if test="county_name !=null and county_name !=''">
,#{county_name} ,#{county_name}
</if> </if>
<if test="final_user != null and final_user != ''">
,#{final_user}
</if>
<if test="relation_customer != null and relation_customer != ''">
,#{relation_customer}
</if>
<if test="industry != null and industry != ''">
,#{industry}
</if>
) )
</insert> </insert>
...@@ -199,7 +217,7 @@ ...@@ -199,7 +217,7 @@
cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note, cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, cast(confirm_income_amount as decimal(18,2)), is_archive, cast(bad_amount as decimal(18,2)), bad_amount_note, cast(confirm_income_amount as decimal(18,2)),
amount_state_unid, start_guarantee_date, end_guarantee_date, amount_state_unid, start_guarantee_date, end_guarantee_date,
mainten_start_point, contract_note, is_delete, project_unid, mainten_start_point, contract_note, is_delete, project_unid, final_user,relation_customer,industry,
customer_unid, customer_unid,
(cast(contract_amount as decimal(18,2))-(select cast(case when total_reback_view.sum is null then 0 else total_reback_view.sum end as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(CASE WHEN deduct_amount IS NULL THEN 0 ELSE deduct_amount end as decimal(18,2))-cast(CASE WHEN stop_amount IS NULL THEN 0 ELSE stop_amount END as decimal(18,2)) (cast(contract_amount as decimal(18,2))-(select cast(case when total_reback_view.sum is null then 0 else total_reback_view.sum end as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid)-cast(CASE WHEN deduct_amount IS NULL THEN 0 ELSE deduct_amount end as decimal(18,2))-cast(CASE WHEN stop_amount IS NULL THEN 0 ELSE stop_amount END as decimal(18,2))
-cast(CASE WHEN exemptions_amount IS NULL THEN 0 ELSE exemptions_amount END as decimal(18,2))-cast(CASE WHEN bad_amount IS NULL THEN 0 ELSE bad_amount END as decimal(18,2))) as contract_remain, -cast(CASE WHEN exemptions_amount IS NULL THEN 0 ELSE exemptions_amount END as decimal(18,2))-cast(CASE WHEN bad_amount IS NULL THEN 0 ELSE bad_amount END as decimal(18,2))) as contract_remain,
...@@ -308,7 +326,16 @@ ...@@ -308,7 +326,16 @@
project_unid=#{project_unid}, project_unid=#{project_unid},
</if> </if>
<if test="customer_unid != null and customer_unid != ''"> <if test="customer_unid != null and customer_unid != ''">
customer_unid=#{customer_unid} customer_unid=#{customer_unid},
</if>
<if test="final_user != null and final_user !=''">
final_user=#{final_user},
</if>
<if test="relation_customer != null and relation_customer !=''">
relation_customer=#{relation_customer},
</if>
<if test="industry != null and industry !=''">
industry=#{industry}
</if> </if>
</set> </set>
where contract_unid=#{contract_unid} where contract_unid=#{contract_unid}
...@@ -398,6 +425,18 @@ ...@@ -398,6 +425,18 @@
and and
contract_type=#{contract_type} contract_type=#{contract_type}
</if> </if>
<if test="final_user !=null and final_user !=''">
and
final_user=#{final_user}
</if>
<if test="relation_customer !=null and relation_customer !=''">
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
and
industry=#{industry}
</if>
<if test="is_archive !=null"> <if test="is_archive !=null">
and and
is_archive=#{is_archive} is_archive=#{is_archive}
...@@ -557,6 +596,18 @@ ...@@ -557,6 +596,18 @@
and and
contract_type=#{contract_type} contract_type=#{contract_type}
</if> </if>
<if test="final_user !=null and final_user !=''">
and
final_user=#{final_user}
</if>
<if test="relation_customer !=null and relation_customer !=''">
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
and
industry=#{industry}
</if>
<if test="is_archive !=null"> <if test="is_archive !=null">
and and
is_archive=#{is_archive} is_archive=#{is_archive}
...@@ -628,7 +679,7 @@ ...@@ -628,7 +679,7 @@
</foreach> </foreach>
</if> </if>
from (select from (select
contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name, contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,final_user,relation_customer,industry,
guarantee_period,to_char(sign_date, 'yyyy-MM-dd') as sign_date, product_line_type, contract_state, guarantee_period,to_char(sign_date, 'yyyy-MM-dd') as sign_date, product_line_type, contract_state,
contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note, contract_type, cast(contract_amount as decimal(18,2)), cast(deduct_amount as decimal(18,2)), contract_amount_note,
cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note, cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
...@@ -748,6 +799,18 @@ ...@@ -748,6 +799,18 @@
and and
contract_type=#{contract_type} contract_type=#{contract_type}
</if> </if>
<if test="final_user !=null and final_user !=''">
and
final_user=#{final_user}
</if>
<if test="relation_customer !=null and relation_customer !=''">
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
and
industry=#{industry}
</if>
<if test="is_archive !=null"> <if test="is_archive !=null">
and and
is_archive=#{is_archive} is_archive=#{is_archive}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -119,7 +119,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -119,7 +119,9 @@ public class ContractServiceImpl implements ContractService {
head_title_name.put("arrive_pay_requirement", "到货款条件"); head_title_name.put("arrive_pay_requirement", "到货款条件");
head_title_name.put("acceptanc_pay_requirement", "验收款条件"); head_title_name.put("acceptanc_pay_requirement", "验收款条件");
head_title_name.put("mainten_pay_requirement", "质保款条件"); head_title_name.put("mainten_pay_requirement", "质保款条件");
head_title_name.put("final_user","最终用户");
head_title_name.put("relation_customer","关联客户");
head_title_name.put("industry","行业");
} }
...@@ -173,8 +175,10 @@ public class ContractServiceImpl implements ContractService { ...@@ -173,8 +175,10 @@ public class ContractServiceImpl implements ContractService {
head_title_key.put("arrive_pay_requirement", "arrive_pay_requirement"); head_title_key.put("arrive_pay_requirement", "arrive_pay_requirement");
head_title_key.put("acceptanc_pay_requirement", "acceptanc_pay_requirement"); head_title_key.put("acceptanc_pay_requirement", "acceptanc_pay_requirement");
head_title_key.put("mainten_pay_requirement", "mainten_pay_requirement"); head_title_key.put("mainten_pay_requirement", "mainten_pay_requirement");
head_title_key.put("final_user", "final_user");
head_title_key.put("relation_customer", "relation_customer");
head_title_key.put("industry", "industry");
} }
private static Map<String,String> num_key = new HashMap<String,String>(); private static Map<String,String> num_key = new HashMap<String,String>();
......
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
...@@ -83,6 +83,10 @@ public class ContractVo extends SelectVo{ ...@@ -83,6 +83,10 @@ public class ContractVo extends SelectVo{
private List<PaymentAgree> paymentAgree_list; private List<PaymentAgree> paymentAgree_list;
private List<String> contract_unids; private List<String> contract_unids;
private String final_user; //最终用户
private String relation_customer; //关联大客户
private String industry; //行业
//private List<> payment_data; //private List<> payment_data;
public String getContract_unid() { public String getContract_unid() {
return contract_unid; return contract_unid;
...@@ -483,6 +487,28 @@ public class ContractVo extends SelectVo{ ...@@ -483,6 +487,28 @@ public class ContractVo extends SelectVo{
public void setMainten_pay_date(Date mainten_pay_date) { public void setMainten_pay_date(Date mainten_pay_date) {
this.mainten_pay_date = mainten_pay_date; this.mainten_pay_date = mainten_pay_date;
} }
public String getFinal_user() {
return final_user;
}
public void setFinal_user(String final_user) {
this.final_user = final_user;
}
public String getRelation_customer() {
return relation_customer;
}
public void setRelation_customer(String relation_customer) {
this.relation_customer = relation_customer;
}
public String getIndustry() {
return industry;
}
public void setIndustry(String industry) {
this.industry = industry;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!