Skip to content

platform / finance_serv

Go to a project
Commit 35ee1332 by 谢明辉
Options

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

2 parents 53150f62 988debf1
Inline Side-by-side
Showing 5 changed files with 68 additions and 50 deletions
code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java
...@@ -39,48 +39,48 @@ public class ExportModel { ...@@ -39,48 +39,48 @@ public class ExportModel {
private String customer_name="-"; //顾客名称 private String customer_name="-"; //顾客名称
@Excel(name="项目名称",width=20) @Excel(name="项目名称",width=20)
private String project_name="-"; //项目名称 private String project_name="-"; //项目名称
@Excel(name="合同金额",width=15,type=1,numFormat="###,###.00") @Excel(name="合同金额",type=1,width=15,numFormat="###############.00")
private Double contract_amount; //合同金额 private Double contract_amount=0D; //合同金额
@Excel(name="暂停金额",width=15,type=1,numFormat="###,###.00") @Excel(name="暂停金额",width=15,type=1,numFormat="###############.00")
private Double stop_amount; //暂停金额 private Double stop_amount=0D; //暂停金额
@Excel(name="坏账金额",width=15,type=1,numFormat="###,###.00") @Excel(name="坏账金额",width=15,type=1,numFormat="###############.00")
private Double bad_amount; //坏账金额 private Double bad_amount=0D; //坏账金额
@Excel(name="豁免金额",width=15,type=1,numFormat="###,###.00") @Excel(name="豁免金额",width=15,type=1,numFormat="###############.00")
private Double exemptions_amount; //豁免金额 private Double exemptions_amount=0D; //豁免金额
@Excel(name="折扣金额",width=15,type=1,numFormat="###,###.00") @Excel(name="折扣金额",width=15,type=1,numFormat="###############.00")
private Double deduct_amount; //折扣金额 private Double deduct_amount=0D; //折扣金额
@Excel(name="累计已收款",width=15,type=1,numFormat="###,###.00") @Excel(name="累计已收款",width=15,type=1,numFormat="###############.00")
private Double total_reback_amount; //累计已收款 private Double total_reback_amount=0D; //累计已收款
@Excel(name="合同余额",width=15,type=1,numFormat="###,###.00") @Excel(name="合同余额",width=15,type=1,numFormat="###############.00")
private Double contract_remain; //合同余额 private Double contract_remain=0D; //合同余额
@Excel(name="账款状态",width=15) @Excel(name="账款状态",width=15)
private String amount_state_unid_name="-"; //账款 状态 private String amount_state_unid_name="-"; //账款 状态
@ExcelIgnore() @ExcelIgnore()
private String amount_state_unid; private String amount_state_unid;
@Excel(name="累计应收款",width=15,type=1,numFormat="###,###.00") @Excel(name="累计应收款",width=15,type=1,numFormat="###############.00")
private Double total_receive_amount; //累计应收款 private Double total_receive_amount=0D; //累计应收款
@Excel(name="应收账款余额",width=15,type=1,numFormat="###,###.00") @Excel(name="应收账款余额",width=15,type=1,numFormat="###############.00")
private Double total_amount_remain; //应收账款余额 private Double total_amount_remain=0D; //应收账款余额
@Excel(name="逾期天数") @Excel(name="逾期天数")
private Integer over_days; //逾期天数 private Integer over_days; //逾期天数
@Excel(name="预付款金额",width=15,type=1,numFormat="###,###.00") @Excel(name="预付款金额",width=15,type=1,numFormat="###############.00")
private Double advance_pay; //预付款金额 private Double advance_pay=0D; //预付款金额
@Excel(name="预付款到期日",width=15) @Excel(name="预付款到期日",width=15)
private String advance_pay_date="-"; //预付款到期日 private String advance_pay_date="-"; //预付款到期日
@Excel(name="到货款金额",width=15,type=1,numFormat="###,###.00") @Excel(name="到货款金额",width=15,type=1,numFormat="###############.00")
private Double arrive_pay; //到货款金额 private Double arrive_pay=0D; //到货款金额
@Excel(name="发货日期",width=15) @Excel(name="发货日期",width=15)
private String deliver_date="-"; //发货日期 private String deliver_date="-"; //发货日期
@Excel(name="到货款到期日",width=15) @Excel(name="到货款到期日",width=15)
private String arrive_pay_date="-"; //到货款到期日 private String arrive_pay_date="-"; //到货款到期日
@Excel(name="验收款金额",width=15,type=1,numFormat="###,###.00") @Excel(name="验收款金额",width=15,type=1,numFormat="###############.00")
private Double acceptanc_pay; //验收款金额 private Double acceptanc_pay=0D; //验收款金额
@Excel(name="验收日期",width=15) @Excel(name="验收日期",width=15)
private String acceptanc_date="-"; //验收日期 private String acceptanc_date="-"; //验收日期
@Excel(name="验收款到期日",width=15) @Excel(name="验收款到期日",width=15)
private String acceptanc_pay_date="-"; //验货款到期日 private String acceptanc_pay_date="-"; //验货款到期日
@Excel(name="质保金额",width=15,type=1,numFormat="###,###.00") @Excel(name="质保金额",width=15,type=1,numFormat="###############.00")
private Double mainten_pay; //质保金额 private Double mainten_pay=0D; //质保金额
@Excel(name="质保款到期日",width=15) @Excel(name="质保款到期日",width=15)
private String mainten_pay_date="-"; //质保款到期日 private String mainten_pay_date="-"; //质保款到期日
......
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
...@@ -324,8 +324,8 @@ ...@@ -324,8 +324,8 @@
<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
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
...@@ -458,18 +458,18 @@ ...@@ -458,18 +458,18 @@
and and
contract_unid=#{contract_unid} contract_unid=#{contract_unid}
</if> </if>
<if test="salesperson_unids !=null and salesperson_unids.length > 0"> <if test="salesperson_unids !=null">
and and
salesperson_unid in salesperson_unid in
<foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=","> <foreach collection="salesperson_unids" index="index" item="salesperson_unid" open="(" close=")" separator=",">
#{salesperson_unid} #{salesperson_unid}
</foreach> </foreach>
</if> </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
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -508,7 +508,7 @@ ...@@ -508,7 +508,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
...@@ -532,12 +532,9 @@ ...@@ -532,12 +532,9 @@
and and
amount_state_unid=#{amount_state_unid} amount_state_unid=#{amount_state_unid}
</if> </if>
<if test="start_date != null "> <if test="start_date != null and end_date !=null">
and and
#{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date #{start_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler} <![CDATA[<=]]> sign_date and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
</if>
<if test="end_date !=null">
and sign_date <![CDATA[<=]]> #{end_date,typeHandler=com.vion.financial.handler.MilliDateTypeHandler}
</if> </if>
<if test="amount_start_point !=null "> <if test="amount_start_point !=null ">
and and
...@@ -566,13 +563,9 @@ ...@@ -566,13 +563,9 @@
and and
contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point}) contract_unid in (select receive_amount_view.contract_unid from receive_amount_view where receive_amount_view.leave_amount_point <![CDATA[<=]]> #{leave_amount_end_point})
</if> </if>
<if test="salesperson_unid !=null and salesperson_unid !=''">
and
salesperson_unid = #{salesperson_unid}
</if>
and is_delete=false and is_delete=false
and project_unid is not null and project_unid is not null
and customer_unid is not null and customer_unid is not null
<if test="limit !=null "> <if test="limit !=null ">
limit #{limit} limit #{limit}
</if> </if>
...@@ -639,8 +632,8 @@ ...@@ -639,8 +632,8 @@
<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
<foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=","> <foreach collection="contract_states" index="index" item="item" open="(" close=")" separator=",">
#{contract_state} #{item}
</foreach> </foreach>
</if> </if>
<if test="project_name__like !=null and project_name__like !=''"> <if test="project_name__like !=null and project_name__like !=''">
...@@ -679,7 +672,7 @@ ...@@ -679,7 +672,7 @@
and and
product_line_type=#{product_line_type} product_line_type=#{product_line_type}
</if> </if>
<if test="contract_state !=null and contract_state!=''"> <if test="contract_state !=null and contract_state !=''">
and and
contract_state=#{contract_state} contract_state=#{contract_state}
</if> </if>
...@@ -748,6 +741,7 @@ ...@@ -748,6 +741,7 @@
and project_unid is not null and project_unid is not null
and customer_unid is not null and customer_unid is not null
) contract ) contract
order by (contract_unid,amount_state_unid) desc
</select> </select>
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
...@@ -139,6 +139,24 @@ public class ContractServiceImpl implements ContractService { ...@@ -139,6 +139,24 @@ public class ContractServiceImpl implements ContractService {
head_title_key.put("mainten_pay_date","mainten_pay_date"); head_title_key.put("mainten_pay_date","mainten_pay_date");
head_title_key.put("goods_acceptanc_date", "goods_acceptanc_date"); head_title_key.put("goods_acceptanc_date", "goods_acceptanc_date");
} }
private static Map<String,String> num_key = new HashMap<String,String>();
{
num_key.put("contract_amount","###############.00");
num_key.put("stop_amount","###############.00");
num_key.put("bad_amount","###############.00");
num_key.put("exemptions_amount","###############.00");
num_key.put("deduct_amount","###############.00");
num_key.put("total_reback_amount","###############.00");
num_key.put("contract_remain","###############.00");
num_key.put("total_receive_amount","###############.00");
num_key.put("total_amount_remain","###############.00");
num_key.put("advance_pay","###############.00");
num_key.put("arrive_pay","###############.00");
num_key.put("acceptanc_pay","###############.00");
num_key.put("mainten_pay","###############.00");
}
@Autowired @Autowired
ContractMapper contractMapper; ContractMapper contractMapper;
@Autowired @Autowired
...@@ -897,11 +915,17 @@ public class ContractServiceImpl implements ContractService { ...@@ -897,11 +915,17 @@ public class ContractServiceImpl implements ContractService {
colList.add(excelExportEntity); colList.add(excelExportEntity);
Object title_name = null; Object title_name = null;
Object title_key = null; Object title_key = null;
String numkey = null;
for(String clo : cloumns) { for(String clo : cloumns) {
title_name = head_title_name.get(clo); title_name = head_title_name.get(clo);
title_key = head_title_key.get(clo); title_key = head_title_key.get(clo);
numkey = num_key.get(clo);
if(title_name != null) { if(title_name != null) {
excelExportEntity = new ExcelExportEntity(head_title_name.get(clo), head_title_key.get(clo)); excelExportEntity = new ExcelExportEntity(head_title_name.get(clo), head_title_key.get(clo));
if(StringUtils.isNotBlank(numkey)) {
excelExportEntity.setNumFormat(numkey);
excelExportEntity.setType(10);
}
colList.add(excelExportEntity); colList.add(excelExportEntity);
} }
} }
......
deploy/application.yml.in
...@@ -39,7 +39,7 @@ logging: ...@@ -39,7 +39,7 @@ logging:
pattern: pattern:
level: INFO level: INFO
console: "[financial_serv]-[%d{yyyy-MM-dd HH:mm:ss.SSS}]-%m%n" console: "[financial_serv]-[%d{yyyy-MM-dd HH:mm:ss.SSS}]-%m%n"
path: F:\LOG\ path: /usr/local/tomcat/logs/
finance: finance:
authurl: http://PH_AUTH_SERV_IP:20080/api/v1/auth/users authurl: http://PH_AUTH_SERV_IP:20080/api/v1/auth/users
......
deploy/deploy.sh
...@@ -5,7 +5,7 @@ cont_name="finance_serv" ...@@ -5,7 +5,7 @@ cont_name="finance_serv"
prj_name="finance_serv" prj_name="finance_serv"
serv_port=19111 serv_port=19111
host_log_dir=/data/vion-data/$cont_name/logs host_log_dir=/data/vion-data/$cont_name/logs
cont_log_dir=/data/vion-data/$cont_name/logs cont_log_dir=/usr/local/tomcat/logs
host_appendix_path=/data/face-web/www/static/pics/cache/finance/ host_appendix_path=/data/face-web/www/static/pics/cache/finance/
cont_appendix_path=/data/finance/ cont_appendix_path=/data/finance/
#cont_log_dir=/usr/local/tomcat/logs #cont_log_dir=/usr/local/tomcat/logs
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!