[合同状态多选]

code/finance_serv/src/main/java/com/vion/financial/controller/CustomerController.java

@@ -16,12 +16,21 @@ public class CustomerController extends BaseController {
 	@Autowired 
 	@Autowired 
 	CustomerService customerService;
 	CustomerService customerService;
 	
 	
+	/**
+	 * 查询顾客列表
+	 * @return
+	 */
 	@GetMapping(value="/customers")
 	@GetMapping(value="/customers")
 	@ResponseBody
 	@ResponseBody
 	public Object queryCustomers() {
 	public Object queryCustomers() {
 		return customerService.queryCustomer();
 		return customerService.queryCustomer();
 	}
 	}
 	
 	
+	/**
+	 * 增加新顾客
+	 * @param customer
+	 * @return
+	 */
 	@PostMapping(value="/customers")
 	@PostMapping(value="/customers")
 	@ResponseBody
 	@ResponseBody
 	public Object addCustomers(@RequestBody Customer customer) {
 	public Object addCustomers(@RequestBody Customer customer) {

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

@@ -20,12 +20,23 @@ public class DeliverGoodsController extends BaseController{
 	@Resource
 	@Resource
 	DeliverGoodsService deliverGoodsService;
 	DeliverGoodsService deliverGoodsService;
 	
 	
+	/**
+	 * 查询某一合同的发货信息
+	 * @param contract_unid
+	 * @return
+	 */
 	@GetMapping("/{contract_unid}/delivers")
 	@GetMapping("/{contract_unid}/delivers")
 	@ResponseBody
 	@ResponseBody
 	public Object queryDeliverInfo(@PathVariable String contract_unid) {
 	public Object queryDeliverInfo(@PathVariable String contract_unid) {
 		return deliverGoodsService.queryDeliverGoods(contract_unid);
 		return deliverGoodsService.queryDeliverGoods(contract_unid);
 	}
 	}
 	
 	
+	/**
+	 * 
+	 * @param deliverGoodsVo
+	 * @param contract_unid
+	 * @return
+	 */
 	@PostMapping("/{contract_unid}/delivers")
 	@PostMapping("/{contract_unid}/delivers")
 	@ResponseBody
 	@ResponseBody
 	public Object addDeliverInfo(@RequestBody DeliverGoodsVo deliverGoodsVo,@PathVariable String contract_unid) {
 	public Object addDeliverInfo(@RequestBody DeliverGoodsVo deliverGoodsVo,@PathVariable String contract_unid) {

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

@@ -458,6 +458,13 @@
 		     #{salesperson_unid} 
 		     #{salesperson_unid} 
 		   </foreach>
 		   </foreach>
 		   </if>
 		   </if>
+		   <if test="contract_states !=null">
+		   and
+		   contract_state in 
+		   <foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=",">
+		   #{contract_state}
+		   </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}||'%') 
@@ -622,6 +629,13 @@
 		     #{salesperson_unid} 
 		     #{salesperson_unid} 
 		   </foreach>
 		   </foreach>
 		   </if>
 		   </if>
+		   <if test="contract_states !=null">
+		   and
+		   contract_state in 
+		   <foreach collection="contract_states" index="index" item="contract_state" open="(" close=")" separator=",">
+		   #{contract_state}
+		   </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/vo/SelectVo.java

@@ -44,6 +44,7 @@ public class SelectVo {
 	private List<String> salesperson_unids;
 	private List<String> salesperson_unids;
 	
 	
 	private String[] columns; 
 	private String[] columns; 
+	private String[] contract_states;  
 	/*
 	/*
 	 * 查询条件
 	 * 查询条件
 	 */
 	 */
@@ -227,6 +228,12 @@ public class SelectVo {
 	public void setColumns(String[] columns) {
 	public void setColumns(String[] columns) {
 		this.columns = columns;
 		this.columns = columns;
 	}
 	}
+	public String[] getContract_states() {
+		return contract_states;
+	}
+	public void setContract_states(String[] contract_states) {
+		this.contract_states = contract_states;
+	}
 	
 	
 	
 	
 }
 }