Skip to content

platform / finance_serv

Go to a project
Commit b680583d by 王军业
Options

[更新]

1 parent 9413c051
Inline Side-by-side
Showing 14 changed files with 129 additions and 163 deletions
code/finance_serv/src/main/java/com/vion/financial/controller/AppendixController.java
......@@ -66,8 +66,8 @@ public class AppendixController extends BaseController{
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("上传异常");
failCode.setEcode("500");
failCode.setEnote("上传异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/mapper/ReturnInfoMapper.java
package com.vion.financial.mapper;
import java.util.List;
import com.vion.financial.entity.ReturnInfo;
public interface ReturnInfoMapper {
public void addReturnInfo(ReturnInfo returnInfo);
public ReturnInfo queryReturnInfo(String s);
public List<ReturnInfo> queryReturnInfo(String s);
public void updateReturnInfo(ReturnInfo returnInfo);
public void deleteReturnInfo(int n);
}
code/finance_serv/src/main/java/com/vion/financial/mapping/AppendixMapper.xml
......@@ -78,13 +78,13 @@
<delete id="deleteAppendix" parameterType="com.vion.financial.entity.Appendix">
delete from tb_appendix where 1=1
<if test="business_table">
business_table = #{business_table} and
and business_table = #{business_table}
</if>
<if test="business_unid">
business_unid = #{business_unid} and
and business_unid = #{business_unid}
</if>
<if test="appendix_unid">
appendix_unid=#{appendix_unid}
and appendix_unid=#{appendix_unid}
</if>
</delete>
</mapper>
\ No newline at end of file
code/finance_serv/src/main/java/com/vion/financial/service/imp/AppendixServiceImpl.java
......@@ -33,8 +33,8 @@ public class AppendixServiceImpl implements AppendixService {
// TODO: handle exception
logger.error("查询附件异常"+e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("附件查询异常");
failCode.setEcode("500");
failCode.setEnote("附件查询异常");
return failCode;
}
}
......@@ -49,8 +49,8 @@ public class AppendixServiceImpl implements AppendixService {
// TODO: handle exception
logger.error("增加附件异常"+e.getLocalizedMessage(),e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("附件增加异常");
failCode.setEcode("500");
failCode.setEnote("附件增加异常");
return failCode;
}
}
......@@ -66,8 +66,8 @@ public class AppendixServiceImpl implements AppendixService {
logger.error("删除附件异常"+e.getLocalizedMessage(),e);
// TODO: handle exception
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("附件修改异常");
failCode.setEcode("500");
failCode.setEnote("附件修改异常");
return failCode;
}
}
......@@ -83,8 +83,8 @@ public class AppendixServiceImpl implements AppendixService {
logger.error("删除附件异常"+e.getLocalizedMessage(), e);
// TODO: handle exception
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("附件删除异常");
failCode.setEcode("500");
failCode.setEnote("附件删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java
......@@ -60,8 +60,8 @@ public class ContractServiceImpl implements ContractService {
} catch (Exception e) {
e.printStackTrace();
logger.error("增加合同异常:"+e.getLocalizedMessage(), e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -82,8 +82,8 @@ public class ContractServiceImpl implements ContractService {
/* return failCode;*/
logger.error("查询合同异常"+e.getLocalizedMessage(),e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -105,8 +105,8 @@ public class ContractServiceImpl implements ContractService {
// TODO: handle exception
logger.error("修改合同异常"+e.getLocalizedMessage(), e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("修改异常");
failCode.setEcode("500");
failCode.setEnote("修改异常");
return failCode;
}
}
......@@ -121,8 +121,8 @@ public class ContractServiceImpl implements ContractService {
} catch (Exception e) {
logger.error("删除合同异常"+e.getLocalizedMessage(),e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......@@ -141,8 +141,8 @@ public class ContractServiceImpl implements ContractService {
// TODO: handle exception
logger.error("查询合同列表异常"+e.getLocalizedMessage(),e);
e.printStackTrace();
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -161,8 +161,8 @@ public class ContractServiceImpl implements ContractService {
} catch (Exception e) {
// TODO: handle exception
logger.error("筛选合同列表异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("筛选异常");
failCode.setEcode("500");
failCode.setEnote("筛选异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java
......@@ -53,15 +53,15 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("增加发货信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -85,16 +85,16 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
}
}
else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
return deliverGoodsVo;
} catch (Exception e) {
// TODO: handle exception
logger.error("查询发货信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -112,19 +112,21 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
for(int n:deliverGoods.getAppendix_unids()) {
appendix=new Appendix();
appendix.setAppendix_unid(n);
appendixService.deleteAppendix(appendix);
appendix.setBusiness_table("tb_deliver_goods");
appendix.setBusiness_unid(String.valueOf(deliverGoods.getDeliver_unid()));
appendixService.updateAppendix(appendix);
}
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("更新发货信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("更新异常");
failCode.setEcode("500");
failCode.setEnote("更新异常");
return failCode;
// TODO: handle exception
}
......@@ -135,22 +137,25 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
// TODO Auto-generated method stub
try {
logger.info("=========================删除合同发货信息=======================");
Appendix appendix=null;
if(contractService.isDelete(s)) {
for(int receiptUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(receiptUnid);
for(int deliverUnid :deliverGoodsVo.getDeliver_unids()) {
deliverGoodsMapper.deleteDeliverGoods(deliverUnid);
appendix=new Appendix();
appendix.setBusiness_unid(String.valueOf(deliverUnid));
appendixService.deleteAppendix(appendix);
}
return successCode;
}
else {
failCode.setEnode("100");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("删除发货信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/PaymentAgreeServiceImpl.java
......@@ -39,15 +39,15 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("增加付款预定信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -59,14 +59,14 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
if((boolean) contractServiceImpl.isDelete(s)) {
return paymentAgreeMapper.queryPaymentAgree(s);
}
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
} catch (Exception e) {
// TODO: handle exception
logger.error("查询付款约定信息异常:"+e.getLocalizedMessage(), e);
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -85,15 +85,15 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("修改付款预定信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("修改异常");
failCode.setEcode("500");
failCode.setEnote("修改异常");
return failCode;
}
}
......@@ -111,15 +111,15 @@ public class PaymentAgreeServiceImpl implements PaymentAgreeService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("删除付款预定信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectAcceptancServiceImpl.java
......@@ -53,15 +53,15 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("增加合同验收信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -86,16 +86,16 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
}
}
else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
return projectAcceptancVo;
} catch (Exception e) {
// TODO: handle exception
logger.error("查询合同验收信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -105,22 +105,30 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
// TODO Auto-generated method stub
try {
logger.info("===========================修改合同验收信息===========================");
Appendix appendix=null;
if(contractService.isDelete(s)) {
List<ProjectAcceptanc> list=projectAcceptancVo.getList_check_data();
for(ProjectAcceptanc projectAcceptanc:list) {
projectAcceptanc.setContract_unid(s);
projectAcceptancMapper.updateProjectAcceptanc(projectAcceptanc);
for(int n:projectAcceptanc.getAppendix_unids()) {
appendix=new Appendix();
appendix.setAppendix_unid(n);
appendix.setBusiness_table("tb_project_acceptanc");
appendix.setBusiness_unid(String.valueOf(projectAcceptanc.getAcceptanc_unid()));
appendixService.updateAppendix(appendix);
}
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("更新合同验收信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("更新异常");
failCode.setEcode("500");
failCode.setEnote("更新异常");
return failCode;
// TODO: handle exception
}
......@@ -142,15 +150,15 @@ public class ProjectAcceptancServiceImpl implements ProjectAcceptancService {
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("删除合同验收信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ProjectServiceImpl.java
......@@ -37,7 +37,7 @@ public class ProjectServiceImpl implements ProjectService {
} catch (Exception e) {
// TODO: handle exception
logger.error("增加合同信息出错"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
......@@ -52,7 +52,7 @@ public class ProjectServiceImpl implements ProjectService {
} catch (Exception e) {
// TODO: handle exception
logger.error("查询合同信息出错"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
......@@ -70,7 +70,7 @@ public class ProjectServiceImpl implements ProjectService {
} catch (Exception e) {
// TODO: handle exception
logger.error("更新合同信息出错"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
......@@ -88,7 +88,7 @@ public class ProjectServiceImpl implements ProjectService {
} catch (Exception e) {
// TODO: handle exception
logger.error("删除合同信息出错"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEcode("500");
failCode.setEnote("Fail");
return failCode;
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReceiptServiceImpl.java
......@@ -39,14 +39,14 @@ public class ReceiptServiceImpl implements ReceiptService {
}
return successCode;
}else {
failCode.setEnode("100");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("增加开票信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -59,14 +59,14 @@ public class ReceiptServiceImpl implements ReceiptService {
if((boolean)contractServiceImpl.isDelete(s)) {
return receiptMapper.queryReceipt(s);
}else {
failCode.setEnode("100");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("查询开票信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -85,14 +85,14 @@ public class ReceiptServiceImpl implements ReceiptService {
return successCode;
}
else {
failCode.setEnode("100");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("修改开票信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("修改异常");
failCode.setEcode("500");
failCode.setEnote("修改异常");
return failCode;
}
}
......@@ -110,14 +110,14 @@ public class ReceiptServiceImpl implements ReceiptService {
return successCode;
}
else {
failCode.setEnode("100");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
logger.error("删除开票信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/service/imp/ReturnInfoServiceImpl.java
......@@ -41,15 +41,15 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("增加回款信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("增加异常");
failCode.setEcode("500");
failCode.setEnote("增加异常");
return failCode;
}
}
......@@ -62,15 +62,15 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
if((boolean) contractServiceImpl.isDelete(s)){
return returnInfoMapper.queryReturnInfo(s);
}else {
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("查询回款信息异常:"+e.getLocalizedMessage(), e);
failCode.setEnode("500");
failCode.setEnode("查询异常");
failCode.setEcode("500");
failCode.setEnote("查询异常");
return failCode;
}
}
......@@ -88,15 +88,15 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("修改回款信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("修改异常");
failCode.setEcode("500");
failCode.setEnote("修改异常");
return failCode;
}
}
......@@ -114,15 +114,15 @@ public class ReturnInfoServiceImpl implements ReturnInfoService {
}
return SuccessCode;
}else{
failCode.setEnode("100");
failCode.setEnode("合同已删除");
failCode.setEcode("100");
failCode.setEnote("合同已删除");
return failCode;
}
} catch (Exception e) {
// TODO: handle exception
logger.error("删除回款信息异常"+e.getLocalizedMessage(),e);
failCode.setEnode("500");
failCode.setEnode("删除异常");
failCode.setEcode("500");
failCode.setEnote("删除异常");
return failCode;
}
}
......
code/finance_serv/src/main/java/com/vion/financial/vo/FailCode.java
......@@ -4,13 +4,13 @@ import org.springframework.stereotype.Component;
@Component
public class FailCode {
private String enode="400";
private String ecode="400";
private String enote="FAIL";
public String getEnode() {
return enode;
public String getEcode() {
return ecode;
}
public void setEnode(String enode) {
this.enode = enode;
public void setEcode(String enode) {
this.ecode = enode;
}
public String getEnote() {
return enote;
......
code/finance_serv/src/main/resources/generator/eneratorConfig.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
<context id="context1">
<jdbcConnection connectionURL="jdbc:postgresql://localhost:5432/financial_serv" driverClass="org.postgresql.Driver" password="vion" userId="postgres" />
<javaModelGenerator targetPackage="com.vion.financial.entity" targetProject="/FinancialSystem/src/main/java" />
<sqlMapGenerator targetPackage="com.vion.financial.mapping" targetProject="/FinancialSystem/src/main/java" />
<javaClientGenerator targetPackage="com.vion.financial.mapper" targetProject="/FinancialSystem/src/main/java" type="XMLMAPPER" />
<table schema="???" tableName="???">
<columnOverride column="???" property="???" />
</table>
</context>
</generatorConfiguration>
\ No newline at end of file
code/finance_serv/src/main/resources/generator/generatorConfig.xml deleted 100644 → 0
<!-- <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE generatorConfiguration
PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
<generatorConfiguration>
数据库驱动:选择你的本地硬盘上面的数据库驱动包
<classPathEntry location="E:\developer\mybatis-generator-core-1.3.2\lib\mysql-connector-java-5.1.25-bin.jar"/>
<context id="DB2Tables" targetRuntime="MyBatis3">
<commentGenerator>
<property name="suppressDate" value="true"/>
是否去除自动生成的注释 true：是 ： false:否
<property name="suppressAllComments" value="true"/>
</commentGenerator>
数据库链接URL，用户名、密码
<jdbcConnection driverClass="com.mysql.jdbc.Driver" connectionURL="jdbc:mysql://127.0.0.1/mytest" userId="root" password="root">
</jdbcConnection>
<javaTypeResolver>
<property name="forceBigDecimals" value="false"/>
</javaTypeResolver>
生成模型的包名和位置
<javaModelGenerator targetPackage="com.winter.model" targetProject="src/main/java">
<property name="enableSubPackages" value="true"/>
<property name="trimStrings" value="true"/>
</javaModelGenerator>
生成映射文件的包名和位置
<sqlMapGenerator targetPackage="mapping" targetProject="src/main/resources">
<property name="enableSubPackages" value="true"/>
</sqlMapGenerator>
生成DAO的包名和位置
<javaClientGenerator type="XMLMAPPER" targetPackage="com.winter.mapper" targetProject="src/main/java">
<property name="enableSubPackages" value="true"/>
</javaClientGenerator>
要生成的表 tableName是数据库中的表名或视图名 domainObjectName是实体类名
<table tableName="t_user" domainObjectName="User" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false"></table>
</context>
</generatorConfiguration> -->
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!