Skip to content

platform / finance_serv

Go to a project
Commit 6ddd5271 by 谢明辉
Options

Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

2 parents 666e1ba2 8983ef51
Inline Side-by-side
Showing 5 changed files with 246 additions and 10 deletions
code/finance_serv/src/main/java/com/vion/financial/constant/ColumnExample.java
...@@ -6,12 +6,12 @@ public class ColumnExample { ...@@ -6,12 +6,12 @@ public class ColumnExample {
*/ */
public static String[] rank1= {"合同编号","签订日期","产品线类型","销售员","省","市","县","客户名称","项目名称" public static String[] rank1= {"合同编号","签订日期","产品线类型","销售员","省","市","县","客户名称","项目名称"
,"合同金额","质保周期","合同性质","维保服务期开始节点","维保服务期结束节点","预付款天数","预付款比例","预付款条件","到货款天数","到货款比例","到货款付款条件" ,"合同金额","质保周期","合同性质","维保服务期开始节点","维保服务期结束节点","预付款天数","预付款比例","预付款条件","到货款天数","到货款比例","到货款付款条件"
,"验收款天数","验收款比例","验收款付款条件","质保款天数","质保款比例","质保款付款条件","质保款类型"}; ,"验收款天数","验收款比例","验收款付款条件","质保款天数","质保款比例","质保款付款条件","质保款类型","账款状态"};
/** /**
* 财务部 * 财务部
*/ */
public static String[] rank2= {"合同编号","暂停金额","坏账金额","豁免金额","折扣金额","合同状态","回款金额","回款日期","回款备注" public static String[] rank2= {"合同编号","暂停金额","坏账金额","豁免金额","折扣金额","合同状态","回款金额","回款日期","回款备注"
,"开票金额","开票OA流水号","开票备注","是否归档","确认收入金额","账款状态","折扣金额备注","暂停金额备注" ,"开票金额","开票OA流水号","开票备注","是否归档","确认收入金额","折扣金额备注","暂停金额备注"
,"豁免金额备注","坏账金额备注","合同备注"}; ,"豁免金额备注","坏账金额备注","合同备注"};
/** /**
* 生产部 * 生产部
......
code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java
...@@ -95,8 +95,126 @@ public class ExportModel { ...@@ -95,8 +95,126 @@ public class ExportModel {
@Excel(name="累计开票金额",width=15,type=1,numFormat="###############.00") @Excel(name="累计开票金额",width=15,type=1,numFormat="###############.00")
private Double total_receipt_amount; private Double total_receipt_amount;
@Excel(name="合同备注",width=35)
private String contract_note;
@Excel(name="坏账金额备注",width=35)
private String bad_amount_note;
@Excel(name="暂停金额备注",width=35)
private String reback_note;
@Excel(name="豁免金额备注",width=35)
private String contract_remain_note;
@Excel(name="抵扣金额备注",width=35)
private String contract_amount_note;
@Excel(name="预付款比例")
private Double advance_pay_proporition;
@Excel(name="到货款比例")
private Double arrive_pay_proportion;
@Excel(name="验收款比例")
private Double acceptanc_pay_proportion;
@Excel(name="质保款比例")
private Double mainten_pay_proportition;
@Excel(name="预付款条件",width=35)
private String advance_pay_requirement;
@Excel(name="到货款条件",width=35)
private String arrive_pay_requirement;
@Excel(name="验收款条件",width=35)
private String acceptanc_pay_requirement;
@Excel(name="质保款条件",width=35)
private String mainten_pay_requirement;
public String getContract_note() {
return contract_note;
}
public void setContract_note(String contract_note) {
this.contract_note = contract_note;
}
public String getBad_amount_note() {
return bad_amount_note;
}
public void setBad_amount_note(String bad_amount_note) {
this.bad_amount_note = bad_amount_note;
}
public String getReback_note() {
return reback_note;
}
public void setReback_note(String reback_note) {
this.reback_note = reback_note;
}
public String getContract_remain_note() {
return contract_remain_note;
}
public void setContract_remain_note(String contract_remain_note) {
this.contract_remain_note = contract_remain_note;
}
public String getContract_amount_note() {
return contract_amount_note;
}
public void setContract_amount_note(String contract_amount_note) {
this.contract_amount_note = contract_amount_note;
}
public Double getAdvance_pay_proporition() {
return advance_pay_proporition;
}
public void setAdvance_pay_proporition(Double advance_pay_proporition) {
this.advance_pay_proporition = advance_pay_proporition;
}
public Double getArrive_pay_proportion() {
return arrive_pay_proportion;
}
public void setArrive_pay_proportion(Double arrive_pay_proportion) {
this.arrive_pay_proportion = arrive_pay_proportion;
}
public Double getAcceptanc_pay_proportion() {
return acceptanc_pay_proportion;
}
public void setAcceptanc_pay_proportion(Double acceptanc_pay_proportion) {
this.acceptanc_pay_proportion = acceptanc_pay_proportion;
}
public Double getMainten_pay_proportition() {
return mainten_pay_proportition;
}
public void setMainten_pay_proportition(Double mainten_pay_proportition) {
this.mainten_pay_proportition = mainten_pay_proportition;
}
public String getAdvance_pay_requirement() {
return advance_pay_requirement;
}
public void setAdvance_pay_requirement(String advance_pay_requirement) {
this.advance_pay_requirement = advance_pay_requirement;
}
public String getArrive_pay_requirement() {
return arrive_pay_requirement;
}
public void setArrive_pay_requirement(String arrive_pay_requirement) {
this.arrive_pay_requirement = arrive_pay_requirement;
}
public String getAcceptanc_pay_requirement() {
return acceptanc_pay_requirement;
}
public void setAcceptanc_pay_requirement(String acceptanc_pay_requirement) {
this.acceptanc_pay_requirement = acceptanc_pay_requirement;
}
public String getMainten_pay_requirement() {
return mainten_pay_requirement;
}
public void setMainten_pay_requirement(String mainten_pay_requirement) {
this.mainten_pay_requirement = mainten_pay_requirement;
}
public Double getConfirm_income_amount() { public Double getConfirm_income_amount() {
return confirm_income_amount; return confirm_income_amount;
} }
......
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
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,
customer_unid, customer_unid,
(cast(contract_amount as decimal(18,2))-(select cast(total_reback_view."sum" 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,
(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount, (select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
(select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount , (select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount ,
...@@ -331,6 +331,13 @@ ...@@ -331,6 +331,13 @@
#{salesperson_unid} #{salesperson_unid}
</foreach> </foreach>
</if> </if>
<if test="amount_state_unids !=null and amount_state_unids.length > 0">
and
amount_state_unid in
<foreach collection="amount_state_unids" index="index" item="amount_state_unid_item" open="(" close=")" separator=",">
#{amount_state_unid_item}
</foreach>
</if>
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
...@@ -338,6 +345,15 @@ ...@@ -338,6 +345,15 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="salesperson_unid_columns !=null and salesperson_unid_columns.length > 0">
and
salesperson_unid in
<foreach collection="salesperson_unid_columns" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
and and
tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%') tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%')
...@@ -444,7 +460,7 @@ ...@@ -444,7 +460,7 @@
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,
customer_unid, customer_unid,
(cast(contract_amount as decimal(18,2))-(select cast(total_reback_view."sum" 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 contract_amount IS NULL THEN 0 ELSE contract_amount END 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,
(select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount, (select cast(total_reback_view.sum as decimal(18,2)) from total_reback_view where total_reback_view.contract_unid=tb_contract.contract_unid) as total_reback_amount,
(select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount , (select cast(total_recv_amount_view.total_recv_amount as decimal(18,2)) from total_recv_amount_view where tb_contract.contract_unid=total_recv_amount_view.contract_unid) as total_receive_amount ,
...@@ -475,6 +491,13 @@ ...@@ -475,6 +491,13 @@
#{salesperson_unid} #{salesperson_unid}
</foreach> </foreach>
</if> </if>
<if test="amount_state_unids !=null and amount_state_unids.length > 0">
and
amount_state_unid in
<foreach collection="amount_state_unids" index="index" item="amount_state_unid_item" open="(" close=")" separator=",">
#{amount_state_unid_item}
</foreach>
</if>
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
...@@ -482,6 +505,14 @@ ...@@ -482,6 +505,14 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="salesperson_unid_columns !=null and salesperson_unid_columns.length > 0">
and
salesperson_unid in
<foreach collection="salesperson_unid_columns" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
and and
tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%') tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%')
...@@ -606,6 +637,15 @@ ...@@ -606,6 +637,15 @@
mainten_start_point, contract_note, is_delete, project_unid, mainten_start_point, contract_note, is_delete, project_unid,
customer_unid, customer_unid,
<!-- cast(confirm_income_amount as decimal(18,2)) as confirm_income_amount, --> <!-- cast(confirm_income_amount as decimal(18,2)) as confirm_income_amount, -->
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100001') as advance_pay_proporition,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100002') as arrive_pay_proportion,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100003') as acceptanc_pay_proportion,
(SELECT tb_payment_agree.payment_propority FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND (tb_payment_agree.payment_type = '100004' OR tb_payment_agree.payment_type = '100005')) as mainten_pay_proportition,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100001') as advance_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100002') as arrive_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND tb_payment_agree.payment_type = '100003') as acceptanc_pay_requirement,
(SELECT tb_payment_agree.payment_requirement FROM tb_payment_agree WHERE tb_payment_agree.contract_unid = tb_contract.contract_unid AND (tb_payment_agree.payment_type = '100004' OR tb_payment_agree.payment_type = '100005')) as mainten_pay_requirement,
(select cast(sum(receipt_amount) as decimal(18,2)) from tb_receipt where tb_receipt.contract_unid = tb_contract.contract_unid) as total_receipt_amount , (select cast(sum(receipt_amount) as decimal(18,2)) from tb_receipt where tb_receipt.contract_unid = tb_contract.contract_unid) as total_receipt_amount ,
to_char(sign_date,'yyyy') as year, to_char(sign_date,'MM') as month, to_char(sign_date,'yyyy') as year, to_char(sign_date,'MM') as month,
(cast(contract_amount as decimal(18,2))-(select cast(total_reback_view."sum" 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(total_reback_view."sum" 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))
...@@ -641,6 +681,13 @@ ...@@ -641,6 +681,13 @@
#{salesperson_unid} #{salesperson_unid}
</foreach> </foreach>
</if> </if>
<if test="amount_state_unids !=null and amount_state_unids.length > 0">
and
amount_state_unid in
<foreach collection="amount_state_unids" index="index" item="amount_state_unid_item" open="(" close=")" separator=",">
#{amount_state_unid_item}
</foreach>
</if>
<if test="contract_states !=null and contract_states.length > 0"> <if test="contract_states !=null and contract_states.length > 0">
and and
contract_state in contract_state in
...@@ -648,6 +695,15 @@ ...@@ -648,6 +695,15 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="salesperson_unid_columns !=null and salesperson_unid_columns.length > 0">
and
salesperson_unid in
<foreach collection="salesperson_unid_columns" index="index" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
and and
tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%') tb_contract.project_unid in (select tb_project.project_unid from tb_project where project_name like '%'||#{project_name__like}||'%')
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -59,6 +59,7 @@ import com.vion.financial.vo.SuccessCode; ...@@ -59,6 +59,7 @@ import com.vion.financial.vo.SuccessCode;
import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.annotation.Excel;
import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
...@@ -75,9 +76,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -75,9 +76,9 @@ public class ContractServiceImpl implements ContractService {
head_title_name.put("sign_date","签订日期"); head_title_name.put("sign_date","签订日期");
head_title_name.put("month","所属月份"); head_title_name.put("month","所属月份");
head_title_name.put("salesperson_unid","销售员"); head_title_name.put("salesperson_unid","销售员");
head_title_name.put("province","省"); head_title_name.put("province_name","省");
head_title_name.put("city","市"); head_title_name.put("city_name","市");
head_title_name.put("county","县"); head_title_name.put("county_name","县");
head_title_name.put("customer_name","客户名称"); head_title_name.put("customer_name","客户名称");
head_title_name.put("project_name","项目名称"); head_title_name.put("project_name","项目名称");
head_title_name.put("contract_amount","合同金额"); head_title_name.put("contract_amount","合同金额");
...@@ -104,6 +105,22 @@ public class ContractServiceImpl implements ContractService { ...@@ -104,6 +105,22 @@ public class ContractServiceImpl implements ContractService {
head_title_name.put("goods_acceptanc_date", "到货验收日期"); head_title_name.put("goods_acceptanc_date", "到货验收日期");
head_title_name.put("confirm_income_amount", "确认收入金额"); head_title_name.put("confirm_income_amount", "确认收入金额");
head_title_name.put("total_receipt_amount", "累计开票金额"); head_title_name.put("total_receipt_amount", "累计开票金额");
head_title_name.put("contract_note", "合同备注");
head_title_name.put("bad_amount_note", "坏账金额备注");
head_title_name.put("reback_note", "暂停金额备注");
head_title_name.put("contract_remain_note", "豁免金额备注");
head_title_name.put("contract_amount_note", "抵扣金额备注");
head_title_name.put("advance_pay_proporition", "预付款比例");
head_title_name.put("arrive_pay_proportion", "到货款比例");
head_title_name.put("acceptanc_pay_proportion", "验收款比例");
head_title_name.put("mainten_pay_proportition", "质保款比例");
head_title_name.put("advance_pay_requirement", "预付款条件");
head_title_name.put("arrive_pay_requirement", "到货款条件");
head_title_name.put("acceptanc_pay_requirement", "验收款条件");
head_title_name.put("mainten_pay_requirement", "质保款条件");
} }
private static Map<String,String> head_title_key = new HashMap<String,String>(); private static Map<String,String> head_title_key = new HashMap<String,String>();
...@@ -113,9 +130,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -113,9 +130,9 @@ public class ContractServiceImpl implements ContractService {
head_title_key.put("sign_date","sign_date"); head_title_key.put("sign_date","sign_date");
head_title_key.put("month","month"); head_title_key.put("month","month");
head_title_key.put("salesperson_unid","salesperson_name"); head_title_key.put("salesperson_unid","salesperson_name");
head_title_key.put("province","province_name"); head_title_key.put("province_name","province_name");
head_title_key.put("city","city_name"); head_title_key.put("city_name","city_name");
head_title_key.put("county","county_name"); head_title_key.put("county_name","county_name");
head_title_key.put("customer_name","customer_name"); head_title_key.put("customer_name","customer_name");
head_title_key.put("project_name","project_name"); head_title_key.put("project_name","project_name");
head_title_key.put("contract_amount","contract_amount"); head_title_key.put("contract_amount","contract_amount");
...@@ -142,6 +159,22 @@ public class ContractServiceImpl implements ContractService { ...@@ -142,6 +159,22 @@ public class ContractServiceImpl implements ContractService {
head_title_key.put("goods_acceptanc_date", "goods_acceptanc_date"); head_title_key.put("goods_acceptanc_date", "goods_acceptanc_date");
head_title_key.put("confirm_income_amount", "confirm_income_amount"); head_title_key.put("confirm_income_amount", "confirm_income_amount");
head_title_key.put("total_receipt_amount", "total_receipt_amount"); head_title_key.put("total_receipt_amount", "total_receipt_amount");
head_title_key.put("contract_note", "contract_note");
head_title_key.put("bad_amount_note", "bad_amount_note");
head_title_key.put("reback_note", "reback_note");
head_title_key.put("contract_remain_note", "contract_remain_note");
head_title_key.put("contract_amount_note", "contract_amount_note");
head_title_key.put("advance_pay_proporition", "advance_pay_proporition");
head_title_key.put("arrive_pay_proportion", "arrive_pay_proportion");
head_title_key.put("acceptanc_pay_proportion", "acceptanc_pay_proportion");
head_title_key.put("mainten_pay_proportition", "mainten_pay_proportition");
head_title_key.put("advance_pay_requirement", "advance_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("mainten_pay_requirement", "mainten_pay_requirement");
} }
private static Map<String,String> num_key = new HashMap<String,String>(); private static Map<String,String> num_key = new HashMap<String,String>();
...@@ -411,6 +444,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -411,6 +444,9 @@ public class ContractServiceImpl implements ContractService {
case "50012" : case "50012" :
contractVo.setAmount_state_unid_name("逾期维保款"); contractVo.setAmount_state_unid_name("逾期维保款");
break; break;
case "50010" :
contractVo.setAmount_state_unid_name("已完成");
break;
default: default:
break; break;
} }
...@@ -495,6 +531,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -495,6 +531,9 @@ public class ContractServiceImpl implements ContractService {
case "50012" : case "50012" :
exportModel.setAmount_state_unid_name("逾期维保款"); exportModel.setAmount_state_unid_name("逾期维保款");
break; break;
case "50010" :
exportModel.setAmount_state_unid_name("已完成");
break;
default: default:
break; break;
} }
...@@ -608,6 +647,8 @@ public class ContractServiceImpl implements ContractService { ...@@ -608,6 +647,8 @@ public class ContractServiceImpl implements ContractService {
} }
} }
} }
if(contractVo.getSalesperson_unid()==null && StringUtils.isNotBlank(importModel.getSalesperson_name())) { if(contractVo.getSalesperson_unid()==null && StringUtils.isNotBlank(importModel.getSalesperson_name())) {
Map tempMap=new HashMap(); Map tempMap=new HashMap();
tempMap.put("norm_type", "employee"); tempMap.put("norm_type", "employee");
...@@ -724,6 +765,9 @@ public class ContractServiceImpl implements ContractService { ...@@ -724,6 +765,9 @@ public class ContractServiceImpl implements ContractService {
contractVo.setAmount_state_unid("50012"); contractVo.setAmount_state_unid("50012");
break; break;
case "已完成":
contractVo.setAmount_state_unid("50010");
break;
default: default:
break; break;
} }
......
code/finance_serv/src/main/java/com/vion/financial/vo/SelectVo.java
...@@ -45,12 +45,24 @@ public class SelectVo { ...@@ -45,12 +45,24 @@ public class SelectVo {
private String[] columns; private String[] columns;
private String[] contract_states; private String[] contract_states;
private String[] salesperson_unid_columns;
private String[] amount_state_unids;
/* /*
* 查询条件 * 查询条件
*/ */
public String getSalesperson_name__like() { public String getSalesperson_name__like() {
return salesperson_name__like; return salesperson_name__like;
} }
public String[] getSalesperson_unid_columns() {
return salesperson_unid_columns;
}
public void setSalesperson_unid_columns(String[] salesperson_unid_columns) {
this.salesperson_unid_columns = salesperson_unid_columns;
}
public void setSalesperson_name__like(String salesperson_name__like) { public void setSalesperson_name__like(String salesperson_name__like) {
this.salesperson_name__like = salesperson_name__like; this.salesperson_name__like = salesperson_name__like;
} }
...@@ -235,5 +247,11 @@ public class SelectVo { ...@@ -235,5 +247,11 @@ public class SelectVo {
this.contract_states = contract_states; this.contract_states = contract_states;
} }
public String[] getAmount_state_unids() {
return amount_state_unids;
}
public void setAmount_state_unids(String[] amount_state_unids) {
this.amount_state_unids = amount_state_unids;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!