加入合同验收信息部分

code/FinancialSystem/src/main/java/com/vion/financial/controller/ContractController.java

@@ -44,4 +44,10 @@ public class ContractController extends BaseController {
 	public Object deleteOne(@PathVariable String contract_unid ) {
 	public Object deleteOne(@PathVariable String contract_unid ) {
 		return contractService.deleteOne(contract_unid);
 		return contractService.deleteOne(contract_unid);
 	}
 	}
+	
+	@GetMapping(value="codes")
+	@ResponseBody
+	public Object queryList() {
+		return contractService.queryList();
+	}
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/controller/DeliverGoodsController.java

@@ -2,6 +2,7 @@ package com.vion.financial.controller;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +37,10 @@ public class DeliverGoodsController extends BaseController{
 	public Object updateDeliverInf(@RequestBody DeliverGoodsVo deliverGoodsVo,@PathVariable String contract_unid) {
 	public Object updateDeliverInf(@RequestBody DeliverGoodsVo deliverGoodsVo,@PathVariable String contract_unid) {
 		return deliverGoodsService.updateDeliverGoods(deliverGoodsVo, contract_unid);
 		return deliverGoodsService.updateDeliverGoods(deliverGoodsVo, contract_unid);
 	}
 	}
+	
+	@DeleteMapping("/{contract_unid}/delivers")
+	@ResponseBody
+	public Object deleteDeliverInfo(@RequestBody DeliverGoodsVo deliverGoodsVo,@PathVariable String contract_unid) {
+		return deliverGoodsService.deleteDeliverGoods(deliverGoodsVo, contract_unid);
+	}
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/entity/Appendix.java

 package com.vion.financial.entity;
 package com.vion.financial.entity;
 
 
 public class Appendix {
 public class Appendix {
-	private int appendix_unid;
+	private Integer appendix_unid;
 	private String business_table;
 	private String business_table;
 	private String business_unid;
 	private String business_unid;
 	private String appendix_name;
 	private String appendix_name;
 	private String appendix_type;
 	private String appendix_type;
 	private String appendix_url;
 	private String appendix_url;
-	public int getAppendix_unid() {
+	public Integer getAppendix_unid() {
 		return appendix_unid;
 		return appendix_unid;
 	}
 	}
-	public void setAppendix_unid(int appendix_unid) {
+	public void setAppendix_unid(Integer appendix_unid) {
 		this.appendix_unid = appendix_unid;
 		this.appendix_unid = appendix_unid;
 	}
 	}
 	public String getBusiness_table() {
 	public String getBusiness_table() {

code/FinancialSystem/src/main/java/com/vion/financial/entity/DeliverGoods.java

@@ -12,7 +12,8 @@ public class DeliverGoods {
 	private String contract_unid;
 	private String contract_unid;
 	private Date deliver_goods_date;
 	private Date deliver_goods_date;
 	private Date goods_acceptanc_date;
 	private Date goods_acceptanc_date;
-	private List<Appendix> appendix_list;
+	private List<Appendix> list_deliver_data;
+	List<Integer> appendix_unids;
 	public int getDeliver_unid() {
 	public int getDeliver_unid() {
 		return deliver_unid;
 		return deliver_unid;
 	}
 	}
@@ -37,11 +38,18 @@ public class DeliverGoods {
 	public void setGoods_acceptanc_date(Date goods_acceptanc_date) {
 	public void setGoods_acceptanc_date(Date goods_acceptanc_date) {
 		this.goods_acceptanc_date = goods_acceptanc_date;
 		this.goods_acceptanc_date = goods_acceptanc_date;
 	}
 	}
-	public List<Appendix> getAppendix_list() {
-		return appendix_list;
+	public List<Appendix> getList_deliver_data() {
+		return list_deliver_data;
 	}
 	}
-	public void setAppendix_list(List<Appendix> appendix_list) {
-		this.appendix_list = appendix_list;
+	public void setList_deliver_data(List<Appendix> list_deliver_data) {
+		this.list_deliver_data = list_deliver_data;
 	}
 	}
+	public List<Integer> getAppendix_unids() {
+		return appendix_unids;
+	}
+	public void setAppendix_unids(List<Integer> appendix_unids) {
+		this.appendix_unids = appendix_unids;
+	}
+	
 	
 	
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/entity/ProjectAcceptanc.java

 package com.vion.financial.entity;
 package com.vion.financial.entity;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 public class ProjectAcceptanc {
 public class ProjectAcceptanc {
 	private int acceptanc_unid;
 	private int acceptanc_unid;
@@ -8,6 +9,8 @@ public class ProjectAcceptanc {
 	private String acceptanc_type;
 	private String acceptanc_type;
 	private Date acceptanc_date;
 	private Date acceptanc_date;
 	private String acceptanc_note;
 	private String acceptanc_note;
+	private List<Integer> appendix_unids;
+	private List<ProjectAcceptanc> appendix_list;
 	public int getAcceptanc_unid() {
 	public int getAcceptanc_unid() {
 		return acceptanc_unid;
 		return acceptanc_unid;
 	}
 	}
@@ -38,5 +41,17 @@ public class ProjectAcceptanc {
 	public void setAcceptanc_note(String acceptanc_note) {
 	public void setAcceptanc_note(String acceptanc_note) {
 		this.acceptanc_note = acceptanc_note;
 		this.acceptanc_note = acceptanc_note;
 	}
 	}
+	public List<ProjectAcceptanc> getAppendix_list() {
+		return appendix_list;
+	}
+	public void setAppendix_list(List<ProjectAcceptanc> appendix_list) {
+		this.appendix_list = appendix_list;
+	}
+	public List<Integer> getAppendix_unids() {
+		return appendix_unids;
+	}
+	public void setAppendix_unids(List<Integer> appendix_unids) {
+		this.appendix_unids = appendix_unids;
+	}
 	
 	
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/mapper/ContractMapper.java

 package com.vion.financial.mapper;
 package com.vion.financial.mapper;
 
 
+import java.util.List;
+
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import com.vion.financial.vo.ContractVo;
 import com.vion.financial.vo.ContractVo;
@@ -14,8 +16,9 @@ public interface ContractMapper {
 	public void updateOne(ContractVo contractVo);
 	public void updateOne(ContractVo contractVo);
 	@Transactional
 	@Transactional
 	public void deleteOne(String contract_unid);
 	public void deleteOne(String contract_unid);
-	
+	public List<String> queryList();
 	public ContractsListVo selectByCondition(SelectVo selectVo);
 	public ContractsListVo selectByCondition(SelectVo selectVo);
 	
 	
 	public boolean isDelete(String contract_unid);
 	public boolean isDelete(String contract_unid);
+	
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectAcceptancMapper.java

 package com.vion.financial.mapper;
 package com.vion.financial.mapper;
 
 
+import java.util.List;
+
 import com.vion.financial.entity.ProjectAcceptanc;
 import com.vion.financial.entity.ProjectAcceptanc;
 
 
 public interface ProjectAcceptancMapper {
 public interface ProjectAcceptancMapper {
-	public Object addProjectAcceptanc(ProjectAcceptanc projectAcceptanc);
-	public ProjectAcceptanc queryProjectAcceptanc(String s);
-	public Object updateProjectAcceptanc(ProjectAcceptanc projectAcceptanc);
-	public Object deleteProjectAcceptanc(int n);
+	public void addProjectAcceptanc(ProjectAcceptanc projectAcceptanc);
+	public List<ProjectAcceptanc> queryProjectAcceptanc(String s);
+	public void updateProjectAcceptanc(ProjectAcceptanc projectAcceptanc);
+	public void deleteProjectAcceptanc(int n);
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/mapper/ProjectMapper.java

 package com.vion.financial.mapper;
 package com.vion.financial.mapper;
 
 
+import java.util.List;
+
 import com.vion.financial.entity.Project;
 import com.vion.financial.entity.Project;
 
 
 public interface ProjectMapper {
 public interface ProjectMapper {
-	public Object addProject(Project projec);
-	public Project queryProject(String s);
-	public Object updateProject(Project project);
-	public Object deleteProject(int n);
+	public void addProject(Project projec);
+	public List<Project> queryProject();
+	public void updateProject(Project project);
+	public void deleteProject(int n);
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/mapping/AppendixMapper.xml

@@ -76,6 +76,6 @@
 		where appendix_unid = #{appendix_unid}
 		where appendix_unid = #{appendix_unid}
 	</update>
 	</update>
 	<delete id="deleteAppendix" parameterType="com.vion.financial.entity.Appendix">
 	<delete id="deleteAppendix" parameterType="com.vion.financial.entity.Appendix">
-	delete from tb_appendix where business_table = #{business_table} and business_unid = #{business_unid}
+	delete from tb_appendix where business_table = #{business_table} or business_unid = #{business_unid}
 	</delete>
 	</delete>
 </mapper>
 </mapper>
\ No newline at end of file

code/FinancialSystem/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -279,4 +279,7 @@
 	<select id="isDelete" parameterType="String" resultType="boolean">
 	<select id="isDelete" parameterType="String" resultType="boolean">
 		select is_delete from tb_contract where contract_unid = #{contract_unid}
 		select is_delete from tb_contract where contract_unid = #{contract_unid}
 	</select>
 	</select>
+	<select id="queryList" resultType="String">
+		select contract_unid from tb_contract
+	</select>
 </mapper>
 </mapper>

code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectAcceptancMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vion.financial.mapper.ProjectAcceptancMapper">
 <mapper namespace="com.vion.financial.mapper.ProjectAcceptancMapper">
-	<insert id="addProjectAcceptanc" parameterType="com.vion.financial.entity.ProjectAcceptanc">
+	<insert id="addProjectAcceptanc" parameterType="com.vion.financial.entity.ProjectAcceptanc" keyColumn="acceptanc_unid" useGeneratedKeys="true" keyProperty="acceptanc_unid">
 		insert into tb_project_acceptanc (contract_unid,acceptanc_type,acceptanc_date,acceptanc_note)
 		insert into tb_project_acceptanc (contract_unid,acceptanc_type,acceptanc_date,acceptanc_note)
         values(#{contract_unid},#{acceptanc_type},#{acceptanc_date},#{acceptanc_note})
         values(#{contract_unid},#{acceptanc_type},#{acceptanc_date},#{acceptanc_note})
 	</insert>
 	</insert>
@@ -9,7 +9,7 @@
 		update tb_project_acceptanc set contract_unid = #{contract_unid},acceptanc_type = #{acceptanc_type},acceptanc_date = #{acceptanc_date},acceptanc_note = #{acceptanc_note}
 		update tb_project_acceptanc set contract_unid = #{contract_unid},acceptanc_type = #{acceptanc_type},acceptanc_date = #{acceptanc_date},acceptanc_note = #{acceptanc_note}
 		where acceptanc_unid = #{acceptanc_unid}
 		where acceptanc_unid = #{acceptanc_unid}
 	</update>
 	</update>
-	<select id="queryProjectAcceptanc" parameterType="String">
+	<select id="queryProjectAcceptanc" parameterType="String" resultType="com.vion.financial.entity.ProjectAcceptanc">
 		select *from tb_project_acceptanc where contract_unid = #{contract_unid}
 		select *from tb_project_acceptanc where contract_unid = #{contract_unid}
 	</select>
 	</select>
 	<delete id="deleteProjectAcceptanc" parameterType="int">
 	<delete id="deleteProjectAcceptanc" parameterType="int">

code/FinancialSystem/src/main/java/com/vion/financial/mapping/ProjectMapper.xml

@@ -8,8 +8,8 @@
 		update tb_project set contract_unid = #{contract_unid},project_name = #{project_name}
 		update tb_project set contract_unid = #{contract_unid},project_name = #{project_name}
 		where project_unid = #{project_unid}
 		where project_unid = #{project_unid}
 	</update>
 	</update>
-	<select id="queryProject" parameterType="String">
-		select *from tb_project where contract_unid = #{contract_unid}
+	<select id="queryProject" resultType="com.vion.financial.entity.Project">
+		select * from tb_project where contract_unid = #{contract_unid}
 	</select>
 	</select>
 	<delete id="deleteProject" parameterType="int">
 	<delete id="deleteProject" parameterType="int">
 		delete from tb_project where project_unid = #{project_unid}
 		delete from tb_project where project_unid = #{project_unid}

code/FinancialSystem/src/main/java/com/vion/financial/service/ContractService.java

@@ -3,9 +3,10 @@ package com.vion.financial.service;
 import com.vion.financial.vo.ContractVo;
 import com.vion.financial.vo.ContractVo;
 
 
 public interface ContractService {
 public interface ContractService {
-	Object addOne(ContractVo vontractVo);
-	Object queryOne(String s);
-	Object updateOne(ContractVo vontractVo);
-	Object deleteOne(String s);
+	public Object addOne(ContractVo vontractVo);
+	public Object queryOne(String s);
+	public Object updateOne(ContractVo vontractVo);
+	public Object deleteOne(String s);
+	public Object queryList();
 	boolean isDelete(String s);
 	boolean isDelete(String s);
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/service/imp/ContractServiceImpl.java

@@ -124,4 +124,20 @@ public class ContractServiceImpl implements ContractService {
 	public boolean isDelete(String s) {
 	public boolean isDelete(String s) {
 		return contractMapper.isDelete(s);
 		return contractMapper.isDelete(s);
 	}
 	}
+
+	@Override
+	public Object queryList() {
+		// TODO Auto-generated method stub
+		try {
+			logger.info("=================查询合同编号=================");
+			return contractMapper.queryList();
+		} catch (Exception e) {
+			// TODO: handle exception
+			logger.error("查询合同列表异常"+e.getLocalizedMessage(),e);
+			e.printStackTrace();
+			failCode.setEnode("500");
+			failCode.setEnode("查询异常");
+			return failCode;
+		}
+	}
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/service/imp/DeliverGoodsServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 
 import com.vion.financial.entity.Appendix;
 import com.vion.financial.entity.Appendix;
 import com.vion.financial.entity.DeliverGoods;
 import com.vion.financial.entity.DeliverGoods;
+import com.vion.financial.entity.Receipt;
 import com.vion.financial.mapper.DeliverGoodsMapper;
 import com.vion.financial.mapper.DeliverGoodsMapper;
 import com.vion.financial.service.AppendixService;
 import com.vion.financial.service.AppendixService;
 import com.vion.financial.service.ContractService;
 import com.vion.financial.service.ContractService;
@@ -43,10 +44,11 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
 				for(DeliverGoods deliverGoods:list) {
 				for(DeliverGoods deliverGoods:list) {
 					deliverGoods.setContract_unid(s);
 					deliverGoods.setContract_unid(s);
 					deliverGoodsMapper.addDeliverGoods(deliverGoods);
 					deliverGoodsMapper.addDeliverGoods(deliverGoods);
-					for(int appendixUnid:deliverGoodsVo.getAppendix_unids()) {
+					for(int appendixUnid:deliverGoods.getAppendix_unids()) {
 						appendix.setAppendix_unid(appendixUnid);
 						appendix.setAppendix_unid(appendixUnid);
 						appendix.setBusiness_table("tb_deliver_goods");
 						appendix.setBusiness_table("tb_deliver_goods");
 						appendix.setBusiness_unid(String.valueOf(deliverGoods.getDeliver_unid()));
 						appendix.setBusiness_unid(String.valueOf(deliverGoods.getDeliver_unid()));
+						appendixService.updateAppendix(appendix);
 					}
 					}
 				}
 				}
 				return successCode;
 				return successCode;
@@ -78,7 +80,7 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
 					appendix.setBusiness_table("tb_deliver_goods");
 					appendix.setBusiness_table("tb_deliver_goods");
 					appendix.setBusiness_unid(String.valueOf(deliverGoods.getDeliver_unid()));
 					appendix.setBusiness_unid(String.valueOf(deliverGoods.getDeliver_unid()));
 					Object o = appendixService.queryAppendixList(appendix);
 					Object o = appendixService.queryAppendixList(appendix);
-					deliverGoods.setAppendix_list(o == null ? null : (List)o);
+					deliverGoods.setList_deliver_data(o == null ? null : (List)o);
 					deliverGoodsVo.getList_deliver_data().add(deliverGoods);
 					deliverGoodsVo.getList_deliver_data().add(deliverGoods);
 				}
 				}
 			}
 			}
@@ -125,7 +127,25 @@ public class DeliverGoodsServiceImpl implements DeliverGoodsService {
 	@Override
 	@Override
 	public Object deleteDeliverGoods(DeliverGoodsVo deliverGoodsVo, String s) {
 	public Object deleteDeliverGoods(DeliverGoodsVo deliverGoodsVo, String s) {
 		// TODO Auto-generated method stub
 		// TODO Auto-generated method stub
-		return null;
+		try {
+			logger.info("=========================删除合同发货信息=======================");
+			if(contractService.isDelete(s)) {
+				for(int receiptUnid :deliverGoodsVo.getDeliver_unids()) {
+					deliverGoodsMapper.deleteDeliverGoods(receiptUnid);;
+				}
+				return successCode;
+			}
+			else {
+				failCode.setEnode("100");
+				failCode.setEnote("合同已删除");
+				return failCode;
+			}
+		} catch (Exception e) {
+			logger.error("删除发货信息异常"+e.getLocalizedMessage(),e);
+			failCode.setEnode("500");
+			failCode.setEnode("删除异常");
+			return failCode;
+		}
 	}
 	}
 
 
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/vo/ContractVo.java

@@ -44,6 +44,7 @@ public class ContractVo extends SelectVo{
 	private String business_table;
 	private String business_table;
 	private String business_unid;
 	private String business_unid;
 	private List<PaymentAgree> paymentAgree_list;
 	private List<PaymentAgree> paymentAgree_list;
+	private List<String> contract_unids;
 	//private List<> payment_data;
 	//private List<> payment_data;
 	
 	
 	public String getContract_unid() {
 	public String getContract_unid() {
@@ -250,6 +251,12 @@ public class ContractVo extends SelectVo{
 	public void setPaymentAgree_list(List<PaymentAgree> paymentAgree_list) {
 	public void setPaymentAgree_list(List<PaymentAgree> paymentAgree_list) {
 		this.paymentAgree_list = paymentAgree_list;
 		this.paymentAgree_list = paymentAgree_list;
 	}
 	}
+	public List<String> getContract_unids() {
+		return contract_unids;
+	}
+	public void setContract_unids(List<String> contract_unids) {
+		this.contract_unids = contract_unids;
+	}
 	
 	
 	
 	
 }
 }

code/FinancialSystem/src/main/java/com/vion/financial/vo/DeliverGoodsVo.java

@@ -16,7 +16,7 @@ public class DeliverGoodsVo {
 	private Date deliver_goods_date;
 	private Date deliver_goods_date;
 	private Date goods_acceptanc_date;
 	private Date goods_acceptanc_date;
 	List<DeliverGoods> list_deliver_data;
 	List<DeliverGoods> list_deliver_data;
-	List<Integer> appendix_unids;
+	List<Integer> deliver_unids;
 	public List<DeliverGoods> getList_deliver_data() {
 	public List<DeliverGoods> getList_deliver_data() {
 		return list_deliver_data;
 		return list_deliver_data;
 	}
 	}
@@ -47,10 +47,12 @@ public class DeliverGoodsVo {
 	public void setGoods_acceptanc_date(Date goods_acceptanc_date) {
 	public void setGoods_acceptanc_date(Date goods_acceptanc_date) {
 		this.goods_acceptanc_date = goods_acceptanc_date;
 		this.goods_acceptanc_date = goods_acceptanc_date;
 	}
 	}
-	public List<Integer> getAppendix_unids() {
-		return appendix_unids;
+	public List<Integer> getDeliver_unids() {
+		return deliver_unids;
 	}
 	}
-	public void setAppendix_unids(List<Integer> appendix_unids) {
-		this.appendix_unids = appendix_unids;
+	public void setDeliver_unids(List<Integer> deliver_unids) {
+		this.deliver_unids = deliver_unids;
 	}
 	}
+	
+	
 }
 }

code/FinancialSystem/src/main/resources/application.yml

@@ -14,8 +14,11 @@ spring:
     password: authpass 
     password: authpass 
     driver-class-name: org.postgresql.Driver
     driver-class-name: org.postgresql.Driver
     hikari:
     hikari:
-      connection-timeout: 1800000
+      connection-timeout: 30000
       maximum-pool-size: 20
       maximum-pool-size: 20
+    dbcp2:
+      max-total: 20
+      pool-prepared-statements: true
 #    hikari:
 #    hikari:
  #    maximum-pool-size: 
  #    maximum-pool-size: 
   http:
   http: