Skip to content

platform / finance_serv

Go to a project
Commit 9285cf88 by 王军业
Options

【提交】

1 parent 1e870473
Inline Side-by-side
Showing 11 changed files with 531 additions and 68 deletions
code/finance_serv/src/main/java/com/vion/financial/controller/FinalUserController.java 0 → 100644
package com.vion.financial.controller;
import com.vion.financial.entity.FinalUser;
import com.vion.financial.entity.Project;
import com.vion.financial.service.FinalUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @Description:
* @Author: WJY
* @Date: 2018-11-29 15:06
*/
@RestController
public class FinalUserController extends BaseController{
@Autowired
FinalUserService finalUserService;
/**
* 增加最终用户名称
* @param
* @return
*/
@PostMapping(value="/finalusers")
@ResponseBody
public Object addFinalUser(@RequestBody FinalUser finalUser) {
return finalUserService.addFinalUser(finalUser);
}
/**
* 查询最终用户列表
* @return
*/
@GetMapping(value="/finalusers")
@ResponseBody
public Object queryFinalUser() {
return finalUserService.queryFinalUser();
}
/**
* 修改最终用户名称
* @param
* @return
*/
@PutMapping(value="/finalusers")
@ResponseBody
public Object updateFinalUser(@RequestBody FinalUser finalUser) {
return finalUserService.updateFinalUser(finalUser);
}
/**
* 删除某一最终用户
* @param
* @return
*/
@DeleteMapping(value="/finalusers")
@ResponseBody
public Object deleteFinalUser(@RequestBody FinalUser finalUser) {
return finalUserService.deleteFinalUser(finalUser);
}
}
code/finance_serv/src/main/java/com/vion/financial/entity/Contract.java
......@@ -35,9 +35,14 @@ public class Contract {
private String mainten_start_point; //质保期开始节点
private String contract_note; //合同备注
private boolean is_delete; //标示合同是否逻辑删除
private String final_user; //最终用户
private int final_user; //最终用户
private String relation_customer; //关联大客户
private String industry; //行业
private String first_industry; //行业
private String final_user_name; //最终用户name
private String relation_customer_name; //关联大客户name
private String first_industry_name; //行业name
private String second_industry;
private String second_industry_name;
public String getContract_unid() {
return contract_unid;
}
......@@ -216,13 +221,6 @@ public class Contract {
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;
......@@ -232,11 +230,63 @@ public class Contract {
this.relation_customer = relation_customer;
}
public String getIndustry() {
return industry;
public String getFinal_user_name() {
return final_user_name;
}
public void setFinal_user_name(String final_user_name) {
this.final_user_name = final_user_name;
}
public String getRelation_customer_name() {
return relation_customer_name;
}
public void setRelation_customer_name(String relation_customer_name) {
this.relation_customer_name = relation_customer_name;
}
public void setFinal_user(int final_user) {
this.final_user = final_user;
}
public String getFirst_industry() {
return first_industry;
}
public void setIndustry(String industry) {
this.industry = industry;
public void setFirst_industry(String first_industry) {
this.first_industry = first_industry;
}
public String getFirst_industry_name() {
return first_industry_name;
}
public void setFirst_industry_name(String first_industry_name) {
this.first_industry_name = first_industry_name;
}
public String getSecond_industry() {
return second_industry;
}
public void setSecond_industry(String second_industry) {
this.second_industry = second_industry;
}
public String getSecond_industry_name() {
return second_industry_name;
}
public void setSecond_industry_name(String second_industry_name) {
this.second_industry_name = second_industry_name;
}
public int getFinal_user() {
return final_user;
}
}
code/finance_serv/src/main/java/com/vion/financial/entity/FinalUser.java 0 → 100644
package com.vion.financial.entity;
/**
* @Description:
* @Author: WJY
* @Date: 2018-11-29 14:25
*/
public class FinalUser {
private int final_user;
private String final_user_name;
public int getFinal_user() {
return final_user;
}
public void setFinal_user(int final_user) {
this.final_user = final_user;
}
public String getFinal_user_name() {
return final_user_name;
}
public void setFinal_user_name(String final_user_name) {
this.final_user_name = final_user_name;
}
}
code/finance_serv/src/main/java/com/vion/financial/excel/ExportModel.java
......@@ -135,13 +135,16 @@ public class ExportModel {
private String mainten_pay_requirement;
@Excel(name ="最终用户",width=35)
private String final_user;
private String final_user_name;
@Excel(name = "关联客户",width = 35)
private String relation_customer;
private String relation_customer_name;
@Excel(name = "行业",width = 35)
private String industry;
@Excel(name = "一级行业",width = 35)
private String first_industry_namefirst_industry_name;
@Excel(name = "二级行业",width = 35)
private String second_industry_name;
public String getContract_note() {
......@@ -473,27 +476,35 @@ public class ExportModel {
this.mainten_pay_date = mainten_pay_date;
}
public String getFinal_user() {
return final_user;
public String getFinal_user_name() {
return final_user_name;
}
public void setFinal_user_name(String final_user_name) {
this.final_user_name = final_user_name;
}
public String getRelation_customer_name() {
return relation_customer_name;
}
public void setFinal_user(String final_user) {
this.final_user = final_user;
public void setRelation_customer_name(String relation_customer_name) {
this.relation_customer_name = relation_customer_name;
}
public String getRelation_customer() {
return relation_customer;
public String getFirst_industry_namefirst_industry_name() {
return first_industry_namefirst_industry_name;
}
public void setRelation_customer(String relation_customer) {
this.relation_customer = relation_customer;
public void setFirst_industry_namefirst_industry_name(String first_industry_namefirst_industry_name) {
this.first_industry_namefirst_industry_name = first_industry_namefirst_industry_name;
}
public String getIndustry() {
return industry;
public String getSecond_industry_name() {
return second_industry_name;
}
public void setIndustry(String industry) {
this.industry = industry;
public void setSecond_industry_name(String second_industry_name) {
this.second_industry_name = second_industry_name;
}
}
code/finance_serv/src/main/java/com/vion/financial/mapper/FinalUserMapper.java 0 → 100644
package com.vion.financial.mapper;
import com.vion.financial.entity.FinalUser;
import com.vion.financial.entity.Project;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* @Description:
* @Author: WJY
* @Date: 2018-11-29 14:27
*/
public interface FinalUserMapper {
@Transactional
void addFinalUser(FinalUser finalUser);
List<FinalUser> queryFinalUser();
@Transactional
void updateFinalUser(FinalUser finalUser);
@Transactional
void deleteFinalUser(int n);
FinalUser selectByName(String name);
}
code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml
......@@ -95,14 +95,29 @@
<if test="county_name !=null and county_name !=''">
,county_name
</if>
<if test="final_user != null and final_user != ''">
<if test="final_user != null ">
,final_user
</if>
<if test="relation_customer != null and relation_customer != ''">
,relation_customer
</if>
<if test="industry != null and industry != ''">
,industry
<if test="first_industry != null and first_industry != ''">
,first_industry
</if>
<if test="final_user != null and final_user != ''">
,final_user_name
</if>
<if test="relation_customer != null and relation_customer != ''">
,relation_customer_name
</if>
<if test="first_industry_name != null and first_industry_name != ''">
,first_industry_name
</if>
<if test="second_industry != null and second_industry != ''">
,second_industry
</if>
<if test="second_industry_name != null and second_industry_name != ''">
,second_industry_name
</if>
) VALUES(
#{contract_unid}
......@@ -197,14 +212,29 @@
<if test="county_name !=null and county_name !=''">
,#{county_name}
</if>
<if test="final_user != null and final_user != ''">
<if test="final_user != null ">
,#{final_user}
</if>
<if test="relation_customer != null and relation_customer != ''">
,#{relation_customer}
</if>
<if test="industry != null and industry != ''">
,#{industry}
<if test="first_industry != null and first_industry != ''">
,#{first_industry}
</if>
<if test="final_user != null and final_user != ''">
,#{final_user_name}
</if>
<if test="relation_customer != null and relation_customer != ''">
,#{relation_customer_name}
</if>
<if test="first_industry_name != null and first_industry_name != ''">
,#{first_industry_name}
</if>
<if test="second_industry != null and second_industry != ''">
,#{second_industry}
</if>
<if test="second_industry_name != null and second_industry_name != ''">
,#{second_industry_name}
</if>
)
......@@ -217,7 +247,7 @@
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)),
amount_state_unid, start_guarantee_date, end_guarantee_date,
mainten_start_point, contract_note, is_delete, project_unid, final_user,relation_customer,industry,
mainten_start_point, contract_note, is_delete, project_unid, final_user,relation_customer,first_industry, final_user_name,relation_customer_name,first_industry_name,second_industry,second_industry_name,
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(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,
......@@ -328,14 +358,29 @@
<if test="customer_unid != null and customer_unid != ''">
customer_unid=#{customer_unid},
</if>
<if test="final_user != null and final_user !=''">
<if test="final_user != null ">
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 test="first_industry != null and first_industry !=''">
first_industry=#{first_industry},
</if>
<if test="second_industry != null and second_industry !=''">
second_industry=#{second_industry},
</if>
<if test="final_user_name != null and final_user_name !=''">
final_user_name=#{final_user_name},
</if>
<if test="relation_customer_name != null and relation_customer_name !=''">
relation_customer_name=#{relation_customer_name},
</if>
<if test="first_industry_name != null and first_industry_name !=''">
first_industry_name=#{first_industry_name},
</if>
<if test="second_industry_name != null and second_industry_name !=''">
second_industry_name=#{second_industry_name}
</if>
</set>
where contract_unid=#{contract_unid}
......@@ -425,7 +470,7 @@
and
contract_type=#{contract_type}
</if>
<if test="final_user !=null and final_user !=''">
<if test="final_user !=null ">
and
final_user=#{final_user}
</if>
......@@ -433,9 +478,29 @@
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
<if test="first_industry !=null and first_industry !=''">
and
first_industry=#{first_industry}
</if>
<if test="second_industry !=null and second_industry !=''">
and
industry=#{industry}
second_industry=#{second_industry}
</if>
<if test="final_user_name !=null and final_user_name !=''">
and
final_user_name=#{final_user_name}
</if>
<if test="relation_customer_name !=null and relation_customer_name !=''">
and
relation_customer_name=#{relation_customer_name}
</if>
<if test="first_industry_name !=null and first_industry_name !=''">
and
first_industry_name=#{first_industry_name}
</if>
<if test="second_industry_name !=null and second_industry_name !=''">
and
second_industry_name=#{second_industry_name}
</if>
<if test="is_archive !=null">
and
......@@ -596,7 +661,7 @@
and
contract_type=#{contract_type}
</if>
<if test="final_user !=null and final_user !=''">
<if test="final_user !=null ">
and
final_user=#{final_user}
</if>
......@@ -604,9 +669,29 @@
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
<if test="first_industry !=null and first_industry !=''">
and
first_industry=#{first_industry}
</if>
<if test="second_industry !=null and second_industry !=''">
and
second_industry=#{second_industry}
</if>
<if test="final_user_name !=null and final_user_name !=''">
and
final_user_name=#{final_user_name}
</if>
<if test="relation_customer_name !=null and relation_customer_name !=''">
and
relation_customer_name=#{relation_customer_name}
</if>
<if test="first_industry_name !=null and first_industry_name !=''">
and
industry=#{industry}
first_industry_name=#{first_industry_name}
</if>
<if test="second_industry_name !=null and second_industry_name !=''">
and
second_industry_name=#{second_industry_name}
</if>
<if test="is_archive !=null">
and
......@@ -679,7 +764,7 @@
</foreach>
</if>
from (select
contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,final_user,relation_customer,industry,
contract_unid, salesperson_unid, province, city, county, province_name,city_name,county_name,final_user_name,relation_customer_name,first_industry_name,second_industry_name,
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,
cast(stop_amount as decimal(18,2)), reback_note, cast(exemptions_amount as decimal(18,2)), contract_remain_note,
......@@ -799,7 +884,7 @@
and
contract_type=#{contract_type}
</if>
<if test="final_user !=null and final_user !=''">
<if test="final_user !=null ">
and
final_user=#{final_user}
</if>
......@@ -807,9 +892,29 @@
and
relation_customer=#{relation_customer}
</if>
<if test="industry !=null and industry !=''">
<if test="first_industry !=null and first_industry !=''">
and
first_industry=#{first_industry}
</if>
<if test="second_industry !=null and second_industry !=''">
and
second_industry=#{second_industry}
</if>
<if test="final_user_name !=null and final_user_name !=''">
and
final_user_name=#{final_user_name}
</if>
<if test="relation_customer_name !=null and relation_customer_name !=''">
and
relation_customer_name=#{relation_customer_name}
</if>
<if test="first_industry_name !=null and first_industry_name !=''">
and
first_industry_name=#{first_industry_name}
</if>
<if test="second_industry_name !=null and second_industry_name !=''">
and
industry=#{industry}
second_industry_name=#{second_industry_name}
</if>
<if test="is_archive !=null">
and
......
code/finance_serv/src/main/java/com/vion/financial/mapping/FinalUserMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vion.financial.mapper.FinalUserMapper">
<insert id="addFinalUser" parameterType="com.vion.financial.entity.FinalUser">
insert into tb_finaluser (final_user_name) values (#{final_user_name})
</insert>
<update id="updateFinalUser" parameterType="com.vion.financial.entity.FinalUser">
update tb_finaluser set final_user_name = #{final_user_name}
where final_user = #{final_user}
</update>
<select id="queryFinalUser" resultType="com.vion.financial.entity.FinalUser">
select * from tb_finaluser
</select>
<delete id="deleteFinalUser" parameterType="int">
delete from tb_finaluser where final_user = #{final_user}
</delete>
<select id="selectByName" parameterType="String" resultType="com.vion.financial.entity.FinalUser">
select * from tb_finaluser where final_user_name=#{final_user_name}
</select>
</mapper>
\ No newline at end of file
code/finance_serv/src/main/java/com/vion/financial/service/FinalUserService.java 0 → 100644
package com.vion.financial.service;
import com.vion.financial.entity.FinalUser;
import com.vion.financial.entity.Project;
/**
* @Description:
* @Author: WJY
* @Date: 2018-11-29 14:46
*/
public interface FinalUserService {
Object addFinalUser(FinalUser finalUser);
Object queryFinalUser();
Object updateFinalUser(FinalUser finalUser);
Object deleteFinalUser(FinalUser finalUser);
}
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
......@@ -119,9 +119,10 @@ public class ContractServiceImpl implements ContractService {
head_title_name.put("arrive_pay_requirement", "到货款条件");
head_title_name.put("acceptanc_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","行业");
head_title_name.put("final_user_name","最终用户");
head_title_name.put("relation_customer_name","关联客户");
head_title_name.put("first_industry_name","一级行业");
head_title_name.put("second_industry_name","二级行业");
}
......@@ -176,9 +177,10 @@ public class ContractServiceImpl implements ContractService {
head_title_key.put("acceptanc_pay_requirement", "acceptanc_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");
head_title_key.put("final_user_name", "final_user_name");
head_title_key.put("relation_customer_name", "relation_customer_name");
head_title_key.put("first_industry_name", "first_industry_name");
head_title_key.put("second_industry_name", "second_industry_name");
}
private static Map<String,String> num_key = new HashMap<String,String>();
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/FinalUserServiceImpl.java 0 → 100644
package com.vion.financial.service.imp;
import com.vion.financial.entity.FinalUser;
import com.vion.financial.mapper.FinalUserMapper;
import com.vion.financial.service.FinalUserService;
import com.vion.financial.vo.FailCode;
import com.vion.financial.vo.SuccessCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @Description:
* @Author: WJY
* @Date: 2018-11-29 14:49
*/
@Service
public class FinalUserServiceImpl implements FinalUserService{
Logger logger= LoggerFactory.getLogger(FinalUserServiceImpl.class);
@Autowired
SuccessCode successCode;
@Autowired
FailCode failCode;
@Autowired
private FinalUserMapper finalUserMapper;
@Override
public Object addFinalUser(FinalUser finalUser) {
// TODO Auto-generated method stub
logger.info("=======================增加最终用户信息========================");
try {
if(finalUserMapper.queryFinalUser()!=null) {
for(FinalUser finalUser1:finalUserMapper.queryFinalUser()) {
if(finalUser1.getFinal_user_name().equals(finalUser.getFinal_user_name())) {
failCode.setEcode("600");
failCode.setEnote("重复数据");
return failCode;
}
}
}
finalUserMapper.addFinalUser(finalUser);
return successCode;
} catch (Exception e) {
// TODO: handle exception
logger.error("增加最终用户信息出错",e);
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
}
@Override
public Object queryFinalUser() {
// TODO Auto-generated method stub
logger.info("=====================查询最终用户信息========================");
try {
return finalUserMapper.queryFinalUser();
} catch (Exception e) {
// TODO: handle exception
logger.error("查询最终用户信息出错"+e.getLocalizedMessage(),e);
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
}
@Override
public Object updateFinalUser(FinalUser finalUser) {
// TODO Auto-generated method stub
logger.info("==================更新最终用户信息======================");
try {
finalUserMapper.updateFinalUser(finalUser);
return successCode;
} catch (Exception e) {
// TODO: handle exception
logger.error("更新最终用户信息出错"+e.getLocalizedMessage(),e);
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
}
@Override
public Object deleteFinalUser(FinalUser finalUser) {
// TODO Auto-generated method stub
logger.info("====================删除最终用户信息=====================");
try {
finalUserMapper.deleteFinalUser(finalUser.getFinal_user());
return successCode;
} catch (Exception e) {
// TODO: handle exception
logger.error("删除最终用户信息出错"+e.getLocalizedMessage(),e);
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
}
}
code/finance_serv/src/main/java/com/vion/financial/vo/ContractVo.java
......@@ -84,9 +84,15 @@ public class ContractVo extends SelectVo{
private List<PaymentAgree> paymentAgree_list;
private List<String> contract_unids;
private String final_user; //最终用户
private Integer final_user; //最终用户
private String relation_customer; //关联大客户
private String industry; //行业
private String first_industry; //一级行业
private String second_industry;
private String final_user_name; //最终用户name
private String relation_customer_name; //关联大客户name
private String first_industry_name; //行业name
private String second_industry_name;
//private List<> payment_data;
public String getContract_unid() {
return contract_unid;
......@@ -488,13 +494,6 @@ public class ContractVo extends SelectVo{
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;
......@@ -504,11 +503,59 @@ public class ContractVo extends SelectVo{
this.relation_customer = relation_customer;
}
public String getIndustry() {
return industry;
public String getFinal_user_name() {
return final_user_name;
}
public void setFinal_user_name(String final_user_name) {
this.final_user_name = final_user_name;
}
public String getRelation_customer_name() {
return relation_customer_name;
}
public void setRelation_customer_name(String relation_customer_name) {
this.relation_customer_name = relation_customer_name;
}
public String getFirst_industry() {
return first_industry;
}
public void setFirst_industry(String first_industry) {
this.first_industry = first_industry;
}
public void setIndustry(String industry) {
this.industry = industry;
public String getSecond_industry() {
return second_industry;
}
public void setSecond_industry(String second_industry) {
this.second_industry = second_industry;
}
public String getFirst_industry_name() {
return first_industry_name;
}
public void setFirst_industry_name(String first_industry_name) {
this.first_industry_name = first_industry_name;
}
public String getSecond_industry_name() {
return second_industry_name;
}
public void setSecond_industry_name(String second_industry_name) {
this.second_industry_name = second_industry_name;
}
public Integer getFinal_user() {
return final_user;
}
public void setFinal_user(Integer final_user) {
this.final_user = final_user;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!