.

Dockerfile

@@ -0,0 +1,5 @@
+FROM 192.168.123.25:31104/unis/java:8
+ 
+ADD ./target/depot-business.jar /root
+CMD ["sh", "-c", "cd /root; java -Djava.security.egd=file:/dev/./urandom -jar /root/depot-business.jar --depot-business.server.enable-self-preservation=false"]
+EXPOSE 9002

pom.xml

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.chinaitop</groupId>
+	<artifactId>depot-business</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>depot-business</name>
+	<description>Demo project for Spring Boot</description>
+
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.0.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
+	<properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-cloud.version>Finchley.M8</spring-cloud.version>
+    </properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
+		
+		
+		<!--activiti新增的jar包   开始  -->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-json-converter</artifactId>
+			<version>5.21.0</version>
+		</dependency>
+ 		<dependency> 
+ 			<groupId>org.activiti</groupId>
+ 			<artifactId>activiti-spring-boot-starter-basic</artifactId>
+ 			<version>5.21.0</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.4</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.xmlgraphics</groupId>
+		    <artifactId>batik-transcoder</artifactId>
+		    <version>1.7</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.xmlgraphics</groupId>
+		    <artifactId>batik-codec</artifactId>
+		    <version>1.7</version>
+		</dependency>
+		
+		<!-- <dependency>
+		    <groupId>com.google.guava</groupId>
+		    <artifactId>guava</artifactId>
+		    <version>17.0</version>
+		</dependency> -->
+		
+		<dependency>
+		    <groupId>commons-codec</groupId>
+		    <artifactId>commons-codec</artifactId>
+		    <version>1.9</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>commons-beanutils</groupId>
+		    <artifactId>commons-beanutils</artifactId>
+		    <version>1.9.1</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>org.apache.xmlgraphics</groupId>
+		    <artifactId>fop</artifactId>
+		    <version>1.0</version>
+		</dependency>
+		
+		<dependency>
+		    <groupId>joda-time</groupId>
+		    <artifactId>joda-time</artifactId>
+		    <version>2.1</version>
+		</dependency>
+		<!--activiti新增的jar包   结束 -->
+		
+		<!-- 阿里巴巴json -->
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.37</version>
+		</dependency>
+		
+		<!--添加webservice-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web-services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>3.1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>3.1.6</version>
+        </dependency>
+        <!--添加webservice end-->
+        
+		<!-- 引入spring boot自带的pagehelper插件 -->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.3</version>
+		</dependency>
+		
+		<!-- 导入Eureka服务的依赖 -->
+        <dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+		</dependency>
+		
+		<dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
+		</dependency>
+
+		<!-- swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.6.1</version>
+		</dependency>
+		
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+        </dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.9</version>
+		</dependency>
+		
+		<!--<dependency>
+		    <groupId>org.apache.httpcomponents</groupId>
+		    <artifactId>httpclient</artifactId>
+		    <version>4.5.3</version>
+		</dependency>-->
+		
+		<dependency>  
+	       <groupId>log4j</groupId>  
+	       <artifactId>log4j</artifactId>  
+	       <version>1.2.15</version>  
+	       <exclusions>  
+	         <exclusion>  
+	           <groupId>javax.mail</groupId>  
+	           <artifactId>mail</artifactId>  
+	         </exclusion>  
+	         <exclusion>  
+	           <groupId>javax.jms</groupId>  
+	           <artifactId>jms</artifactId>  
+	         </exclusion>  
+	         <exclusion>  
+	           <groupId>com.sun.jdmk</groupId>  
+	           <artifactId>jmxtools</artifactId>  
+	         </exclusion>  
+	         <exclusion>  
+	           <groupId>com.sun.jmx</groupId>  
+	           <artifactId>jmxri</artifactId>  
+	         </exclusion>  
+	       </exclusions>  
+	       <scope>compile</scope>  
+	     </dependency>
+		
+	</dependencies>
+
+	<!-- 导入Spring Cloud的依赖管理 -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+	 <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<!-- <plugin>
+            	<groupId>org.apache.maven.plugins</groupId>
+            	<artifactId>maven-war-plugin</artifactId>
+            	<version>2.6</version>
+            	<configuration>
+                	<failOnMissingWebXml>false</failOnMissingWebXml>
+            	</configuration>
+        	</plugin> -->
+		</plugins>
+        <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
+        <resources>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+					<include>**/*.xml</include>
+					<include>**/*.store</include>
+                </includes>
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+    
+    <repositories>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+    
+</project>

src/main/java/com/chinaitop/depot/DatePermissionInterceptor.java

@@ -0,0 +1,169 @@
+package com.chinaitop.depot;
+
+import com.chinaitop.depot.utils.DataPolicyEngine;
+import com.chinaitop.depot.utils.RedisUtil;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.util.TablesNamesFinder;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.ReflectorFactory;
+import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
+import org.apache.ibatis.reflection.factory.ObjectFactory;
+import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
+import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+/**
+ * Sql执行时间记录拦截器
+ */
+@Intercepts({ @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class })})
+@Component
+public class DatePermissionInterceptor implements Interceptor {
+	
+	private static final ObjectFactory DEFAULT_OBJECT_FACTORY = new DefaultObjectFactory();
+    private static final ObjectWrapperFactory DEFAULT_OBJECT_WRAPPER_FACTORY = new DefaultObjectWrapperFactory();
+    private static final ReflectorFactory DEFAULT_REFLECTOR_FACTORY = new DefaultReflectorFactory();
+
+	@Autowired
+	private RedisUtil redisUtil;
+	
+	@Override
+	public Object intercept(Invocation invocation) throws Throwable {
+		
+		StatementHandler statementHandler = (StatementHandler) invocation.getTarget();
+        MetaObject metaStatementHandler = MetaObject.forObject(statementHandler, DEFAULT_OBJECT_FACTORY,
+                DEFAULT_OBJECT_WRAPPER_FACTORY, DEFAULT_REFLECTOR_FACTORY);
+        
+        MappedStatement mappedStatement = (MappedStatement) metaStatementHandler.getValue("delegate.mappedStatement");
+        
+		final BoundSql boundSql = statementHandler.getBoundSql();
+		String bouString = boundSql.getSql();// 获取执行sql 
+		
+		//sql是查询的才进行权限过滤且不过滤t_url_config表的数据
+	    if(mappedStatement.getSqlCommandType().toString().equals("select".toUpperCase()) && 
+	    		!bouString.contains("t_url_config")) {
+			//通过本地线程获取库id
+			Object threadLocalObj = DataPolicyEngine.get();
+			String orgId = null;
+			if(threadLocalObj != null) {
+				orgId = ObjectUtils.toString(threadLocalObj);
+			}
+			if(orgId!=null) {
+				//机构单独查询时使用递归查询，可以查询机构下级机构
+				if("com.chinaitop.depot.system.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId())) {
+					bouString = bouString.replaceAll("org_info", "(SELECT * from org_info"
+							+ " WHERE FIND_IN_SET(org_id,getChildrenOrg("+orgId+"))) org_info ");
+				}else if(!"com.chinaitop.depot.business.mapper.RoleInfoMapper.selectByPrimaryKey".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.UserRoleMapper.selectByExample".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.UserInfoMapper.selectByPrimaryKey".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.OrgInfoMapper.selectByPrimaryKey".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.OrgInfoMapper.selectByExample".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.UserInfoMapper.selectByExample".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper.selectByExample".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByPrimaryKey".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByExample_COUNT".equals(mappedStatement.getId()) &&
+						!"com.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper.selectByExample".equals(mappedStatement.getId()) 
+						){
+					//解析sql中的表名
+					Statement statement = CCJSqlParserUtil.parse(bouString);
+					Select selectStatement = (Select)statement;
+					TablesNamesFinder tablesNamesFinder = new TablesNamesFinder();
+					List<String> result = tablesNamesFinder.getTableList(selectStatement);
+					
+					Set<String> tableNames = new HashSet<String>();// 定义需要替换的table信息列表
+					//获取业务表信息数据
+					List<String> tableList = (List<String>)redisUtil.lGetAll("tableList").get(0);
+					for(int i=0;i<result.size();i++) {
+						for (int j = 0; j < tableList.size(); j++) {// 处理查看sql中是否有业务表
+							if (result.get(i).equals(ObjectUtils.toString(tableList.get(j)))) {// 是否存在业务表
+								tableNames.add(result.get(i));
+							}
+						}
+					}
+					
+					if (tableNames != null && tableNames.size() > 0) {// sql中存在业务表进行sql拼接数据重新检索
+						if(result.size() >= 2) {//sql中存在2张及以上表
+							for (String table : tableNames) {// 进行业务表的数据权限替换
+								table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+								bouString = bouString.replaceAll(table, "(SELECT * from " + table
+										+ " WHERE org_id = '"+orgId+"') ");
+							}
+						}else {//sql中是单表
+							for (String table : tableNames) {// 进行业务表的数据权限替换
+								if(bouString.contains(table+" ")) {//防止是单表查询，表后面没有空格的时候替换不了
+									table += " ";//表名后面加空格，防止两个表名一部分相似，导致替换出错
+								}
+								bouString = bouString.replaceAll(table, "(SELECT * from " + table
+										+ " WHERE org_id = '"+orgId+"') "+table+" ");
+							}
+						}
+						
+						/*bouString = bouString.replaceAll(table, "(SELECT b.* from " + table
+						+ " b,user_business u WHERE b.org_id = u.org_id AND u .user_id ='"+userId+"' AND u.business_type = '"+table+"') ");*/
+						
+					}
+				}
+				
+				
+				//metaStatementHandler.setValue("delegate.boundSql.sql", bouString);
+				
+				Field field = getField(boundSql, "sql");
+				if (field != null) {
+					try {
+						field.setAccessible(true);
+						field.set(boundSql, bouString);
+					} catch (IllegalArgumentException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					} catch (IllegalAccessException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+				}
+			}
+		
+	    }
+			
+		return invocation.proceed();
+		
+
+	}
+
+	private static Field getField(Object obj, String fieldName) {
+		Field field = null;
+		for (Class<?> clazz = obj.getClass(); clazz != Object.class; clazz = clazz.getSuperclass()) {
+			try {
+				field = clazz.getDeclaredField(fieldName);
+				break;
+			} catch (NoSuchFieldException e) {
+				// 这里不用做处理，子类没有该字段可能对应的父类有，都没有就返回null。
+			}
+		}
+		return field;
+	}
+
+	@Override
+	public Object plugin(Object target) {
+		return Plugin.wrap(target, this);
+	}
+
+	@Override
+	public void setProperties(Properties properties) {
+	}
+
+}

src/main/java/com/chinaitop/depot/DepotBusinessApplication.java

@@ -0,0 +1,67 @@
+package com.chinaitop.depot;
+
+import org.activiti.spring.boot.SecurityAutoConfiguration;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+
+@EnableEurekaClient
+@EnableDiscoveryClient
+@EnableCaching
+@EnableRedisHttpSession
+@EnableSwagger2
+@SpringBootApplication(
+		//exclude = {DataSourceAutoConfiguration.class}	// 禁止自动配置数据源，多数据源需采用手动配置
+		exclude = SecurityAutoConfiguration.class
+
+	)
+@MapperScan(basePackages = {"com.chinaitop.depot.*.mapper"})
+public class DepotBusinessApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DepotBusinessApplication.class, args);
+	}
+	
+	
+	/**
+	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
+	 */
+	@Bean
+	public ServletRegistrationBean restServlet(){
+		//注解扫描上下文
+		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
+		//base package
+		applicationContext.scan("com.chinaitop.depot.unissoft");
+		//通过构造函数指定dispatcherServlet的上下文
+		DispatcherServlet rest_dispatcherServlet = new DispatcherServlet(applicationContext);
+		//用ServletRegistrationBean包装servlet
+		ServletRegistrationBean registrationBean = new ServletRegistrationBean(rest_dispatcherServlet);
+		registrationBean.setLoadOnStartup(1);
+		//指定urlmapping
+		registrationBean.addUrlMappings("/*");
+		//指定name，如果不指定默认为dispatcherServlet
+		registrationBean.setName("rest");
+		return registrationBean;
+	}
+
+	@Bean
+	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
+		return new ThreadPoolTaskScheduler();
+	}
+	
+
+}

src/main/java/com/chinaitop/depot/HelloWebXml.java

@@ -0,0 +1,13 @@
+package com.chinaitop.depot;
+
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+ 
+public class HelloWebXml extends SpringBootServletInitializer {
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(DepotBusinessApplication.class);
+    }
+ 
+}

src/main/java/com/chinaitop/depot/SwaggerConfig.java

@@ -0,0 +1,35 @@
+package com.chinaitop.depot;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+ 
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+ 
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig {
+ 
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.chinaitop.depot.business.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("智能粮库管理平台api文档")
+                .description("经营业务")
+                .termsOfServiceUrl("http://10.10.25:9001")
+                .version("1.0")
+                .build();
+    }
+}

src/main/java/com/chinaitop/depot/act/controller/ActDynamicFormController.java

@@ -0,0 +1,182 @@
+package com.chinaitop.depot.act.controller;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import org.activiti.engine.FormService;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.form.FormProperty;
+import org.activiti.engine.impl.form.StartFormDataImpl;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.act.model.DeploymentList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.utils.activiti.PageUtils;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 动态表单Controller
+ *
+ * @author xujh
+ */
+@RestController
+@RequestMapping(value = "/act/form/dynamic")
+public class ActDynamicFormController {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+    @Autowired
+    private RepositoryService repositoryService;
+    @Autowired
+    private FormService formService;
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private IdentityService identityService;
+    @Autowired
+    private HistoryService historyService;
+    @Autowired
+    private RuntimeService runtimeService;
+    /*@Resource
+    private ActTaskService actTaskService;*/
+    
+    /**
+     * 动态form流程列表
+     *
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = {"process-list", ""})
+    public PageInfo<DeploymentList> processDefinitionList(Integer pageNum, Integer pageSize,Model model, @RequestParam(value = "processType", required = false) String processType, HttpServletRequest request) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        // 读取所有流程
+        ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery().active().orderByDeploymentId().desc();
+        List<ProcessDefinition> list = query.list();
+        
+        List<DeploymentList> deploymentlist=new ArrayList<DeploymentList>();
+		if(list!=null&&list.size()>0){
+			for(ProcessDefinition m: list){
+				DeploymentList deploymentLists=new DeploymentList();
+				deploymentLists.setId(m.getId());
+				deploymentLists.setName(m.getName());
+				deploymentLists.setKey(m.getKey());
+				deploymentLists.setVersion(m.getVersion());
+				deploymentLists.setResourceName(m.getResourceName());
+				deploymentLists.setDiagramResourceName(m.getDiagramResourceName());
+				deploymentLists.setDeploymentId(m.getDeploymentId());
+				deploymentlist.add(deploymentLists);
+			}
+			
+		}
+		PageInfo<DeploymentList> pageInfo = PageUtils.page2(deploymentlist, pageNum, pageSize);
+        return pageInfo;
+    }
+    
+    
+    /**
+     * 初始化启动流程，读取启动流程的表单字段来渲染start form
+     */
+    @RequestMapping(value = "get-form/start")
+    @ResponseBody
+    @SuppressWarnings("unchecked")
+    public Map<String, Object> findStartForm(String processDefinitionId,String key) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+        StartFormDataImpl startFormData = (StartFormDataImpl) formService.getStartFormData(processDefinitionId);
+        startFormData.setProcessDefinition(null);
+
+	    /*
+	     * 读取enum类型数据，用于下拉框
+	     */
+        List<FormProperty> formProperties = startFormData.getFormProperties();
+        for (FormProperty formProperty : formProperties) {
+            Map<String, String> values = (Map<String, String>) formProperty.getType().getInformation("values");
+            if (values != null) {
+                for (Entry<String, String> enumEntry : values.entrySet()) {
+                    logger.debug("enum, key: {}, value: {}", enumEntry.getKey(), enumEntry.getValue());
+                }
+                result.put("enum_" + formProperty.getId(), values);
+            }
+        }
+
+        result.put("form", startFormData);
+        result.put("key", key);
+        result.put("processDefinitionId", processDefinitionId);
+
+        return result;
+    }
+    
+    public static Map<String, Object> objectToMap(Object obj) throws IllegalAccessException {
+    	         Map<String, Object> map = new HashMap<>();
+    	         Class<?> clazz = obj.getClass();
+    	          for (Field field : clazz.getDeclaredFields()) {
+    	              field.setAccessible(true);
+    	              String fieldName = field.getName();
+    	             Object value = field.get(obj);
+    	             map.put(fieldName, value);
+    	         }
+    	          return map;
+    	      }
+    
+    /**
+     * 办理任务，提交task的并保存form
+     * @throws IOException 
+     * @throws JsonMappingException 
+     * @throws JsonParseException 
+     */
+    @RequestMapping(value = "task/complete")
+    public String completeTask(RedirectAttributes redirectAttributes, HttpServletRequest request, String formJson,String keys,String processDefinitionId) throws JsonParseException, JsonMappingException, IOException {
+    	
+    	UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+		// 把字符串转换为JSONArray对象
+//		Object parse = JSON.parse(formJson);
+		Map<String, String> formProperties = new HashMap<String, String>();
+		List<JSONObject> array = JSON.parseArray(formJson, JSONObject.class);
+		for(JSONObject obj : array) {
+			String id = obj.getString("id");
+			String value = obj.getString("value");
+			formProperties.put(id, value);
+		}
+		
+
+        logger.debug("start form parameters: {}", formProperties);
+        ProcessInstance processInstance = null;
+        try {
+            //设置提交人的名字
+			identityService.setAuthenticatedUserId(userInfo.getUserId().toString());
+//            formService.saveFormData(processDefinitionId, formProperties);
+            processInstance = formService.submitStartFormData(processDefinitionId, formProperties);
+//            formService.submitStartFormData(processDefinition.getId(), formProperties);
+        } finally {
+            identityService.setAuthenticatedUserId(userInfo.getUserId().toString());
+        }
+
+        String processType = null;
+		//        redirectAttributes.addFlashAttribute("message", "任务完成：taskId=" + taskId);
+        return processType;
+    }
+}

src/main/java/com/chinaitop/depot/act/controller/ActModelController.java

@@ -0,0 +1,176 @@
+package com.chinaitop.depot.act.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.chinaitop.depot.act.model.Act;
+import com.chinaitop.depot.act.model.DeploymentList;
+import com.chinaitop.depot.act.service.ActModelService;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.utils.activiti.PageUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
+
+/**
+ * 流程模型相关Controller
+ * @author xujh
+ * @version 2017-09-30
+ */
+@RestController
+@RequestMapping(value = "act/model")
+public class ActModelController {
+	@Autowired
+	private ActModelService actModelService;
+	
+	
+	/**
+	 * 查找用户信息
+	 * @param pageNum 页码
+	 * @param pageSize 页码显示条数
+	 * @return
+	 */
+	/*@RequestMapping(value="/getModel", produces = MediaType.APPLICATION_JSON_VALUE)
+	public PageInfo<Model> getUser(Integer pageNum, Integer pageSize) {
+		PageHelper.startPage(pageNum, pageSize);
+		List<Model> list = actModelService.queryByExample();
+		
+		PageInfo<Model> pageInfo = new PageInfo<Model>(list);
+		return pageInfo;
+	}*/
+	@RequestMapping(value="/getModel", produces = MediaType.APPLICATION_JSON_VALUE)
+	public PageInfo<Model> getUser(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+		//UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+		Integer orgId= (Integer) request.getSession().getAttribute("orgId");
+		//ObjectMapper mapper = new ObjectMapper();
+		//String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+		/*if(!userInfoObject.isEmpty()) {
+			UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+			//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+			modelMap.put("userInfo", userInfo);
+		}*/
+		
+		
+		
+		//Integer orgId = userInfo.getOrgId();
+		//Integer orgId = 12;
+		//Integer depotId = (Integer)request.getSession().getAttribute("depotId");
+		Integer depotId = orgId;
+		if (StringUtil.isNotEmpty(depotId.toString())) {
+			String category=depotId.toString();
+			PageHelper.startPage(pageNum, pageSize);
+			List<Model> list = actModelService.modelList(category);
+			PageInfo<Model> pageInfo = PageUtils.page2(list, pageNum, pageSize);
+//			PageInfo<Model> pageInfo = new PageInfo<Model>(list);
+			return pageInfo;
+		}else {
+			String category=orgId.toString();
+			PageHelper.startPage(pageNum, pageSize);
+			List<Model> list = actModelService.modelList(category);
+			PageInfo<Model> pageInfo = PageUtils.page2(list, pageNum, pageSize);
+//			PageInfo<Model> pageInfo = new PageInfo<Model>(list);
+			return pageInfo;
+		}
+	}
+	
+	
+	
+	/**
+	 * 创建模型
+	 * @param name流程图的名字
+	 * @param key 流程启动的key值
+	 * @param description 流程描述
+	 * @param category 流程图
+	 * @return
+	 */
+	@RequestMapping(value = "create", method = RequestMethod.POST)
+	public void create(String name, String key, String description, 
+			HttpServletRequest request, HttpServletResponse response) {
+		try {
+			Integer depotId =(Integer) request.getSession().getAttribute("depotId");
+			UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+			Integer orgId = userInfo.getOrgId();
+			if(StringUtil.isNotEmpty(depotId.toString())){
+				String category = depotId.toString();
+				org.activiti.engine.repository.Model modelData = actModelService.create(name, key, description, category);
+				String modelId = modelData.getId();
+				response.getWriter().write(modelId);
+			}else {
+				org.activiti.engine.repository.Model modelData = actModelService.create(name, key, description, orgId.toString());
+				String modelId = modelData.getId();
+				response.getWriter().write(modelId);
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 
+	 * @param id 根据编号查找用户信息
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE)
+	public Act edit(Integer id) {
+		Act act = new Act();
+		if (id != null) {
+//			user = userService.findById(id);
+		}
+		return act;
+	}
+	
+	/**
+	 * 删除Model
+	 * @param id 根据id删除
+	 * @param redirectAttributes 返回信息
+	 * @return
+	 */
+	@RequestMapping(value = "delete")
+	public String delete(String id, RedirectAttributes redirectAttributes) {
+		actModelService.delete(id);
+		redirectAttributes.addFlashAttribute("message", "删除成功，模型ID=" + id);
+		return null;
+	}
+	
+	/**
+	 * 导出model的xml文件
+	 * @param id根据id导出xml文件
+	 * 
+	 */
+	@RequestMapping(value = "export")
+	public void export(String id, HttpServletResponse response) {
+		actModelService.export(id, response);
+	}
+	
+	/**
+	 * 根据Model部署流程
+	 * @param id根据id部署流程定义
+	 * @param redirectAttributes 返回信息
+	 */
+	@RequestMapping(value = "deploy")
+	public Map<String, Object> deploy(String id, RedirectAttributes redirectAttributes) {
+		String message = actModelService.deploy(id);
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		modelMap.put("status", message);
+		redirectAttributes.addFlashAttribute("message", message);
+//		return "redirect:" + adminPath + "/act/process";
+		return modelMap;
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/controller/ActProcessController.java

@@ -0,0 +1,233 @@
+package com.chinaitop.depot.act.controller;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.stream.XMLStreamException;
+
+import org.activiti.engine.repository.ProcessDefinition;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.chinaitop.depot.act.model.DeploymentList;
+import com.chinaitop.depot.act.service.ActProcessService;
+import com.chinaitop.depot.act.service.DeleteService;
+import com.chinaitop.depot.utils.activiti.PageUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * 流程定义相关Controller
+ * @author xujh
+ * @version 2017-10-10
+ */
+@RestController
+@RequestMapping(value = "/act/process")
+public class ActProcessController{
+
+	@Resource
+	private ActProcessService actProcessService;
+	@Resource
+	private DeleteService deleteService;
+
+	/**
+	 * 流程定义列表
+	 * @param pageNum 页数
+	 * @param pageSize 每页多少条数
+	 * @return
+	 */
+	@RequestMapping(value="/processList")
+	public PageInfo<DeploymentList> processList(Integer pageNum, Integer pageSize, HttpServletRequest request) {
+		PageHelper.startPage(pageNum, pageSize);
+		List<ProcessDefinition> processList = actProcessService.processList(request);
+		List<DeploymentList> deploymentlist=new ArrayList<DeploymentList>();
+		if(processList!=null&&processList.size()>0){
+			for(ProcessDefinition m: processList){
+				DeploymentList deploymentLists=new DeploymentList();
+				deploymentLists.setId(m.getId());
+				deploymentLists.setName(m.getName());
+				deploymentLists.setKey(m.getKey());
+				deploymentLists.setVersion(m.getVersion());
+				deploymentLists.setResourceName(m.getResourceName());
+				deploymentLists.setDiagramResourceName(m.getDiagramResourceName());
+				deploymentLists.setDeploymentId(m.getDeploymentId());
+				deploymentlist.add(deploymentLists);
+			}
+			
+		}
+		PageInfo<DeploymentList> pageInfo = PageUtils.page2(deploymentlist, pageNum, pageSize);
+//		PageInfo<DeploymentList> pageInfo = new PageInfo<DeploymentList>(deploymentlist);
+		return pageInfo;
+	}
+	
+	/**
+	 * 运行中的实例列表
+	 */
+	@RequestMapping(value = "running")
+	public String runningList(String procInsId, String procDefKey, HttpServletRequest request, HttpServletResponse response, Model model) {
+	    /*Page<ProcessInstance> page = actProcessService.runningList(new Page<ProcessInstance>(request, response), procInsId, procDefKey);
+		model.addAttribute("page", page);
+		model.addAttribute("procInsId", procInsId);
+		model.addAttribute("procDefKey", procDefKey);*/
+		return "modules/act/actProcessRunningList";
+	}
+
+	/**
+	 * 部署流程
+	 */
+	@RequestMapping(value = "/deploy", method=RequestMethod.GET)
+	public String deploy(Model model) {
+		return "modules/act/actProcessDeploy";
+	}
+	
+	/**
+	 * 部署流程 - 保存
+	 */
+	@RequestMapping(value = "/deploy", method=RequestMethod.POST)
+	public String deploy(@Value("#{APP_PROP['activiti.export.diagram.path']}") String exportDir, 
+			String category, MultipartFile file, RedirectAttributes redirectAttributes) {
+
+		String fileName = file.getOriginalFilename();
+		
+		if (fileName==null){
+			redirectAttributes.addFlashAttribute("message", "请选择要部署的流程文件");
+		}else{
+			String message = actProcessService.deploy(exportDir, category, file);
+			redirectAttributes.addFlashAttribute("message", message);
+		}
+
+//		return "redirect:" + adminPath + "/act/process";
+		return null;
+	}
+	
+	/**
+	 * 设置流程分类
+	 */
+	@RequestMapping(value = "updateCategory")
+	public String updateCategory(String procDefId, String category, RedirectAttributes redirectAttributes) {
+		actProcessService.updateCategory(procDefId, category);
+//		return "redirect:" + adminPath + "/act/process";
+		return null;
+	}
+
+	/**
+	 * 挂起、激活流程实例
+	 */
+	@RequestMapping(value = "update/{state}")
+	public String updateState(@PathVariable("state") String state, String procDefId, RedirectAttributes redirectAttributes) {
+		String message = actProcessService.updateState(state, procDefId);
+		redirectAttributes.addFlashAttribute("message", message);
+//		return "redirect:" + adminPath + "/act/process";
+		return null;
+	}
+	
+	/**
+	 * 将部署的流程转换为模型
+	 */
+	@RequestMapping(value = "convert/toModel")
+	public String convertToModel(String procDefId, RedirectAttributes redirectAttributes) throws UnsupportedEncodingException, XMLStreamException {
+		org.activiti.engine.repository.Model modelData = actProcessService.convertToModel(procDefId);
+		redirectAttributes.addFlashAttribute("message", "转换模型成功，模型ID="+modelData.getId());
+//		return "redirect:" + adminPath + "/act/model";
+		return null;
+	}
+	
+	/**
+	 * 导出图片文件到硬盘
+	 */
+	@RequestMapping(value = "export/diagrams")
+	@ResponseBody
+	public List<String> exportDiagrams(@Value("#{APP_PROP['activiti.export.diagram.path']}") String exportDir) throws IOException {
+		List<String> files = actProcessService.exportDiagrams(exportDir);
+		return files;
+	}
+
+	/**
+	 * 删除部署的流程，级联删除流程实例
+	 * @param deploymentId 流程部署ID
+	 * @param redirectAttributes 返回信息
+	 */
+	@RequestMapping(value = "delete")
+	public String delete(String deploymentId,RedirectAttributes redirectAttributes) {
+		deleteService.deleteDeployment(deploymentId);
+		redirectAttributes.addFlashAttribute("message", "删除成功，模型ID=" + deploymentId);
+		return null;
+	}
+	
+	/**
+	 * 删除流程实例
+	 * @param procInsId 流程实例ID
+	 * @param reason 删除原因
+	 * @param redirectAttributes 返回信息
+	 */
+	@RequestMapping(value = "deleteProcIns")
+	public String deleteProcIns(String procInsId, String reason, RedirectAttributes redirectAttributes) {
+		if (reason==null){
+			addMessage(redirectAttributes, "请填写删除原因");
+		}else{
+			actProcessService.deleteProcIns(procInsId, reason);
+			addMessage(redirectAttributes, "删除流程实例成功，实例ID=" + procInsId);
+		}
+//		return "redirect:" + adminPath + "/act/process/running/";
+		return null;
+	}
+	
+	/**
+	 * 添加Flash消息
+	 */
+	protected void addMessage(RedirectAttributes redirectAttributes, String... messages) {
+		StringBuilder sb = new StringBuilder();
+		for (String message : messages){
+			sb.append(message).append(messages.length>1?"<br/>":"");
+		}
+		redirectAttributes.addFlashAttribute("message", sb.toString());
+	}
+	
+	/**
+	 * 查看流程图
+	 * @throws IOException 
+	 * @throws Exception 
+	 * @param deploymentId 流程定义的id
+	 * @param imageName 定义流程图的名字
+	 */
+	@RequestMapping(value = "viewImage")
+	public String viewImage(String deploymentId,String imageName,HttpServletResponse response) throws IOException{
+		InputStream in  = deleteService.findImageInputStream(deploymentId, imageName);
+		//3：从response对象获取输出流
+		OutputStream out = response.getOutputStream();
+//		OutputStream out = ServletActionContext.getResponse().getOutputStream();
+		//4：将输入流中的数据读取出来，写到输出流中
+		for(int b=-1;(b=in.read())!=-1;){
+			out.write(b);
+		}
+		out.close();
+		in.close();
+		return null;
+	}
+	
+	@RequestMapping(value = "resource/read")
+	public void resourceRead(String procDefId, String proInsId, String resType, HttpServletResponse response) throws Exception {
+		resType="xml";
+		InputStream resourceAsStream = actProcessService.resourceRead(procDefId, proInsId, resType);
+		byte[] b = new byte[1024];
+		int len = -1;
+		while ((len = resourceAsStream.read(b, 0, 1024)) != -1) {
+			response.getOutputStream().write(b, 0, len);
+		}
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/controller/ActRoleController.java

@@ -0,0 +1,82 @@
+package com.chinaitop.depot.act.controller;
+
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.RoleInfo;
+import com.chinaitop.depot.business.model.RoleInfoExample;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.business.service.RoleInfoService;
+import org.activiti.engine.delegate.Expression;
+import org.activiti.engine.impl.task.TaskDefinition;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@RestController
+@RequestMapping(value = "/act/roleList")
+public class ActRoleController {
+	@Resource
+	private ActTaskService actTaskService;
+
+	@Resource
+	private RoleInfoService roleInfoService;
+	/**
+	 * 查看下一个流程定义的人
+	 * @throws Exception
+	 * @param procInstId 流程定义的id
+	 */
+	@RequestMapping(value="/getUserList")
+	public Map<String, Object> getUserList(String procInstId, String type,Integer orgId) throws Exception{
+		/*procInstId = "190075";*/
+		int roleId = 0 ;
+		Map <String, Object> modelMap = new HashMap<String, Object>();
+		TaskDefinition nextTaskDefinition = actTaskService.nextTaskDefinition(procInstId);
+		if(nextTaskDefinition!=null){
+			Set<Expression> candidateGroupIdExpressions = nextTaskDefinition.getCandidateGroupIdExpressions();
+
+			List<RoleInfo> roleInfoList = new ArrayList<RoleInfo>();
+			for (Expression expression : candidateGroupIdExpressions) {
+				String string = expression.toString();
+				roleId = Integer.parseInt(string);
+				RoleInfo roleInfo = roleInfoService.findById(roleId);
+				if(roleInfo != null){
+					RoleInfoExample example = new RoleInfoExample();
+					RoleInfoExample.Criteria createCriteria = example.createCriteria();
+					createCriteria.andRoleNameEqualTo(roleInfo.getRoleName());
+					createCriteria.andOrgIdEqualTo(orgId);
+					roleInfoList.addAll(roleInfoService.queryByExample(example));
+				}
+			}
+			List<UserInfo> userByRoleId = new ArrayList<UserInfo>();
+			if(type.equals("transferContract")){
+				for(RoleInfo r : roleInfoList){
+					if(r.getRoleName().equals("中转部经理") || r.getRoleName().equals("库领导") ){
+						userByRoleId = actTaskService.getUserByRoleId(r.getRoleId(),orgId);
+						break;
+					}
+				}
+			}else{
+				for(RoleInfo r : roleInfoList){
+					if(r.getRoleName().equals("经营部经理") || r.getRoleName().equals("库领导") || r.getRoleName().equals("财务") ){
+						userByRoleId = actTaskService.getUserByRoleId(r.getRoleId(),orgId);
+						break;
+					}
+				}
+			}
+
+			if(userByRoleId.size()>0&&userByRoleId!=null){
+				modelMap.put("userByRoleId", userByRoleId);
+			}else {
+				modelMap.put("isEnd", true);
+			}
+
+		}else {
+			modelMap.put("isEnd", true);
+
+		}
+		return modelMap;
+
+	}
+
+}

src/main/java/com/chinaitop/depot/act/controller/ActTaskController.java

@@ -0,0 +1,176 @@
+package com.chinaitop.depot.act.controller;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.http.MediaType;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import com.chinaitop.depot.act.model.Act;
+import com.chinaitop.depot.act.model.DeploymentList;
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.enums.TaskType;
+import com.chinaitop.depot.business.service.BusinessPlanService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+
+/**
+ * 流程个人任务相关Controller
+ * @author xujh
+ * @version 2017-10-10
+ */
+@RestController
+@RequestMapping(value = "/act/task")
+public class ActTaskController {
+
+	@Resource
+	private ActTaskService actTaskService;
+	@Resource
+	private BusinessPlanService planService;
+	
+	/**
+	 * 获取待办列表
+	 * @param name 名字
+	 * @param act 实体类
+	 * @param pageNum 页数
+	 * @param pageSize 每页显示多少条
+	 * @param taskType  任务类型
+	 * @return
+	 */
+	@RequestMapping(value="/todoList", produces = MediaType.APPLICATION_JSON_VALUE)
+	public PageInfo<DeploymentList> todoList(String name,Act act,HttpServletResponse response, Integer pageNum, Integer pageSize,TaskType taskType) {
+		PageHelper.startPage(pageNum, pageSize);
+		name="1";
+		List<DeploymentList> todoList = actTaskService.todoList(name,taskType);
+		
+		PageInfo<DeploymentList> pageInfo = new PageInfo<DeploymentList>(todoList);
+		return pageInfo;
+	}
+	
+	
+	/**
+	 * 获取已办任务
+	 * @param name名字
+	 * @param taskType 任务类型
+	 * @param pageNum 页数
+	 * @param pageSize 每页显示多少条
+	 * @return
+	 */
+	@RequestMapping(value = "historic")
+	public PageInfo<DeploymentList> historicList(String name,String taskType, Integer pageNum, Integer pageSize) throws Exception {
+		PageHelper.startPage(pageNum, pageSize);
+		List<DeploymentList> historicList = actTaskService.historicList(name, taskType);
+		
+		PageInfo<DeploymentList> pageInfo = new PageInfo<DeploymentList>(historicList);
+		return pageInfo;
+	}
+
+	
+	/**
+	 * 获取流程表单
+	 * @param act	流程实体类
+	 * @param request	
+	 * @param model 
+	 * @param startAct 开始
+	 * @param endAct 结束
+	 */
+	@RequestMapping(value = "form")
+	public Map<String, Object> form(Act act, HttpServletRequest request, Model model, String startAct, String endAct){
+		
+		// 获取流程XML上的表单KEY
+		String formKey = actTaskService.getFormKey(act.getProcDefId(), act.getTaskDefKey());
+
+		// 获取流程实例对象
+		if (act.getProcInsId() != null){
+			act.setProcIns(actTaskService.getProcIns(act.getProcInsId()));
+		}
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		modelMap.put("url", formKey);
+		modelMap.put("taskId", act.getTaskId());
+		modelMap.put("taskName", act.getTaskName());
+		modelMap.put("taskDefKey", act.getTaskDefKey());
+		modelMap.put("procInsId", act.getProcInsId());
+		modelMap.put("procDefId", act.getProcDefId());
+		modelMap.put("status", act.getStatus());
+		modelMap.put("id", act.getBusinessId());
+		//得到流程对应的业务id
+		String businessId = act.getBusinessId();
+		Integer id = Integer.valueOf(businessId);
+		BusinessPlan plan = planService.findById(id);
+		//根据procInsId查找历史审批意见
+		String procInsId = act.getProcInsId();
+		
+		List<HistoryList> histoicFlowList = actTaskService.histoicFlowList(procInsId, startAct, endAct);
+		
+		List<HistoryList> historyList=new ArrayList<HistoryList>();
+		
+		if(histoicFlowList!=null&&histoicFlowList.size()>0){
+			for(HistoryList m: histoicFlowList){
+				HistoryList historyLists=new HistoryList();
+				historyLists.setAssigneeName(m.getAssigneeName());
+				historyLists.setComment(m.getComment());
+				historyList.add(historyLists);
+			}
+		}
+		modelMap.put("plan", plan);
+		modelMap.put("histoicFlowList", historyList);
+		return modelMap;
+//		return "redirect:" + ActUtils.getFormUrl(formKey, act);
+	}
+	
+
+	/**
+	 * 完成任务
+	 * @param act 流程定义的实体类
+	 * @param procInsId 流程实例ID
+	 * @param comment 任务提交意见的内容
+	 */
+	@RequestMapping(value = "complete")
+	@ResponseBody
+	public String complete(Act act,String taskId,String procInsId,String comment) {
+//		actTaskService.complete(act.getTaskId(), act.getProcInsId(), act.getComment(), act.getVars().getVariableMap());
+		return "true";//adminPath + "/act/task";
+	}
+	
+
+	/**
+	 * 获取历史审批意见
+	 * @param procInsId	流程实例ID
+	 * @param startAct	开始
+	 * @param endAct 结束
+	 * @param pageNum 页数
+	 * @param pageSize 每页显示多少条
+	 */
+	@RequestMapping(value = "/historyList")
+	public Map<String, Object> historyList(String procInsId,String startAct, String endAct,Integer pageNum, Integer pageSize){
+		List<HistoryList> histoicFlowList = actTaskService.histoicFlowList(procInsId, startAct, endAct);
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		List<HistoryList> historyList=new ArrayList<HistoryList>();
+		if(histoicFlowList!=null&&histoicFlowList.size()>0){
+			for(HistoryList m: histoicFlowList){
+				HistoryList historyLists=new HistoryList();
+				historyLists.setAssigneeName(m.getAssigneeName());
+				historyLists.setComment(m.getComment());
+				historyList.add(historyLists);
+			}
+		}
+		modelMap.put("histoicFlowList", historyList);
+		return modelMap;
+	}
+	
+	@RequestMapping(value = "/submintAgent")
+	public Map<String, Object> SubmintAgent(String processInstanceId,String userId){
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		String mgs = actTaskService.setAssigneeTask(processInstanceId, userId);
+		modelMap.put("mgs", mgs);
+		return modelMap;
+	}
+}

src/main/java/com/chinaitop/depot/act/controller/ActTemplateController.java

@@ -0,0 +1,51 @@
+package com.chinaitop.depot.act.controller;
+
+import java.io.UnsupportedEncodingException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.chinaitop.depot.act.service.ActTemplateService;
+@RestController
+@RequestMapping(value = "/act/template")
+public class ActTemplateController {
+	@Autowired
+	private ActTemplateService actTemplateService;
+	
+	@RequestMapping(value = "/deploy", method=RequestMethod.POST)
+	public String deploy( MultipartFile file, RedirectAttributes redirectAttributes, HttpServletRequest request) {
+
+		String fileName = file.getOriginalFilename();
+		
+		if (StringUtils.isBlank(fileName)){
+			redirectAttributes.addFlashAttribute("message", "请选择要部署的流程文件");
+		}else{
+			String message = actTemplateService.deploy(file,request);
+			return message;
+		}
+		return null;
+	}
+	
+	/**
+	 * 将部署的流程转换为模型
+	 * @param procDefId
+	 * @param redirectAttributes
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 * @throws XMLStreamException
+	 */
+	@RequestMapping(value = "convert/toModel")
+	public String convertToModel(String procDefId, RedirectAttributes redirectAttributes ) throws UnsupportedEncodingException, XMLStreamException {
+		org.activiti.engine.repository.Model modelData = actTemplateService.convertToModel(procDefId);
+		return "转换模型成功，模型ID="+modelData.getId();
+	}
+}

src/main/java/com/chinaitop/depot/act/mapper/ActMapper.java

@@ -0,0 +1,8 @@
+package com.chinaitop.depot.act.mapper;
+
+import com.chinaitop.depot.act.model.Act;
+
+
+public interface ActMapper {
+	public int updateProcInsIdByBusinessId(Act act);
+}

src/main/java/com/chinaitop/depot/act/mapper/ActMapper.xml

@@ -0,0 +1,11 @@
+<?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.chinaitop.depot.act.mapper.ActMapper">
+    
+	<update id="updateProcInsIdByBusinessId">
+		UPDATE ${businessTable} SET 
+			proc_ins_id = #{procInsId}
+		WHERE id = #{businessId}
+	</update>
+	
+</mapper>

src/main/java/com/chinaitop/depot/act/model/Act.java

@@ -0,0 +1,368 @@
+package com.chinaitop.depot.act.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Task;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.chinaitop.depot.utils.activiti.TimeUtils;
+import com.chinaitop.depot.utils.activiti.Variable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * 工作流Entity
+ * @author xujh
+ * @version 2017-10-11
+ */
+public class Act implements Serializable{
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 实体编号（唯一标识）
+	 */
+	private String id;
+	private String taskId; 		// 任务编号
+	private String taskName; 	// 任务名称
+	private String taskDefKey; 	// 任务定义Key（任务环节标识）
+	private String procInsId; 	// 流程实例ID
+	private String procDefId; 	// 流程定义ID
+	private String procDefKey; 	// 流程定义Key（流程定义标识）
+	private String businessTable;	// 业务绑定Table
+	private String businessId;		// 业务绑定ID
+	private String title; 		// 任务标题
+	private String status; 		// 任务状态（todo/claim/finish）
+	private String comment; 	// 任务意见
+	private String flag; 		// 意见状态
+	private Task task; 			// 任务对象
+	private ProcessDefinition procDef; 	// 流程定义对象
+	private ProcessInstance procIns;	// 流程实例对象
+	private HistoricTaskInstance histTask; // 历史任务
+	private HistoricActivityInstance histIns;	//历史活动任务
+	private String assignee; // 任务执行人编号
+	private String assigneeName; // 任务执行人名称
+	private Variable vars; 		// 流程变量
+	private Date beginDate;	// 开始查询日期
+	private Date endDate;	// 结束查询日期
+	private List<Act> list; // 任务列表
+	private Date startDate;
+	private Long usedDate;
+	
+	
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Act() {
+		super();
+	}
+
+	public String getTaskId() {
+		if (taskId == null && task != null){
+			taskId = task.getId();
+		}
+		return taskId;
+	}
+
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+
+	public String getTaskName() {
+		if (taskName == null && task != null){
+			taskName = task.getName();
+		}
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskDefKey() {
+		if (taskDefKey == null && task != null){
+			taskDefKey = task.getTaskDefinitionKey();
+		}
+		return taskDefKey;
+	}
+
+	public void setTaskDefKey(String taskDefKey) {
+		this.taskDefKey = taskDefKey;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getTaskCreateDate() {
+		if (task != null){
+			return task.getCreateTime();
+		}
+		return null;
+	}
+	
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getTaskEndDate() {
+		if (histTask != null){
+			return histTask.getEndTime();
+		}
+		return null;
+	}
+	
+	@JsonIgnore
+	public Task getTask() {
+		return task;
+	}
+
+	public void setTask(Task task) {
+		this.task = task;
+	}
+
+	@JsonIgnore
+	public ProcessDefinition getProcDef() {
+		return procDef;
+	}
+
+	public void setProcDef(ProcessDefinition procDef) {
+		this.procDef = procDef;
+	}
+	
+	public String getProcDefName() {
+		return procDef.getName();
+	}
+
+	@JsonIgnore
+	public ProcessInstance getProcIns() {
+		return procIns;
+	}
+
+	public void setProcIns(ProcessInstance procIns) {
+		this.procIns = procIns;
+		if (procIns != null && procIns.getBusinessKey() != null){
+			String[] ss = procIns.getBusinessKey().split(":");
+			setBusinessTable(ss[0]);
+			setBusinessId(ss[1]);
+		}
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+
+	@JsonIgnore
+	public HistoricTaskInstance getHistTask() {
+		return histTask;
+	}
+
+	public void setHistTask(HistoricTaskInstance histTask) {
+		this.histTask = histTask;
+	}
+
+	@JsonIgnore
+	public HistoricActivityInstance getHistIns() {
+		return histIns;
+	}
+
+	public void setHistIns(HistoricActivityInstance histIns) {
+		this.histIns = histIns;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getFlag() {
+		return flag;
+	}
+
+	public void setFlag(String flag) {
+		this.flag = flag;
+	}
+
+	public String getProcDefId() {
+		if (procDefId == null && task != null){
+			procDefId = task.getProcessDefinitionId();
+		}
+		return procDefId;
+	}
+
+	public void setProcDefId(String procDefId) {
+		this.procDefId = procDefId;
+	}
+
+	public String getProcInsId() {
+		if (procInsId == null && task != null){
+			procInsId = task.getProcessInstanceId();
+		}
+		return procInsId;
+	}
+
+	public void setProcInsId(String procInsId) {
+		this.procInsId = procInsId;
+	}
+
+	public String getBusinessId() {
+		return businessId;
+	}
+
+	public void setBusinessId(String businessId) {
+		this.businessId = businessId;
+	}
+
+	public String getBusinessTable() {
+		return businessTable;
+	}
+
+	public void setBusinessTable(String businessTable) {
+		this.businessTable = businessTable;
+	}
+
+	public String getAssigneeName() {
+		return assigneeName;
+	}
+
+	public void setAssigneeName(String assigneeName) {
+		this.assigneeName = assigneeName;
+	}
+
+	public String getAssignee() {
+		if (assignee == null && task != null){
+			assignee = task.getAssignee();
+		}
+		return assignee;
+	}
+
+	public void setAssignee(String assignee) {
+		this.assignee = assignee;
+	}
+
+	public List<Act> getList() {
+		return list;
+	}
+
+	public void setList(List<Act> list) {
+		this.list = list;
+	}
+
+	public Variable getVars() {
+		return vars;
+	}
+
+	public void setVars(Variable vars) {
+		this.vars = vars;
+	}
+	
+	/**
+	 * 通过Map设置流程变量值
+	 * @param map
+	 */
+	public void setVars(Map<String, Object> map) {
+		this.vars = new Variable(map);
+	}
+
+	/**
+	 * 获取流程定义KEY
+	 * @return
+	 */
+	public String getProcDefKey() {
+		/*if (StringUtils.isBlank(procDefKey) && StringUtils.isNotBlank(procDefId)){
+			procDefKey = StringUtils.split(procDefId, ":")[0];
+		}*/
+		if (procDefKey==null&& procDefId!=null){
+			procDefKey = StringUtils.split(procDefId, ":")[0];
+		}
+		return procDefKey;
+	}
+
+	public void setProcDefKey(String procDefKey) {
+		this.procDefKey = procDefKey;
+	}
+	
+	/**
+	 * 获取过去的任务历时
+	 * @return
+	 */
+	public String getDurationTime(){
+		if (histIns!=null && histIns.getDurationInMillis() != null){
+			return TimeUtils.toTimeString(histIns.getDurationInMillis());
+		}
+		return "";
+	}
+	
+	/**
+	 * 是否是一个待办任务
+	 * @return
+	 */
+	public boolean isTodoTask(){
+		return "todo".equals(status) || "claim".equals(status);
+	}
+	
+	/**
+	 * 是否是已完成任务
+	 * @return
+	 */
+	public boolean isFinishTask(){
+		return "finish".equals(status) || StringUtils.isBlank(taskId);
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Long getUsedDate() {
+		return usedDate;
+	}
+
+	public void setUsedDate(Long usedDate) {
+		this.usedDate = usedDate;
+	}
+
+
+}
+
+

src/main/java/com/chinaitop/depot/act/model/DeploymentList.java

@@ -0,0 +1,128 @@
+package com.chinaitop.depot.act.model;
+
+import java.util.Date;
+
+/**
+ * 工作流ProcessDefinition展示内容
+ * @author xujh
+ * @version 2017-10-11
+ */
+public class DeploymentList {
+	
+	private String id;
+	private String key; 
+	private String name;
+	private Integer version;
+	private Date createTime;
+	private Date lastUpdateTime;
+	private String resourceName;
+	private String diagramResourceName;
+	private String deploymentId;
+	private String taskDefKey;
+	private String procInsId;
+	private String procDefId;
+	private String status;
+	private String taskName;
+	private String taskId;
+	private String describe;
+	
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getKey() {
+		return key;
+	}
+	public void setKey(String key) {
+		this.key = key;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getVersion() {
+		return version;
+	}
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
+	
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	
+	public Date getLastUpdateTime() {
+		return lastUpdateTime;
+	}
+	public void setLastUpdateTime(Date lastUpdateTime) {
+		this.lastUpdateTime = lastUpdateTime;
+	}
+	public String getResourceName() {
+		return resourceName;
+	}
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+	public String getDiagramResourceName() {
+		return diagramResourceName;
+	}
+	public void setDiagramResourceName(String diagramResourceName) {
+		this.diagramResourceName = diagramResourceName;
+	}
+	public String getDeploymentId() {
+		return deploymentId;
+	}
+	public void setDeploymentId(String deploymentId) {
+		this.deploymentId = deploymentId;
+	}
+	public String getTaskDefKey() {
+		return taskDefKey;
+	}
+	public void setTaskDefKey(String taskDefKey) {
+		this.taskDefKey = taskDefKey;
+	}
+	public String getProcInsId() {
+		return procInsId;
+	}
+	public void setProcInsId(String procInsId) {
+		this.procInsId = procInsId;
+	}
+	public String getProcDefId() {
+		return procDefId;
+	}
+	public void setProcDefId(String procDefId) {
+		this.procDefId = procDefId;
+	}
+	public String getStatus() {
+		return status;
+	}
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	public String getTaskName() {
+		return taskName;
+	}
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+	public String getTaskId() {
+		return taskId;
+	}
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+	public String getDescribe() {
+		return describe;
+	}
+	public void setDescribe(String describe) {
+		this.describe = describe;
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/model/HistoryList.java

@@ -0,0 +1,69 @@
+package com.chinaitop.depot.act.model;
+
+import java.util.Date;
+
+/**
+ * 审批历史意见
+ * */
+public class HistoryList {
+	private String assigneeName;//审批人
+	//意见
+	private String comment;//审批意见
+	
+	private Date startTime;//开始时间
+	
+	private Date EndDate;//结束时间
+	
+	private String activityName;//审批人岗位
+	
+	private String department;//申请人部门
+
+	public String getAssigneeName() {
+		return assigneeName;
+	}
+
+	public void setAssigneeName(String assigneeName) {
+		this.assigneeName = assigneeName;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndDate() {
+		return EndDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		EndDate = endDate;
+	}
+
+	public String getActivityName() {
+		return activityName;
+	}
+
+	public void setActivityName(String activityName) {
+		this.activityName = activityName;
+	}
+
+	public String getDepartment() {
+		return department;
+	}
+
+	public void setDepartment(String department) {
+		this.department = department;
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/model/RoleInfoVo.java

@@ -0,0 +1,28 @@
+package com.chinaitop.depot.act.model;
+
+import com.chinaitop.depot.business.model.RoleInfo;
+
+public class RoleInfoVo extends RoleInfo{
+
+	private Integer id;
+	
+	private String name;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	
+}

src/main/java/com/chinaitop/depot/act/rest/diagram/services/BaseProcessDefinitionDiagramLayoutResource.java

@@ -0,0 +1,483 @@
+package com.chinaitop.depot.act.rest.diagram.services;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.ActivitiObjectNotFoundException;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.impl.bpmn.behavior.BoundaryEventActivityBehavior;
+import org.activiti.engine.impl.bpmn.behavior.CallActivityBehavior;
+import org.activiti.engine.impl.bpmn.parser.BpmnParse;
+import org.activiti.engine.impl.bpmn.parser.ErrorEventDefinition;
+import org.activiti.engine.impl.bpmn.parser.EventSubscriptionDeclaration;
+import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.delegate.ActivityBehavior;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.process.Lane;
+import org.activiti.engine.impl.pvm.process.LaneSet;
+import org.activiti.engine.impl.pvm.process.ParticipantProcess;
+import org.activiti.engine.impl.pvm.process.TransitionImpl;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.Execution;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+/**
+ * 查看流程图工具
+ * @author xujh
+ * @version 2017-10-17
+ */
+public class BaseProcessDefinitionDiagramLayoutResource {
+
+	@Autowired
+	private RuntimeService runtimeService;
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	@Autowired
+	private HistoryService historyService;
+
+	@SuppressWarnings("deprecation")
+	public ObjectNode getDiagramNode(String processInstanceId, String processDefinitionId) {
+		List<String> highLightedFlows = Collections.<String> emptyList();
+		List<String> highLightedActivities = Collections.<String> emptyList();
+
+		Map<String, ObjectNode> subProcessInstanceMap = new HashMap<String, ObjectNode>();
+
+		ProcessInstance processInstance = null;
+		if (processInstanceId != null) {
+			processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+			if (processInstance == null) {
+				throw new ActivitiObjectNotFoundException("Process instance could not be found");
+			}
+			processDefinitionId = processInstance.getProcessDefinitionId();
+
+			List<ProcessInstance> subProcessInstances = runtimeService.createProcessInstanceQuery().superProcessInstanceId(processInstanceId).list();
+
+			for (ProcessInstance subProcessInstance : subProcessInstances) {
+				String subDefId = subProcessInstance.getProcessDefinitionId();
+
+				String superExecutionId = ((ExecutionEntity) subProcessInstance).getSuperExecutionId();
+				ProcessDefinitionEntity subDef = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(subDefId);
+
+				ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
+				processInstanceJSON.put("processInstanceId", subProcessInstance.getId());
+				processInstanceJSON.put("superExecutionId", superExecutionId);
+				processInstanceJSON.put("processDefinitionId", subDef.getId());
+				processInstanceJSON.put("processDefinitionKey", subDef.getKey());
+				processInstanceJSON.put("processDefinitionName", subDef.getName());
+
+				subProcessInstanceMap.put(superExecutionId, processInstanceJSON);
+			}
+		}
+
+		if (processDefinitionId == null) {
+			throw new ActivitiObjectNotFoundException("No process definition id provided");
+		}
+
+		ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
+
+		if (processDefinition == null) {
+			throw new ActivitiException("Process definition " + processDefinitionId + " could not be found");
+		}
+
+		ObjectNode responseJSON = new ObjectMapper().createObjectNode();
+
+		// Process definition
+		JsonNode pdrJSON = getProcessDefinitionResponse(processDefinition);
+
+		if (pdrJSON != null) {
+			responseJSON.put("processDefinition", pdrJSON);
+		}
+
+		// Highlighted activities
+		if (processInstance != null) {
+			ArrayNode activityArray = new ObjectMapper().createArrayNode();
+			ArrayNode flowsArray = new ObjectMapper().createArrayNode();
+
+			highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+			highLightedFlows = getHighLightedFlows(processInstanceId, processDefinition);
+
+			for (String activityName : highLightedActivities) {
+				activityArray.add(activityName);
+			}
+
+			for (String flow : highLightedFlows)
+				flowsArray.add(flow);
+
+			responseJSON.put("highLightedActivities", activityArray);
+			responseJSON.put("highLightedFlows", flowsArray);
+		}
+
+		// Pool shape, if process is participant in collaboration
+		if (processDefinition.getParticipantProcess() != null) {
+			ParticipantProcess pProc = processDefinition.getParticipantProcess();
+
+			ObjectNode participantProcessJSON = new ObjectMapper().createObjectNode();
+			participantProcessJSON.put("id", pProc.getId());
+			if (StringUtils.isNotEmpty(pProc.getName())) {
+				participantProcessJSON.put("name", pProc.getName());
+			} else {
+				participantProcessJSON.put("name", "");
+			}
+			participantProcessJSON.put("x", pProc.getX());
+			participantProcessJSON.put("y", pProc.getY());
+			participantProcessJSON.put("width", pProc.getWidth());
+			participantProcessJSON.put("height", pProc.getHeight());
+
+			responseJSON.put("participantProcess", participantProcessJSON);
+		}
+
+		// Draw lanes
+
+		if (processDefinition.getLaneSets() != null && !processDefinition.getLaneSets().isEmpty()) {
+			ArrayNode laneSetArray = new ObjectMapper().createArrayNode();
+			for (LaneSet laneSet : processDefinition.getLaneSets()) {
+				ArrayNode laneArray = new ObjectMapper().createArrayNode();
+				if (laneSet.getLanes() != null && !laneSet.getLanes().isEmpty()) {
+					for (Lane lane : laneSet.getLanes()) {
+						ObjectNode laneJSON = new ObjectMapper().createObjectNode();
+						laneJSON.put("id", lane.getId());
+						if (StringUtils.isNotEmpty(lane.getName())) {
+							laneJSON.put("name", lane.getName());
+						} else {
+							laneJSON.put("name", "");
+						}
+						laneJSON.put("x", lane.getX());
+						laneJSON.put("y", lane.getY());
+						laneJSON.put("width", lane.getWidth());
+						laneJSON.put("height", lane.getHeight());
+
+						List<String> flowNodeIds = lane.getFlowNodeIds();
+						ArrayNode flowNodeIdsArray = new ObjectMapper().createArrayNode();
+						for (String flowNodeId : flowNodeIds) {
+							flowNodeIdsArray.add(flowNodeId);
+						}
+						laneJSON.put("flowNodeIds", flowNodeIdsArray);
+
+						laneArray.add(laneJSON);
+					}
+				}
+				ObjectNode laneSetJSON = new ObjectMapper().createObjectNode();
+				laneSetJSON.put("id", laneSet.getId());
+				if (StringUtils.isNotEmpty(laneSet.getName())) {
+					laneSetJSON.put("name", laneSet.getName());
+				} else {
+					laneSetJSON.put("name", "");
+				}
+				laneSetJSON.put("lanes", laneArray);
+
+				laneSetArray.add(laneSetJSON);
+			}
+
+			if (laneSetArray.size() > 0)
+				responseJSON.put("laneSets", laneSetArray);
+		}
+
+		ArrayNode sequenceFlowArray = new ObjectMapper().createArrayNode();
+		ArrayNode activityArray = new ObjectMapper().createArrayNode();
+
+		// Activities and their sequence-flows
+
+		for (ActivityImpl activity : processDefinition.getActivities()) {
+			getActivity(processInstanceId, activity, activityArray, sequenceFlowArray, processInstance, highLightedFlows, subProcessInstanceMap);
+		}
+
+		responseJSON.put("activities", activityArray);
+		responseJSON.put("sequenceFlows", sequenceFlowArray);
+
+		return responseJSON;
+	}
+
+	private List<String> getHighLightedFlows(String processInstanceId, ProcessDefinitionEntity processDefinition) {
+
+		List<String> highLightedFlows = new ArrayList<String>();
+		List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
+				.processInstanceId(processInstanceId).orderByHistoricActivityInstanceStartTime().asc().list();
+
+		List<String> historicActivityInstanceList = new ArrayList<String>();
+		for (HistoricActivityInstance hai : historicActivityInstances) {
+			historicActivityInstanceList.add(hai.getActivityId());
+		}
+
+		// add current activities to list
+		List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+		historicActivityInstanceList.addAll(highLightedActivities);
+
+		// activities and their sequence-flows
+		for (ActivityImpl activity : processDefinition.getActivities()) {
+			int index = historicActivityInstanceList.indexOf(activity.getId());
+
+			if (index >= 0 && index + 1 < historicActivityInstanceList.size()) {
+				List<PvmTransition> pvmTransitionList = activity.getOutgoingTransitions();
+				for (PvmTransition pvmTransition : pvmTransitionList) {
+					String destinationFlowId = pvmTransition.getDestination().getId();
+					if (destinationFlowId.equals(historicActivityInstanceList.get(index + 1))) {
+						highLightedFlows.add(pvmTransition.getId());
+					}
+				}
+			}
+		}
+		return highLightedFlows;
+	}
+
+	@SuppressWarnings("deprecation")
+	private void getActivity(String processInstanceId, ActivityImpl activity, ArrayNode activityArray, ArrayNode sequenceFlowArray,
+			ProcessInstance processInstance, List<String> highLightedFlows, Map<String, ObjectNode> subProcessInstanceMap) {
+
+		ObjectNode activityJSON = new ObjectMapper().createObjectNode();
+
+		// Gather info on the multi instance marker
+		String multiInstance = (String) activity.getProperty("multiInstance");
+		if (multiInstance != null) {
+			if (!"sequential".equals(multiInstance)) {
+				multiInstance = "parallel";
+			}
+		}
+
+		ActivityBehavior activityBehavior = activity.getActivityBehavior();
+		// Gather info on the collapsed marker
+		Boolean collapsed = (activityBehavior instanceof CallActivityBehavior);
+		Boolean expanded = (Boolean) activity.getProperty(BpmnParse.PROPERTYNAME_ISEXPANDED);
+		if (expanded != null) {
+			collapsed = !expanded;
+		}
+
+		Boolean isInterrupting = null;
+		if (activityBehavior instanceof BoundaryEventActivityBehavior) {
+			isInterrupting = ((BoundaryEventActivityBehavior) activityBehavior).isInterrupting();
+		}
+
+		// Outgoing transitions of activity
+		for (PvmTransition sequenceFlow : activity.getOutgoingTransitions()) {
+			String flowName = (String) sequenceFlow.getProperty("name");
+			boolean isHighLighted = (highLightedFlows.contains(sequenceFlow.getId()));
+			boolean isConditional = sequenceFlow.getProperty(BpmnParse.PROPERTYNAME_CONDITION) != null
+					&& !((String) activity.getProperty("type")).toLowerCase().contains("gateway");
+			boolean isDefault = sequenceFlow.getId().equals(activity.getProperty("default"))
+					&& ((String) activity.getProperty("type")).toLowerCase().contains("gateway");
+
+			List<Integer> waypoints = ((TransitionImpl) sequenceFlow).getWaypoints();
+			ArrayNode xPointArray = new ObjectMapper().createArrayNode();
+			ArrayNode yPointArray = new ObjectMapper().createArrayNode();
+			for (int i = 0; i < waypoints.size(); i += 2) { // waypoints.size()
+															// minimally 4: x1, y1,
+															// x2, y2
+				xPointArray.add(waypoints.get(i));
+				yPointArray.add(waypoints.get(i + 1));
+			}
+
+			ObjectNode flowJSON = new ObjectMapper().createObjectNode();
+			flowJSON.put("id", sequenceFlow.getId());
+			flowJSON.put("name", flowName);
+			flowJSON.put("flow", "(" + sequenceFlow.getSource().getId() + ")--" + sequenceFlow.getId() + "-->("
+					+ sequenceFlow.getDestination().getId() + ")");
+
+			if (isConditional)
+				flowJSON.put("isConditional", isConditional);
+			if (isDefault)
+				flowJSON.put("isDefault", isDefault);
+			if (isHighLighted)
+				flowJSON.put("isHighLighted", isHighLighted);
+
+			flowJSON.put("xPointArray", xPointArray);
+			flowJSON.put("yPointArray", yPointArray);
+
+			sequenceFlowArray.add(flowJSON);
+		}
+
+		// Nested activities (boundary events)
+		ArrayNode nestedActivityArray = new ObjectMapper().createArrayNode();
+		for (ActivityImpl nestedActivity : activity.getActivities()) {
+			nestedActivityArray.add(nestedActivity.getId());
+		}
+
+		Map<String, Object> properties = activity.getProperties();
+		ObjectNode propertiesJSON = new ObjectMapper().createObjectNode();
+		for (String key : properties.keySet()) {
+			Object prop = properties.get(key);
+			if (prop instanceof String)
+				propertiesJSON.put(key, (String) properties.get(key));
+			else if (prop instanceof Integer)
+				propertiesJSON.put(key, (Integer) properties.get(key));
+			else if (prop instanceof Boolean)
+				propertiesJSON.put(key, (Boolean) properties.get(key));
+			else if ("initial".equals(key)) {
+				ActivityImpl act = (ActivityImpl) properties.get(key);
+				propertiesJSON.put(key, act.getId());
+			} else if ("timerDeclarations".equals(key)) {
+				@SuppressWarnings("unchecked")
+				ArrayList<TimerDeclarationImpl> timerDeclarations = (ArrayList<TimerDeclarationImpl>) properties.get(key);
+				ArrayNode timerDeclarationArray = new ObjectMapper().createArrayNode();
+
+				if (timerDeclarations != null)
+					for (TimerDeclarationImpl timerDeclaration : timerDeclarations) {
+						ObjectNode timerDeclarationJSON = new ObjectMapper().createObjectNode();
+
+						timerDeclarationJSON.put("isExclusive", timerDeclaration.isExclusive());
+						if (timerDeclaration.getRepeat() != null)
+							timerDeclarationJSON.put("repeat", timerDeclaration.getRepeat());
+
+						timerDeclarationJSON.put("retries", String.valueOf(timerDeclaration.getRetries()));
+						timerDeclarationJSON.put("type", timerDeclaration.getJobHandlerType());
+						timerDeclarationJSON.put("configuration", timerDeclaration.getJobHandlerConfiguration());
+						//timerDeclarationJSON.put("expression", timerDeclaration.getDescription());
+
+						timerDeclarationArray.add(timerDeclarationJSON);
+					}
+				if (timerDeclarationArray.size() > 0)
+					propertiesJSON.put(key, timerDeclarationArray);
+				// TODO: implement getting description
+			} else if ("eventDefinitions".equals(key)) {
+				@SuppressWarnings("unchecked")
+				ArrayList<EventSubscriptionDeclaration> eventDefinitions = (ArrayList<EventSubscriptionDeclaration>) properties.get(key);
+				ArrayNode eventDefinitionsArray = new ObjectMapper().createArrayNode();
+
+				if (eventDefinitions != null) {
+					for (EventSubscriptionDeclaration eventDefinition : eventDefinitions) {
+						ObjectNode eventDefinitionJSON = new ObjectMapper().createObjectNode();
+
+						if (eventDefinition.getActivityId() != null)
+							eventDefinitionJSON.put("activityId", eventDefinition.getActivityId());
+
+						eventDefinitionJSON.put("eventName", eventDefinition.getEventName());
+						eventDefinitionJSON.put("eventType", eventDefinition.getEventType());
+						eventDefinitionJSON.put("isAsync", eventDefinition.isAsync());
+						eventDefinitionJSON.put("isStartEvent", eventDefinition.isStartEvent());
+						eventDefinitionsArray.add(eventDefinitionJSON);
+					}
+				}
+
+				if (eventDefinitionsArray.size() > 0)
+					propertiesJSON.put(key, eventDefinitionsArray);
+
+				// TODO: implement it
+			} else if ("errorEventDefinitions".equals(key)) {
+				@SuppressWarnings("unchecked")
+				ArrayList<ErrorEventDefinition> errorEventDefinitions = (ArrayList<ErrorEventDefinition>) properties.get(key);
+				ArrayNode errorEventDefinitionsArray = new ObjectMapper().createArrayNode();
+
+				if (errorEventDefinitions != null) {
+					for (ErrorEventDefinition errorEventDefinition : errorEventDefinitions) {
+						ObjectNode errorEventDefinitionJSON = new ObjectMapper().createObjectNode();
+
+						if (errorEventDefinition.getErrorCode() != null)
+							errorEventDefinitionJSON.put("errorCode", errorEventDefinition.getErrorCode());
+						else
+							errorEventDefinitionJSON.putNull("errorCode");
+
+						errorEventDefinitionJSON.put("handlerActivityId", errorEventDefinition.getHandlerActivityId());
+
+						errorEventDefinitionsArray.add(errorEventDefinitionJSON);
+					}
+				}
+
+				if (errorEventDefinitionsArray.size() > 0)
+					propertiesJSON.put(key, errorEventDefinitionsArray);
+			}
+
+		}
+
+		if ("callActivity".equals(properties.get("type"))) {
+			CallActivityBehavior callActivityBehavior = null;
+
+			if (activityBehavior instanceof CallActivityBehavior) {
+				callActivityBehavior = (CallActivityBehavior) activityBehavior;
+			}
+
+			if (callActivityBehavior != null) {
+				propertiesJSON.put("processDefinitonKey", callActivityBehavior.getProcessDefinitonKey());
+
+				// get processDefinitonId from execution or get last processDefinitonId
+				// by key
+				ArrayNode processInstanceArray = new ObjectMapper().createArrayNode();
+				if (processInstance != null) {
+					List<Execution> executionList = runtimeService.createExecutionQuery().processInstanceId(processInstanceId)
+							.activityId(activity.getId()).list();
+					if (!executionList.isEmpty()) {
+						for (Execution execution : executionList) {
+							ObjectNode processInstanceJSON = subProcessInstanceMap.get(execution.getId());
+							processInstanceArray.add(processInstanceJSON);
+						}
+					}
+				}
+
+				// If active activities nas no instance of this callActivity then add
+				// last definition
+				if (processInstanceArray.size() == 0 && StringUtils.isNotEmpty(callActivityBehavior.getProcessDefinitonKey())) {
+					// Get last definition by key
+					ProcessDefinition lastProcessDefinition = repositoryService.createProcessDefinitionQuery()
+							.processDefinitionKey(callActivityBehavior.getProcessDefinitonKey()).latestVersion().singleResult();
+
+					// TODO: unuseful fields there are processDefinitionName, processDefinitionKey
+					if (lastProcessDefinition != null) {
+						ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
+						processInstanceJSON.put("processDefinitionId", lastProcessDefinition.getId());
+						processInstanceJSON.put("processDefinitionKey", lastProcessDefinition.getKey());
+						processInstanceJSON.put("processDefinitionName", lastProcessDefinition.getName());
+						processInstanceArray.add(processInstanceJSON);
+					}
+				}
+
+				if (processInstanceArray.size() > 0) {
+					propertiesJSON.put("processDefinitons", processInstanceArray);
+				}
+			}
+		}
+
+		activityJSON.put("activityId", activity.getId());
+		activityJSON.put("properties", propertiesJSON);
+		if (multiInstance != null)
+			activityJSON.put("multiInstance", multiInstance);
+		if (collapsed)
+			activityJSON.put("collapsed", collapsed);
+		if (nestedActivityArray.size() > 0)
+			activityJSON.put("nestedActivities", nestedActivityArray);
+		if (isInterrupting != null)
+			activityJSON.put("isInterrupting", isInterrupting);
+
+		activityJSON.put("x", activity.getX());
+		activityJSON.put("y", activity.getY());
+		activityJSON.put("width", activity.getWidth());
+		activityJSON.put("height", activity.getHeight());
+
+		activityArray.add(activityJSON);
+
+		// Nested activities (boundary events)
+		for (ActivityImpl nestedActivity : activity.getActivities()) {
+			getActivity(processInstanceId, nestedActivity, activityArray, sequenceFlowArray, processInstance, highLightedFlows, subProcessInstanceMap);
+		}
+	}
+
+	private JsonNode getProcessDefinitionResponse(ProcessDefinitionEntity processDefinition) {
+		ObjectMapper mapper = new ObjectMapper();
+		ObjectNode pdrJSON = mapper.createObjectNode();
+		pdrJSON.put("id", processDefinition.getId());
+		pdrJSON.put("name", processDefinition.getName());
+		pdrJSON.put("key", processDefinition.getKey());
+		pdrJSON.put("version", processDefinition.getVersion());
+		pdrJSON.put("deploymentId", processDefinition.getDeploymentId());
+		pdrJSON.put("isGraphicNotationDefined", isGraphicNotationDefined(processDefinition));
+		return pdrJSON;
+	}
+
+	private boolean isGraphicNotationDefined(ProcessDefinitionEntity processDefinition) {
+		return ((ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinition.getId())).isGraphicalNotationDefined();
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.act.rest.diagram.services;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+/**
+ * 查看流程图工具
+ * @author xujh
+ * @version 2017-10-17
+ */
+@RestController
+public class ProcessDefinitionDiagramLayoutResource extends BaseProcessDefinitionDiagramLayoutResource {
+	
+	@RequestMapping(value = "/act/service/process-definition/{processDefinitionId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processDefinitionId) {
+		return getDiagramNode(null, processDefinitionId);
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java

@@ -0,0 +1,22 @@
+package com.chinaitop.depot.act.rest.diagram.services;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+/**
+ * 查看流程图工具
+ * @author xujh
+ * @version 2017-10-17
+ */
+@RestController
+public class ProcessInstanceDiagramLayoutResource extends BaseProcessDefinitionDiagramLayoutResource {
+
+	@RequestMapping(value = "/act/service/process-instance/{processInstanceId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processInstanceId) {
+		return getDiagramNode(processInstanceId, null);
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/rest/diagram/services/ProcessInstanceHighlightsResource.java

@@ -0,0 +1,279 @@
+package com.chinaitop.depot.act.rest.diagram.services;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+/**
+ * 查看流程图工具
+ * @author xujh
+ * @version 2017-10-17
+ */
+@RestController
+public class ProcessInstanceHighlightsResource {
+
+	@Autowired
+	private RuntimeService runtimeService;
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	@Autowired
+	private HistoryService historyService;
+
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@SuppressWarnings("deprecation")
+	@RequestMapping(value = "/act/service/process-instance/{processInstanceId}/highlights", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getHighlighted(@PathVariable String processInstanceId) {
+		ObjectNode responseJSON = objectMapper.createObjectNode();
+
+		responseJSON.put("processInstanceId", processInstanceId);
+
+		ArrayNode activitiesArray = objectMapper.createArrayNode();
+		ArrayNode flowsArray = objectMapper.createArrayNode();
+
+		try {
+			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+			/*ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processInstance
+					.getProcessDefinitionId());
+
+			responseJSON.put("processDefinitionId", processInstance.getProcessDefinitionId());
+
+			List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+			List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
+
+			for (String activityId : highLightedActivities) {
+				activitiesArray.add(activityId);
+			}
+
+			for (String flow : highLightedFlows) {
+				flowsArray.add(flow);
+			}*/
+			
+			if(processInstance!=null) {
+				ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processInstance
+						.getProcessDefinitionId());
+
+				responseJSON.put("processDefinitionId", processInstance.getProcessDefinitionId());
+
+				List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+				List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
+
+				for (String activityId : highLightedActivities) {
+					activitiesArray.add(activityId);
+				}
+
+				for (String flow : highLightedFlows) {
+					flowsArray.add(flow);
+				}
+			} else {
+				HistoricProcessInstance processDefinition2 = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+				ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinition2
+						.getProcessDefinitionId());
+				responseJSON.put("processDefinitionId", processDefinition2.getProcessDefinitionId());
+				List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
+
+				for (String flow : highLightedFlows) {
+					flowsArray.add(flow);
+				}
+
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		responseJSON.put("activities", activitiesArray);
+		responseJSON.put("flows", flowsArray);
+
+		return responseJSON;
+	}
+
+	/**
+	 * getHighLightedFlows
+	 * 
+	 * @param processDefinition
+	 * @param processInstanceId
+	 * @return
+	 */
+	private List<String> getHighLightedFlows(ProcessDefinitionEntity processDefinition, String processInstanceId) {
+
+		List<String> highLightedFlows = new ArrayList<String>();
+
+		List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
+				.processInstanceId(processInstanceId)
+				//order by startime asc is not correct. use default order is correct.
+				//.orderByHistoricActivityInstanceStartTime().asc()/*.orderByActivityId().asc()*/
+				.list();
+
+		LinkedList<HistoricActivityInstance> hisActInstList = new LinkedList<HistoricActivityInstance>();
+		hisActInstList.addAll(historicActivityInstances);
+
+		getHighlightedFlows(processDefinition.getActivities(), hisActInstList, highLightedFlows);
+
+		return highLightedFlows;
+	}
+
+	/**
+	 * getHighlightedFlows
+	 * 
+	 * code logic: 1. Loop all activities by id asc order; 2. Check each activity's outgoing transitions and eventBoundery outgoing transitions, if
+	 * outgoing transitions's destination.id is in other executed activityIds, add this transition to highLightedFlows List; 3. But if activity is not
+	 * a parallelGateway or inclusiveGateway, only choose the earliest flow.
+	 * 
+	 * @param activityList
+	 * @param hisActInstList
+	 * @param highLightedFlows
+	 */
+	private void getHighlightedFlows(List<ActivityImpl> activityList, LinkedList<HistoricActivityInstance> hisActInstList,
+			List<String> highLightedFlows) {
+
+		//check out startEvents in activityList
+		List<ActivityImpl> startEventActList = new ArrayList<ActivityImpl>();
+		Map<String, ActivityImpl> activityMap = new HashMap<String, ActivityImpl>(activityList.size());
+		for (ActivityImpl activity : activityList) {
+
+			activityMap.put(activity.getId(), activity);
+
+			String actType = (String) activity.getProperty("type");
+			if (actType != null && actType.toLowerCase().indexOf("startevent") >= 0) {
+				startEventActList.add(activity);
+			}
+		}
+
+		//These codes is used to avoid a bug: 
+		//ACT-1728 If the process instance was started by a callActivity, it will be not have the startEvent activity in ACT_HI_ACTINST table 
+		//Code logic:
+		//Check the first activity if it is a startEvent, if not check out the startEvent's highlight outgoing flow.
+		HistoricActivityInstance firstHistActInst = hisActInstList.getFirst();
+		String firstActType = (String) firstHistActInst.getActivityType();
+		if (firstActType != null && firstActType.toLowerCase().indexOf("startevent") < 0) {
+			PvmTransition startTrans = getStartTransaction(startEventActList, firstHistActInst);
+			if (startTrans != null) {
+				highLightedFlows.add(startTrans.getId());
+			}
+		}
+
+		while (!hisActInstList.isEmpty()) {
+			HistoricActivityInstance histActInst = hisActInstList.removeFirst();
+			ActivityImpl activity = activityMap.get(histActInst.getActivityId());
+			if (activity != null) {
+				boolean isParallel = false;
+				String type = histActInst.getActivityType();
+				if ("parallelGateway".equals(type) || "inclusiveGateway".equals(type)) {
+					isParallel = true;
+				} else if ("subProcess".equals(histActInst.getActivityType())) {
+					getHighlightedFlows(activity.getActivities(), hisActInstList, highLightedFlows);
+				}
+
+				List<PvmTransition> allOutgoingTrans = new ArrayList<PvmTransition>();
+				allOutgoingTrans.addAll(activity.getOutgoingTransitions());
+				allOutgoingTrans.addAll(getBoundaryEventOutgoingTransitions(activity));
+				List<String> activityHighLightedFlowIds = getHighlightedFlows(allOutgoingTrans, hisActInstList, isParallel);
+				highLightedFlows.addAll(activityHighLightedFlowIds);
+			}
+		}
+	}
+
+	/**
+	 * Check out the outgoing transition connected to firstActInst from startEventActList
+	 * 
+	 * @param startEventActList
+	 * @param firstActInst
+	 * @return
+	 */
+	private PvmTransition getStartTransaction(List<ActivityImpl> startEventActList, HistoricActivityInstance firstActInst) {
+		for (ActivityImpl startEventAct : startEventActList) {
+			for (PvmTransition trans : startEventAct.getOutgoingTransitions()) {
+				if (trans.getDestination().getId().equals(firstActInst.getActivityId())) {
+					return trans;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * getBoundaryEventOutgoingTransitions
+	 * 
+	 * @param activity
+	 * @return
+	 */
+	private List<PvmTransition> getBoundaryEventOutgoingTransitions(ActivityImpl activity) {
+		List<PvmTransition> boundaryTrans = new ArrayList<PvmTransition>();
+		for (ActivityImpl subActivity : activity.getActivities()) {
+			String type = (String) subActivity.getProperty("type");
+			if (type != null && type.toLowerCase().indexOf("boundary") >= 0) {
+				boundaryTrans.addAll(subActivity.getOutgoingTransitions());
+			}
+		}
+		return boundaryTrans;
+	}
+
+	/**
+	 * find out single activity's highlighted flowIds
+	 * 
+	 * @param activity
+	 * @param hisActInstList
+	 * @param isExclusive if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task)
+	 * @return
+	 */
+	private List<String> getHighlightedFlows(List<PvmTransition> pvmTransitionList, LinkedList<HistoricActivityInstance> hisActInstList,
+			boolean isParallel) {
+
+		List<String> highLightedFlowIds = new ArrayList<String>();
+
+		PvmTransition earliestTrans = null;
+		HistoricActivityInstance earliestHisActInst = null;
+
+		for (PvmTransition pvmTransition : pvmTransitionList) {
+
+			String destActId = pvmTransition.getDestination().getId();
+			HistoricActivityInstance destHisActInst = findHisActInst(hisActInstList, destActId);
+			if (destHisActInst != null) {
+				if (isParallel) {
+					highLightedFlowIds.add(pvmTransition.getId());
+				} else if (earliestHisActInst == null || (earliestHisActInst.getId().compareTo(destHisActInst.getId()) > 0)) {
+					earliestTrans = pvmTransition;
+					earliestHisActInst = destHisActInst;
+				}
+			}
+		}
+
+		if ((!isParallel) && earliestTrans != null) {
+			highLightedFlowIds.add(earliestTrans.getId());
+		}
+
+		return highLightedFlowIds;
+	}
+
+	private HistoricActivityInstance findHisActInst(LinkedList<HistoricActivityInstance> hisActInstList, String actId) {
+		for (HistoricActivityInstance hisActInst : hisActInstList) {
+			if (hisActInst.getActivityId().equals(actId)) {
+				return hisActInst;
+			}
+		}
+		return null;
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/editor/main/StencilsetRestResource.java

@@ -0,0 +1,27 @@
+package com.chinaitop.depot.act.rest.editor.main;
+
+import java.io.InputStream;
+
+import org.activiti.engine.ActivitiException;
+import org.apache.commons.io.IOUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xujh
+ */
+@RestController
+public class StencilsetRestResource {
+	
+	@RequestMapping(value = "/act/service/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
+	public @ResponseBody String getStencilset() {
+		InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
+		try {
+			return IOUtils.toString(stencilsetStream, "utf-8");
+		} catch (Exception e) {
+			throw new ActivitiException("Error while loading stencil set", e);
+		}
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/editor/model/ModelEditorJsonRestResource.java

@@ -0,0 +1,59 @@
+package com.chinaitop.depot.act.rest.editor.model;
+
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * @author xujh
+ */
+@RestController
+public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
+
+	protected static final Logger LOGGER = LoggerFactory.getLogger(ModelEditorJsonRestResource.class);
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@SuppressWarnings("deprecation")
+	@RequestMapping(value = "/act/service/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getEditorJson(@PathVariable String modelId) {
+		ObjectNode modelNode = null;
+
+		Model model = repositoryService.getModel(modelId);
+
+		if (model != null) {
+			try {
+				if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+					modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+				} else {
+					modelNode = objectMapper.createObjectNode();
+					modelNode.put(MODEL_NAME, model.getName());
+				}
+				modelNode.put(MODEL_ID, model.getId());
+				ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(new String(repositoryService.getModelEditorSource(model.getId()),
+						"utf-8"));
+				modelNode.put("model", editorJsonNode);
+
+			} catch (Exception e) {
+				LOGGER.error("Error creating model JSON", e);
+				throw new ActivitiException("Error creating model JSON", e);
+			}
+		}
+		return modelNode;
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/editor/model/ModelSaveRestResource.java

@@ -0,0 +1,122 @@
+package com.chinaitop.depot.act.rest.editor.model;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.UserInfo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.github.pagehelper.util.StringUtil;
+
+/**
+ * @author xujh
+ */
+@RestController
+public class ModelSaveRestResource implements ModelDataJsonConstants {
+
+	protected static final Logger LOGGER = Logger.getLogger(ModelSaveRestResource.class);
+
+	@Autowired
+	private RepositoryService repositoryService;
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+	@RequestMapping(value = "/act/service/model/{modelId}/save")
+	@ResponseStatus(value = HttpStatus.OK)
+	public void saveModel(@PathVariable String modelId, String json_xml,String svg_xml,String name,String description,HttpServletRequest request) {
+		try {
+			Model model = repositoryService.getModel(modelId);
+			
+			ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+			
+			modelJson.put(MODEL_NAME, name);
+			modelJson.put(MODEL_DESCRIPTION, description);
+			model.setMetaInfo(modelJson.toString());
+			model.setName(name);
+			repositoryService.saveModel(model);
+			UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+			Integer orgId = userInfo.getOrgId();
+			Integer depotId =(Integer) request.getSession().getAttribute("depotId");
+			
+			String[] split = json_xml.split("process_id");
+			
+			for (String string : split) {
+				System.out.println(string);
+			}
+			//得到第一个字符串
+			String string = split[0];
+			String string2 =string+="process_id";
+			
+			//得到后边的字符串
+			String string1 = split[1];
+			
+			int indexOf = string1.indexOf(",");
+			//取到第一个字符
+			String substring1 = string1.substring(0,indexOf);
+			//用"分开，得到想要拼接的值
+			String[] split2 = substring1.split("\"");
+			//得到processId的值，用于拼接
+			String processIdValue = split2[2];
+			System.out.println(substring1);
+			
+//			if(StringUtil.isNotEmpty(depotId.toString())){
+//				String process_id_value = "\":\""+  processIdValue+depotId + "\"";
+//				//把值拼接进去
+//				String substring2 = string1.substring(indexOf);
+//				
+//				String json_xmls=string2+=process_id_value+=substring2;
+//				repositoryService.addModelEditorSource(model.getId(), json_xmls.getBytes("utf-8"));
+//			}else {
+//				String process_id_value = "\":\""+  processIdValue+orgId + "\"";
+//				//把值拼接进去
+//				String substring2 = string1.substring(indexOf);
+//				
+//				String json_xmls=string2+=process_id_value+=substring2;
+//				repositoryService.addModelEditorSource(model.getId(), json_xmls.getBytes("utf-8"));
+//			}
+			
+			String process_id_value = "\":\""+  processIdValue + "\"";
+			//把值拼接进去
+			String substring2 = string1.substring(indexOf);
+			
+			String json_xmls=string2+=process_id_value+=substring2;
+			repositoryService.addModelEditorSource(model.getId(), json_xmls.getBytes("utf-8"));
+			
+
+
+			InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
+			TranscoderInput input = new TranscoderInput(svgStream);
+
+			PNGTranscoder transcoder = new PNGTranscoder();
+			ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+			TranscoderOutput output = new TranscoderOutput(outStream);
+
+			transcoder.transcode(input, output);
+			final byte[] result = outStream.toByteArray();
+			repositoryService.addModelEditorSourceExtra(model.getId(), result);
+			outStream.close();
+
+		} catch (Exception e) {
+			LOGGER.error("Error saving model", e);
+
+			throw new ActivitiException("Error saving model", e);
+		}
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/servlet/FilterServletOutputStream.java

@@ -0,0 +1,45 @@
+package com.chinaitop.depot.act.rest.servlet;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+/**
+ * @author xujh
+ * @version 2017-10-17
+ */
+public class FilterServletOutputStream extends ServletOutputStream {
+
+	private DataOutputStream stream;
+
+	public FilterServletOutputStream(OutputStream output) {
+		stream = new DataOutputStream(output);
+	}
+
+	public void write(int b) throws IOException {
+		stream.write(b);
+	}
+
+	public void write(byte[] b) throws IOException {
+		stream.write(b);
+	}
+
+	public void write(byte[] b, int off, int len) throws IOException {
+		stream.write(b, off, len);
+	}
+
+	@Override
+	public boolean isReady() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	@Override
+	public void setWriteListener(WriteListener listener) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}

src/main/java/com/chinaitop/depot/act/rest/servlet/GenericResponseWrapper.java

@@ -0,0 +1,53 @@
+package com.chinaitop.depot.act.rest.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+/**
+ * @author xujh
+ * @version 2017-10-17
+ */
+public class GenericResponseWrapper extends HttpServletResponseWrapper {
+	
+	private ByteArrayOutputStream output;
+	private int contentLength;
+	private String contentType;
+
+	public GenericResponseWrapper(HttpServletResponse response) {
+		super(response);
+		output = new ByteArrayOutputStream();
+	}
+
+	public byte[] getData() {
+		return output.toByteArray();
+	}
+
+	public ServletOutputStream getOutputStream() {
+		return new FilterServletOutputStream(output);
+	}
+
+	public PrintWriter getWriter() {
+		return new PrintWriter(getOutputStream(), true);
+	}
+
+	public void setContentLength(int length) {
+		this.contentLength = length;
+		super.setContentLength(length);
+	}
+
+	public int getContentLength() {
+		return contentLength;
+	}
+
+	public void setContentType(String type) {
+		this.contentType = type;
+		super.setContentType(type);
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+}

src/main/java/com/chinaitop/depot/act/rest/servlet/JsonpCallbackFilter.java

@@ -0,0 +1,66 @@
+package com.chinaitop.depot.act.rest.servlet;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * 配置过滤器
+ * @author xujh
+ * @version 2017-10-17
+ */
+public class JsonpCallbackFilter implements Filter {
+
+	private static Logger log = LoggerFactory.getLogger(JsonpCallbackFilter.class);
+
+	public void init(FilterConfig fConfig) throws ServletException {}
+
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+		Map<String, String[]> parms = httpRequest.getParameterMap();
+
+		if (parms.containsKey("callback")) {
+			if (log.isDebugEnabled())
+				log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'");
+
+			OutputStream out = httpResponse.getOutputStream();
+
+			GenericResponseWrapper wrapper = new GenericResponseWrapper(httpResponse);
+
+			chain.doFilter(request, wrapper);
+
+			//handles the content-size truncation
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			outputStream.write(new String(parms.get("callback")[0] + "(").getBytes());
+			outputStream.write(wrapper.getData());
+			outputStream.write(new String(");").getBytes());
+			byte jsonpResponse[] = outputStream.toByteArray();
+
+			wrapper.setContentType("text/javascript;charset=UTF-8");
+			wrapper.setContentLength(jsonpResponse.length);
+
+			out.write(jsonpResponse);
+
+			out.close();
+
+		} else {
+			chain.doFilter(request, response);
+		}
+	}
+
+	public void destroy() {}
+}

src/main/java/com/chinaitop/depot/act/rest/servlet/filterBean.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.act.rest.servlet;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+/**
+ * 配置过滤器
+ * @author xujh
+ * @version 2017-10-17
+ */
+@Configuration
+public class filterBean {
+	  @Bean
+	  public FilterRegistrationBean indexFilterRegistration() {
+	    FilterRegistrationBean registration = new FilterRegistrationBean(new JsonpCallbackFilter());
+	    registration.addUrlPatterns("/act/service/*");
+	    return registration;
+	  }
+}

src/main/java/com/chinaitop/depot/act/service/ActDynamicFormService.java

@@ -0,0 +1,62 @@
+package com.chinaitop.depot.act.service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.activiti.engine.FormService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.form.FormProperty;
+import org.activiti.engine.impl.form.StartFormDataImpl;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
+/**
+ * 流程模型相关Service
+ * @author xujh
+ * @version 2017-10-11
+ */
+@Service
+public class ActDynamicFormService {
+	private Logger logger = LoggerFactory.getLogger(getClass());
+	@Autowired
+    private RepositoryService repositoryService;
+	@Autowired
+    private FormService formService;
+	public List<ProcessDefinition> getProcess(){
+		// 读取所有流程
+        ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery().active().orderByDeploymentId().desc();
+        List<ProcessDefinition> list = query.list();
+		return list;
+	}
+	
+	public Map<String, Object> findStartForm(@PathVariable("processDefinitionId") String processDefinitionId) throws Exception {
+        Map<String, Object> result = new HashMap<String, Object>();
+        StartFormDataImpl startFormData = (StartFormDataImpl) formService.getStartFormData(processDefinitionId);
+        startFormData.setProcessDefinition(null);
+
+    /*
+     * 读取enum类型数据，用于下拉框
+     */
+        List<FormProperty> formProperties = startFormData.getFormProperties();
+        for (FormProperty formProperty : formProperties) {
+            @SuppressWarnings("unchecked")
+			Map<String, String> values = (Map<String, String>) formProperty.getType().getInformation("values");
+            if (values != null) {
+                for (Entry<String, String> enumEntry : values.entrySet()) {
+                    logger.debug("enum, key: {}, value: {}", enumEntry.getKey(), enumEntry.getValue());
+                }
+                result.put("enum_" + formProperty.getId(), values);
+            }
+        }
+
+        result.put("form", startFormData);
+
+        return result;
+    }
+}

src/main/java/com/chinaitop/depot/act/service/ActModelService.java

@@ -0,0 +1,183 @@
+package com.chinaitop.depot.act.service;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.Model;
+import org.activiti.engine.repository.ModelQuery;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/**
+ * 流程模型相关Service
+ * @author xujh
+ * @version 2017-10-11
+ */
+@Service
+@Transactional(readOnly = true)
+public class ActModelService{
+
+	@Autowired
+	private RepositoryService repositoryService;
+	protected ObjectMapper objectMapper = new ObjectMapper();
+
+
+	/**
+	 * 创建模型
+	 * @throws UnsupportedEncodingException 
+	 */
+	@SuppressWarnings("deprecation")
+	@Transactional(readOnly = false)
+	public Model create(String name, String key, String description, String category) throws UnsupportedEncodingException {
+		
+		ObjectNode editorNode = objectMapper.createObjectNode();
+		editorNode.put("id", "canvas");
+		editorNode.put("resourceId", "canvas");
+		ObjectNode properties = objectMapper.createObjectNode();
+		properties.put("process_author", "xujh");
+		editorNode.put("properties", properties);
+		ObjectNode stencilset = objectMapper.createObjectNode();
+		stencilset.put("namespace", "http://b3mn.org/stencilset/bpmn2.0#");
+		editorNode.put("stencilset", stencilset);
+		
+		Model modelData = repositoryService.newModel();
+		description = StringUtils.defaultString(description);
+		modelData.setKey(StringUtils.defaultString(key));
+		modelData.setName(name);
+		modelData.setCategory(category);
+		modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+
+		ObjectNode modelObjectNode = objectMapper.createObjectNode();
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, name);
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+		modelData.setMetaInfo(modelObjectNode.toString());
+		
+		repositoryService.saveModel(modelData);
+		repositoryService.addModelEditorSource(modelData.getId(), editorNode.toString().getBytes("utf-8"));
+		
+		return modelData;
+	}
+
+	/**
+	 * 根据Model部署流程
+	 */
+	@Transactional(readOnly = false)
+	public String deploy(String id) {
+		String message = "";
+		try {
+			org.activiti.engine.repository.Model modelData = repositoryService.getModel(id);
+			BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+			JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
+			BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+			BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+			byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+			
+			String processName = modelData.getName();
+			if (!StringUtils.endsWith(processName, ".bpmn20.xml")){
+				processName += ".bpmn20.xml";
+			}
+			ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+			Deployment deployment = repositoryService.createDeployment().name(modelData.getName())
+					.addInputStream(processName, in).deploy();
+			
+			// 设置流程分类
+			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+			for (ProcessDefinition processDefinition : list) {
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), modelData.getCategory());
+				message = "部署成功，流程ID=" + processDefinition.getId();
+			}
+			if (list.size() == 0){
+				message = "部署失败，没有流程。";
+			}
+		} catch (Exception e) {
+			throw new ActivitiException("设计模型图不正确，检查模型正确性，模型ID="+id, e);
+		}
+		return message;
+	}
+	
+	/**
+	 * 导出model的xml文件
+	 * @throws IOException 
+	 * @throws JsonProcessingException 
+	 */
+	public void export(String id, HttpServletResponse response) {
+		try {
+			org.activiti.engine.repository.Model modelData = repositoryService.getModel(id);
+			BpmnJsonConverter jsonConverter = new BpmnJsonConverter();
+			JsonNode editorNode = new ObjectMapper().readTree(repositoryService.getModelEditorSource(modelData.getId()));
+			BpmnModel bpmnModel = jsonConverter.convertToBpmnModel(editorNode);
+			BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+			byte[] bpmnBytes = xmlConverter.convertToXML(bpmnModel);
+
+			ByteArrayInputStream in = new ByteArrayInputStream(bpmnBytes);
+			IOUtils.copy(in, response.getOutputStream());
+			String filename = bpmnModel.getMainProcess().getId() + ".bpmn20.xml";
+			response.setHeader("Content-Disposition", "attachment; filename=" + filename);
+			response.flushBuffer();
+		} catch (Exception e) {
+			throw new ActivitiException("导出model的xml文件失败，模型ID="+id, e);
+		}
+		
+	}
+
+	/**
+	 * 更新Model分类
+	 */
+	@Transactional(readOnly = false)
+	public void updateCategory(String id, String category) {
+		org.activiti.engine.repository.Model modelData = repositoryService.getModel(id);
+		modelData.setCategory(category);
+		repositoryService.saveModel(modelData);
+	}
+	
+	/**
+	 * 删除模型
+	 * @param id
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public void delete(String id) {
+		repositoryService.deleteModel(id);
+	}
+
+	public List<Model> queryByExample() {
+		// TODO Auto-generated method stub
+//		List<Model> list = repositoryService.createModelQuery().list();
+		List<Model> list = repositoryService.createModelQuery().list();
+		return list;
+	}
+	
+	/**
+	 * 流程模型列表
+	 */
+	public List<Model> modelList(String category) {
+
+		ModelQuery modelQuery = repositoryService.createModelQuery().latestVersion().orderByLastUpdateTime().desc();
+		
+//		if (StringUtils.isNotEmpty(category)){
+//			modelQuery.modelCategory(category);
+//		}
+		List<Model> list = modelQuery.orderByCreateTime().desc().list();
+		return list;
+	}
+}

src/main/java/com/chinaitop/depot/act/service/ActProcessService.java

@@ -0,0 +1,276 @@
+package com.chinaitop.depot.act.service;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+
+/**
+ * 流程定义相关Service
+ * @author xujh
+ * @version 2017-10-11
+ */
+@Service
+public class ActProcessService {
+	@Resource
+	private RepositoryService repositoryService;
+	@Resource
+	private RuntimeService runtimeService;
+	
+	/**
+	 * 流程定义列表
+	 */
+	public List<ProcessDefinition> processList(HttpServletRequest request) {
+		ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+	    		.latestVersion().orderByProcessDefinitionKey().asc();
+		/*List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery()//创建流程定义查询
+				.orderByProcessDefinitionVersion().asc()//按照版本的升序排列
+				//.orderByProcessDefinitionName().desc()//按照流程定义的名称降序排列
+				.list();//返回一个集合列表，封装流程定义
+		//.singleResult();//返回唯一结果集
+		 */
+		
+		
+//		Integer depotId =(Integer) request.getSession().getAttribute("depotId");
+//		
+//		if (depotId.toString()!=null && "".equals(depotId.toString())){
+//	    	processDefinitionQuery.processDefinitionCategory(depotId.toString());
+//		}
+		
+		List<ProcessDefinition> list =processDefinitionQuery.list();
+		return list;
+	}
+
+	/**
+	 * 部署流程 - 保存
+	 * @param file
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public String deploy(String exportDir, String category, MultipartFile file) {
+
+		String message = "";
+		
+		String fileName = file.getOriginalFilename();
+		
+		try {
+			InputStream fileInputStream = file.getInputStream();
+			Deployment deployment = null;
+			String extension = FilenameUtils.getExtension(fileName);
+			if (extension.equals("zip") || extension.equals("bar")) {
+				ZipInputStream zip = new ZipInputStream(fileInputStream);
+				deployment = repositoryService.createDeployment().addZipInputStream(zip).deploy();
+			} else if (extension.equals("png")) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (fileName.indexOf("bpmn20.xml") != -1) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (extension.equals("bpmn")) { // bpmn扩展名特殊处理，转换为bpmn20.xml
+				String baseName = FilenameUtils.getBaseName(fileName); 
+				deployment = repositoryService.createDeployment().addInputStream(baseName + ".bpmn20.xml", fileInputStream).deploy();
+			} else {
+				message = "不支持的文件类型：" + extension;
+			}
+			
+			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+
+			// 设置流程分类
+			for (ProcessDefinition processDefinition : list) {
+//					ActUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), category);
+				message += "部署成功，流程ID=" + processDefinition.getId() + "<br/>";
+			}
+			
+			if (list.size() == 0){
+				message = "部署失败，没有流程。";
+			}
+			
+		} catch (Exception e) {
+			throw new ActivitiException("部署失败！", e);
+		}
+		return message;
+	}
+	
+	/**
+	 * 设置流程分类
+	 */
+	@Transactional(readOnly = false)
+	public void updateCategory(String procDefId, String category) {
+		repositoryService.setProcessDefinitionCategory(procDefId, category);
+	}
+
+	/**
+	 * 挂起、激活流程实例
+	 */
+	@Transactional(readOnly = false)
+	public String updateState(String state, String procDefId) {
+		if (state.equals("active")) {
+			repositoryService.activateProcessDefinitionById(procDefId, true, null);
+			return "已激活ID为[" + procDefId + "]的流程定义。";
+		} else if (state.equals("suspend")) {
+			repositoryService.suspendProcessDefinitionById(procDefId, true, null);
+			return "已挂起ID为[" + procDefId + "]的流程定义。";
+		}
+		return "无操作";
+	}
+	
+	/**
+	 * 将部署的流程转换为模型
+	 * @param procDefId
+	 * @throws UnsupportedEncodingException
+	 * @throws XMLStreamException
+	 */
+	@Transactional(readOnly = false)
+	public org.activiti.engine.repository.Model convertToModel(String procDefId) throws UnsupportedEncodingException, XMLStreamException {
+		
+		ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+		InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+		processDefinition.getResourceName());
+		XMLInputFactory xif = XMLInputFactory.newInstance();
+		InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+		XMLStreamReader xtr = xif.createXMLStreamReader(in);
+		BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+	
+		BpmnJsonConverter converter = new BpmnJsonConverter();
+		ObjectNode modelNode = converter.convertToJson(bpmnModel);
+		org.activiti.engine.repository.Model modelData = repositoryService.newModel();
+		modelData.setKey(processDefinition.getKey());
+		modelData.setName(processDefinition.getResourceName());
+		modelData.setCategory(processDefinition.getCategory());//.getDeploymentId());
+		modelData.setDeploymentId(processDefinition.getDeploymentId());
+		modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+	
+		ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+		modelData.setMetaInfo(modelObjectNode.toString());
+	
+		repositoryService.saveModel(modelData);
+	
+		repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+	
+		return modelData;
+	}
+	
+
+
+	/**
+	 * 删除部署的流程，级联删除流程实例
+	 * @param deploymentId 流程部署ID
+	 */
+//	@Transactional(readOnly = false)
+	public void deleteDeployment(String deploymentId) {
+		repositoryService.deleteDeployment(deploymentId, true);
+	}
+	
+	/**
+	 * 删除部署的流程实例
+	 * @param procInsId 流程实例ID
+	 * @param deleteReason 删除原因，可为空
+	 */
+	@Transactional(readOnly = false)
+	public void deleteProcIns(String procInsId, String deleteReason) {
+		runtimeService.deleteProcessInstance(procInsId, deleteReason);
+	}
+	
+	
+	/**
+	 * 导出图片文件到硬盘
+	 */
+	public List<String> exportDiagrams(String exportDir) throws IOException {
+		List<String> files = new ArrayList<String>();
+		List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().list();
+		
+		for (ProcessDefinition processDefinition : list) {
+			String diagramResourceName = processDefinition.getDiagramResourceName();
+			String key = processDefinition.getKey();
+			int version = processDefinition.getVersion();
+			String diagramPath = "";
+
+			InputStream resourceAsStream = repositoryService.getResourceAsStream(
+					processDefinition.getDeploymentId(), diagramResourceName);
+			byte[] b = new byte[resourceAsStream.available()];
+
+			@SuppressWarnings("unused")
+			int len = -1;
+			resourceAsStream.read(b, 0, b.length);
+
+			// create file if not exist
+			String diagramDir = exportDir + "/" + key + "/" + version;
+			File diagramDirFile = new File(diagramDir);
+			if (!diagramDirFile.exists()) {
+				diagramDirFile.mkdirs();
+			}
+			diagramPath = diagramDir + "/" + diagramResourceName;
+			File file = new File(diagramPath);
+
+			// 文件存在退出
+			if (file.exists()) {
+				// 文件大小相同时直接返回否则重新创建文件(可能损坏)
+				throw  new  NullPointerException("diagram exist");
+			} else {
+				file.createNewFile();
+				/*logger.debug("export diagram to : {}", diagramPath);*/
+				throw  new  NullPointerException("export diagram to");
+			}
+			
+		}
+		
+		return files;
+	}
+	
+	/**
+	 * 读取资源，通过部署ID
+	 * @param processDefinitionId  流程定义ID
+	 * @param processInstanceId 流程实例ID
+	 * @param resourceType 资源类型(xml|image)
+	 */
+	public InputStream resourceRead(String procDefId, String proInsId, String resType) throws Exception {
+		
+		if (procDefId!=null){
+			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(proInsId).singleResult();
+			procDefId = processInstance.getProcessDefinitionId();
+		}
+		ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+		
+		String resourceName = "";
+		if (resType.equals("image")) {
+			resourceName = processDefinition.getDiagramResourceName();
+		} else if (resType.equals("xml")) {
+			resourceName = processDefinition.getResourceName();
+		}
+		
+		InputStream resourceAsStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), resourceName);
+		return resourceAsStream;
+	}
+	
+}

src/main/java/com/chinaitop/depot/act/service/ActTaskService.java

@@ -0,0 +1,745 @@
+package com.chinaitop.depot.act.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+import org.activiti.engine.FormService;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.IdentityService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.history.HistoricProcessInstance;
+import org.activiti.engine.history.HistoricTaskInstance;
+import org.activiti.engine.history.HistoricTaskInstanceQuery;
+import org.activiti.engine.impl.RepositoryServiceImpl;
+import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmActivity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.task.TaskDefinition;
+import org.activiti.engine.repository.ProcessDefinitionQuery;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.task.Comment;
+import org.activiti.engine.task.Task;
+import org.activiti.engine.task.TaskQuery;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.alibaba.fastjson.JSONObject;
+import com.chinaitop.depot.act.model.Act;
+import com.chinaitop.depot.act.model.DeploymentList;
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.business.model.enums.TaskType;
+import com.chinaitop.depot.business.mapper.UserInfoMapper;
+import com.chinaitop.depot.business.mapper.UserRoleMapper;
+import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.business.model.UserInfoExample;
+import com.chinaitop.depot.business.model.UserRole;
+import com.chinaitop.depot.business.model.UserRoleExample;
+import com.chinaitop.depot.business.model.BusinessPlanExample.Criteria;
+import com.chinaitop.depot.business.service.OrgInfoService;
+import com.chinaitop.depot.business.service.UserInfoService;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+/**
+ * 流程定义相关Service
+ * @author xujh
+ * @version 2017-10-11
+ */
+@Service
+public class ActTaskService {
+	
+	/**
+	 * 日志对象
+	 */
+	protected Logger logger = LoggerFactory.getLogger(getClass());
+
+	@Autowired
+	private RuntimeService runtimeService;
+	@Autowired
+	private TaskService taskService;
+	@Autowired
+	private FormService formService;
+	@Autowired
+	private HistoryService historyService;
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private IdentityService identityService;
+	@Resource
+	private UserRoleMapper userRoleMapper;
+	@Resource
+	private UserInfoMapper userInfoMapper;
+	@Resource
+	private UserInfoService userInfoService;
+	@Resource
+	private OrgInfoService orgInfoService;
+	
+	/**
+	 * 获取待办列表
+	 * @param procDefKey 流程定义标识
+	 * @return
+	 */
+	public List<DeploymentList> todoList(String name,TaskType taskType){
+		List<Act> result = new ArrayList<Act>();
+		
+		// =============== 已经签收的任务  ===============
+		TaskQuery todoTaskQuery = taskService.createTaskQuery().taskAssignee(name).active()
+				.includeProcessVariables().orderByTaskCreateTime().desc();
+		
+		// 设置查询条件
+		if(taskType != null) {
+			todoTaskQuery.processDefinitionKey(taskType.getTaskType());
+		}
+		
+		// 查询列表
+		List<Task> todoList = todoTaskQuery.list();
+		for (Task task : todoList) {
+			Act e = new Act();
+			e.setTask(task);
+			e.setVars(task.getProcessVariables());
+			e.setStatus("todo");
+			result.add(e);
+		}
+		
+		// =============== 等待签收的任务  ===============
+		TaskQuery toClaimQuery = taskService.createTaskQuery().taskCandidateUser(name)
+				.includeProcessVariables().active().orderByTaskCreateTime().desc();
+		
+		// 查询列表
+		List<Task> toClaimList = toClaimQuery.list();
+		for (Task task : toClaimList) {
+			Act e = new Act();
+			e.setTask(task);
+			e.setVars(task.getProcessVariables());
+			e.setStatus("claim");
+			result.add(e);
+		}
+		
+		List<DeploymentList> deploymentlist=new ArrayList<DeploymentList>();
+		if(result!=null&&result.size()>0){
+			for(Act m: result){
+				DeploymentList deploymentLists=new DeploymentList();
+				//第一个参数
+				deploymentLists.setTaskId(m.getTaskId());
+				//第二个参数
+				deploymentLists.setTaskName(m.getTaskName());
+				//第三个参数
+				deploymentLists.setTaskDefKey(m.getTaskDefKey());
+				//第四个参数
+				deploymentLists.setProcInsId(m.getProcInsId());
+				//第五个参数
+				deploymentLists.setProcDefId(m.getProcDefId());
+				//第六个参数
+				deploymentLists.setStatus(m.getStatus());
+				deploymentLists.setName(m.getProcDefId());
+				deploymentLists.setResourceName(m.getAssignee());
+				deploymentlist.add(deploymentLists);
+			}
+			
+		}
+		
+		
+		
+		return deploymentlist;
+	}
+
+	
+	/**
+	 * 获取已办任务
+	 * @param page
+	 * @param procDefKey 流程定义标识
+	 * @return
+	 */
+	public List<DeploymentList> historicList(String name,String taskType){
+//		String userId = "";//ObjectUtils.toString(UserUtils.getUser().getId());
+
+		HistoricTaskInstanceQuery histTaskQuery = historyService.createHistoricTaskInstanceQuery().taskAssignee(name).finished()
+				.includeProcessVariables().orderByHistoricTaskInstanceEndTime().desc();
+		
+		// 设置查询条件
+		if (StringUtils.isNotBlank(taskType)){
+			histTaskQuery.processDefinitionKey(taskType);
+		}
+		/*if (act.getBeginDate() != null){
+			histTaskQuery.taskCompletedAfter(act.getBeginDate());
+		}
+		if (act.getEndDate() != null){
+			histTaskQuery.taskCompletedBefore(act.getEndDate());
+		}*/
+		
+		// 查询列表
+		List<HistoricTaskInstance> list = histTaskQuery.list();
+		//处理分页问题
+		List<Act> actList=Lists.newArrayList();
+		for (HistoricTaskInstance histTask : list) {
+			Act e = new Act();
+			e.setHistTask(histTask);
+			e.setVars(histTask.getProcessVariables());
+			e.setStatus("finish");
+			actList.add(e);
+		}
+		
+		List<DeploymentList> deploymentlist=new ArrayList<DeploymentList>();
+		if(actList!=null&&actList.size()>0){
+			for(Act m: actList){
+				DeploymentList deploymentLists=new DeploymentList();
+				//第一个参数
+				deploymentLists.setTaskId(m.getTaskId());
+				//第二个参数
+				deploymentLists.setTaskName(m.getTaskName());
+				//第三个参数
+				deploymentLists.setTaskDefKey(m.getTaskDefKey());
+				//第四个参数
+				deploymentLists.setProcInsId(m.getProcInsId());
+				//第五个参数
+				deploymentLists.setProcDefId(m.getProcDefId());
+				//第六个参数
+				deploymentLists.setStatus(m.getStatus());
+				deploymentLists.setName(m.getProcDefId());
+				deploymentLists.setResourceName(m.getAssignee());
+				deploymentlist.add(deploymentLists);
+			}
+			
+		}
+		
+		return deploymentlist;
+	}
+	
+	/**
+	 * 获取流转历史列表
+	 * @param procInsId 流程实例
+	 * @param startAct 开始活动节点名称
+	 * @param endAct 结束活动节点名称
+	 */
+	@SuppressWarnings("unused")
+	public List<HistoryList> histoicFlowList(String procInsId, String startAct, String endAct){
+		List<Act> actList = Lists.newArrayList();
+		List<HistoricActivityInstance> list = historyService.createHistoricActivityInstanceQuery().processInstanceId(procInsId)
+				.orderByHistoricActivityInstanceStartTime().asc().orderByHistoricActivityInstanceEndTime().asc().list();
+		
+		boolean start = false;
+		Map<String, Integer> actMap = Maps.newHashMap();
+		
+		for (int i=0; i<list.size(); i++){
+			
+			HistoricActivityInstance histIns = list.get(i);
+			
+			// 过滤开始节点前的节点
+			if (StringUtils.isNotBlank(startAct) && startAct.equals(histIns.getActivityId())){
+				start = true;
+			}
+			if (StringUtils.isNotBlank(startAct) && !start){
+				continue;
+			}
+			
+			// 只显示开始节点和结束节点，并且执行人不为空的任务
+			if (StringUtils.isNotBlank(histIns.getAssignee())
+					 || "startEvent".equals(histIns.getActivityType())
+					 || "endEvent".equals(histIns.getActivityType())){
+				
+				// 给节点增加一个序号
+				Integer actNum = actMap.get(histIns.getActivityId());
+				if (actNum == null){
+					actMap.put(histIns.getActivityId(), actMap.size());
+				}
+				
+				Act e = new Act();
+				e.setHistIns(histIns);
+				// 获取流程发起人名称
+				if ("startEvent".equals(histIns.getActivityType())){
+					List<HistoricProcessInstance> il = historyService.createHistoricProcessInstanceQuery().processInstanceId(procInsId).orderByProcessInstanceStartTime().asc().list();
+//					List<HistoricIdentityLink> il = historyService.getHistoricIdentityLinksForProcessInstance(procInsId);
+					if (il.size() > 0){
+						if (StringUtils.isNotBlank(il.get(0).getStartUserId())){
+//							User user = UserUtils.getByLoginName(il.get(0).getStartUserId());
+							UserInfo user = null;
+							if (user != null){
+								e.setAssignee(histIns.getAssignee());
+								e.setAssigneeName(user.getUsername());
+							}
+						}
+					}
+				}
+				// 获取任务执行人名称
+				if (StringUtils.isNotEmpty(histIns.getAssignee())){
+//					User user = UserUtils.getByLoginName(histIns.getAssignee());
+					UserInfo user = null;
+					if (user != null){
+						e.setAssignee(histIns.getAssignee());
+						e.setAssigneeName(user.getUsername());
+					}
+				}
+				// 获取意见评论内容
+				if (StringUtils.isNotBlank(histIns.getTaskId())){
+					List<Comment> commentList = taskService.getTaskComments(histIns.getTaskId());
+					if (commentList.size()>0){
+						e.setComment(commentList.get(0).getFullMessage());
+					}
+				}
+				actList.add(e);
+			}
+			
+			// 过滤结束节点后的节点
+			if (StringUtils.isNotBlank(endAct) && endAct.equals(histIns.getActivityId())){
+				boolean bl = false;
+				Integer actNum = actMap.get(histIns.getActivityId());
+				// 该活动节点，后续节点是否在结束节点之前，在后续节点中是否存在
+				for (int j=i+1; j<list.size(); j++){
+					HistoricActivityInstance hi = list.get(j);
+					Integer actNumA = actMap.get(hi.getActivityId());
+					if ((actNumA != null && actNumA < actNum) || StringUtils.equals(hi.getActivityId(), histIns.getActivityId())){
+						bl = true;
+					}
+				}
+				if (!bl){
+					break;
+				}
+			}
+		}
+		
+		List<HistoryList> historyList1=new ArrayList<HistoryList>();
+		for (int j = 0; j < actList.size(); j++) {
+			if(j != 0&&j!=actList.size()-1){
+				HistoryList historyList=new HistoryList();
+				historyList.setAssigneeName(actList.get(j).getHistIns().getAssignee());//审批人名字
+				
+				UserInfo userInfo = userInfoService.findById( Integer.valueOf(actList.get(j).getHistIns().getAssignee()));
+				Integer orgId = userInfo.getOrgId();
+				
+				OrgInfo orgInfo=orgInfoService.findById(orgId);
+				String departmentName=orgInfo.getOrgName();
+				historyList.setDepartment(departmentName);
+				
+				historyList.setComment(actList.get(j).getComment());//审批意见
+				historyList.setStartTime(actList.get(j).getHistIns().getStartTime());//开始时间
+				historyList.setEndDate(actList.get(j).getHistIns().getEndTime());//结束时间
+				historyList.setActivityName(actList.get(j).getHistIns().getActivityName());//审批人岗位
+				historyList1.add(historyList);
+			}
+		}
+		return historyList1;
+	}
+
+	/**
+	 * 获取流程列表
+	 * @param category 流程分类
+	 */
+	public Object[] processList(String category) {
+		/*
+		 * 保存两个对象，一个是ProcessDefinition（流程定义），一个是Deployment（流程部署）
+		 */
+	    ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
+	    		.latestVersion().active().orderByProcessDefinitionKey().asc();
+	    
+	    if (StringUtils.isNotEmpty(category)){
+	    	processDefinitionQuery.processDefinitionCategory(category);
+		}
+	    
+		return null;
+	}
+	
+	/**
+	 * 获取流程表单（首先获取任务节点表单KEY，如果没有则取流程开始节点表单KEY）
+	 * @return
+	 */
+	public String getFormKey(String procDefId, String taskDefKey){
+		String formKey = "";
+		if (StringUtils.isNotBlank(procDefId)){
+			if (StringUtils.isNotBlank(taskDefKey)){
+				try{
+					formKey = formService.getTaskFormKey(procDefId, taskDefKey);
+				}catch (Exception e) {
+					formKey = "";
+				}
+			}
+			if (StringUtils.isBlank(formKey)){
+				formKey = formService.getStartFormKey(procDefId);
+			}
+			if (StringUtils.isBlank(formKey)){
+				formKey = "/404";
+			}
+		}
+		logger.debug("getFormKey: {}", formKey);
+		return formKey;
+	}
+	
+	/**
+	 * 获取流程实例对象
+	 * @param procInsId
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public ProcessInstance getProcIns(String procInsId) {
+		return runtimeService.createProcessInstanceQuery().processInstanceId(procInsId).singleResult();
+	}
+
+	
+
+	/**
+	 * 获取任务
+	 * @param taskId 任务ID
+	 */
+	public Task getTask(String taskId){
+		return taskService.createTaskQuery().taskId(taskId).singleResult();
+	}
+	
+	/**
+	 * 删除任务
+	 * @param taskId 任务ID
+	 * @param deleteReason 删除原因
+	 */
+	@Transactional(readOnly = false)
+	public void deleteTask(String taskId, String deleteReason){
+		taskService.deleteTask(taskId, deleteReason);
+	}
+	
+	
+	/**
+	 * 提交任务, 并保存意见
+	 * @param taskId 任务ID
+	 * @param procInsId 流程实例ID，如果为空，则不保存任务提交意见
+	 * @param comment 任务提交意见的内容
+	 * @param title			流程标题，显示在待办任务标题
+	 * @param vars 任务变量
+	 */
+	@SuppressWarnings("unused")
+	@Transactional(readOnly = false)
+	public void complete(String taskId, String procInsId, String comment, String title, Map<String, Object> vars){
+		String pass = (String) vars.get("pass");
+		if(pass.equals("0")&&StringUtils.isNotBlank(procInsId)){
+			// 添加意见
+			String advice="退回";
+			advice+=comment;
+		
+			taskService.addComment(taskId, procInsId, advice);
+			
+		}else if (pass.equals("1")&&StringUtils.isNotBlank(procInsId)) {
+			// 添加意见
+			String advice="同意";
+			advice+=comment;
+			taskService.addComment(taskId, procInsId, advice);
+			
+		}else if (pass.equals("2")&&StringUtils.isNotBlank(procInsId)) {
+			// 添加意见
+			String advice="驳回";
+			advice+=comment;
+			taskService.addComment(taskId, procInsId, advice);
+		}else if (pass.equals("3")&&StringUtils.isNotBlank(procInsId)) {
+			// 添加意见
+			String advice="拒绝";
+			advice+=comment;
+			taskService.addComment(taskId, procInsId, advice);
+		}
+		
+		// 设置流程变量
+		if (vars == null){
+			vars = Maps.newHashMap();
+		}
+		
+		// 设置流程标题
+		if (StringUtils.isNotBlank(title)){
+			vars.put("title", title);
+		}
+		
+		// 提交任务
+		taskService.complete(taskId, vars);
+	}
+	
+	/**
+	 * 添加任务意见
+	 */
+	public void addTaskComment(String taskId, String procInsId, String comment){
+		taskService.addComment(taskId, procInsId, comment);
+	}
+	
+	
+	/**
+	 * 设置当前处理人信息
+	 * @param vars
+	 * @param currentTask
+	 */
+	@SuppressWarnings("unused")
+	private void setCurrentTaskAssignee(Map<String, Object> vars, Task currentTask) {
+		String assignee = currentTask.getAssignee();
+		if (assignee != null) {
+			org.activiti.engine.identity.User assigneeUser = identityService.createUserQuery().userId(assignee).singleResult();
+			String userInfo = assigneeUser.getFirstName() + " " + assigneeUser.getLastName();
+			vars.put("当前处理人", userInfo);
+		}
+	}
+	
+	/**
+	 * 设置当前处理人信息
+	 * @param type 启动流程的类型
+	 * @param id 业务id
+	 * @param name启动人的名字
+	 */
+	public ProcessInstance startProcess(String type,String id,String name,String userId,String deportId) {
+		// 启动流程
+        Map<String, Object> variables = new HashMap<String, Object>();
+        // TODO 用来设置启动流程的人员ID
+        identityService.setAuthenticatedUserId(name);
+        String businessKey = id.toString();
+        variables.put("type", type);
+        variables.put("busId", businessKey);
+		variables.put("inputUser", userId);
+        //新增拼接businessKey作为业务数据与流程绑定
+        String objId =type + ":" + businessKey;
+        // 启动流程
+        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(type, objId, variables);
+        
+//        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(type+deportId, objId, variables);
+        
+		return processInstance;
+		
+	}
+	
+	public String startProcessNew(String type,String id,String name,String userId,String deportId){
+		ProcessInstance startProcess = this.startProcess(type, id, name, userId, deportId);
+		String processInstanceId = startProcess.getProcessInstanceId();
+		// 设置流程定义id.
+        String processDefinitionId = startProcess.getProcessDefinitionId();
+        JSONObject json=new JSONObject();
+        json.put("processInstanceId", processInstanceId);
+        json.put("processDefinitionId",processDefinitionId);
+		return json.toString();
+	}
+	
+	/** 
+     * 根据实例编号查找下一个任务节点 
+     * @param String procInstId ：实例编号 
+     * @return 
+     */  
+    public TaskDefinition nextTaskDefinition(String procInstId){  
+        //流程标示  
+        String processDefinitionId = historyService.createHistoricProcessInstanceQuery().processInstanceId(procInstId).singleResult().getProcessDefinitionId();  
+          
+        ProcessDefinitionEntity def = (ProcessDefinitionEntity) ((RepositoryServiceImpl)repositoryService).getDeployedProcessDefinition(processDefinitionId);  
+        //执行实例  
+        ExecutionEntity execution = (ExecutionEntity) runtimeService.createProcessInstanceQuery().processInstanceId(procInstId).singleResult();  
+        //当前实例的执行到哪个节点  
+        String activitiId = execution.getActivityId();  
+        //获得当前任务的所有节点  
+        List<ActivityImpl> activitiList = def.getActivities();  
+        String id = null;  
+        for(ActivityImpl activityImpl:activitiList){    
+            id = activityImpl.getId();   
+            if(activitiId.equals(id)){  
+                System.out.println("当前任务："+activityImpl.getProperty("name"));  
+                return nextTaskDefinition(activityImpl, activityImpl.getId(),"${pass==1}");  
+//              System.out.println(taskDefinition.getCandidateGroupIdExpressions().toArray()[0]);  
+//              return taskDefinition;  
+            }  
+        }  
+        return null;  
+    }  
+      
+    /** 
+     * 下一个任务节点 
+     * @param activityImpl 
+     * @param activityId 
+     * @param elString 
+     * @return 
+     */  
+    private TaskDefinition nextTaskDefinition(ActivityImpl activityImpl, String activityId, String elString){  
+            if("userTask".equals(activityImpl.getProperty("type")) && !activityId.equals(activityImpl.getId())){  
+                TaskDefinition taskDefinition = ((UserTaskActivityBehavior)activityImpl.getActivityBehavior()).getTaskDefinition();  
+//              taskDefinition.getCandidateGroupIdExpressions().toArray();  
+                return taskDefinition;  
+            }else{  
+                List<PvmTransition> outTransitions = activityImpl.getOutgoingTransitions();  
+                List<PvmTransition> outTransitionsTemp = null;  
+                for(PvmTransition tr:outTransitions){    
+                    PvmActivity ac = tr.getDestination(); //获取线路的终点节点    
+                    if("exclusiveGateway".equals(ac.getProperty("type"))){  
+                        outTransitionsTemp = ac.getOutgoingTransitions();  
+                        if(outTransitionsTemp.size() == 1){  
+                            return nextTaskDefinition((ActivityImpl)outTransitionsTemp.get(0).getDestination(), activityId, elString);  
+                        }else if(outTransitionsTemp.size() > 1){  
+                            for(PvmTransition tr1 : outTransitionsTemp){  
+                                Object s = tr1.getProperty("conditionText");  
+                                String string = s.toString();
+                                if(elString.equals(string)){  
+                                    return nextTaskDefinition((ActivityImpl)tr1.getDestination(), activityId, elString);  
+                                }  
+                            }  
+                        }  
+                    }else if("userTask".equals(ac.getProperty("type"))){  
+                        return ((UserTaskActivityBehavior)((ActivityImpl)ac).getActivityBehavior()).getTaskDefinition();  
+                    }else{  
+//                        logger.debug(ac.getProperty("type"));  
+                    }  
+                }   
+            return null;  
+        }  
+    }
+    
+    public List<UserInfo> getUserByRoleId(Integer roleId) {
+    	UserRoleExample userRoleExample = new UserRoleExample();
+    	userRoleExample.createCriteria().andRoleIdEqualTo(roleId);
+    	List<UserRole> urlist = userRoleMapper.selectByExample(userRoleExample);
+    	List<UserInfo> userlist = new ArrayList<UserInfo>();
+    	if (urlist.size() > 0) {
+        	List<Integer> userIds = new ArrayList<Integer>();
+        	for (UserRole userRole : urlist) {
+    			userIds.add(userRole.getUserId());
+    		}
+        	UserInfoExample userExample = new UserInfoExample();
+        	userExample.createCriteria().andUserIdIn(userIds);
+        	userlist = userInfoMapper.selectByExample(userExample);
+    	}
+    	return userlist;
+    };
+    
+    
+    public List<UserInfo> getUserByRoleId(Integer roleId, Integer orgId) {
+    	UserRoleExample userRoleExample = new UserRoleExample();
+    	userRoleExample.createCriteria().andRoleIdEqualTo(roleId);
+    	List<UserRole> urlist = userRoleMapper.selectByExample(userRoleExample);
+    	List<UserInfo> userlist = new ArrayList<UserInfo>();
+    	if (urlist.size() > 0) {
+    		List<Integer> userIds = new ArrayList<Integer>();
+    		for (UserRole userRole : urlist) {
+    			userIds.add(userRole.getUserId());
+    		}
+    		UserInfoExample userExample = new UserInfoExample();
+    		UserInfoExample.Criteria criteria = userExample.createCriteria();
+    		criteria.andUserIdIn(userIds);
+    		criteria.andOrgIdEqualTo(orgId);
+    		userlist = userInfoMapper.selectByExample(userExample);
+    	}
+    	return userlist;
+    };
+    
+    
+    //可以分配个人任务从一个人到另一个人（认领任务:）
+    //任务ID
+    //指定的办理人
+	public String setAssigneeTask(String processInstanceId,String userId){
+		Task singleResult = selectTask(processInstanceId);
+		String taskId = singleResult.getId();
+		taskService.setAssignee(taskId, userId);
+		String mgs="设置成功";
+		return mgs;
+	}
+	
+	//使用流程实例id 查询当前任务信息
+	public Task selectTask(String processInstanceId){
+		//使用流程实例id 查询当前任务信息
+		Task singleResult = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
+		return singleResult;
+	}
+	//使用流程实例id 查询当前任务id
+	public String selectTaskId(String processInstanceId){
+		Task selectTask = this.selectTask(processInstanceId);
+		return selectTask.getId();
+	}
+	
+	/**查询历史任务(获取上一个人的名字)*/
+	public String findHistoryTaskName(String processInstanceId){
+		String assignee = null;
+		@SuppressWarnings("deprecation")
+		List<HistoricTaskInstance> list = historyService//与历史数据（历史表）相关的Service
+						.createHistoricTaskInstanceQuery()//创建历史任务实例查询
+						.processInstanceId(processInstanceId)//
+						.orderByHistoricTaskInstanceStartTime().asc()
+						.list();
+		if(list!=null && list.size()>0){
+			int length = list.size()-1;
+			for (int i = 0; i < list.size(); i++) {
+				if(i==length){
+					assignee = list.get(length).getAssignee();
+				}
+			}
+		}
+		return assignee;
+	}
+	/**查询历史任务(获取第一个人的名字)*/
+	public String findHistoryFirstTaskName(String processInstanceId){
+		String assignee = null;
+		@SuppressWarnings("deprecation")
+		List<HistoricTaskInstance> list = historyService//与历史数据（历史表）相关的Service
+						.createHistoricTaskInstanceQuery()//创建历史任务实例查询
+						.processInstanceId(processInstanceId)//
+						.orderByHistoricTaskInstanceStartTime().asc()
+						.list();
+		if(list!=null && list.size()>0){
+			assignee=list.get(0).getAssignee();
+		}
+		return assignee;
+	}
+	/**查询流程状态（判断流程正在执行，还是结束）*/
+	public ProcessInstance isProcessEnd(String processInstanceId){
+		ProcessInstance pi = runtimeService//表示正在执行的流程实例和执行对象
+						.createProcessInstanceQuery()//创建流程实例查询
+						.processInstanceId(processInstanceId)//使用流程实例ID查询
+						.singleResult();
+		return pi;
+	}
+	
+	/**查询流程状态（判断流程正在执行，还是结束）*/
+	public boolean isProcessEndNew(String processInstanceId){
+		ProcessInstance processEnd = this.isProcessEnd(processInstanceId);
+		if(processEnd!=null){
+			
+			return false;
+		}
+		return true;
+	}
+	
+	/**删除正在执行中的任务*/
+	public void delRunTask(String processInstanceId,String deleteReason){
+		runtimeService.deleteProcessInstance(processInstanceId, deleteReason);
+	}
+	
+	/**统计正在执行中的任务*/
+	public Map<String, Object> todoType(String userId){
+		//计划总条数
+		int countPlan = 0;
+		//合同总条数
+		int countContract = 0;
+		//合同变更总条数
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		TaskType taskType = null;
+		List<DeploymentList> todoList = todoList(userId, taskType);
+		for (DeploymentList deploymentList : todoList) {
+			String procDefId = deploymentList.getProcDefId();
+			String[] split = procDefId.split(":");
+			String string = split[0];
+			if(string.equals("plan")){
+				countPlan++;
+			}else if (string.equals("contract")) {
+				countContract++;
+			}
+		}
+		modelMap.put("plan", countPlan);
+		modelMap.put("contract", countContract);
+		return modelMap;
+	}
+	
+	// 获取到当前进行到的任务节点.
+	public String taskNode(String processInstanceId){
+        Task singleResult = taskService.createTaskQuery().processInstanceId(processInstanceId).singleResult();
+        JSONObject json=new JSONObject();
+        
+        if(singleResult!=null){
+        	String id = singleResult.getId();
+        	String name = singleResult.getName();
+        	json.put("taskId", id);
+        	json.put("taskName",name);
+        }
+		return json.toString();
+	} 
+}

src/main/java/com/chinaitop/depot/act/service/ActTemplateService.java

@@ -0,0 +1,123 @@
+package com.chinaitop.depot.act.service;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.zip.ZipInputStream;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.activiti.bpmn.converter.BpmnXMLConverter;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.editor.language.json.converter.BpmnJsonConverter;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Deployment;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.apache.commons.io.FilenameUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.business.model.UserInfo;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+@Service
+public class ActTemplateService {
+	@Autowired
+	private RepositoryService repositoryService;
+	/**
+	 * 部署流程 - 保存
+	 * @param file
+	 * @return
+	 */
+	@Transactional(readOnly = false)
+	public String deploy(MultipartFile file, HttpServletRequest request) {
+
+		String message = "";
+		
+		String fileName = file.getOriginalFilename();
+		
+		try {
+			InputStream fileInputStream = file.getInputStream();
+			Deployment deployment = null;
+			String extension = FilenameUtils.getExtension(fileName);
+			if (extension.equals("zip") || extension.equals("bar")) {
+				ZipInputStream zip = new ZipInputStream(fileInputStream);
+				deployment = repositoryService.createDeployment().addZipInputStream(zip).deploy();
+			} else if (extension.equals("png")) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (fileName.indexOf("bpmn20.xml") != -1) {
+				deployment = repositoryService.createDeployment().addInputStream(fileName, fileInputStream).deploy();
+			} else if (extension.equals("bpmn")) { // bpmn扩展名特殊处理，转换为bpmn20.xml
+				String baseName = FilenameUtils.getBaseName(fileName); 
+				deployment = repositoryService.createDeployment().addInputStream(baseName + ".bpmn20.xml", fileInputStream).deploy();
+			} else {
+				message = "不支持的文件类型：" + extension;
+			}
+			
+			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();
+			
+			Integer depotId =(Integer) request.getSession().getAttribute("depotId");
+			
+				// 设置流程分类
+			for (ProcessDefinition processDefinition : list) {
+	//				ActUtils.exportDiagramToFile(repositoryService, processDefinition, exportDir);
+				repositoryService.setProcessDefinitionCategory(processDefinition.getId(), depotId.toString());
+				message += "部署成功，流程ID=" + processDefinition.getId() + "<br/>";
+			}
+			if (list.size() == 0){
+				message = "部署失败，没有流程。";
+			}
+			
+		} catch (Exception e) {
+			throw new ActivitiException("部署失败！", e);
+		}
+		return message;
+	}
+	
+	/**
+	 * 将部署的流程转换为模型
+	 * @param procDefId
+	 * @throws UnsupportedEncodingException
+	 * @throws XMLStreamException
+	 */
+	@Transactional(readOnly = false)
+	public org.activiti.engine.repository.Model convertToModel(String procDefId) throws UnsupportedEncodingException, XMLStreamException {
+		
+		ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId).singleResult();
+		InputStream bpmnStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(),
+		processDefinition.getResourceName());
+		XMLInputFactory xif = XMLInputFactory.newInstance();
+		InputStreamReader in = new InputStreamReader(bpmnStream, "UTF-8");
+		XMLStreamReader xtr = xif.createXMLStreamReader(in);
+		BpmnModel bpmnModel = new BpmnXMLConverter().convertToBpmnModel(xtr);
+	
+		BpmnJsonConverter converter = new BpmnJsonConverter();
+		ObjectNode modelNode = converter.convertToJson(bpmnModel);
+		org.activiti.engine.repository.Model modelData = repositoryService.newModel();
+		modelData.setKey(processDefinition.getKey());
+		modelData.setName(processDefinition.getResourceName());
+		modelData.setCategory(processDefinition.getCategory());//.getDeploymentId());
+		modelData.setDeploymentId(processDefinition.getDeploymentId());
+		modelData.setVersion(Integer.parseInt(String.valueOf(repositoryService.createModelQuery().modelKey(modelData.getKey()).count()+1)));
+	
+		ObjectNode modelObjectNode = new ObjectMapper().createObjectNode();
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_NAME, processDefinition.getName());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_REVISION, modelData.getVersion());
+		modelObjectNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, processDefinition.getDescription());
+		modelData.setMetaInfo(modelObjectNode.toString());
+	
+		repositoryService.saveModel(modelData);
+	
+		repositoryService.addModelEditorSource(modelData.getId(), modelNode.toString().getBytes("utf-8"));
+	
+		return modelData;
+	}
+}

src/main/java/com/chinaitop/depot/act/service/DeleteService.java

@@ -0,0 +1,28 @@
+package com.chinaitop.depot.act.service;
+
+import java.io.InputStream;
+
+import javax.annotation.Resource;
+
+import org.activiti.engine.RepositoryService;
+import org.springframework.stereotype.Service;
+@Service
+public class DeleteService {
+	@Resource
+	private RepositoryService repositoryService;
+	/**
+	 * 删除部署的流程，级联删除流程实例
+	 * @param deploymentId 流程部署ID
+	 */
+
+	public void deleteDeployment(String deploymentId) {
+		repositoryService.deleteDeployment(deploymentId, true);
+	}
+	
+	/**使用部署对象ID和资源图片名称，获取图片的输入流*/
+	public InputStream findImageInputStream(String deploymentId,
+			String imageName) {
+		return repositoryService.getResourceAsStream(deploymentId, imageName);
+	}
+
+}

src/main/java/com/chinaitop/depot/act/service/cmd/JumpTaskCmd.java

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.act.service.cmd;
+
+import java.util.Map;
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.interceptor.Command;
+import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.TaskEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.runtime.AtomicOperation;
+
+public class JumpTaskCmd implements Command<java.lang.Void> {
+	
+	private TaskEntity taskEntity;
+	private ActivityImpl targetActivity;
+	protected Map<String, Object> variables;
+
+	public JumpTaskCmd(TaskEntity taskEntity, ActivityImpl targetActivity, Map<String, Object> variables) {
+		this.taskEntity = taskEntity;
+		this.targetActivity = targetActivity;
+		this.variables = variables;
+	}
+
+	@Override
+	public Void execute(CommandContext commandContext) {
+		
+		if (taskEntity != null) {
+			
+			//删除当前的任务，不能删除当前正在执行的任务，所以要先清除掉关联
+			if (variables != null) {
+				if (taskEntity.getExecutionId() != null) {
+					taskEntity.setExecutionVariables(variables);
+				} else {
+					taskEntity.setVariables(variables);
+				}
+			}
+
+//			// 完成活动历史
+//			Context.getCommandContext().getHistoryManager()
+//				.recordActivityEnd((ExecutionEntity) taskEntity.getExecution());
+			
+			// 完成待办任务
+			Context.getCommandContext().getTaskEntityManager().deleteTask(taskEntity, 
+					TaskEntity.DELETE_REASON_COMPLETED, false);	// DELETE_REASON_DELETED  DELETE_REASON_COMPLETED
+			
+			// 跳转任务
+			ExecutionEntity execution = taskEntity.getExecution();
+			execution.setActivity(targetActivity);
+			execution.performOperation(AtomicOperation.ACTIVITY_START);
+			
+		}
+
+		return null;
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/ChainedActivitiesCreator.java

@@ -0,0 +1,49 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.springframework.util.CollectionUtils;
+
+import com.chinaitop.depot.utils.activiti.ProcessDefUtils;
+
+public class ChainedActivitiesCreator extends RuntimeActivityCreatorSupport implements RuntimeActivityCreator {
+	
+	@SuppressWarnings("unchecked")
+	public ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition,
+			RuntimeActivityDefinitionEntity info) {
+		info.setFactoryName(ChainedActivitiesCreator.class.getName());
+		RuntimeActivityDefinitionEntityIntepreter radei = new RuntimeActivityDefinitionEntityIntepreter(info);
+
+		if (radei.getCloneActivityIds() == null) {
+			radei.setCloneActivityIds(CollectionUtils.arrayToList(new String[radei.getAssignees().size()]));
+		}
+
+		return createActivities(processEngine, processDefinition, info.getProcessInstanceId(), radei.getPrototypeActivityId(),
+				radei.getNextActivityId(), radei.getAssignees(), radei.getCloneActivityIds());
+	}
+
+	private ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition, String processInstanceId,
+			String prototypeActivityId, String nextActivityId, List<String> assignees, List<String> activityIds) {
+		ActivityImpl prototypeActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), prototypeActivityId);
+
+		List<ActivityImpl> activities = new ArrayList<ActivityImpl>();
+		for (int i = 0; i < assignees.size(); i++) {
+			if (activityIds.get(i) == null) {
+				String activityId = createUniqueActivityId(processInstanceId, prototypeActivityId);
+				activityIds.set(i, activityId);
+			}
+
+			ActivityImpl clone = createActivity(processEngine, processDefinition, prototypeActivity, activityIds.get(i), assignees.get(i));
+			activities.add(clone);
+		}
+
+		ActivityImpl nextActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), nextActivityId);
+		createActivityChain(activities, nextActivity);
+
+		return activities.toArray(new ActivityImpl[0]);
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/CreateAndTakeTransitionCmd.java

@@ -0,0 +1,45 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.util.Map;
+
+import org.activiti.engine.impl.context.Context;
+import org.activiti.engine.impl.interceptor.Command;
+import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.TaskEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.pvm.runtime.AtomicOperation;
+
+public class CreateAndTakeTransitionCmd implements Command<java.lang.Void> {
+	
+	private TaskEntity currentTaskEntity;
+	private ActivityImpl activity;
+	protected Map<String, Object> variables;
+
+	public CreateAndTakeTransitionCmd(TaskEntity currentTaskEntity, ActivityImpl activity, Map<String, Object> variables) {
+		this.currentTaskEntity = currentTaskEntity;
+		this.activity = activity;
+		this.variables = variables;
+	}
+
+	@Override
+	public Void execute(CommandContext commandContext) {
+		if (currentTaskEntity != null) {
+
+			ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(currentTaskEntity.getExecutionId());
+			execution.setActivity(activity);
+			execution.performOperation(AtomicOperation.TRANSITION_CREATE_SCOPE);
+
+			if (variables != null) {
+				if (currentTaskEntity.getExecutionId() != null) {
+					currentTaskEntity.setExecutionVariables(variables);
+				} else {
+					currentTaskEntity.setVariables(variables);
+				}
+			}
+			//删除当前的任务，不能删除当前正在执行的任务，所以要先清除掉关联
+			Context.getCommandContext().getTaskEntityManager().deleteTask(currentTaskEntity, TaskEntity.DELETE_REASON_DELETED, false);
+		}
+		return null;
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/MultiInstanceActivityCreator.java

@@ -0,0 +1,58 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.util.List;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.impl.bpmn.behavior.MultiInstanceActivityBehavior;
+import org.activiti.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior;
+import org.activiti.engine.impl.bpmn.behavior.SequentialMultiInstanceBehavior;
+import org.activiti.engine.impl.bpmn.behavior.TaskActivityBehavior;
+import org.activiti.engine.impl.el.FixedValue;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+
+import com.chinaitop.depot.utils.activiti.ProcessDefUtils;
+
+public class MultiInstanceActivityCreator extends RuntimeActivityCreatorSupport implements RuntimeActivityCreator {
+	
+	public ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition,
+			RuntimeActivityDefinitionEntity info) {
+		info.setFactoryName(MultiInstanceActivityCreator.class.getName());
+		RuntimeActivityDefinitionEntityIntepreter radei = new RuntimeActivityDefinitionEntityIntepreter(info);
+
+		if (radei.getCloneActivityId() == null) {
+			String cloneActivityId = createUniqueActivityId(info.getProcessInstanceId(), radei.getPrototypeActivityId());
+			radei.setCloneActivityId(cloneActivityId);
+		}
+
+		return new ActivityImpl[] { createMultiInstanceActivity(processEngine, processDefinition, info.getProcessInstanceId(),
+				radei.getPrototypeActivityId(), radei.getCloneActivityId(), radei.getSequential(), radei.getAssignees()) };
+	}
+
+	private ActivityImpl createMultiInstanceActivity(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition,
+			String processInstanceId, String prototypeActivityId, String cloneActivityId, boolean isSequential, List<String> assignees) {
+		ActivityImpl prototypeActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), prototypeActivityId);
+
+		//拷贝listener，executionListeners会激活历史记录的保存
+		ActivityImpl clone = cloneActivity(processDefinition, prototypeActivity, cloneActivityId, "executionListeners", "properties");
+		//拷贝所有后向链接
+		for (PvmTransition trans : prototypeActivity.getOutgoingTransitions()) {
+			clone.createOutgoingTransition(trans.getId()).setDestination((ActivityImpl) trans.getDestination());
+		}
+
+		MultiInstanceActivityBehavior multiInstanceBehavior = isSequential ? new SequentialMultiInstanceBehavior(clone,
+				(TaskActivityBehavior) prototypeActivity.getActivityBehavior()) : new ParallelMultiInstanceBehavior(clone,
+				(TaskActivityBehavior) prototypeActivity.getActivityBehavior());
+
+		clone.setActivityBehavior(multiInstanceBehavior);
+
+		clone.setScope(true);
+		clone.setProperty("multiInstance", isSequential ? "sequential" : "parallel");
+
+		//设置多实例节点属性
+		multiInstanceBehavior.setLoopCardinalityExpression(new FixedValue(assignees.size()));
+		multiInstanceBehavior.setCollectionExpression(new FixedValue(assignees));
+		return clone;
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/RuntimeActivityCreator.java

@@ -0,0 +1,11 @@
+package com.chinaitop.depot.act.service.creator;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+
+public interface RuntimeActivityCreator
+{
+	public ActivityImpl[] createActivities(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition,
+			RuntimeActivityDefinitionEntity info);
+}

src/main/java/com/chinaitop/depot/act/service/creator/RuntimeActivityCreatorSupport.java

@@ -0,0 +1,90 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
+import org.activiti.engine.impl.el.FixedValue;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.impl.task.TaskDefinition;
+import org.apache.commons.lang3.reflect.FieldUtils;
+//import org.junit.Assert;
+import org.springframework.beans.BeanUtils;
+
+import com.chinaitop.depot.utils.activiti.ProcessDefUtils;
+
+
+public abstract class RuntimeActivityCreatorSupport {
+	private static int SEQUNCE_NUMBER = 0;
+
+	protected ActivityImpl cloneActivity(ProcessDefinitionEntity processDefinition, ActivityImpl prototypeActivity, String newActivityId,
+			String... fieldNames) {
+		ActivityImpl clone = processDefinition.createActivity(newActivityId);
+		copyFields(prototypeActivity, clone, fieldNames);
+
+		return clone;
+	}
+
+	protected TaskDefinition cloneTaskDefinition(TaskDefinition taskDefinition) {
+		TaskDefinition newTaskDefinition = new TaskDefinition(taskDefinition.getTaskFormHandler());
+		BeanUtils.copyProperties(taskDefinition, newTaskDefinition);
+		return newTaskDefinition;
+	}
+
+	protected ActivityImpl createActivity(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition, ActivityImpl prototypeActivity,
+			String cloneActivityId, String assignee) {
+		ActivityImpl clone = cloneActivity(processDefinition, prototypeActivity, cloneActivityId, "executionListeners", "properties");
+
+		//设置assignee
+		UserTaskActivityBehavior activityBehavior = (UserTaskActivityBehavior) (prototypeActivity.getActivityBehavior());
+
+		TaskDefinition taskDefinition = cloneTaskDefinition(activityBehavior.getTaskDefinition());
+		taskDefinition.setKey(cloneActivityId);
+		if (assignee != null) {
+			taskDefinition.setAssigneeExpression(new FixedValue(assignee));
+		}
+
+		UserTaskActivityBehavior cloneActivityBehavior = new UserTaskActivityBehavior(null, taskDefinition);
+		clone.setActivityBehavior(cloneActivityBehavior);
+
+		return clone;
+	}
+
+	protected ActivityImpl createActivity(ProcessEngine processEngine, ProcessDefinitionEntity processDefinition, String prototypeActivityId,
+			String cloneActivityId, String assignee) {
+		ActivityImpl prototypeActivity = ProcessDefUtils.getActivity(processEngine, processDefinition.getId(), prototypeActivityId);
+
+		return createActivity(processEngine, processDefinition, prototypeActivity, cloneActivityId, assignee);
+	}
+
+	protected void createActivityChain(List<ActivityImpl> activities, ActivityImpl nextActivity) {
+		for (int i = 0; i < activities.size(); i++) {
+			//设置各活动的下线
+			activities.get(i).getOutgoingTransitions().clear();
+			activities.get(i).createOutgoingTransition("flow" + (i + 1))
+					.setDestination(i == activities.size() - 1 ? nextActivity : activities.get(i + 1));
+		}
+	}
+
+	protected String createUniqueActivityId(String processInstanceId, String prototypeActivityId) {
+		return processInstanceId + ":" + prototypeActivityId + ":" + System.currentTimeMillis() + "-" + (SEQUNCE_NUMBER++);
+	}
+
+	private static void copyFields(Object source, Object target, String... fieldNames) {
+//		Assert.assertNotNull(source);
+//		Assert.assertNotNull(target);
+//		Assert.assertSame(source.getClass(), target.getClass());
+
+		for (String fieldName : fieldNames) {
+			try {
+				Field field = FieldUtils.getField(source.getClass(), fieldName, true);
+				field.setAccessible(true);
+				field.set(target, field.get(source));
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/RuntimeActivityDefinitionEntity.java

@@ -0,0 +1,65 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public interface RuntimeActivityDefinitionEntity
+{
+	/**
+	 * 反序列化PropertiesText到Map
+	 */
+	void deserializeProperties() throws IOException;
+
+	/**
+	 * 获取工厂名
+	 */
+	String getFactoryName();
+
+	/**
+	 * 获取流程定义的ID
+	 */
+	String getProcessDefinitionId();
+
+	/**
+	 * 获取流程实例的ID
+	 */
+	String getProcessInstanceId();
+
+	/**
+	 * 获取PropertiesText，它是一个JSON字符串
+	 */
+	String getPropertiesText();
+
+	/**
+	 * 获取指定的属性值
+	 */
+	<T> T getProperty(String name);
+
+	/**
+	 * 序列化Map至PropertiesText
+	 */
+	void serializeProperties() throws JsonProcessingException;
+
+	/**
+	 * 设置工厂名
+	 */
+	void setFactoryName(String factoryName);
+
+	/**
+	 * 设置流程定义ID
+	 */
+	void setProcessDefinitionId(String processDefinitionId);
+
+	/**
+	 * 设置流程实例ID
+	 */
+	void setProcessInstanceId(String processInstanceId);
+
+	/**
+	 * 设置PropertiesText
+	 */
+	void setPropertiesText(String propertiesText);
+
+	<T> void setProperty(String name, T value);
+}

src/main/java/com/chinaitop/depot/act/service/creator/RuntimeActivityDefinitionEntityIntepreter.java

@@ -0,0 +1,81 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.util.List;
+
+/**
+ * RuntimeActivityDefinitionEntity的解释类（代理类）
+ * 主要用以解释properties字段的值，如为get("name")提供getName()方法
+ * 
+ * @author xujh
+ * 
+ */
+public class RuntimeActivityDefinitionEntityIntepreter
+{
+	RuntimeActivityDefinitionEntity _entity;
+
+	public RuntimeActivityDefinitionEntityIntepreter(RuntimeActivityDefinitionEntity entity)
+	{
+		super();
+		_entity = entity;
+	}
+
+	public List<String> getAssignees()
+	{
+		return _entity.getProperty("assignees");
+	}
+
+	public String getCloneActivityId()
+	{
+		return _entity.getProperty("cloneActivityId");
+	}
+
+	public List<String> getCloneActivityIds()
+	{
+		return _entity.getProperty("cloneActivityIds");
+	}
+
+	public String getNextActivityId()
+	{
+		return _entity.getProperty("nextActivityId");
+	}
+
+	public String getPrototypeActivityId()
+	{
+		return _entity.getProperty("prototypeActivityId");
+	}
+
+	public boolean getSequential()
+	{
+		return (Boolean) _entity.getProperty("sequential");
+	}
+
+	public void setAssignees(List<String> assignees)
+	{
+		_entity.setProperty("assignees", assignees);
+	}
+
+	public void setCloneActivityId(String cloneActivityId)
+	{
+		_entity.setProperty("cloneActivityId", cloneActivityId);
+	}
+
+	public void setCloneActivityIds(List<String> cloneActivityIds)
+	{
+		_entity.setProperty("cloneActivityIds", cloneActivityIds);
+	}
+
+	public void setNextActivityId(String nextActivityId)
+	{
+		_entity.setProperty("nextActivityId", nextActivityId);
+	}
+
+	public void setPrototypeActivityId(String prototypeActivityId)
+	{
+		_entity.setProperty("prototypeActivityId", prototypeActivityId);
+	}
+
+	public void setSequential(boolean sequential)
+	{
+		_entity.setProperty("sequential", sequential);
+	}
+}

src/main/java/com/chinaitop/depot/act/service/creator/SimpleRuntimeActivityDefinitionEntity.java

@@ -0,0 +1,88 @@
+package com.chinaitop.depot.act.service.creator;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class SimpleRuntimeActivityDefinitionEntity implements RuntimeActivityDefinitionEntity {
+	String _factoryName;
+
+	String _processDefinitionId;
+
+	public Map<String, Object> getProperties() {
+		return _properties;
+	}
+
+	public void setProperties(Map<String, Object> properties) {
+		_properties = properties;
+	}
+
+	public void setFactoryName(String factoryName) {
+		_factoryName = factoryName;
+	}
+
+	public void setProcessDefinitionId(String processDefinitionId) {
+		_processDefinitionId = processDefinitionId;
+	}
+
+	public void setProcessInstanceId(String processInstanceId) {
+		_processInstanceId = processInstanceId;
+	}
+
+	public void setPropertiesText(String propertiesText) {
+		_propertiesText = propertiesText;
+	}
+
+	String _processInstanceId;
+
+	Map<String, Object> _properties = new HashMap<String, Object>();
+
+	String _propertiesText;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void deserializeProperties() throws IOException {
+		ObjectMapper objectMapper = new ObjectMapper();
+		_properties = objectMapper.readValue(_propertiesText, Map.class);
+	}
+
+	@Override
+	public String getFactoryName() {
+		return _factoryName;
+	}
+
+	@Override
+	public String getProcessDefinitionId() {
+		return _processDefinitionId;
+	}
+
+	@Override
+	public String getProcessInstanceId() {
+		return _processInstanceId;
+	}
+
+	@Override
+	public String getPropertiesText() {
+		return _propertiesText;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> T getProperty(String name) {
+		return (T) _properties.get(name);
+	}
+
+	@Override
+	public void serializeProperties() throws JsonProcessingException {
+		ObjectMapper objectMapper = new ObjectMapper();
+		_propertiesText = objectMapper.writeValueAsString(_properties);
+	}
+
+	@Override
+	public <T> void setProperty(String name, T value) {
+		_properties.put(name, value);
+	}
+}

src/main/java/com/chinaitop/depot/agile/mapper/BusinessSceduleMapper.java

@@ -0,0 +1,64 @@
+package com.chinaitop.depot.agile.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.chinaitop.depot.agile.model.BusinessScedule;
+
+
+
+/**
+ * 粮库业务管理与出入库系统关联mapper.
+* <p>Title: BusinessSceduleMapper</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年11月20日 上午10:58:55
+ */
+public interface BusinessSceduleMapper {
+
+    /**
+     * 通过多个计划id,获取这多个计划的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getPlanSceduleInPlanId(@Param("planIds")String planIds);
+    
+    /**
+     * 通过多个合同id,获取这多个合同的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getContractSceduleInContractId(@Param("contractIds")String contractIds);
+    
+    /**
+     * 通过多个通知单id,获取这多个通知单的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getNoticeSceduleInNoticeId(@Param("noticeIds")String noticeIds);
+
+    /**
+     * 根据粮库业务管理中出入库通知单id,修改出入库系统中，通知单状态. 
+     * 修改出入库表  data_crkyw_tzdxx_default中tzdh等于 这边的 通知单id获取到DataID 
+     * 通过DataID 链接 fl_bill_relation 修改字段FLOWSTATUS
+     * @param paramMap 通知单id. 通知单状态.
+     */
+    void updateNoticeStatus(Map<String, Object> paramMap);
+
+    /**
+     * 通过多个到站中转合同id,获取这多个合同的出入库类型，出库总数量，
+     * @param noticeIds
+     * @return
+     */
+	List<BusinessScedule> getDzContractSceduleInContractId(@Param("contractIds")String contractIds);
+
+	/**
+     * 通过多个发运中转合同id,获取这多个合同的出入库类型，出库总数量，
+     * @param noticeIds
+     * @return
+     */
+	List<BusinessScedule> getFyContractSceduleInContractId(@Param("contractIds")String contractIds);
+    
+}

src/main/java/com/chinaitop/depot/agile/mapper/BusinessSceduleMapper.xml

@@ -0,0 +1,81 @@
+<?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.chinaitop.depot.agile.mapper.BusinessSceduleMapper" >
+  <select id="getPlanSceduleInPlanId" parameterType="java.lang.String" resultType="com.chinaitop.depot.agile.model.BusinessScedule">
+	SELECT
+		a.jhdID jhId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		lsreport_ts.data_kcgl_xckc_default x,
+        lsreport_ts.data_crkyw_tzdxx_default a,
+		lsreport_ts.data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid  
+		and x.tzdh = a.tzdbh  
+		and a.jhdID IN ${planIds} GROUP BY a.jhdID, x.cazylx;
+  </select>
+  
+  <select id="getContractSceduleInContractId" parameterType="java.lang.String" resultType="com.chinaitop.depot.agile.model.BusinessScedule">
+  	SELECT
+		b.htID htId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		lsreport_ts.data_kcgl_xckc_default x,
+        lsreport_ts.data_crkyw_tzdxx_default b,
+		lsreport_ts.data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid
+        and x.tzdh = b.tzdbh
+		and b.htID IN ${contractIds} GROUP BY b.htID, x.cazylx;
+  </select>
+  
+  <select id="getNoticeSceduleInNoticeId" parameterType="java.lang.String" resultType="com.chinaitop.depot.agile.model.BusinessScedule">
+  	SELECT
+		b.tzdID tzdId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		lsreport_ts.data_kcgl_xckc_default x,
+        lsreport_ts.data_crkyw_tzdxx_default b,
+		lsreport_ts.data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid
+		and x.tzdh = b.tzdbh
+		and b.tzdID IN ${noticeIds} GROUP BY b.tzdID, x.cazylx;
+  </select>
+  
+  <update id="updateNoticeStatus" parameterType="java.util.Map">
+  	UPDATE 
+  		lsreport_ts.fl_bill_relation 
+  	SET 
+  		FLOWSTATUS = ${FLOWSTATUS}
+	WHERE 
+		DATAID IN (SELECT DataID FROM lsreport_ts.data_crkyw_tzdxx_default WHERE tzdID = ${tzdh})
+		<!-- 不能修改已经执行完毕的通知单的状态  -->
+		and FLOWSTATUS != 2
+  </update>
+  
+  <select id="getDzContractSceduleInContractId" parameterType="java.lang.String" resultType="com.chinaitop.depot.agile.model.BusinessScedule">
+  	SELECT
+	     SUM(b.klhjz) sumCksl,d.htbh,bc.id htId
+    FROM
+	     lsreport_ts.data_crkyw_ckrmdj_default a
+		inner JOIN lsreport_ts.data_crkyw_ckcmz_default b ON a.BizNo = b.BizNo
+		inner JOIN lsreport_ts.data_crkyw_dzzzthd_default c ON a.thdh = c.thdh
+		left JOIN lsreport_ts.data_crkyw_hcrzdj_default d ON c.rzdh = d.rzdh
+		left join depot.business_contract bc on d.htbh = bc.contract_number
+	WHERE
+	    a.thdh IS NOT NULL 
+	    and bc.id in ${contractIds} GROUP BY d.htbh
+	
+  </select>
+  
+  <select id="getFyContractSceduleInContractId" parameterType="java.lang.String" resultType="com.chinaitop.depot.agile.model.BusinessScedule">
+  	SELECT
+	    SUM(b.xzklhjz) sumCksl,d.htID htId
+    FROM
+	      lsreport_ts.DATA_CRKYW_FYZZQCDZRMDJ_DEFAULT a
+		LEFT JOIN lsreport_ts.DATA_CRKYW_CPZ_DEFAULT b ON a.BizNo = b.BizNo
+		LEFT JOIN lsreport_ts.data_crkyw_tzdxx_default d ON a.tzdbh = d.tzdbh
+		LEFT JOIN lsreport_ts.data_crkyw_hcckrzdj_default c ON d.htbh = c.htbh
+    WHERE
+	c.cczyfl = '4028818465320af10165322e04ec0c51'
+    AND d.htID IN ${contractIds} GROUP BY c.htbh
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agile/model/BusinessScedule.java

@@ -0,0 +1,102 @@
+/**
+ * 
+ */
+package com.chinaitop.depot.agile.model;
+
+/**
+ * 粮食业务管理，进度查询.
+ * <p>Title: BusinessScedule</p>
+ * <p>Description: </p>
+ * @author yaoyabin
+ * @date 2017年11月1日 下午8:04:31
+ */
+
+public class BusinessScedule {
+    // 可研报告号 对应 粮食业务管理中的计划id
+    private String jhId;
+    // 合同编号 对应 粮食业务管理中的合同id.
+    private String htId;
+    // 通知单号 对应 粮食业务管理中的通知单id.
+    private String tzdId;
+    // 仓廒作业类型   1:入库 3:出库
+    private String crkLx;
+    
+    // 入库数量.
+    private String sumRksl;
+    // 出库数量.
+    private String sumCksl;
+    /**
+     * @return the jhId
+     */
+    public String getJhId() {
+        return jhId;
+    }
+    /**
+     * @param jhId the jhId to set
+     */
+    public void setJhId(String jhId) {
+        this.jhId = jhId;
+    }
+    /**
+     * @return the htId
+     */
+    public String getHtId() {
+        return htId;
+    }
+    /**
+     * @param htId the htId to set
+     */
+    public void setHtId(String htId) {
+        this.htId = htId;
+    }
+    /**
+     * @return the tzdId
+     */
+    public String getTzdId() {
+        return tzdId;
+    }
+    /**
+     * @param tzdId the tzdId to set
+     */
+    public void setTzdId(String tzdId) {
+        this.tzdId = tzdId;
+    }
+    /**
+     * @return the sumRksl
+     */
+    public String getSumRksl() {
+        return sumRksl;
+    }
+    /**
+     * @param sumRksl the sumRksl to set
+     */
+    public void setSumRksl(String sumRksl) {
+        this.sumRksl = sumRksl;
+    }
+    /**
+     * @return the sumCksl
+     */
+    public String getSumCksl() {
+        return sumCksl;
+    }
+    /**
+     * @param sumCksl the sumCksl to set
+     */
+    public void setSumCksl(String sumCksl) {
+        this.sumCksl = sumCksl;
+    }
+    /**
+     * @return the crkLx
+     */
+    public String getCrkLx() {
+        return crkLx;
+    }
+    /**
+     * @param crkLx the crkLx to set
+     */
+    public void setCrkLx(String crkLx) {
+        this.crkLx = crkLx;
+    }
+    
+    
+}

src/main/java/com/chinaitop/depot/agile/service/BusinessSceduleService.java

@@ -0,0 +1,54 @@
+package com.chinaitop.depot.agile.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.agile.model.BusinessScedule;
+
+
+public interface BusinessSceduleService {
+
+    /**
+     * 通过多个计划id,获取这多个计划的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getPlanSceduleInPlanId(String planIds);
+    
+    /**
+     * 通过多个合同id,获取这多个合同的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getContractSceduleInContractId(String contractIds);
+    
+    /**
+     * 通过多个通知单id,获取这多个通知单的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     */
+    List<BusinessScedule> getNoticeSceduleInNoticeId(String noticeIds);
+
+    /**
+     * 根据粮库业务管理中出入库通知单id,修改出入库系统中，通知单状态. 
+     * 修改出入库表  data_crkyw_tzdxx_default中tzdh等于 这边的 通知单id获取到DataID 
+     * 通过DataID 链接 fl_bill_relation 修改字段FLOWSTATUS
+     * @param paramMap 通知单id. 通知单状态.
+     */
+    void updateNoticeStatus(Map<String, Object> paramMap);
+    
+    /**
+     * 通过多个到站中转合同id,获取这多个合同的出入库类型，出库总数量，
+     * @param noticeIds
+     * @return
+     */
+	List<BusinessScedule> getDzContractSceduleInContractId(String contractIds);
+
+	/**
+     * 通过多个发运中转合同id,获取这多个合同的出入库类型，出库总数量，
+     * @param noticeIds
+     * @return
+     */
+	List<BusinessScedule> getFyContractSceduleInContractId(String contractIds);
+
+}

src/main/java/com/chinaitop/depot/agile/service/impl/BusinessSceduleServiceImpl.java

@@ -0,0 +1,62 @@
+/**
+ * 
+ */
+package com.chinaitop.depot.agile.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agile.mapper.BusinessSceduleMapper;
+import com.chinaitop.depot.agile.model.BusinessScedule;
+import com.chinaitop.depot.agile.service.BusinessSceduleService;
+
+
+/**
+ * <p>Title: BusinessSceduleServiceImpl</p>
+ * <p>Description: </p>
+ * @author yaoyabin
+ * @date 2018年3月1日 下午4:52:53
+ */
+@Service
+public class BusinessSceduleServiceImpl implements BusinessSceduleService{
+
+    @Autowired
+    private BusinessSceduleMapper businessSceduleMapper;
+    
+    @Override
+    public List<BusinessScedule> getPlanSceduleInPlanId(String planIds) {
+        return businessSceduleMapper.getPlanSceduleInPlanId(planIds);
+    }
+
+    @Override
+    public List<BusinessScedule> getContractSceduleInContractId(
+            String contractIds) {
+        return businessSceduleMapper.getContractSceduleInContractId(contractIds);
+    }
+
+    @Override
+    public List<BusinessScedule> getNoticeSceduleInNoticeId(String noticeIds) {
+        return businessSceduleMapper.getNoticeSceduleInNoticeId(noticeIds);
+    }
+
+    @Override
+    public void updateNoticeStatus(Map<String, Object> paramMap) {
+        businessSceduleMapper.updateNoticeStatus(paramMap);
+    }
+
+	@Override
+	public List<BusinessScedule> getDzContractSceduleInContractId(String contractIds) {
+		// TODO Auto-generated method stub
+		return businessSceduleMapper.getDzContractSceduleInContractId(contractIds);
+	}
+
+	@Override
+	public List<BusinessScedule> getFyContractSceduleInContractId(String contractIds) {
+		// TODO Auto-generated method stub
+		return businessSceduleMapper.getFyContractSceduleInContractId(contractIds);
+	}
+
+}

src/main/java/com/chinaitop/depot/business/controller/ApprovalController.java

@@ -0,0 +1,183 @@
+package com.chinaitop.depot.business.controller;
+
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessApprovalExample;
+import com.chinaitop.depot.business.model.BusinessApprovalExample.Criteria;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value="/depot/business/select")
+@Api(value= "ApprovalController", description = "审批管理")
+
+public class ApprovalController {
+	@Resource
+	private BusinessApprovalService businessApprovalService;
+
+	@RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="获取审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+		@ApiImplicitParam(name = "projectId", value = "业务单据id", paramType = "query"),
+		@ApiImplicitParam(name = "orderByClause", value = "排序方式", paramType = "query")
+	})
+    public PageInfo<BusinessApproval> getList(Integer pageNum,Integer pageSize,String type, BusinessApproval businessApproval,Integer userId ,Integer projectId, String taskType, String orderByClause) {
+		Map<String, Object> map = new HashMap<String, Object>();
+    	map.put("type", type);
+    	map.put("userId", userId);
+    	if (null != taskType && !"".equals(taskType)) {
+    		map.put("taskType", taskType);
+    	}
+    	if (businessApproval.getProjectName()!=null && !"".equals(businessApproval.getProjectName())) {
+    		map.put("projectName", businessApproval.getProjectName());
+    	}
+    	if (businessApproval.getApplyName()!=null && !"".equals(businessApproval.getApplyName())){
+    		map.put("applyName", businessApproval.getApplyName());
+    	}
+    	if(businessApproval.getTaskId()!=null && !"".equals(businessApproval.getTaskId())){
+    		map.put("taskId", businessApproval.getTaskId());
+    	}
+    	if (projectId != null){
+    		map.put("projectId", projectId);
+    	}
+    	
+    	if (null != pageNum && null != pageSize) {
+    		PageHelper.startPage(pageNum, pageSize);
+    	}
+    	 List<BusinessApproval> queryByExample = businessApprovalService.queryByMap(map);
+        PageInfo<BusinessApproval> pageInfo = new PageInfo<BusinessApproval>(queryByExample);
+        return pageInfo;
+    }
+
+	@RequestMapping(value="/getListSize", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取审批列表总数，为首页提供", notes = "获取审批列表总数")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public int getListSize(String type, BusinessApproval businessApproval,Integer userId ,HttpServletRequest request) {
+		Map<String, Object> map = new HashMap<String, Object>();
+    	map.put("userId", userId);
+    	map.put("type", "todo"); //待办
+    	List<BusinessApproval> queryByExample = businessApprovalService.queryByMap(map);
+        //待办理共有多少条数据
+        int size = queryByExample.size();
+        return size;
+
+    }
+
+	@RequestMapping(value="/update", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="更新流程轨迹表数据", notes = "更新流程轨迹表数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "businessApproval", value = "数据字符串", paramType = "form"),
+		@ApiImplicitParam(name = "approvalStatus", value = "审批状态", paramType = "form")
+	})
+    public Map<String, Object> update(String businessApproval, Integer approvalStatus) {
+    	Map<String, Object> map = new HashMap<String, Object>();
+
+    	ObjectMapper mapper = new ObjectMapper();
+    	BusinessApproval Approval = null;
+    	try {
+			Approval = mapper.readValue(businessApproval, BusinessApproval.class);
+
+			//先将前面的审批数据的result刷成已审批
+    		BusinessApprovalExample businessApprovalExample=new BusinessApprovalExample();
+        	Criteria criteria = businessApprovalExample.createCriteria();
+        	
+        	if(Approval.getProjectId()!=null){
+        		criteria.andProjectIdEqualTo(Approval.getProjectId());
+        	}
+        	if(Approval.getTaskType()!=null){
+        		criteria.andTaskTypeEqualTo(Approval.getTaskType());
+        	}
+        	if(Approval.getTaskId()!=null){
+        		criteria.andTaskIdEqualTo(Approval.getTaskId());
+        	}
+        	if(Approval.getTaskType()!=null){
+        		criteria.andTaskTypeEqualTo(Approval.getTaskType());
+        	}
+        	businessApprovalExample.setOrderByClause(" id  asc ");
+
+        	List<BusinessApproval> list = businessApprovalService.queryByExample(businessApprovalExample);
+        	if (null != list && list.size() > 0) {
+        		for (BusinessApproval obj_list : list) {
+        			BusinessApproval approval_obj = obj_list;
+        			approval_obj.setResult("已审批");
+            		businessApprovalService.updateByPrimaryKeySelective(approval_obj);
+        		}
+        	}
+
+        	/* 把新的轨迹数据插入 */
+			businessApprovalService.add(Approval);
+
+			if (4 == approvalStatus || approvalStatus == 0 || approvalStatus == 6) {
+				//将当前单号的所有轨迹数据刷为审批结束
+				list = businessApprovalService.queryByExample(businessApprovalExample);
+				if (null != list && list.size() > 0) {
+	        		for (BusinessApproval obj_list : list) {
+	        			BusinessApproval approval_obj = obj_list;
+	        			if (4 == approvalStatus || approvalStatus == 6) {
+	        				approval_obj.setResult("审批结束");
+	        			} else if (approvalStatus == 0) {
+	        				approval_obj.setResult("已审批");
+	        			}
+	            		businessApprovalService.updateByPrimaryKeySelective(approval_obj);
+	        		}
+	        	}
+			}
+	    	map.put("status", "success");
+		} catch (IOException e) {
+			System.err.println("》》》提交流程异常》》》提交流程异常》》》》提交流程异常》》》提交流程异常》》》》》提交流程异常》》》》》提交流程异常》》》》提交流程异常》》》》提交流程异常");
+			e.printStackTrace();
+		}
+
+        return map;
+    }
+
+	@RequestMapping(value="/removeList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="删除流程轨迹表数据", notes = "更新流程轨迹表数据")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "projectId", value = "业务数据ID", paramType = "form"),
+		@ApiImplicitParam(name = "taskType", value = "任务类型", paramType = "form")
+	})
+    public Map<String, Object> removeList(Integer projectId, String taskType) {
+    	Map<String, Object> map = new HashMap<String, Object>();
+
+    	try {
+    		BusinessApprovalExample businessApprovalExample=new BusinessApprovalExample();
+        	Criteria criteria = businessApprovalExample.createCriteria();
+        	criteria.andProjectIdEqualTo(projectId);
+        	if ("1".equals(taskType)) {
+        		criteria.andTaskTypeEqualTo("fumigationProgram");
+        	} else if ("2".equals(taskType)) {
+        		criteria.andTaskTypeEqualTo("storageAeration");
+        	}
+
+        	businessApprovalService.removeList(businessApprovalExample);
+	    	map.put("status", "success");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+        return map;
+    }
+
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessContractController.java

@@ -0,0 +1,850 @@
+package com.chinaitop.depot.business.controller;
+
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessContract;
+import com.chinaitop.depot.business.model.BusinessContractExample;
+import com.chinaitop.depot.business.model.BusinessContractExample.Criteria;
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.AuditType;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessContractAuditVO;
+import com.chinaitop.depot.business.service.BusinessContractService;
+import com.chinaitop.depot.business.service.BusinessDeliveryStorageNoticeService;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-合同管理
+* <p>Title: BusinessContractController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:28:02
+ */
+@RestController
+@RequestMapping(value="/depot/business/contract")
+@Api(value= "BusinessContractController", description = "合同管理")
+
+public class BusinessContractController {
+    
+    @Resource
+    private BusinessContractService contractService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+    @Resource
+    private ActTaskService actTaskService;
+    @Autowired
+    private BusinessFileService businessFileService;
+    @Autowired
+    private BusinessDeliveryStorageNoticeService businessNoticeService;
+    
+    /**
+     * 合同申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     * @throws Exception 
+     */
+    @RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="合同申请列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getList(Integer pageNum, Integer pageSize,HttpServletRequest request, BusinessContract contract ,Integer userId) throws Exception {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+		if (userInfo==null) {
+			throw new Exception("请您先登录"); 
+		}
+		Integer userId = userInfo.getUserId();*/
+       
+        List<BusinessContract> list = contractService.queryByExample(pageNum, pageSize, userId, contract, "FIELD(audit_state,0,3,1,2,4 ), id desc", "");
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 审批通过列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @param contract 合同体
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/getAuditPassList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="合同审批通过列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getAuditPassList(Integer pageNum, Integer pageSize, BusinessContract contract,
+            Integer billType, HttpServletRequest request) {
+        List<BusinessContract> list = contractService.getAuditPassList(pageNum, pageSize, contract, billType);
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 获取可以合同变更的申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getCanChangeList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取合同可以变更的申请列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getCanChangeList(Integer pageNum, Integer pageSize,Integer userId,HttpServletRequest request) {
+
+    	List<BusinessContract> new_list = contractService.queryContractChangeList(userId, pageNum, pageSize);
+
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(new_list);
+
+        return pageInfo;
+    }
+    
+    //中转
+    /**
+     * 获取可以合同变更的申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getCanChangeListTransfer", produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+	@ApiOperation(value="获取中转合同变更的申请列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getCanChangeListTransfer(Integer pageNum, Integer pageSize,Integer userId,HttpServletRequest request) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	BusinessContractExample example = new BusinessContractExample();
+    	Criteria createCriteria = example.createCriteria();
+    	// 审批通过的.
+    	createCriteria.andAuditStateEqualTo(AuditType.AGREE.getAuditCode());
+    	// 变更状态为没有被变更.
+    	createCriteria.andChangingEqualTo("0");
+    	// 只能变更自己申请的合同.
+    	createCriteria.andCreaterIdEqualTo(userId);
+    	// 倒序.
+    	example.setOrderByClause(" id desc");
+    	//中转合同
+    	createCriteria.andContractTypeEqualTo(6913);
+    	PageHelper.startPage(pageNum, pageSize);
+    	List<BusinessContract> list = contractService.queryByExample(example);  
+    	PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+    	return pageInfo;
+    }
+    
+    /**
+     * 合同变更列表.
+     * 注：如果一条合同变更多次，只会显示最新一次的变更.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getChangeList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="合同变更列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getChangeList(Integer pageNum, Integer pageSize,
+            BusinessContract contract, Integer userId,HttpServletRequest request) {
+        // 登录人信息.
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	
+        List<BusinessContract> list = contractService.queryByExample(pageNum, pageSize, userId, contract, "FIELD(audit_state,0,3,1,2,4 ), id desc", "change");
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+    
+    //中转
+    /**
+     * 中转合同变更列表.
+     * 注：如果一条合同变更多次，只会显示最新一次的变更.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getChangeListTransfer", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="中转合同变更列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getChangeListTransfer(Integer pageNum, Integer pageSize,
+    		BusinessContract contract, Integer userId,HttpServletRequest request) {
+    	// 登录人信息.
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	
+    	List<BusinessContract> list = contractService.queryByExampleTransfer(pageNum, pageSize, userId, contract, "FIELD(audit_state,0,3,1,2,4 ), id desc", "change");
+    	PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+    	return pageInfo;
+    }
+    
+    /**
+     * 获取合同进度列表.
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/getScheduleList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取合同进度列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+    public PageInfo<BusinessContractAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessContract contract) {
+        PageInfo<BusinessContractAuditVO> pageInfo = contractService.getScheduleList(pageNum, pageSize, contract);
+        return pageInfo;
+    }
+    
+    /**
+     * 根据id查询合同.
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="根据id查找详情", notes = "根据id查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
+	})
+    public Map<String, Object> edit(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            BusinessContract contract = contractService.findById(id);
+            modelMap.put("contract", contract);
+            List<BusinessFile> fileList= businessFileService.getByBid(id, "contract", null, null);
+            modelMap.put("fileList", fileList);
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 根据id查询变更的合同.
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/editForChange",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="根据id查找变更的合同", notes = "根据id查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "id", paramType = "query")
+	})
+    public Map<String, Object> editForChange(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+        	// 获取当前合同主表数据
+            BusinessContract contract = contractService.findById(id);
+            modelMap.put("contract", contract);
+            
+            //附件
+            List<BusinessFile> fileList= businessFileService.getByBid(id, "contract", null, null);
+            modelMap.put("fileList", fileList);
+            
+            // 获取当前合同的历次修改原因，内容，时间.
+            List<BusinessContract> changeDetailList = contractService.getChangeDetailList(id, "edit");
+            modelMap.put("changeDetailList", changeDetailList);
+            
+            // 仓号货位号数量质量标准.
+            List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.contract.getValue());
+            if(contract.getPlanBid()!=null){
+            	List<BusinessStoreWareDetail> planList= businessStoreWareDetailService.getByZidAndType(contract.getPlanBid(), StoreWareType.plan.getValue());
+
+            	/* 根据引用内容获取被引用合同明细的剩余数量 */
+            	Map<String, Object> param_map = new HashMap<String, Object>();
+            	param_map.put("plan_id", contract.getPlanBid());
+                List<Map<String, Object>> map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+                BusinessStoreWareDetail obj = null;
+                double sysl = 0d;
+                double sum_use_num = 0d; //已使用总量
+                double plan_sum_num = 0d; //原计划数量
+                for (int i = 0; i < planList.size(); i++) {
+                	obj = planList.get(i);
+                	for (Map<String, Object> m : map) {
+                		if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+                			if (!"".equals(m.get("in_count")) && null != m.get("in_count")) {
+                				plan_sum_num = Double.parseDouble(obj.getInCount());
+                				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num;
+                					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+                					if (sysl == 0) {
+                						obj.setRemainingNumber("0");
+                					}
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num - plan_sum_num;
+                					obj.setRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                			if (!"".equals(m.get("out_count")) && null != m.get("out_count")) {
+                				plan_sum_num = Double.parseDouble(obj.getOutCount());
+                				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num;
+                					obj.setOutRemainingNumber(""+sysl);
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num - plan_sum_num;
+                					obj.setOutRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                		}
+                	}
+                }
+
+                for (BusinessStoreWareDetail contractDetail : storeWareDetailList) {
+    				for (BusinessStoreWareDetail planDetail : planList) {
+    					if(contractDetail.getHouseId().equals(planDetail.getHouseId())  && 
+            					contractDetail.getWarehouseId().equals(planDetail.getWarehouseId())){
+   
+            				contractDetail.setRemainingNumber(planDetail.getRemainingNumber());
+            				contractDetail.setOutRemainingNumber(planDetail.getOutRemainingNumber());
+            			}
+    				}
+    			}
+			}
+            modelMap.put("storeWareDetailList", storeWareDetailList);
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 根据id查询.
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/addForChange",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+   	@ApiOperation(value="根据id查找，获取历次变更详情(新增时，不显示当前id对应的历史记录)", notes = "根据id查找")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "id", value = "id", paramType = "query")
+   	})
+    public Map<String, Object> addForChange(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+        	// 获取当前合同主数据
+            BusinessContract contract = contractService.findById(id);
+            // 获取当前合同的历次修改原因，内容，时间.
+            List<BusinessContract> changeDetailList = contractService.getChangeDetailList(id, "add");
+            // 获取当前合同明细数据
+            List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.contract.getValue());
+            if(contract.getPlanBid()!=null){
+            	// 查询当前合同所在的计划的明细信息
+            	List<BusinessStoreWareDetail> planList= businessStoreWareDetailService.getByZidAndType(contract.getPlanBid(), StoreWareType.plan.getValue());
+
+            	/* 根据引用内容获取被引用合同明细的剩余数量 */
+            	Map<String, Object> param_map = new HashMap<String, Object>();
+            	param_map.put("plan_id", contract.getPlanBid());
+                List<Map<String, Object>> map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+                BusinessStoreWareDetail obj = null;
+                double sysl = 0d;
+                double sum_use_num = 0d; //已使用总量
+                double plan_sum_num = 0d; //原计划数量
+                for (int i = 0; i < planList.size(); i++) {
+                	obj = planList.get(i);
+                	for (Map<String, Object> m : map) {
+                		if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+                			if (!"".equals(m.get("in_count")) && null != m.get("in_count")) {
+                				plan_sum_num = Double.parseDouble(obj.getInCount());
+                				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num;
+                					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+                					if (sysl == 0) {
+                						obj.setRemainingNumber("0");
+                					}
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num - plan_sum_num;
+                					obj.setRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                			if (!"".equals(m.get("out_count")) && null != m.get("out_count")) {
+                				plan_sum_num = Double.parseDouble(obj.getOutCount());
+                				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+                				if (sum_use_num <= plan_sum_num) {
+                					sysl = plan_sum_num - sum_use_num;
+                					obj.setOutRemainingNumber(""+sysl);
+                				} else if (sum_use_num > plan_sum_num){
+                					sysl = sum_use_num - plan_sum_num;
+                					obj.setOutRemainingNumber("超出:" + sysl);
+                				}
+                			}
+                		}
+                	}
+                }
+            	
+                for (BusinessStoreWareDetail contractDetail : storeWareDetailList) {
+    				for (BusinessStoreWareDetail planDetail : planList) {
+    					if(contractDetail.getHouseId().equals(planDetail.getHouseId())  && 
+            					contractDetail.getWarehouseId().equals(planDetail.getWarehouseId())){
+   
+            				contractDetail.setRemainingNumber(planDetail.getRemainingNumber());
+            				contractDetail.setOutRemainingNumber(planDetail.getOutRemainingNumber());
+            			}
+    				}
+    			}
+    		}
+            List<BusinessFile> fileList= businessFileService.getByBid(id, "contract", null, null);
+            modelMap.put("fileList", fileList);
+            
+            modelMap.put("contract", contract);
+            modelMap.put("changeDetailList", changeDetailList);
+            modelMap.put("storeWareDetailList", storeWareDetailList);
+        }
+        return modelMap;
+    }
+
+    /**
+     * 保存
+     * @param contractJson 合同数据json
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="contractJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="businessStoreWareDetailJson", value="子表数据", paramType="form"),
+    	@ApiImplicitParam(name="userId", value="当前登录人的id", paramType="form"),
+    	@ApiImplicitParam(name="realName", value="当前登录人的name", paramType="form"),
+    	@ApiImplicitParam(name="depotInfoOrgId", value="当前登录人的组织id", paramType="form")
+    })
+    public Map<String, Object> save(String contractJson, String businessStoreWareDetailJson,
+            HttpServletRequest request,Integer userId,String realName,Integer depotInfoOrgId,String fileIds, String deleteFileIds) 
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	if (userInfo == null) {
+    	    modelMap.put("status", "error");
+            modelMap.put("msg", "请重新登录！");
+            return modelMap;
+    	}
+    	OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");*/
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessContract contract = (BusinessContract)mapper.readValue(contractJson, BusinessContract.class);
+            
+            // 明细.
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+            }
+            if (contract.getId() == null) {
+                Map<String, Object> returnMap = contractService.add(contract, storeWareDetailList,  userId, realName, depotInfoOrgId,fileIds);
+                if (returnMap != null && returnMap.get("error") != null) {
+                    modelMap.put("status", "error");
+                    modelMap.put("msg", returnMap.get("error"));
+                    return modelMap;
+                }
+                modelMap.put("id", returnMap.get("id"));
+            } else {
+                contractService.update(contract, storeWareDetailList,fileIds,deleteFileIds);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            return modelMap;
+        }
+        return modelMap;
+    }
+
+    /**
+     * 删除
+     * @param id 主键
+     * @param processInstanceId 流程实例id
+     * @param deleteReason 删除原因
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/remove",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+    @ApiOperation(value="删除合同", notes = "根据id删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "合同id", paramType = "query"),
+            @ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+            @ApiImplicitParam(name = "deleteReason", value = "删除原因", paramType = "query"),
+            @ApiImplicitParam(name = "planBid", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> remove(Integer id, String processInstanceId, String deleteReason,Integer planBid)
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            contractService.remove(id, processInstanceId, deleteReason,planBid);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 保存合同变更
+     * @param contractJson 合同数据json
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/saveChange", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存合同变更", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="contractJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="businessStoreWareDetailJson", value="子表数据", paramType="form"),
+    	@ApiImplicitParam(name="userId", value="当前登录人的id", paramType="form"),
+    	@ApiImplicitParam(name="userName", value="当前登录人的name", paramType="form"),
+    	@ApiImplicitParam(name="depotInfoOrgId", value="当前登录人的组织id", paramType="form"),
+            @ApiImplicitParam(name="id", value="原id", paramType="form")
+    })
+    public Map<String, Object> saveChange(String contractJson, String businessStoreWareDetailJson,
+    		Integer userId,String userName, String realName,Integer depotInfoOrgId,Integer id,String fileIds, String deleteFileIds) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessContract contract = (BusinessContract)mapper.readValue(contractJson, BusinessContract.class);
+
+            // 明细.
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+            }
+
+            if (id == null) {
+                throw new RuntimeException("原合同id为空，保存失败！");
+            } else {
+                Map<String, Object> returnMap =  contractService.saveChange(contract, storeWareDetailList,  userId, userName,  realName, depotInfoOrgId,id,fileIds);
+                modelMap.put("id",returnMap.get("id"));
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 修改合同变更.
+     * @param contractJson 合同数据json
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/updateChange", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="修改合同变更", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="contractJson", value="主表数据", paramType="form"),
+    	@ApiImplicitParam(name="businessStoreWareDetailJson", value="子表数据", paramType="form")
+    })
+    public Map<String, Object> updateChange(String contractJson, String businessStoreWareDetailJson,String fileIds, String deleteFileIds)
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessContract contract = (BusinessContract)mapper.readValue(contractJson, BusinessContract.class);
+
+            // 明细.
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+            }
+
+            if (contract.getId() == null) {
+                throw new RuntimeException("合同id为空，保存失败！");
+            } else {
+                contractService.update(contract, storeWareDetailList,fileIds,deleteFileIds);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 删除合同变更.
+     * @param id 主键
+     * @param originalContractBid 原合同id
+     * @param processInstanceId 流程实例id
+     * @param deleteReason 删除原因
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/changeContractRemove",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+	@ApiOperation(value="删除合同变更", notes = "根据id删除")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query"),
+		@ApiImplicitParam(name = "originalContractBid", value = "原合同id", paramType = "query"),
+		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+		@ApiImplicitParam(name = "deleteReason", value = "删除原因", paramType = "query"),
+	})
+    public Map<String, Object> changeContractRemove(Integer id, Integer originalContractBid,
+    		String processInstanceId, String deleteReason,Integer planBid)
+    		throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            modelMap = contractService.changeContractRemove(id, originalContractBid, processInstanceId, deleteReason,planBid);
+            if ("success".equals(modelMap.get("status"))) {
+                try {
+                    if (deleteReason!=null) {
+                        actTaskService.delRunTask(processInstanceId, deleteReason);
+                    } else {
+                        deleteReason="删除原因无";
+                        actTaskService.delRunTask(processInstanceId, deleteReason);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "id为空，删除失败！");
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 提交
+     * @param contract 合同
+     * @param assignee 下一个审批人
+     * @return
+     */
+    @RequestMapping(value="/submit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="提交", notes = "提交")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "contract", value = "合同", paramType = "query"),
+		@ApiImplicitParam(name = "assignee", value = "下一个审批人", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+		@ApiImplicitParam(name = "realName", value = "当前登录人name", paramType = "query")
+	})
+    public Map<String, Object> submit(BusinessContract contract,String assignee,Integer userId,String realName,HttpServletRequest request) {
+    	//UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> returnMap = contractService.submit(contract, assignee, userId, realName);
+        return returnMap;
+    }
+    
+    /**
+     * 启用
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/application", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="合同启用", notes = "合同启用")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
+	})
+    public Map<String, Object> application(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<String, String> returnMap = contractService.application(id);
+        if (StringUtils.isNoneBlank(returnMap.get("error"))) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", returnMap.get("error"));
+        } else {
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 暂停
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/discontinue", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="合同暂停", notes = "合同暂停")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
+	})
+    public Map<String, Object> discontinue(Integer id,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        contractService.discontinue(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    /**
+     * 终止
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/finish", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="合同终止", notes = "合同终止")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query")
+   	})
+    public Map<String, Object> finish(Integer id,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        contractService.finish(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    /**
+     * 校验合同编号，是否可用.
+     * @param id 主键.
+     * @param contractNumber 合同编号.
+     * @return true 为可用，false为不可用.
+     */
+    @RequestMapping(value="/validContractNumber", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="校验合同编号，是否可用", notes = "校验合同编号，是否可用")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query"),
+		@ApiImplicitParam(name = "contractNumber", value = "合同编号", paramType = "query")
+	})
+    public Boolean validContractNumber(Integer id, String contractNumber) {
+        return contractService.validContractNumber(id, contractNumber);
+    }
+    
+    
+    //中转------------------------------------------------------------------
+    /**
+     * 中转合同申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     * @throws Exception 
+     */
+    @RequestMapping(value="/getTransferList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="中转合同申请列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getTransferList(Integer pageNum, Integer pageSize,HttpServletRequest request, BusinessContract contract,Integer userId) throws Exception {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+		if (userInfo==null) {
+			throw new Exception("请您先登录"); 
+		}
+		Integer userId = userInfo.getUserId();*/
+        List<BusinessContract> list = contractService.queryByExampleTransfer(pageNum, pageSize, userId, contract, "FIELD(audit_state,0,3,1,2,4 ), id desc", "");
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 审批通过列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @param contract 合同体
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/getAuditPassListTransfer", produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+	@ApiOperation(value="审批通过列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "billType", value = "合同类型(收购/销售)", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getAuditPassListTransfer(Integer pageNum, Integer pageSize, BusinessContract contract,
+            Integer billType, HttpServletRequest request) {
+        List<BusinessContract> list = contractService.getAuditPassListTransfer(pageNum, pageSize, contract, billType);
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+    
+    
+    /**
+     * 审批通过列表(所有类型的合同，用于移动端).
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @param contract 合同体
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/getAuditPassListApp",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="合同审批通过列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "billType", value = "合同类型(收购/销售)", paramType = "query")
+	})
+    public PageInfo<BusinessContract> getAuditPassListApp(Integer pageNum, Integer pageSize, BusinessContract contract,
+            Integer billType, HttpServletRequest request) {
+        List<BusinessContract> list = contractService.getAuditPassListApp(pageNum, pageSize, contract, billType);
+        PageInfo<BusinessContract> pageInfo = new PageInfo<BusinessContract>(list);
+        return pageInfo;
+    }
+    
+    
+    
+   /* //合同信息同步
+  	@RequestMapping("/contractInfoSynchronization")
+  	public void contractInfoSynchronization() {
+  		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
+  		List list = DataSynchronization.queryContractInfo();
+  		List<BusinessContract> contractList = contractService.getAllContractInfo();
+  		for(BusinessContract contractInfo:contractList) {
+  			int num = 0;
+  			for(int i=0;i<list.size();i++) {
+  				Map<String,Object> map = (Map<String,Object>)list.get(i);
+  				String kdbm = ObjectUtils.toString(map.get("kdbm"),"");//库点编码
+  				String refreshTime = ObjectUtils.toString(map.get("refreshTime"),"");
+  				if(kdbm.equals(ObjectUtils.toString(orgInfo.getOrgId(),""))) {
+  					if(!refreshTime.equals(format.format(orgInfo.getUpdateTime()))) {
+  						DataSynchronization.orgInfoSynchronizationUpdate(map, orgInfo);
+  					}
+  					break;
+  				}else if(num == (list.size()-1)){
+  					DataSynchronization.orgInfoSynchronizationInsert(orgInfo);
+  				}else {
+  					num = num+1;
+  				}
+  			}
+  		}
+  	}*/
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessContractPayController.java

@@ -0,0 +1,101 @@
+package com.chinaitop.depot.business.controller;
+
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.BusinessContractPayRecevice;
+import com.chinaitop.depot.business.service.BusinessContractPayService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-合同收付款管理
+* 
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:33:42
+ */
+@RestController
+@RequestMapping(value="/depot/business/contractPay")
+public class BusinessContractPayController {
+	
+	@Resource
+	private BusinessContractPayService contractPayService;
+   
+	
+	/**
+	 * 列表
+	 * @param pageNum
+	 * @param pageSize
+	 * @param customerBadrecord
+	 * @return
+	 */
+	@RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="合同收付款列表", notes = "查询数据列表，支持分页")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+   		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+   	})
+	public PageInfo<BusinessContractPayRecevice> getList(Integer pageNum, Integer pageSize,BusinessContractPayRecevice contractPayRecevice) {
+		List<BusinessContractPayRecevice> list = contractPayService.queryByExample(pageNum,pageSize,contractPayRecevice);	
+		PageInfo<BusinessContractPayRecevice> pageInfo = new PageInfo<BusinessContractPayRecevice>(list);
+		return pageInfo;
+	}
+
+	
+
+	/**
+	 * 保存
+	 * @param customerJson 业务数据json
+	 * @return
+	 * @throws JsonParseException
+	 * @throws JsonMappingException
+	 * @throws IOException
+	 */
+	@RequestMapping(value="/contractPaySave", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="contractJson", value="增加数据", paramType="form")
+    })
+	public Map<String, Object> save(HttpServletRequest request, String contractJson) throws JsonParseException, JsonMappingException, IOException {
+		
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+		try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessContractPayRecevice contract = (BusinessContractPayRecevice)mapper.readValue(contractJson, BusinessContractPayRecevice.class);
+            if (contract.getId() == null) {
+            	contractPayService.add(contract);
+            } else {
+            	
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+		return modelMap;
+	}
+	
+	
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessDeliveryStorageNoticeController.java

@@ -0,0 +1,472 @@
+package com.chinaitop.depot.business.controller;
+
+
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.AuditType;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
+import com.chinaitop.depot.business.service.BusinessDeliveryStorageNoticeService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 粮库业务管理-出入库通知单管理
+* <p>Title: BusinessDeliveryStorageNoticeController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:36:15
+ */
+@RestController
+@RequestMapping(value="/depot/business/deliveryStorageNotice")
+@Api(value= "BusinessDeliveryStorageNoticeController", description = "出入库通知单管理")
+
+public class BusinessDeliveryStorageNoticeController {
+    
+    @Resource
+    private BusinessDeliveryStorageNoticeService deliveryStorageNoticeService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+   /* @Resource
+    private BasicCodeRuleService basicCodeRuleService;*/
+    
+    /**
+     * 申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="申请列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessDeliveryStorageNotice> getList(Integer pageNum, Integer pageSize,
+            HttpServletRequest request, BusinessDeliveryStorageNotice notice,Integer userId) {
+        /*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Integer userId = userInfo.getUserId();*/
+        List<BusinessDeliveryStorageNotice> list = deliveryStorageNoticeService.queryByExample(pageNum, pageSize, userId, notice, "FIELD(audit_state,0,3,1,2,4 ), id desc");  
+        PageInfo<BusinessDeliveryStorageNotice> pageInfo = new PageInfo<BusinessDeliveryStorageNotice>(list);
+        return pageInfo;
+    }
+    
+    //中转
+    /**
+     * 申请列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getListTransfer", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="申请列表(中转)", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessDeliveryStorageNotice> getListTransfer(Integer pageNum, Integer pageSize,
+    		HttpServletRequest request, BusinessDeliveryStorageNotice notice,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	List<BusinessDeliveryStorageNotice> list = deliveryStorageNoticeService.queryByExampleTransfer(pageNum, pageSize, userId, notice, "FIELD(audit_state,0,3,1,2,4 ), id desc");  
+    	PageInfo<BusinessDeliveryStorageNotice> pageInfo = new PageInfo<BusinessDeliveryStorageNotice>(list);
+    	return pageInfo;
+    }
+
+    /**
+     * 审批通过列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getAuditPassList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="通知单审批通过列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+    public PageInfo<BusinessDeliveryStorageNotice> getAuditPassList(Integer pageNum, Integer pageSize, BusinessDeliveryStorageNotice notice) {
+        notice.setAuditState(AuditType.AGREE.getAuditCode());
+        List<BusinessDeliveryStorageNotice> list = deliveryStorageNoticeService.queryByExample(pageNum, pageSize, null, notice, "agree_time desc");  
+        PageInfo<BusinessDeliveryStorageNotice> pageInfo = new PageInfo<BusinessDeliveryStorageNotice>(list);
+        return pageInfo;
+    }
+   
+    /**
+     * 获取进度列表.
+     * @param pageNum
+     * @param pageSize
+     * @param deliveryStorageNotice
+     * @return
+     */
+    @RequestMapping(value="/getScheduleList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="获取通知单进度列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+    public PageInfo<BusinessDeliveryStorageNoticeAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessDeliveryStorageNotice deliveryStorageNotice) {
+        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = deliveryStorageNoticeService.getScheduleList(pageNum, pageSize, deliveryStorageNotice);
+        return pageInfo;
+    }
+    /**
+     * 根据id查询.
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="根据id查找", notes = "根据id查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "通知单id", paramType = "query")
+	})
+    public Map<String, Object> edit(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            BusinessDeliveryStorageNotice deliveryStorageNotice = deliveryStorageNoticeService.findById(id);
+            modelMap.put("deliveryStorageNotice", deliveryStorageNotice);
+            
+            List<BusinessStoreWareDetail> list = new ArrayList<BusinessStoreWareDetail>();
+            Integer plan_id = deliveryStorageNotice.getPlanBid(); //计划ID
+            Integer contract_id = deliveryStorageNotice.getContractBid(); //合同ID
+            Map<String, Object> param_map = new HashMap<String, Object>();
+            List<Map<String, Object>> map = null;
+            if (null != contract_id) {
+            	list = businessStoreWareDetailService.getByZidAndType(contract_id, "contract");
+            	param_map.put("contract_id", contract_id);
+            	map = businessStoreWareDetailService.selectContractUseCount(param_map);
+            } else if (null != plan_id) {
+            	list = businessStoreWareDetailService.getByZidAndType(plan_id, "plan");
+            	param_map.put("plan_id", plan_id);
+            	map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+            }
+            
+            BusinessStoreWareDetail obj = null;
+            double sysl = 0d;
+            double sum_use_num = 0d; //已使用总量
+            double plan_sum_num = 0d; //原计划数量
+            for (int i = 0; i < list.size(); i++) {
+            	obj = list.get(i);
+            	for (Map<String, Object> m : map) {
+            		if (obj.getHouseId().equals(m.get("house_id")) && obj.getWarehouseId().equals(m.get("warehouse_id"))) {
+            			if ("1".equals(deliveryStorageNotice.getBillType())) {
+            				plan_sum_num = Double.parseDouble(obj.getInCount());
+            				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+        						sysl = plan_sum_num - sum_use_num;
+        						obj.setRemainingNumber(sysl+""); //页面上明细列表的剩余数量
+        					} else if (sum_use_num > plan_sum_num){
+        						sysl = sum_use_num - plan_sum_num;
+        						obj.setRemainingNumber("超出:"+sysl);
+        					}
+            			}
+            			if ("3".equals(deliveryStorageNotice.getBillType())) {
+            				plan_sum_num = Double.parseDouble(obj.getOutCount());
+            				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+        						sysl = plan_sum_num - sum_use_num;
+        						obj.setOutRemainingNumber(sysl+""); //页面上明细列表的剩余数量
+        					} else if (sum_use_num > plan_sum_num){
+        						sysl = sum_use_num - plan_sum_num;
+        						obj.setOutRemainingNumber("超出:"+sysl);
+        					}
+            			}
+            		}
+            	}
+            }
+            
+            //明细
+            List<BusinessStoreWareDetail> transferNoticeList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.transferNotice.getValue());
+            /*for (int i = 0; i < list.size(); i++) {
+            	obj = list.get(i);
+            	for (BusinessStoreWareDetail m : transferNoticeList) {
+            		if (obj.getHouseId().equals(m.getHouseId()) && obj.getWarehouseId().equals(m.getWarehouseId())) {
+            			if ("1".equals(deliveryStorageNotice.getBillType())) {
+            				m.setRemainingNumber(obj.getRemainingNumber());
+            			}
+            			if ("3".equals(deliveryStorageNotice.getBillType())) {
+            				m.setOutRemainingNumber(obj.getOutRemainingNumber());
+            			}
+            		}
+            	}
+            }*/
+            List<BusinessStoreWareDetail> noticelList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.notice.getValue());
+
+            for (int i = 0; i < list.size(); i++) {
+            	obj = list.get(i);
+            	for (BusinessStoreWareDetail m : noticelList) {
+            		if (obj.getHouseId().equals(m.getHouseId()) && obj.getWarehouseId().equals(m.getWarehouseId())) {
+            			if ("1".equals(deliveryStorageNotice.getBillType())) {
+            				m.setRemainingNumber(obj.getRemainingNumber());
+            			}
+            			if ("3".equals(deliveryStorageNotice.getBillType())) {
+            				m.setOutRemainingNumber(obj.getOutRemainingNumber());
+            			}
+            		}
+            	}
+            }
+            if(transferNoticeList.size()>0 && transferNoticeList!=null){
+            	modelMap.put("storeWareDetailList", transferNoticeList);
+            }
+            if(noticelList.size()>0 && noticelList!=null){
+            	modelMap.put("storeWareDetailList", noticelList);
+            }
+            
+        }
+        return modelMap;
+    }
+
+    /**
+     * 保存
+     * @param deliveryStorageNoticeJson 主表信息
+     * @param businessStoreWareDetailJson 明细
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "deliveryStorageNoticeJson", value = "主表数据", paramType = "query"),
+		@ApiImplicitParam(name = "businessStoreWareDetailJson", value = "子表数据", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+		@ApiImplicitParam(name = "name", value = "当前登录人name", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "当前登录人所在组织", paramType = "query"),
+		@ApiImplicitParam(name = "depotInfoOrgId", value = "当前登录人所在组织id", paramType = "query")
+	})
+    public Map<String, Object> save(String deliveryStorageNoticeJson, String businessStoreWareDetailJson, 
+    		Integer userId, String name ,Integer orgId,Integer depotInfoOrgId,HttpServletRequest request) 
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        /*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");*/
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessDeliveryStorageNotice businessDeliveryStorageNotice = (BusinessDeliveryStorageNotice)mapper.readValue(deliveryStorageNoticeJson, BusinessDeliveryStorageNotice.class);
+            
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+                
+                 //通知单的明细 库点名称都是一样的，所以取第一个
+					if(storeWareDetailList.get(0).getState() != storeWareDetailList.get(0).getOrgId()){ //代储库的
+						businessDeliveryStorageNotice.setHouseId(storeWareDetailList.get(0).getState());
+					}else{
+						businessDeliveryStorageNotice.setHouseId(storeWareDetailList.get(0).getOrgId());
+					}
+            
+            }
+            
+            if (businessDeliveryStorageNotice.getId() == null) {
+                Map<String, Object> returnMap = deliveryStorageNoticeService.add(businessDeliveryStorageNotice, storeWareDetailList,  userId,  name , orgId, depotInfoOrgId);
+                if (returnMap != null && returnMap.get("error") != null) {
+                    modelMap.put("status", "error");
+                    modelMap.put("msg", returnMap.get("error"));
+                    return modelMap;
+                }
+                modelMap.put("id", returnMap.get("id"));
+            } else {
+                deliveryStorageNoticeService.update(businessDeliveryStorageNotice, storeWareDetailList);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            return modelMap;
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 删除(同时删除流程)
+     * @param id 主键
+     * @param processInstanceId 流程实例id
+     * @param deleteReason 删除原因
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="通知单删除(同时删除流程)", notes = "删除.")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键id", paramType = "query"),
+		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+		@ApiImplicitParam(name = "deleteReason", value = "删除原因", paramType = "query"),
+        @ApiImplicitParam(name = "planBid", value = "计划id", paramType = "query"),
+        @ApiImplicitParam(name = "contractBid", value = "合同id", paramType = "query")
+	})
+    public Map<String, Object> remove(Integer id, String processInstanceId, String deleteReason,Integer planBid,Integer contractBid) 
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            deliveryStorageNoticeService.remove(id, processInstanceId, deleteReason,planBid,contractBid);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    /**
+     * 提交
+     * @param businessDeliveryStorageNotice 业务主体
+     * @param assignee 下一个审批人
+     * @return
+     */
+    @RequestMapping(value="/submit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="提交", notes = "提交")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "businessDeliveryStorageNotice", value = "业务主体", paramType = "query"),
+		@ApiImplicitParam(name = "assignee", value = "下一个审批人", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+		@ApiImplicitParam(name = "realName", value = "当前登录人name", paramType = "query")
+	})
+    public Map<String, Object> startProcess(BusinessDeliveryStorageNotice businessDeliveryStorageNotice, String assignee,Integer userId,String realName,HttpServletRequest request) {
+        //UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> returnMap = deliveryStorageNoticeService.submit(businessDeliveryStorageNotice, assignee, userId, realName);
+        return returnMap;
+    }
+    
+    /**
+     * 启用
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/application", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="通知单启用", notes = "启用.")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
+	})
+    public Map<String, Object> application(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<String, String> returnMap = deliveryStorageNoticeService.application(id);
+        if (StringUtils.isNoneBlank(returnMap.get("error"))) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", returnMap.get("error"));
+        } else {
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 暂停
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/discontinue",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+    @ApiOperation(value="通知单暂停", notes = "暂停.")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
+	})
+    public Map<String, Object> discontinue(Integer id ,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        deliveryStorageNoticeService.discontinue(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    /**
+     * 终止.
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/finish",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+    @ApiOperation(value="通知单终止", notes = "终止.")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
+	})
+    public Map<String, Object> finish(Integer id,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        deliveryStorageNoticeService.finish(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    
+    /**
+     * 中转保存
+     * @param deliveryStorageNoticeJson 主表信息
+     * @param businessStoreWareDetailJson 明细
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/addTransfer",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.POST)
+	@ApiOperation(value="中转保存", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+		@ApiImplicitParam(name = "deliveryStorageNoticeJson", value = "主表数据", paramType = "query"),
+		@ApiImplicitParam(name = "businessStoreWareDetailJson", value = "子表数据", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+		@ApiImplicitParam(name = "name", value = "当前登录人name", paramType = "query"),
+		@ApiImplicitParam(name = "orgId", value = "当前登录人所在组织", paramType = "query")
+		
+	})
+    public Map<String, Object> addTransfer(String deliveryStorageNoticeJson, String businessStoreWareDetailJson, Integer userId, String name ,Integer orgId,HttpServletRequest request) 
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+       /* UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");*/
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessDeliveryStorageNotice businessDeliveryStorageNotice = (BusinessDeliveryStorageNotice)mapper.readValue(deliveryStorageNoticeJson, BusinessDeliveryStorageNotice.class);
+            businessDeliveryStorageNotice.setHouseId(orgId);
+            //List<BusinessStoreWareDetail> storeWareDetailList = null;
+            /*if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+            }*/
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+                
+            }
+            
+            if (businessDeliveryStorageNotice.getId() == null) {
+                Map<String, Object> returnMap = deliveryStorageNoticeService.addTransfer(businessDeliveryStorageNotice, storeWareDetailList,  userId,  name , orgId);
+                if (returnMap != null && returnMap.get("error") != null) {
+                    modelMap.put("status", "error");
+                    modelMap.put("msg", returnMap.get("error"));
+                    return modelMap;
+                }
+            } else {
+                //deliveryStorageNoticeService.update(businessDeliveryStorageNotice, storeWareDetailList);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            return modelMap;
+        }
+        return modelMap;
+    }
+    
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessFileController.java

@@ -0,0 +1,99 @@
+package com.chinaitop.depot.business.controller;
+
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-文件
+* <p>Title: BusinessPlanController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年12月8日 下午5:43:19
+ */
+@RestController
+@RequestMapping(value="/depot/business/file")
+@Api(value= "BusinessFileController", description = "文件")
+
+public class BusinessFileController {
+    @Autowired
+    private BusinessFileService businessFileService;
+    
+    /**
+     * 删除.
+     * @param id
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="删除", notes = "根据id删除")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "id", paramType = "form")
+	})
+    public Map<String, Object> remove(Integer id, HttpServletRequest request) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        if (id != null) {
+            businessFileService.remove(id, rootPath);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    
+    @RequestMapping(value="/uploadFile")
+    public BusinessFile uploadFile(MultipartFile file, String type, Integer bid, Integer userId,Integer orgId,HttpServletRequest request) throws IllegalStateException, IOException {
+        BusinessFile businessFile = businessFileService.uploadFile(file,type,bid, userId, orgId);
+        return businessFile;
+    }
+
+    @RequestMapping(value="/updateFile", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="修改数据", notes = "修改数据保存的文件数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileIds", value = "文件ID集合", paramType = "form"),
+            @ApiImplicitParam(name = "bid", value = "主键id", paramType = "form")
+    })
+    public void updateFile(String fileIds, Integer bid, String fileType){
+        businessFileService.updateFileByFileIdsAndBid(fileIds,bid,fileType);
+    }
+
+    @RequestMapping(value="/getList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="按条件查询附件数据", notes = "按条件查询附件数据")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "bid", value = "主表id", paramType = "query"),
+        @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "query"),
+        @ApiImplicitParam(name = "order", value = "排序方式", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "单位id", paramType = "query")
+    })
+    public List<BusinessFile> getList(Integer bid, String fileType, String order, Integer orgId){
+    	List<BusinessFile> list = null;
+  
+    	list = businessFileService.getByBid(bid, fileType, orgId, order);
+
+        return list;
+    }
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessLadingController.java

@@ -0,0 +1,129 @@
+package com.chinaitop.depot.business.controller;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.BusinessLading;
+import com.chinaitop.depot.business.model.BusinessLadingExample;
+import com.chinaitop.depot.business.service.BusinessLadingService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/depot/business/lading")
+@Api(value= "BusinessLadingController", description = "提货单")
+
+public class BusinessLadingController {
+
+	@Resource
+    private BusinessLadingService ladingService;
+	
+	/**
+     * 列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+	@RequestMapping(value="/getList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取提货单列表信息", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+	})
+    public PageInfo<BusinessLading> getList(Integer pageNum, Integer pageSize) {
+    	BusinessLadingExample example = new BusinessLadingExample();
+        example.setOrderByClause("id desc");
+        if (pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<BusinessLading> list = ladingService.queryByExample(example);    
+        PageInfo<BusinessLading> pageInfo = new PageInfo<BusinessLading>(list);
+        return pageInfo;
+    }
+    
+    
+	/**
+	 * 保存
+	 * @param ladingJson
+	 * @param request
+	 * @return
+	 * @throws JsonParseException
+	 * @throws JsonMappingException
+	 * @throws IOException
+	 */
+	@RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="保存数据", notes = "保存")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "ladingJson", value = "新增数据", paramType = "query")
+	})
+    public Map<String, Object> save(String ladingJson, HttpServletRequest request)
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        try {
+           /* // 用户信息.
+            UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+            Integer userId = userInfo.getUserId();
+            // 组织机构信息.
+            OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");*/
+            
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessLading lading = (BusinessLading)mapper.readValue(ladingJson, BusinessLading.class);
+            if (lading.getId() == null) {
+                Map<String, Object> returnMap = ladingService.add(lading);
+                if (returnMap != null && returnMap.get("error") != null) {
+                    modelMap.put("status", "error");
+                    modelMap.put("msg", returnMap.get("error"));
+                    return modelMap;
+                }
+            } else {
+                modelMap = ladingService.update(lading);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+        return modelMap;
+    }
+    
+	/**
+     * 根据id查询.
+     * @param id 主键
+     * @return
+     */
+	@RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="根据id查找", notes = "根据id查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
+	})
+    public BusinessLading edit(Integer id) {
+    	BusinessLading lading = new BusinessLading();
+        if (id != null) {
+        	lading = ladingService.findById(id);
+        }
+        return lading;
+    }
+
+	
+	
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessPlanController.java

@@ -0,0 +1,648 @@
+package com.chinaitop.depot.business.controller;
+
+
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.AuditType;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.chinaitop.depot.business.service.BusinessPlanService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.chinaitop.depot.utils.HTTPUtils;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 粮库业务管理-计划管理
+ * <p>Title: BusinessPlanController</p>
+ * <p>Description: </p>
+ * @author yaoyabin
+ * @date 2017年10月25日 下午5:43:19
+ */
+@RestController
+@RequestMapping(value="/depot/business/plan")
+@Api(value= "BusinessPlanController", description = "计划管理")
+
+public class BusinessPlanController {
+
+    @Resource
+    private BusinessPlanService businessPlanService;
+    @Autowired
+    private BusinessFileService businessFileService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+
+    // 获取ip地址
+    @Value("${reportUrl}")
+    private String reportPath;
+
+    /**
+     * 查找申请列表
+     * @param pageNum  页码
+     * @param pageSize 每页显示条数
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划申请列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "当前登录的用户编号", paramType = "query")
+    })
+    public PageInfo<BusinessPlan> getList(Integer pageNum, Integer pageSize, Integer userId ,HttpServletRequest request, BusinessPlan businessPlan) throws Exception {
+
+        // Integer userId = userInfo.getUserId();
+        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, userId, businessPlan, "FIELD(audit_state,0,3,1,2,4 ), id desc", null);
+        PageInfo<BusinessPlan> pageInfo = new PageInfo<BusinessPlan>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 审批通过列表
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getAuditPassList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划审批通过列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+    })
+    public PageInfo<BusinessPlan> getAuditPassList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan, Integer billType) {
+        // 可以查询所有人通过的计划，必须是应用的.
+        businessPlan.setAuditState(AuditType.AGREE.getAuditCode());
+        List<BusinessPlan> list = businessPlanService.queryByExample(pageNum, pageSize, null, businessPlan, " agree_time desc", billType);
+        PageInfo<BusinessPlan> pageInfo = new PageInfo<BusinessPlan>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 获取进度列表.
+     * @param pageNum
+     * @param pageSize
+     * @param businessPlan
+     * @return
+     */
+    @RequestMapping(value="/getScheduleList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="获取计划进度列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+    })
+    public PageInfo<BusinessPlanAuditVO> getScheduleList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan) {
+        PageInfo<BusinessPlanAuditVO> pageInfo = businessPlanService.getScheduleList(pageNum, pageSize, businessPlan);
+        return pageInfo;
+    }
+
+    /**
+     * 根据id查询
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/edit", produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.GET)
+    @ApiOperation(value="根据计划id查找信息", notes = "根据id查找")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> edit(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        BusinessPlan businessPlan = new BusinessPlan();
+        if (id != null) {
+            businessPlan = businessPlanService.findById(id);
+            // 获取对应的文件.
+            List<BusinessFile> fileList= businessFileService.getByBid(id, "plan", null, null);
+            modelMap.put("fileList", fileList);
+        }else{
+            businessPlan=new BusinessPlan();
+        }
+        modelMap.put("plan", businessPlan);
+
+        return modelMap;
+    }
+
+    /**
+     * 保存
+     * @param businessPlanJson 计划json
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/save",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="保存数据", notes = "保存")
+    @SuppressWarnings("unchecked")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="businessPlanJson", value="主表数据", paramType="form"),
+            @ApiImplicitParam(name="businessStoreWareDetailJson", value="子表数据", paramType="form"),
+            @ApiImplicitParam(name="fileIds", value="文件数据", paramType="form"),
+            @ApiImplicitParam(name="userId", value="当前登录人的id", paramType="form"),
+            @ApiImplicitParam(name="orgId", value="当前登录人的组织id", paramType="form"),
+            @ApiImplicitParam(name="name", value="当前登录人的name", paramType="form"),
+            @ApiImplicitParam(name="depotInfoOrgId", value="当前登录人的组织id", paramType="form")
+    })
+    public Map<String, Object> save(String businessPlanJson, String businessStoreWareDetailJson,
+                                    String fileIds, String deleteFileIds, Integer userId , Integer orgId ,String name ,Integer depotInfoOrgId,
+                                    HttpServletRequest request) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+       /* UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");*/
+        try {
+            // JSON字符串转对象
+            ObjectMapper mapper = new ObjectMapper();
+            BusinessPlan businessPlan = (BusinessPlan)mapper.readValue(businessPlanJson, BusinessPlan.class);
+
+            List<BusinessStoreWareDetail> storeWareDetailList = null;
+            if (businessStoreWareDetailJson != null) {
+                storeWareDetailList = (List<BusinessStoreWareDetail>)mapper.readValue(businessStoreWareDetailJson, new TypeReference<List<BusinessStoreWareDetail>>(){});
+            }
+
+            if (businessPlan.getId() == null) {
+                Map<String, Object> returnMap = businessPlanService.add(businessPlan, storeWareDetailList, fileIds , userId ,  orgId , name , depotInfoOrgId);
+                if (returnMap.get("error") != null) {
+                    modelMap.put("status", "error");
+                    modelMap.put("msg", returnMap.get("error"));
+                    return modelMap;
+                }
+                modelMap.put("id", returnMap.get("id"));
+            } else {
+                businessPlanService.update(businessPlan, storeWareDetailList, fileIds, deleteFileIds);
+            }
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            return modelMap;
+        }
+        return modelMap;
+    }
+
+    /**
+     * 删除(同时删除流程)
+     * @param id 主键
+     * @param processInstanceId 流程实例id
+     * @param deleteReason 删除原因
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="删除(同时删除流程)", notes = "根据id删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query")
+    })
+    public Map<String, Object> remove(Integer id, String processInstanceId, String deleteReason, HttpServletRequest request)
+            throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 服务器路径
+        String rootPath = request.getSession().getServletContext().getRealPath("");
+        if (id != null) {
+            businessPlanService.remove(id, processInstanceId, deleteReason, rootPath);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 提交
+     * @param businessDeliveryStorageNotice 业务主体
+     * @param assignee 下一个审批人
+     * @return
+     */
+    @RequestMapping(value="/submit",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="计划提交", notes = "计划提交")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "assignee", value = "下一个审批人", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query"),
+            @ApiImplicitParam(name = "realName", value = "当前登录人姓名", paramType = "query")
+    })
+    public Map<String, Object> submit(Integer id, String assignee,Integer userId , String realName ,HttpServletRequest request) {
+        // UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> returnMap = businessPlanService.submit(id, assignee,userId ,realName);
+        return returnMap;
+    }
+
+    /**
+     * 启用
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/application", produces = MediaType.APPLICATION_JSON_VALUE,method=RequestMethod.POST)
+    @ApiOperation(value="计划启用", notes = "计划启用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> application(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessPlanService.application(id);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 暂停
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/discontinue", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="计划暂停", notes = "计划暂停")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> discontinue(Integer id,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessPlanService.discontinue(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 终止
+     * @param id 主键.
+     * @return
+     */
+    @RequestMapping(value="/finish", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="计划终止", notes = "计划终止")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> finish(Integer id,String refuseReason) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessPlanService.finish(id,refuseReason);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 校验计划编号，是否可用.
+     * @param id 主键.
+     * @param planNumber 计划编号.
+     * @return
+     */
+    @RequestMapping(value="/validPlanNumber", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="校验计划编号，是否可用", notes = "校验计划编号，是否可用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "planNumber", value = "计划编号", paramType = "query")
+    })
+    public Boolean validPlanNumber(Integer id, String planNumber) {
+        return businessPlanService.validPlanNumber(id, planNumber);
+    }
+
+
+    /**
+     * 根据id查询追溯数据.
+     * @param id 主键
+     * @return
+     */
+    @RequestMapping(value="/getSynthInfo", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="根据id查询计划追溯数据", notes = "根据id查找")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query")
+    })
+    public Map<String, Object> getSynthInfo(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+            modelMap = businessPlanService.getSynthInfo(id);
+        }
+        return modelMap;
+    }
+
+    /**
+     * 计划已上报的列表展示(省)
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @param request
+     * @param businessPlan
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getReportList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划已上报列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query")
+    })
+    public PageInfo<BusinessPlan> getReportList(Integer pageNum, Integer pageSize, Integer userId ,HttpServletRequest request, BusinessPlan businessPlan) throws Exception {
+
+        // 可以查询所有人通过的计划，必须是应用的.
+        businessPlan.setAuditState(AuditType.AGREE.getAuditCode());
+        List<BusinessPlan> list = businessPlanService.queryReportByExample(pageNum, pageSize, userId, businessPlan);
+        for (BusinessPlan plan : list) {
+            int id=plan.getId();
+            List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.plan.getValue());
+            int grainAttribute = storeWareDetailList.get(0).getGrainAttribute();
+            plan.setGrainAttributeByfirst(String.valueOf(grainAttribute));
+        }
+        PageInfo<BusinessPlan> pageInfo = new PageInfo<BusinessPlan>(list);
+        return pageInfo;
+    }
+
+
+    /**
+     * 计划已上报的列表的查看(省)
+     * @param pageNum
+     * @param pageSize
+     * @param userId
+     * @param request
+     * @param businessPlan
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/getReportEduit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划已上报列表查看", notes = "计划已上报列表查看")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "userName", value = "当前登录人的姓名", paramType = "query")
+    })
+    public Map<String, Object> getReportEduit(Integer id,String userName) throws Exception {
+
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 详情.
+        BusinessPlan plan = businessPlanService.findById(id);
+        modelMap.put("plan", plan);
+
+        // 获取对应的文件.
+        List<BusinessFile> fileList= businessFileService.getByBid(id, "plan", null, null);
+
+        modelMap.put("fileList", fileList);
+
+        // 仓号货位号数量质量标准.
+        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.plan.getValue());
+        modelMap.put("storeWareDetailList", storeWareDetailList);
+        return modelMap;
+    }
+
+
+    /**
+     * 上报 修改状态
+     * @param id
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/updatePlanStatus", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="修改计划上报状态", notes = "修改计划上报状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "status", value = "计划状态", paramType = "query")
+    })
+    public Map<String, Object> updatePlanStatus(Integer id,Integer status,String totalQuantity,String enterpriseRemark,String provinceRemark) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        BusinessPlan plan = new BusinessPlan();
+        try {
+            if(id!=null && status!=null){
+            	Date date = new Date();
+                plan.setId(id);
+                if(status==10){ //上报的状态
+                    plan.setReportDate(date);
+                }
+                if(status==40){ //下发的状态
+                    plan.setSendDate(date);
+                }
+                plan.setCustomerPlanState(String.valueOf(status));
+                if(totalQuantity!=null){
+                	plan.setTotalQuantity(totalQuantity);
+                }
+                if(enterpriseRemark!=null){
+                	plan.setEnterpriseRemark(enterpriseRemark);
+                }
+                if(provinceRemark!=null){
+                	plan.setProvinceRemark(provinceRemark);
+                }
+                businessPlanService.updatePlanStatus(plan);
+                modelMap.put("plan", plan);
+                modelMap.put("status", "success");
+            }else{
+                throw new RuntimeException("id或status无值");
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+
+        return modelMap;
+
+    }
+
+
+    /**
+     *
+     * 验收申请
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/acceptanceSave",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划申请列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planJson", value = "计划", paramType = "query"),
+            @ApiImplicitParam(name = "houseJson", value = "明细信息", paramType = "query"),
+            @ApiImplicitParam(name = "fileJson", value = "文件", paramType = "query")
+    })
+    public Map<String, Object> acceptanceSave(String planJson, String houseJson, String fileJson) throws Exception {
+        // Integer userId = userInfo.getUserId();
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        StringBuffer req = new StringBuffer();
+        try {
+            String plan = URLEncoder.encode(planJson, "UTF-8");
+            String house = URLEncoder.encode(houseJson, "UTF-8");
+            String file = URLEncoder.encode(fileJson, "UTF-8");
+
+
+            String url = reportPath+"/business-management/businessPlan/houseSave";
+
+            String count= HTTPUtils.doGet(url+"?planJson="+plan+"&houseJson="+house+"&fileJson="+file);
+            System.out.println(count+"********验收***"+reportPath+"地址");
+            if(count.contains("Success") || count.contains("200")){
+                modelMap.put("status", "success");
+                modelMap.put("msg", "成功！");
+            }
+
+        } catch (Exception e){
+            // req.append("?data=");
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+
+        return modelMap;
+    }
+
+
+    /**
+     *
+     * 上报申请
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/reportSave",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划申请列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "businessPlan", value = "计划", paramType = "query")
+
+    })
+    public Map<String, Object> reportSave(String businessPlan) throws Exception {
+        // Integer userId = userInfo.getUserId();
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        StringBuffer req = new StringBuffer();
+        try {
+            String plan = URLEncoder.encode(businessPlan, "UTF-8");
+
+            String url = reportPath+"/business-management/businessPlan/save";
+
+            String count= HTTPUtils.doGet(url+"?businessPlan="+plan);
+            System.out.println(count+"********上报*****"+reportPath+"地址");
+            if(count.contains("Success") || count.contains("200")){
+                modelMap.put("status", "success");
+                modelMap.put("msg", "成功！");
+            }
+        } catch (Exception e){
+            // req.append("?data=");
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+        }
+
+        return modelMap;
+    }
+
+    /**
+     * 验收列表
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getAcceptanceList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划审批通过列表", notes = "查询数据列表，支持分页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getAcceptanceList(Integer pageNum, Integer pageSize, BusinessPlan businessPlan,Integer userId,Integer orgId) {
+       
+    	Map<String, Object> map = new HashMap<String, Object>();
+    	map.put("orgId", orgId);
+    	map.put("userId", userId);
+    	if(null != businessPlan.getPlanNumber()){
+    		map.put("planNumber", businessPlan.getPlanNumber());
+    	}
+    	if(null != businessPlan.getPlanTitle()){
+    		map.put("planTitle", businessPlan.getPlanTitle());
+    	}
+    	if(null != businessPlan.getCustomerPlanState()){
+    		map.put("customerPlanState", businessPlan.getCustomerPlanState());
+    	}
+    	if(null != pageNum && null != pageSize){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+    	
+        List<Map<String, Object>> list = businessPlanService.queryAcceptanceList(map);
+        
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 架空期查询数据
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getJkqPlanNumberList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="架空期数据查询", notes = "架空期数据查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "executeType", value = "轮换计划", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getJkqPlanNumberList(HttpServletRequest request, Integer pageNum, Integer pageSize,
+    		String applyTimeA, String applyTimeB, String lhEndA, String lhEndB) {
+       
+    	Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+    	List<Map<String, Object>> countList = new ArrayList<Map<String, Object>>();
+    	List<Map<String, Object>> lastList = new ArrayList<Map<String, Object>>();
+    	Map<String, Object> map = new HashMap<String, Object>();
+    	map.put("orgId", orgId);
+    	map.put("executeType", 3156);
+    	map.put("cjsjA", applyTimeA);
+    	map.put("cjsjB", applyTimeB);
+    	map.put("rqA", lhEndA);
+    	map.put("rqB", lhEndB);
+        List<Map<String, Object>> list = businessPlanService.getjkqPlanList(map);
+        for (Map<String, Object> countMap : list) {
+        	countMap.put("orgId", orgId);
+        	countMap.put("executeType", 3156);
+        	countMap.put("cjsjA", applyTimeA);
+        	countMap.put("cjsjB", applyTimeB);
+        	countMap.put("rqA", lhEndA);
+        	countMap.put("rqB", lhEndB);
+			countList = businessPlanService.getjkqPlanDayList(countMap);
+			for (Map<String, Object> lastMap : countList) {
+				if(lastMap != null && !lastMap.isEmpty() && lastMap.get("jkqEnd") !=null) {
+				lastList.add(lastMap);
+				}
+        	}
+		}
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(lastList);
+        return pageInfo;
+    }
+    
+    /**
+     * 架空期查询轮入数据
+     * @return
+     */
+    @RequestMapping(value="/getJkqPlanDayList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="架空期查询轮入数据", notes = "架空期查询轮入数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "executeType", value = "轮换计划", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getJkqPlanDayList(HttpServletRequest request, Integer pageNum, Integer pageSize, Integer houseId, Integer warHouseId) {
+       
+    	Integer orgId = (Integer) request.getSession().getAttribute("orgId");
+    	Map<String, Object> map = new HashMap<String, Object>();
+    	map.put("orgId", orgId);
+    	map.put("executeType", 3156);
+    	map.put("billType", 3);
+    	map.put("ch", houseId);
+    	map.put("hwh", warHouseId);
+    	if(null != pageNum && null != pageSize){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+        List<Map<String, Object>> list = businessPlanService.getjkqPlanDayList(map);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        return pageInfo;
+    }
+    
+}

src/main/java/com/chinaitop/depot/business/controller/BusinessStoreWareDetailController.java

@@ -0,0 +1,222 @@
+package com.chinaitop.depot.business.controller;
+
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.service.BusinessContractService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-计划合同通知单-子表
+* <p>Title: BusinessStoreWareDetailController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年12月20日 下午7:42:10
+ */
+@RestController
+@RequestMapping(value="/depot/business/storeWareDetail")
+@Api(value= "BusinessStoreWareDetailController", description = "计划合同通知单-子表")
+
+public class BusinessStoreWareDetailController {
+    
+    @Resource
+    private BusinessStoreWareDetailService detailService;
+    
+    @Resource
+    private BusinessContractService contractService;
+    
+    
+    /**
+     * 删除
+     * @param id 主键
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/remove",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="删除", notes = "根据id删除")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "计划合同通知单子表id", paramType = "query")
+	})
+    public Map<String, Object> remove(Integer id) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id != null) {
+        	detailService.remove(id);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    
+    @RequestMapping(value="/getByZidAndType", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="根据条件查找", notes = "根据条件查找")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "zid", value = "关联的主表id", paramType = "query"),
+		@ApiImplicitParam(name = "type", value = "类型", paramType = "query")
+	})
+    public Map<String, Object> getByZidAndType(Integer zid, String type) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        try {
+            if (zid != null && StringUtils.isNotBlank(type)) {
+                List<BusinessStoreWareDetail> list = new ArrayList<BusinessStoreWareDetail>();
+                Map<String, Object> param_map = new HashMap<String, Object>();
+                List<Map<String, Object>> map = null;
+                if (!"plan".equals(type)) {
+                	list = detailService.getByZidAndType(zid, "contract");
+        			param_map.put("contract_id", zid);
+        			map = detailService.selectContractUseCount(param_map);
+                } else {
+                	list = detailService.getByZidAndType(zid, "plan");
+                	param_map.put("plan_id", zid);
+                	map = detailService.selectPlanUseCount(param_map);
+                }
+                BusinessStoreWareDetail obj = null;
+                double sysl = 0d;
+                double sum_use_num = 0d; //已使用总量
+                double plan_sum_num = 0d; //原计划数量
+                for (int i = 0; i < list.size(); i++) {
+                	obj = list.get(i);
+                	if (map.size() > 0) {
+                		for (Map<String, Object> m : map) {
+                			if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+                				if (!"".equals(m.get("in_count")) && null != m.get("in_count")) {
+                					if (!"".equals(obj.getInCount()) && null != obj.getInCount()) {
+                						plan_sum_num = Double.parseDouble(obj.getInCount());
+                    					sum_use_num = Double.parseDouble(m.get("in_count")+"");
+                    					if (sum_use_num <= plan_sum_num) {
+                    						sysl = plan_sum_num - sum_use_num;
+                    						obj.setRemainingNumber("0"); //页面上明细列表的剩余数量
+                    						obj.setInCount(sysl+"");
+                    					} else if (sum_use_num > plan_sum_num){
+                    						sysl = sum_use_num - plan_sum_num;
+                    						obj.setRemainingNumber("超出:"+sysl);
+                    					}
+                					}
+                					//轮换计划的引用了入的，出的为空  "".equals(m.get("out_count")) && null == m.get("out_count")
+                					if(!m.containsKey("out_count")){
+                						if(!"".equals(obj.getOutCount()) && null != obj.getOutCount()){
+                							plan_sum_num = Double.parseDouble(obj.getOutCount());
+                    						sum_use_num = 0d;
+                    						if (sum_use_num <= plan_sum_num) {
+                    							sysl = plan_sum_num - sum_use_num;
+                    							obj.setOutRemainingNumber("0");
+                    							obj.setOutCount(sysl+"");
+                    						} 
+                						}
+                					}
+                				}
+                				if (!"".equals(m.get("out_count")) && null != m.get("out_count")) {
+                					if (!"".equals(obj.getOutCount()) && null != obj.getOutCount()) {
+                						plan_sum_num = Double.parseDouble(obj.getOutCount());
+                						sum_use_num = Double.parseDouble(m.get("out_count")+"");
+                						if (sum_use_num <= plan_sum_num) {
+                							sysl = plan_sum_num - sum_use_num;
+                							obj.setOutRemainingNumber("0");
+                							obj.setOutCount(sysl+"");
+                						} else if (sum_use_num > plan_sum_num){
+                							sysl = sum_use_num - plan_sum_num;
+                							obj.setOutRemainingNumber("超出:"+sysl);
+                						}
+                					}
+                					
+                					//轮换计划的引用了出的，入的为空  "".equals(m.get("in_count")) && null == m.get("in_count")
+                					if (!m.containsKey("in_count")) {
+                    					if (!"".equals(obj.getInCount()) && null != obj.getInCount()) {
+                    						plan_sum_num = Double.parseDouble(obj.getInCount());
+                        					sum_use_num = 0d;
+                        					if (sum_use_num <= plan_sum_num) {
+                        						sysl = plan_sum_num - sum_use_num;
+                        						obj.setRemainingNumber("0"); //页面上明细列表的剩余数量
+                        						obj.setInCount(sysl+"");
+                        					} 
+                    					}
+                					}
+                					
+                				}
+                			}
+                		}
+                	} else {
+                		/* 如果没有查询到数据，则表示还没有被任何通知单和合同引用过 */
+                		obj.setRemainingNumber("0");
+                		obj.setOutRemainingNumber("0");
+                	}
+                }
+                modelMap.put("status", "success");
+                modelMap.put("list", list);
+            } else {
+                throw new RuntimeException("zid或者type为空！");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "查询失败！");
+        }
+        return modelMap;
+    }
+    
+    
+    /**
+     * 根据id 修改数据
+     * @param id 主键
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/updateById",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="修改", notes = "根据id修改")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "BusinessStoreWareDetail", value = "子表数据", paramType = "query")
+	})
+    public int updateById(BusinessStoreWareDetail detail) {
+        
+        	int i= detailService.updateById(detail);
+        
+        return i;
+    }
+    
+    
+    /**
+     * 根据id 查询数据
+     * @param id 主键
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/queryStoreWareDetailInfo",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="修改", notes = "根据id修改")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name = "BusinessStoreWareDetail", value = "子表数据", paramType = "query")
+    })
+    public BusinessStoreWareDetail queryStoreWareDetailInfo(String id) {
+    	BusinessStoreWareDetail businessStoreWareDetail = null;
+    	if(id!=null && !"".equals(id)){
+    		 businessStoreWareDetail= detailService.queryInfo(id);
+    	}
+    	
+    	return businessStoreWareDetail;
+    }
+    
+}

src/main/java/com/chinaitop/depot/business/controller/OrgInfoController.java

@@ -0,0 +1,72 @@
+package com.chinaitop.depot.business.controller;
+import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.business.model.OrgInfoExample;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.business.model.UserInfoExample;
+import com.chinaitop.depot.business.service.OrgInfoService;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 组织信息控制类
+ * @author xueenxi
+ *
+ */
+@RestController
+@RequestMapping(value="/orgInfo")
+@Api(description = "组织机构信息控制类")
+public class OrgInfoController {
+	
+	@Resource
+	private OrgInfoService orgInfoService;
+	
+	
+	/**
+     * 查询所有的用户枚举，返回id与用户姓名的map.
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/findAllOrgMap", method = RequestMethod.GET)
+    public Map<Integer, Object> findAllUserMapByOrgId(HttpServletRequest request) {
+        Map<Integer, Object> map = new HashMap<>();
+		
+           OrgInfoExample orgExample = new OrgInfoExample();
+			//Criteria criteria = keeperExample.createCriteria();
+			List<OrgInfo> list = null;
+			try {
+				list = orgInfoService.queryByExample(orgExample);
+				for (OrgInfo orgInfo : list) {
+					map.put(orgInfo.getOrgId(), orgInfo.getOrgName());
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+        
+        return map;
+    }
+	
+
+	
+}

src/main/java/com/chinaitop/depot/business/controller/UserInfoController.java

@@ -0,0 +1,482 @@
+package com.chinaitop.depot.business.controller;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.business.model.UserInfoExample;
+import com.chinaitop.depot.business.model.UserInfoExample.Criteria;
+import com.chinaitop.depot.business.model.UserRole;
+import com.chinaitop.depot.business.service.OrgInfoService;
+import com.chinaitop.depot.business.service.RoleInfoService;
+import com.chinaitop.depot.business.service.UserInfoService;
+import com.chinaitop.depot.business.service.UserRoleService;
+import com.chinaitop.depot.utils.SecurityCode;
+import com.chinaitop.depot.utils.SecurityCode.SecurityCodeLevel;
+import com.chinaitop.depot.utils.SecurityImage;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 用户信息控制类
+ * @author xueenxi
+ *
+ */
+@RestController
+@RequestMapping(value="/userInfo")
+@Api(description = "用户信息控制类")
+public class UserInfoController {
+	
+	@Resource
+	private UserInfoService userInfoService;
+
+	@Resource
+	private OrgInfoService orgInfoService;
+
+	@Resource
+	private UserRoleService userRoleService;
+
+	@Resource
+	private RoleInfoService roleInfoService;
+
+	@Value("${web.upload-path}")
+	private String uploadPath;
+
+	/**
+	 * 查找用户信息
+	 * @param pageNum	页码
+	 * @param pageSize	每页条数
+	 * @return
+	 */
+	@RequestMapping(value="/getUser", method = RequestMethod.GET)
+	@ApiOperation(value="查询用户信息", notes = "查询用户信息列表，支持分页")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+			@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query"),
+			@ApiImplicitParam(name = "realName", value = "用户真实姓名", paramType = "query")
+	})
+	public PageInfo<UserInfo> getUserInfo(HttpServletRequest request, Integer pageNum, Integer pageSize,
+                                          String username, String realName, Integer roleId, String orgIds) {
+		
+		if (pageNum!=null && pageSize!=null) {
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		
+		HashMap<Object, Object> map = new HashMap<Object, Object>();
+		map.put("username", username);
+		map.put("realName", realName);
+		map.put("roleId", roleId);
+		List<UserInfo> listAll=userInfoService.queryAll(map);
+		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
+		return pageInfo;
+	}
+
+	/**
+	 * 用户登录
+	 * @param request
+	 * @param username	用户名
+	 * @param password	密码
+	 * @return
+	 */
+	@RequestMapping(value="/login", method = RequestMethod.POST)
+	@ApiOperation(value="用户登录", notes = "用户登录")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "username", value = "用户名", paramType = "form"),
+			@ApiImplicitParam(name = "password", value = "密码", paramType = "form"),
+			@ApiImplicitParam(name = "yzm", value = "验证码", paramType = "form"),
+			@ApiImplicitParam(name = "from", value = "来源，app代表来自于移动端", paramType = "form")
+	})
+	public Map<String, Object> Login(HttpServletRequest request, String username, String password, String yzm, String from) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (StringUtils.isBlank(from) || from.compareTo("app")!=0) {
+			String yzm_code = (String) request.getSession().getAttribute("Service_Code");
+			if (!yzm_code.equals(yzm)) {
+				map.put("status", false);
+				map.put("success", "验证码输入错误！");
+				return map;
+			}
+		}
+		UserInfo userInfo = userInfoService.valid(username, password);
+		if (userInfo != null) {
+			//把对象转变成一个json
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				String userInfoObject = mapper.writeValueAsString(userInfo);
+				// 当前登录用户
+				request.getSession().setAttribute("userInfo", userInfoObject);
+				// 当前登录用户id
+				request.getSession().setAttribute("userId", userInfo.getUserId());
+				// 当前组织信息
+				OrgInfo orgInfo = orgInfoService.findById(userInfo.getOrgId());
+				String orgInfoObject = mapper.writeValueAsString(orgInfo);
+				request.getSession().setAttribute("orgInfo", orgInfoObject);
+				// 当前用户所属的库信息及库编号
+				OrgInfo depotInfo = orgInfoService.getDepotInfo(orgInfo);
+				if(depotInfo!=null){
+					String depotInfoObject = mapper.writeValueAsString(depotInfo);
+					request.getSession().setAttribute("depotInfo", depotInfoObject);
+					request.getSession().setAttribute("depotId", depotInfo.getOrgId());
+				}
+			} catch (JsonProcessingException e) {
+				e.printStackTrace();
+			}
+			map.put("status", true);
+			map.put("userInfo", userInfo);
+		} else {
+			map.put("status", false);
+			map.put("success", "用户名或密码错误，登录失败！");
+		}
+		return map;
+	}
+
+	/**
+	 * 获取用户登录信息,包括当前用户、当前组织、当前库、当前库编号
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value="/getLoginInfo", method = RequestMethod.GET)
+	@ApiOperation(value="获取用户登录信息", notes = "获取用户登录信息")
+	public Map<String, Object> getLoginInfo(HttpServletRequest request) {
+		Map<String, Object> modelMap = new HashMap<>();
+		try {
+			// JSON字符串转对象
+			ObjectMapper mapper = new ObjectMapper();
+			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+			if(!userInfoObject.isEmpty()) {
+				UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+				//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+				modelMap.put("userInfo", userInfo);
+			}
+			String orgInfoObject = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
+			if(!orgInfoObject.isEmpty()) {
+				OrgInfo orgInfo = mapper.readValue(orgInfoObject, OrgInfo.class);
+				//OrgInfo orgInfo = (OrgInfo)request.getSession().getAttribute("orgInfo");
+				modelMap.put("orgInfo", orgInfo);
+			}
+			String depotInfoObject = ObjectUtils.toString(request.getSession().getAttribute("depotInfo"),"");
+			if(!depotInfoObject.isEmpty()) {
+				OrgInfo depotInfo = mapper.readValue(depotInfoObject, OrgInfo.class);
+				//OrgInfo depotInfo = (OrgInfo)request.getSession().getAttribute("depotInfo");
+				modelMap.put("depotInfo", depotInfo);
+			}
+			Integer depotId = (Integer)request.getSession().getAttribute("depotId");
+			modelMap.put("depotId", depotId);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+		return modelMap;
+	}
+	
+	/**
+	 * 退出登录
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value="/exitLogin", method = RequestMethod.GET)
+	@ApiOperation(value="退出登录", notes = "退出登录，删除session")
+	public Map<String, Object> exitLogin(HttpServletRequest request) {
+		Map<String, Object> modelMap = new HashMap<>();
+		request.getSession().removeAttribute("userInfo");
+		modelMap.put("status", "success");
+		return modelMap;
+	}
+
+	/**
+	 * 验证用户名是否可用
+	 * @param userId	用户编号
+	 * @param username	用户名
+	 * @return
+	 */
+	@RequestMapping(value="/validUsername", method = RequestMethod.GET)
+	@ApiOperation(value="验证用户名", notes = "验证用户名是否可用")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userId", value = "用户编号", paramType = "query"),
+			@ApiImplicitParam(name = "username", value = "用户名", paramType = "query")
+	})
+	public Boolean validUsername(Integer userId, String username) {
+		return userInfoService.validUsername(userId, username);
+	}
+	
+	/**
+	 * 验证用户输入的原密码是否正确
+	 * @param oldPassword	用户输入的原密码
+	 * @return
+	 */
+	@RequestMapping(value="/validPassword", method = RequestMethod.GET)
+	@ApiOperation(value="验证用户输入的原密码是否正确", notes = "验证用户输入的原密码是否正确")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "oldPassword", value = "用户密码", paramType = "query")
+	})
+	public boolean validPassword(HttpServletRequest request, String oldPassword) throws Exception{
+		ObjectMapper mapper = new ObjectMapper();
+		String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+		UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+		String resPassword = userInfo.getPassword();
+		return userInfoService.validPassword(resPassword, oldPassword);
+	}
+
+	/**
+	 * 重置密码
+	 * @param userId
+	 * @return
+	 */
+	@RequestMapping(value="/resetPassword", method = RequestMethod.POST)
+	@ApiOperation(value="重置密码", notes = "重置密码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userId", value = "用户编号", paramType = "form")
+	})
+	public void resetPassword(Integer userId) {
+		userInfoService.resetPassword(userId);
+	}
+	
+	/**
+	 * 根据编号查找用户信息
+	 * @param userId 用户编号
+	 * @return	UserInfo	用户信息
+	 */
+	@RequestMapping(value="/edit", method = RequestMethod.GET)
+	@ApiOperation(value="编辑用户信息", notes = "编辑用户信息，用于新增或者修改")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userId", value = "用户编号", paramType = "query")
+	})
+	public UserInfo edit(Integer userId) {
+		UserInfo userInfo = new UserInfo();
+		if (userId != null) {
+			userInfo = userInfoService.findById(userId);
+		}
+		return userInfo;
+	}
+
+	/**
+	 * 保存用户信息
+	 * @param userInfoJson	用户信息json字符串
+	 * @return
+	 * @throws JsonParseException
+	 * @throws JsonMappingException
+	 * @throws IOException
+	 */
+	@RequestMapping(value="/save", method = RequestMethod.POST)
+	@ApiOperation(value="保存用户", notes = "保存用户信息，新增或者修改")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userInfoJson", value = "用户信息JSON串", paramType = "form"),
+			@ApiImplicitParam(name = "userRoleIds", value = "用户角色编号，多个之间用逗号隔开", paramType = "form")
+	})
+	public Map<String, Object> save(String userInfoJson , String userRoleIds) throws JsonParseException, JsonMappingException, IOException {
+		Map<String, Object> modelMap = new HashMap<>();
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		UserInfo userInfo = (UserInfo)mapper.readValue(userInfoJson, UserInfo.class);
+		UserRole userRole = new UserRole();
+		 if (StringUtils.isNotBlank(userRoleIds) && !"[]".equals(userRoleIds)) {
+			 userRoleIds = userRoleIds.substring(1, userRoleIds.length());
+			 userRoleIds = userRoleIds.substring(0, userRoleIds.length() - 1);
+	            String[] idArray = userRoleIds.split(",");
+	           if(userInfo.getUserId() == null){
+	        	   userInfoService.add(userInfo);
+	        	  /* userRole.setUserId(userInfo.getUserId());
+	        	   for (String id : idArray) {
+		            	userRole.setRoleId(Integer.parseInt(id));
+			            userRoleService.add(userRole);
+		            }*/
+	           }else{
+	        	   userInfoService.update(userInfo);
+	        	   userRoleService.deleteById(userInfo.getUserId());
+	           }
+	           userRole.setUserId(userInfo.getUserId());
+	           for (String id : idArray) {
+	        	   userRole.setRoleId(Integer.parseInt(id));
+	        	   userRoleService.add(userRole);
+	           }
+	           
+	          
+		 }
+		
+		/*String[] split1 = userRoleIds.split("[");
+		String[] split2 = split1[0].split("]");
+		String[] userRoleids = split2[0].split(",");*/
+		
+		//int userRoleids = Integer.parseInt(userRoleIds);
+		/*UserRole userRole = new UserRole();
+		for (int i = 0; i < userRoleids.length; i++) {
+			userRole.setRoleId(Integer.parseInt(userRoleids[i]));
+		}*/
+		modelMap.put("status", "success");
+		return modelMap;
+	}
+	
+	/**
+	 * 根据编号删除用户编纂 
+	 * @param userId	用户编号
+	 * @return
+	 */
+	@RequestMapping(value="/remove", method = RequestMethod.POST)
+	@ApiOperation(value="删除用户", notes = "按用户编号删除用户")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "userId", value = "用户名", paramType = "form")
+	})
+	public Map<String, Object> remove(Integer userId) {
+		Map<String, Object> modelMap = new HashMap<>();
+		if (userId != null) {
+			userInfoService.remove(userId);
+			userRoleService.deleteById(userId);//删除用户角色信息
+		}
+		modelMap.put("status", "success");
+		return modelMap;
+	}
+	
+	/**
+	 * 修改密码
+	 * @param request
+	 * @param oldPassword	原密码
+	 * @param newPassword	新密码
+	 * @return
+	 */
+	@RequestMapping(value="/modifyPwd", method = RequestMethod.POST)
+	@ApiOperation(value="修改密码", notes = "修改用户登录密码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "oldPassword", value = "源密码", paramType = "form"),
+			@ApiImplicitParam(name = "newPassword", value = "新密码", paramType = "form")
+	})
+	public UserInfo modifyPwd(HttpServletRequest request, String oldPassword, String newPassword) {
+		try {
+			ObjectMapper mapper = new ObjectMapper();
+			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+			UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+			if (userInfo.getPassword().equals(userInfoService.getMD5(oldPassword))) {
+				userInfo.setPassword(userInfoService.getMD5(newPassword));
+				userInfoService.update(userInfo);
+				
+				String userInfoObjectNew = mapper.writeValueAsString(userInfo);
+				request.getSession().setAttribute("userInfo", userInfoObjectNew);
+				return userInfo;
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
+	 * 查询当前库下所有的用户
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value="/findAllUserByOrgId", method = RequestMethod.GET)
+	@ApiOperation(value="查询当前库下所有的用户", notes = "查询当前库下所有的用户")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "form")
+	})
+	public List<UserInfo> findAllUserByOrgId(Integer orgId){
+		UserInfoExample example = new UserInfoExample();
+		Criteria criteria = example.createCriteria();
+		List<UserInfo> list = null;
+		try {
+			// 拼接查询条件单位
+			if (null != orgId && !"".equals(orgId)) {
+				criteria.andOrgIdEqualTo(orgId);
+			}
+			//criteria.andDelFlagEqualTo(1); // 查询正常数据（暂时不做限制）
+			list = userInfoService.queryByExample(example);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return list;
+	}
+	
+	/**
+     * 查询所有的用户枚举，返回id与用户姓名的map.
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/findAllUserMapByOrgId", method = RequestMethod.GET)
+    public Map<Integer, Object> findAllUserMapByOrgId(HttpServletRequest request) {
+        Map<Integer, Object> map = new HashMap<>();
+		
+			//ObjectMapper mapper = new ObjectMapper();
+			/*String depotInfoObject = ObjectUtils.toString(request.getSession().getAttribute("depotInfo"),"");
+			OrgInfo orgInfo = mapper.readValue(depotInfoObject, OrgInfo.class);*/
+			
+			UserInfoExample keeperExample = new UserInfoExample();
+			//Criteria criteria = keeperExample.createCriteria();
+			List<UserInfo> list = null;
+			try {
+				//Integer orgId = null;
+				/*if (orgInfo != null) {
+					orgId=orgInfo.getOrgId();//所属库id
+				}
+				// 拼接查询条件单位
+				if (null != orgId && !"".equals(orgId)) {
+					criteria.andOrgIdEqualTo(orgId);
+				}*/
+				list = userInfoService.queryByExample(keeperExample);
+				for (UserInfo userInfo : list) {
+					map.put(userInfo.getUserId(), userInfo.getRealName());
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+        
+        return map;
+    }
+
+    /**
+	 * 生成验证码图片, 并将验证码图片上传到服务器，然后将生成的验证码串值保存到session 中
+	 * 
+	 * @param request
+	 **/
+	@RequestMapping(value="/getCode", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="生成验证码图片", notes = "生成验证码图片")
+	public Map<String, Object> getCode(HttpServletRequest request, Integer fontSize, Integer width, Integer heigth) {
+
+		// 图片流
+		BufferedImage image;
+
+		// 获取验证码数字字符串
+		String yzm_code = SecurityCode.getSecurityCode(4, SecurityCodeLevel.Hard, false).toLowerCase();
+		request.getSession().setAttribute("Service_Code", yzm_code);
+		// 生成验证码图片
+		image = SecurityImage.createImage(yzm_code, fontSize, width, heigth);
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+			ImageIO.write(image, "jpg", baos);
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+
+        //将图片转换为base64位二进制编码返回
+        String imgBase64 = new Base64().encodeToString(baos.toByteArray());
+  		Map<String, Object> map = new HashMap<String, Object>();
+  		map.put("file", imgBase64);
+  		return map;
+	}
+}

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessContractAuditController.java

@@ -0,0 +1,480 @@
+package com.chinaitop.depot.business.controller.audit;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessContract;
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessContractAuditVO;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.chinaitop.depot.business.service.BusinessContractService;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-合同审批管理
+* <p>Title: BusinessContractAuditController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:45:39
+ */
+@RestController
+@RequestMapping(value="/depot/business/contract/audit")
+@Api(value= "BusinessContractAuditController", description = "合同审批管理")
+public class BusinessContractAuditController {
+    
+    @Resource
+    private BusinessContractService businessContractService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+    @Resource
+    private BusinessApprovalService businessApprovalService;
+    @Resource
+    private ActTaskService actTaskService;
+    @Autowired
+    private BusinessFileService businessFileService;
+    
+    /**
+     * 获取审批列表.
+     * @param pageNum  页码
+     * @param pageSize  每页显示条数
+     * @return
+     */
+	 @RequestMapping(value="/getList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取合同审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+ 
+    public PageInfo<BusinessContractAuditVO> getList(Integer pageNum, Integer pageSize, 
+            HttpServletRequest request, BusinessContractAuditVO businessContractAuditVO,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+        PageHelper.startPage(pageNum, pageSize);
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("operator", userId);
+        paramMap.put("changeRecordFlag", "0");
+        
+        if(StringUtils.isNotBlank(businessContractAuditVO.getContractNumber())) {
+            paramMap.put("contractNumber", businessContractAuditVO.getContractNumber());
+        }
+        
+        if(StringUtils.isNotBlank(businessContractAuditVO.getAuditState())) {
+            paramMap.put("result", businessContractAuditVO.getAuditState());
+        }
+        paramMap.put("ctype", 6913);
+        List<BusinessContractAuditVO> list = businessContractService.getApprovalList(paramMap);
+        PageInfo<BusinessContractAuditVO> pageInfo = new PageInfo<BusinessContractAuditVO>(list);
+        return pageInfo;
+    }
+    
+    //中转
+    /**
+     * 获取审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getListTransfer",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+	@ApiOperation(value="获取中转合同审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessContractAuditVO> getListTransfer(Integer pageNum, Integer pageSize, 
+    		HttpServletRequest request, BusinessContractAuditVO businessContractAuditVO,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	PageHelper.startPage(pageNum, pageSize);
+    	Map<String,Object> paramMap = new HashMap<String, Object>();
+    	paramMap.put("operator", userId);
+    	paramMap.put("changeRecordFlag", "0");
+    	
+    	if(StringUtils.isNotBlank(businessContractAuditVO.getContractNumber())) {
+    		paramMap.put("contractNumber", businessContractAuditVO.getContractNumber());
+    	}
+    	
+    	if(StringUtils.isNotBlank(businessContractAuditVO.getAuditState())) {
+    		paramMap.put("result", businessContractAuditVO.getAuditState());
+    	}
+        paramMap.put("contract_type", 6913);
+    	List<BusinessContractAuditVO> list = businessContractService.getApprovalList(paramMap);
+    	PageInfo<BusinessContractAuditVO> pageInfo = new PageInfo<BusinessContractAuditVO>(list);
+    	return pageInfo;
+    }
+    
+    /**
+     * 获取审批页面详情.
+     * @param id 业务主键
+     * @param processInstanceId 流程实例id
+     * @return   
+     */
+    @RequestMapping(value="/getAudit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取合同审批页面详情", notes = "获取审批页面详情")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query"),
+		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+		@ApiImplicitParam(name = "userName", value = "当前登录人name", paramType = "query")
+	})
+    public Map<String, Object> getAudit(Integer id, String processInstanceId,String userName) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        BusinessContract contract = businessContractService.findById(id);
+        modelMap.put("contract", contract);
+       // 获取对应的文件.
+        List<BusinessFile> fileList= businessFileService.getByBid(id,"contract", null, null);
+        
+        modelMap.put("fileList", fileList);
+        // 审批历史.
+        if(processInstanceId!=null){
+        	HistoryList historyList= null;
+        	List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        	if(auditList.size()>0 && auditList!=null){
+        		for(int i = auditList.size() - 1; i >= 0; i--) { 
+        			if(auditList.get(i).getComment().contains("驳回")) {
+        				if(i<auditList.size()) {
+        					if(auditList.get(i).getActivityName().contains("库领导审批")){
+        						historyList = auditList.get(i-1);
+        					}else{
+        						historyList = auditList.get(i);
+        					}
+        					if(historyList!=null){
+        						break;
+        					}
+        				} else {
+        					historyList = null;
+        				}
+        			}
+        		}
+        	}
+			modelMap.put("subAudit", historyList);
+        	modelMap.put("auditList", auditList);
+        }
+        
+        if(contract.getPlanBid()!=null){
+        	// 查询该条合同引的计划的剩余数量
+        	List<BusinessStoreWareDetail> storeWareDetailListPlan= businessStoreWareDetailService.getByZidAndType(contract.getPlanBid(), StoreWareType.plan.getValue());
+        	//计算每条明细所对应的计划的剩余数量
+        	Map<String, Object> param_map = new HashMap<String, Object>();
+        	param_map.put("plan_id", contract.getPlanBid());
+            List<Map<String, Object>> map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+            BusinessStoreWareDetail obj = null;
+            double sysl = 0d;
+            double sum_use_num = 0d; //已使用总量
+            double plan_sum_num = 0d; //原计划数量
+            for (int i = 0; i < storeWareDetailListPlan.size(); i++) {
+            	obj = storeWareDetailListPlan.get(i);
+            	for (Map<String, Object> m : map) {
+            		if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+            			if (!"".equals(m.get("in_count")) && null != m.get("in_count") && !"".equals(obj.getInCount()) && null != obj.getInCount()) {
+            				plan_sum_num = Double.parseDouble(obj.getInCount());
+            				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+            					sysl = plan_sum_num - sum_use_num;
+            					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+            					if (sysl == 0) {
+            						obj.setRemainingNumber("0");
+            					}
+            				} else if (sum_use_num > plan_sum_num){
+            					sysl = sum_use_num - plan_sum_num;
+            					obj.setRemainingNumber("超出:" + sysl);
+            				}
+            			}
+            			if (!"".equals(m.get("out_count")) && null != m.get("out_count") && !"".equals(obj.getOutCount()) && null != obj.getOutCount()) {
+            				plan_sum_num = Double.parseDouble(obj.getOutCount());
+            				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+            					sysl = plan_sum_num - sum_use_num;
+            					obj.setOutRemainingNumber(""+sysl);
+            				} else if (sum_use_num > plan_sum_num){
+            					sysl = sum_use_num - plan_sum_num;
+            					obj.setOutRemainingNumber("超出:" + sysl);
+            				}
+            			}
+            		}
+            	}
+            }
+
+        	// 该条合同下的明细
+	        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.contract.getValue());
+	        for (BusinessStoreWareDetail businessPlanDetail : storeWareDetailListPlan) {
+	        	 for (BusinessStoreWareDetail businessStoreWareDetail : storeWareDetailList) {
+					if(businessPlanDetail.getHouseId().equals(businessStoreWareDetail.getHouseId()) &&
+					   businessPlanDetail.getWarehouseId().equals(businessStoreWareDetail.getWarehouseId())){
+					    
+						if(businessPlanDetail.getRemainingNumber()!=null){
+							businessStoreWareDetail.setRemainingNumber(businessPlanDetail.getRemainingNumber());
+						}
+						if(businessPlanDetail.getOutRemainingNumber()!=null){
+							businessStoreWareDetail.setOutRemainingNumber(businessPlanDetail.getOutRemainingNumber());
+						}
+						
+					}
+				}
+			}
+	        modelMap.put("storeWareDetailList", storeWareDetailList);
+        }else{
+	        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.contract.getValue());
+	        modelMap.put("storeWareDetailList", storeWareDetailList);
+        }
+        return modelMap;
+    }
+    
+    /**
+     * 获取审批页面详情.
+     * @param id 业务主键
+     * @param processInstanceId 流程实例id
+     * @return
+     */
+    @RequestMapping(value="/getAuditForChange",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="获取合同变更审批页面详情", notes = "查询数据列表，支持分页")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "id", value = "合同id", paramType = "query"),
+   		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+   		@ApiImplicitParam(name = "userName", value = "当前登录人name", paramType = "query")
+   	})
+    public Map<String, Object> getAduitForChange(Integer id, String processInstanceId, String userName) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 主体.
+        BusinessContract contract = businessContractService.findById(id);
+        modelMap.put("contract", contract);
+        // 获取对应的文件.
+        List<BusinessFile> fileList= businessFileService.getByBid(id,"contract", null, null);
+        
+        modelMap.put("fileList", fileList);
+        /*// 审批历史.
+        List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        modelMap.put("auditList", auditList);*/
+        
+       // 审批历史.
+        if(processInstanceId!=null){
+        	HistoryList historyList= null;
+        	List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        	if(auditList.size()>0 && auditList!=null){
+        		for(int i = auditList.size() - 1; i >= 0; i--) { 
+        			if(auditList.get(i).getComment().contains("驳回")) {
+        				if(i<auditList.size()) {
+        					historyList = auditList.get(i-1);
+        					if(historyList!=null){
+        						break;
+        					}
+        				} else {
+        					historyList = null;
+        				}
+        			}
+        		}
+        	}
+			modelMap.put("subAudit", historyList);
+        	modelMap.put("auditList", auditList);
+        }
+        
+        
+        // 获取历史变更详情
+        List<BusinessContract> changeDetailList = businessContractService.getChangeDetailList(id,"");
+        modelMap.put("changeDetailList", changeDetailList);
+        
+        // 仓号货位号数量质量标准.
+        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.contract.getValue());
+        if(contract.getPlanBid()!=null){
+        	List<BusinessStoreWareDetail> planList= businessStoreWareDetailService.getByZidAndType(contract.getPlanBid(), StoreWareType.plan.getValue());
+        	
+        	/* 根据引用内容获取被引用合同明细的剩余数量 */
+        	Map<String, Object> param_map = new HashMap<String, Object>();
+        	param_map.put("plan_id", contract.getPlanBid());
+            List<Map<String, Object>> map = businessStoreWareDetailService.selectPlanUseCount(param_map);
+            BusinessStoreWareDetail obj = null;
+            double sysl = 0d;
+            double sum_use_num = 0d; //已使用总量
+            double plan_sum_num = 0d; //原计划数量
+            for (int i = 0; i < planList.size(); i++) {
+            	obj = planList.get(i);
+            	for (Map<String, Object> m : map) {
+            		if (m.get("house_id").equals(obj.getHouseId()) && m.get("warehouse_id").equals(obj.getWarehouseId())) {
+            			if (!"".equals(m.get("in_count")) && null != m.get("in_count")) {
+            				plan_sum_num = Double.parseDouble(obj.getInCount());
+            				sum_use_num = Double.parseDouble(m.get("in_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+            					sysl = plan_sum_num - sum_use_num;
+            					obj.setRemainingNumber(sysl+""); //页面上明细列表的数量
+            					if (sysl == 0) {
+            						obj.setRemainingNumber("0");
+            					}
+            				} else if (sum_use_num > plan_sum_num){
+            					sysl = sum_use_num - plan_sum_num;
+            					obj.setRemainingNumber("超出:" + sysl);
+            				}
+            			}
+            			if (!"".equals(m.get("out_count")) && null != m.get("out_count")) {
+            				plan_sum_num = Double.parseDouble(obj.getOutCount());
+            				sum_use_num = Double.parseDouble(m.get("out_count")+"");
+            				if (sum_use_num <= plan_sum_num) {
+            					sysl = plan_sum_num - sum_use_num;
+            					obj.setOutRemainingNumber(""+sysl);
+            				} else if (sum_use_num > plan_sum_num){
+            					sysl = sum_use_num - plan_sum_num;
+            					obj.setOutRemainingNumber("超出:" + sysl);
+            				}
+            			}
+            		}
+            	}
+            }
+        	
+        	/* 把获取的剩余数量给予当前的合同的明细剩余数量 */
+        	for (BusinessStoreWareDetail contractDetail : storeWareDetailList) {
+				for (BusinessStoreWareDetail planDetail : planList) {
+					if(contractDetail.getHouseId().equals(planDetail.getHouseId())  && 
+        					contractDetail.getWarehouseId().equals(planDetail.getWarehouseId())){
+        				
+//        				if(contractDetail.getInCount()!=null){
+//        					contractDetail.setPlanRemainingNumber(planDetail.getRemainingNumber());
+//        				}
+//        				if(contractDetail.getOutCount()!=null){
+//        					contractDetail.setPlanOutRemainingNumber(planDetail.getOutRemainingNumber());
+//        				}
+        				contractDetail.setRemainingNumber(planDetail.getRemainingNumber());
+        				contractDetail.setOutRemainingNumber(planDetail.getOutRemainingNumber());
+        			}
+				}
+				}
+			}
+        modelMap.put("storeWareDetailList", storeWareDetailList);
+        return modelMap;
+    }
+
+    /**
+     * 审批.
+     * @param contractId 业务主键
+     * @param businessApproval 中间表主体
+     * @param assignee 下一个审批人
+     * @param result 当前环节审批结果
+     * @return
+     */
+	 @RequestMapping(value="/audit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	 @ApiOperation(value="合同审批", notes = "合同审批")
+	 @ApiImplicitParams({
+	   		@ApiImplicitParam(name = "contractId", value = "业务主键", paramType = "query"),
+	   		@ApiImplicitParam(name = "businessApproval", value = "中间表主体", paramType = "query"),
+	   		@ApiImplicitParam(name = "assignee", value = "下一个审批人", paramType = "query"),
+	   		@ApiImplicitParam(name = "result", value = "当前环节审批结果", paramType = "query"),
+	   		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query"),
+	   		@ApiImplicitParam(name = "userName", value = "当前登录人name", paramType = "query")
+	   	})
+    public Map<String, Object> audit(Integer contractId, BusinessApproval businessApproval,String assignee,String result,Integer userId ,String realName,HttpServletRequest request) {
+    	//UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessContractService.audit(contractId, businessApproval,assignee, result, userId , realName);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    /**
+     * 获取合同变更审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+	@RequestMapping(value="/getContractChangeList",produces = MediaType.APPLICATION_JSON_VALUE,  method=RequestMethod.GET)
+    @ApiOperation(value="获取合同变更审批列表", notes = "获取合同变更审批列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+   
+    public PageInfo<BusinessContractAuditVO> getContractChangeList(Integer pageNum, Integer pageSize,
+            HttpServletRequest request, BusinessContractAuditVO businessContractAuditVO,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+        PageHelper.startPage(pageNum, pageSize);
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        // TODO 获取当前登录人
+        paramMap.put("operator", userId);
+        paramMap.put("changeRecordFlag", "1");
+        
+        if(StringUtils.isNotBlank(businessContractAuditVO.getContractNumber())) {
+            paramMap.put("contractNumber", businessContractAuditVO.getContractNumber());
+        }
+        
+       /* if(businessContractAuditVO.getGrainKind() != null) {
+            paramMap.put("grainKind", businessContractAuditVO.getGrainKind());
+        }*/
+        
+        if(StringUtils.isNotBlank(businessContractAuditVO.getAuditState())) {
+            paramMap.put("result", businessContractAuditVO.getAuditState());
+        }
+        paramMap.put("ctype", 6913);
+        List<BusinessContractAuditVO> list = businessContractService.getApprovalList(paramMap);
+        PageInfo<BusinessContractAuditVO> pageInfo = new PageInfo<BusinessContractAuditVO>(list);
+        return pageInfo;
+    }
+    
+    //中转
+    /**
+     * 获取合同变更审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+	@RequestMapping(value="/getContractChangeListTransfer", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="获取中转合同变更审批列表", notes = "获取合同变更审批列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+   
+    public PageInfo<BusinessContractAuditVO> getContractChangeListTransfer(Integer pageNum, Integer pageSize,
+    		HttpServletRequest request, BusinessContractAuditVO businessContractAuditVO,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	PageHelper.startPage(pageNum, pageSize);
+    	Map<String,Object> paramMap = new HashMap<String, Object>();
+    	// TODO 获取当前登录人
+    	paramMap.put("operator", userId);
+    	paramMap.put("changeRecordFlag", "1");
+    	
+    	if(StringUtils.isNotBlank(businessContractAuditVO.getContractNumber())) {
+    		paramMap.put("contractNumber", businessContractAuditVO.getContractNumber());
+    	}
+    	
+    	/* if(businessContractAuditVO.getGrainKind() != null) {
+            paramMap.put("grainKind", businessContractAuditVO.getGrainKind());
+        }*/
+    	
+    	if(StringUtils.isNotBlank(businessContractAuditVO.getAuditState())) {
+    		paramMap.put("result", businessContractAuditVO.getAuditState());
+    	}
+    	paramMap.put("contract_type", 6913);
+    	List<BusinessContractAuditVO> list = businessContractService.getApprovalList(paramMap);
+    	PageInfo<BusinessContractAuditVO> pageInfo = new PageInfo<BusinessContractAuditVO>(list);
+    	return pageInfo;
+    }
+    
+    
+}

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessDeliveryStorageNoticeAuditController.java

@@ -0,0 +1,168 @@
+package com.chinaitop.depot.business.controller.audit;
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.chinaitop.depot.business.service.BusinessDeliveryStorageNoticeService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 粮库业务管理-出入库通知单审批
+* <p>Title: BusinessDeliveryStorageNoticeAuditController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:48:06  
+ */
+@RestController
+@RequestMapping(value="/depot/business/deliveryStorageNotice/audit")
+@Api(value= "BusinessDeliveryStorageNoticeAuditController", description = "出入库通知单审批")
+public class BusinessDeliveryStorageNoticeAuditController {
+    
+    @Resource
+    private BusinessDeliveryStorageNoticeService businessDeliveryStorageNoticeService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+    @Resource
+    private BusinessApprovalService businessApprovalService;
+    @Resource
+    private ActTaskService actTaskService;
+    
+    /**
+     * 获取审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getList",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人id", paramType = "query")
+	})
+    public PageInfo<BusinessDeliveryStorageNoticeAuditVO> getList(Integer pageNum, Integer pageSize, 
+            BusinessDeliveryStorageNotice notice, HttpServletRequest request,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+        PageHelper.startPage(pageNum, pageSize);
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("operator", userId);
+        if (StringUtils.isNotEmpty(notice.getBillType())) {
+            paramMap.put("billType", notice.getBillType());
+        }
+        if (StringUtils.isNotBlank(notice.getAuditState())) {
+            paramMap.put("result", notice.getAuditState());
+        }
+        List<BusinessDeliveryStorageNoticeAuditVO> list = businessDeliveryStorageNoticeService.getApprovalList(paramMap);
+        PageInfo<BusinessDeliveryStorageNoticeAuditVO> pageInfo = new PageInfo<BusinessDeliveryStorageNoticeAuditVO>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 获取审批页面详情.
+     * @param id 业务主键
+     * @param processInstanceId 流程实例id
+     * @return
+     */
+    @RequestMapping(value="/getAudit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+   	@ApiOperation(value="获取审批页面详情", notes = "获取审批页面详情")
+   	@ApiImplicitParams({
+   		@ApiImplicitParam(name = "id", value = "通知单id", paramType = "query"),
+   		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query"),
+   		@ApiImplicitParam(name = "userName", value = "当前登录人name", paramType = "query")
+   	})
+    public Map<String, Object> getAduit(Integer id, String processInstanceId,String userName) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 详情.
+        BusinessDeliveryStorageNotice deliveryStorageNotice = businessDeliveryStorageNoticeService.findById(id);
+        modelMap.put("deliveryStorageNotice", deliveryStorageNotice);
+        
+        // 审批列表.
+        //List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        //modelMap.put("auditList", auditList);
+        
+        // 审批列表.
+        if(processInstanceId!=null){
+        	HistoryList historyList= null;
+        	List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        	if(auditList.size()>0 && auditList!=null){
+        		for(int i = auditList.size() - 1; i >= 0; i--) { 
+        			if(auditList.get(i).getComment().contains("驳回")) {
+        				if(i<auditList.size()) {
+        					/*if(auditList.get(i).getActivityName().contains("库领导审批")){
+        						historyList = auditList.get(i-1);
+        					}else{
+        						historyList = auditList.get(i);
+        					}*/
+        					historyList = auditList.get(1);
+        					if(historyList!=null){
+        						break;
+        					}
+        				} else {
+        					historyList = null;
+        				}
+        			}
+        		}
+        	}
+			modelMap.put("subAudit", historyList);
+        	modelMap.put("auditList", auditList);
+        }
+        // 仓号货位号数量质量标准.
+        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.notice.getValue());
+        modelMap.put("storeWareDetailList", storeWareDetailList);
+        return modelMap;
+    }
+
+    /**
+     * 审批.
+     * @param deliveryStorageNoticeId 业务主键
+     * @param businessApproval 中间表
+     * @param assignee 下一个环节审批人
+     * @param result 当前环节审批结果
+     * @return
+     */
+    @RequestMapping(value="/audit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+   	@ApiOperation(value="通知单审批", notes = "审批")
+    @ApiImplicitParams({
+   		@ApiImplicitParam(name = "deliveryStorageNoticeId", value = "业务主键", paramType = "query"),
+   		@ApiImplicitParam(name = "businessApproval", value = "中间表", paramType = "query"),
+   		@ApiImplicitParam(name = "assignee", value = "下一个环节审批人", paramType = "query"),
+   		@ApiImplicitParam(name = "result", value = "当前环节审批结果", paramType = "query"),
+   		@ApiImplicitParam(name = "name", value = "当前登录人name", paramType = "query")
+   	})
+    public Map<String, Object> audit(Integer deliveryStorageNoticeId, BusinessApproval businessApproval,String assignee,String result,String name ,HttpServletRequest request) {
+    	//UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessDeliveryStorageNoticeService.audit(deliveryStorageNoticeId, businessApproval,assignee,result, name);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+    
+    
+}

src/main/java/com/chinaitop/depot/business/controller/audit/BusinessPlanAuditController.java

@@ -0,0 +1,279 @@
+package com.chinaitop.depot.business.controller.audit;
+
+
+import com.chinaitop.depot.act.model.HistoryList;
+import com.chinaitop.depot.act.service.ActTaskService;
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.enums.StoreWareType;
+import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
+import com.chinaitop.depot.business.service.BusinessApprovalService;
+import com.chinaitop.depot.business.service.BusinessFileService;
+import com.chinaitop.depot.business.service.BusinessPlanService;
+import com.chinaitop.depot.business.service.BusinessStoreWareDetailService;
+import com.chinaitop.depot.utils.activiti.StringUtils;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 粮库业务管理-计划审批管理
+* <p>Title: BusinessPlanAuditController</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年10月25日 下午5:50:37
+ */
+@RestController
+@RequestMapping(value="/depot/business/plan/audit")
+@Api(value= "BusinessPlanAuditController", description = "计划审批管理")
+public class BusinessPlanAuditController {
+    
+    @Resource
+    private BusinessPlanService businessPlanService;
+    @Resource
+    private BusinessStoreWareDetailService businessStoreWareDetailService;
+    @Resource
+    private BusinessApprovalService businessApprovalService;
+    @Autowired
+    private BusinessFileService businessFileService;
+    @Resource
+    private ActTaskService actTaskService;
+    
+    /**
+     * 获取审批列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getList",  method=RequestMethod.GET)
+	@ApiOperation(value="获取计划审批列表", notes = "查询数据列表，支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+		@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+		@ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query")
+	})
+    public PageInfo<BusinessPlanAuditVO> getList(Integer pageNum, Integer pageSize,HttpServletRequest request,BusinessPlanAuditVO businessPlanAuditVO,Integer userId) {
+    	/*UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+    	Integer userId = userInfo.getUserId();*/
+    	
+        PageHelper.startPage(pageNum, pageSize);
+        
+        
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("operator", userId);
+        if(StringUtils.isNotEmpty(businessPlanAuditVO.getPlanNumber())&&businessPlanAuditVO.getPlanNumber()!=null){
+        	String planNumber = businessPlanAuditVO.getPlanNumber();
+        	paramMap.put("planNumber", planNumber);
+		}
+		if(StringUtils.isNotEmpty(businessPlanAuditVO.getAuditState())&&businessPlanAuditVO.getAuditState()!=null){
+			String result = businessPlanAuditVO.getAuditState();
+			paramMap.put("result", result);
+		}
+		//储备粮计划
+		if(null!=businessPlanAuditVO.getAttributeType()){
+			Integer attributeType = businessPlanAuditVO.getAttributeType();
+			paramMap.put("attributeType", attributeType);
+		}
+        List<BusinessPlanAuditVO> list = businessPlanService.getApprovalList(paramMap);
+        PageInfo<BusinessPlanAuditVO> pageInfo = new PageInfo<BusinessPlanAuditVO>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 获取审批页面详情.
+     * @param id  业务主键
+     * @param processInstanceId 流程实例id
+     * @return
+     */
+    @RequestMapping(value="/getAudit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="获取计划审批页面详情", notes = "获取计划审批页面详情")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "id", value = "计划id", paramType = "query"),
+		@ApiImplicitParam(name = "processInstanceId", value = "流程实例id", paramType = "query")
+	})
+    public Map<String, Object> getAduit(Integer id, String processInstanceId,String userName,Integer userId) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // 详情.
+        BusinessPlan plan = businessPlanService.findById(id);
+        modelMap.put("plan", plan);
+        
+        // 审批列表.
+        if(processInstanceId!=null){
+        	HistoryList historyList= null;
+        	List<HistoryList> auditList = actTaskService.histoicFlowList(processInstanceId, null, null);
+        	if(auditList.size()>0 && auditList!=null){
+        		for(int i = auditList.size() - 1; i >= 0; i--) { 
+        			if(auditList.get(i).getComment().contains("驳回")) {
+        				if(i<auditList.size()) {
+        					if(auditList.get(i).getActivityName().contains("库领导审批")){
+        						historyList = auditList.get(i-1);
+        					}else{
+        						historyList = auditList.get(i);
+        					}
+        					if(historyList!=null){
+        						break;
+        					}
+        				} else {
+        					historyList = null;
+        				}
+        			}
+        		}
+        	}
+			modelMap.put("subAudit", historyList);
+        	modelMap.put("auditList", auditList);
+        }
+        
+        // 获取对应的文件.
+        List<BusinessFile> fileList= businessFileService.getByBid(id,"plan", null, null);
+        
+        modelMap.put("fileList", fileList);
+        
+        // 仓号货位号数量质量标准.
+        List<BusinessStoreWareDetail> storeWareDetailList= businessStoreWareDetailService.getByZidAndType(id, StoreWareType.plan.getValue());
+        modelMap.put("storeWareDetailList", storeWareDetailList);
+        return modelMap;
+    }
+
+    /**
+     * 审批.
+     * @param planId 业务主键
+     * @param businessApproval 中间表
+     * @param assignee 下一个环节审批人
+     * @param result 当前环节审批结果
+     * @return
+     */
+    @RequestMapping(value="/audit", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+	@ApiOperation(value="计划审批", notes = "计划审批")
+    @ApiImplicitParams({
+    	@ApiImplicitParam(name="planId", value="计划id", paramType="form"),
+    	@ApiImplicitParam(name="businessApproval", value="中间表数据", paramType="form"),
+    	@ApiImplicitParam(name="assignee", value="下一个环节审批人", paramType="form"),
+    	@ApiImplicitParam(name="result", value="当前环节审批结果", paramType="form"),
+    	@ApiImplicitParam(name="userId", value="当前登录人id", paramType="form"),
+    	@ApiImplicitParam(name="realName", value="前登录人姓名", paramType="form")
+    })
+    public Map<String, Object> audit(HttpServletRequest request, Integer planId,
+            BusinessApproval businessApproval, String assignee, String result,Integer userId, String realName) {
+        //UserInfo userInfo= (UserInfo) request.getSession().getAttribute("userInfo");
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        businessPlanService.audit(planId, businessApproval,assignee,result,  userId,  realName);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 获取计划验收列表.
+     * @param pageNum 页码
+     * @param pageSize 每页显示条数
+     * @return
+     */
+    @RequestMapping(value="/getAcceptanceList", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划验收", notes = "获取计划验收列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+            @ApiImplicitParam(name = "userId", value = "当前登录人的id", paramType = "query"),
+            @ApiImplicitParam(name = "businessPlanAuditVO", value = "查询条件", paramType = "query")
+    })
+    public PageInfo<BusinessPlanAuditVO> getAcceptanceList(Integer pageNum, Integer pageSize,String userId,BusinessPlanAuditVO businessPlanAuditVO) {
+        PageHelper.startPage(pageNum, pageSize);
+        String planNumber = businessPlanAuditVO.getPlanNumber();
+        String planTitle = businessPlanAuditVO.getPlanTitle();
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("operator", userId);
+        if(StringUtils.isNotEmpty(businessPlanAuditVO.getPlanNumber())&&businessPlanAuditVO.getPlanNumber()!=null){
+            paramMap.put("planNumber", planNumber);
+        }
+        if(StringUtils.isNotEmpty(businessPlanAuditVO.getPlanTitle())&&businessPlanAuditVO.getPlanTitle()!=null){
+            paramMap.put("planTitle", planTitle);
+        }
+        List<BusinessPlanAuditVO> list = businessPlanService.getAcceptanceList(paramMap);
+        PageInfo<BusinessPlanAuditVO> pageInfo = new PageInfo<BusinessPlanAuditVO>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存
+     * @param businessPlanId 计划json
+     * @return
+     * @throws JsonParseException
+     * @throws JsonMappingException
+     * @throws IOException
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
+    @ApiOperation(value="保存计划验收", notes = "保存计划验收详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "businessPlanId", value = "计划id", paramType = "query"),
+            @ApiImplicitParam(name = "businessPlancreateTime", value = "计划验收时间", paramType = "query"),
+            @ApiImplicitParam(name = "businessStoreWareDetailJson", value = "验收详细信息", paramType = "query"),
+            @ApiImplicitParam(name = "fileIds", value = "附件id", paramType = "query"),
+            @ApiImplicitParam(name = "acceptanceNumber", value = "申请验收编号", paramType = "query"),
+    })
+    public Map<String, Object> save(String businessPlanId,String acceptanceNumber,String businessPlancreateTime, String qualityIds, String fileIds) throws JsonParseException, JsonMappingException, IOException {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        BusinessPlan plan = new BusinessPlan();
+        try {
+        	Date date = new Date();
+        	plan.setAcceptTanceDate(date);
+        	plan.setCustomerPlanState("60");
+        	plan.setId(Integer.valueOf(businessPlanId));
+        	businessPlanService.updatePlanStatus(plan);
+            // JSON字符串转对象
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Map<String, Object> returnMap = businessPlanService.addAcceptance(businessPlanId,acceptanceNumber, sdf.format(date), qualityIds, fileIds);
+            if (returnMap.get("error") != null) {
+                modelMap.put("status", "error");
+                modelMap.put("msg", returnMap.get("error"));
+                return modelMap;
+            }
+            modelMap.put("id", returnMap.get("id"));
+
+            modelMap.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            modelMap.put("status", "error");
+            modelMap.put("msg", "保存失败！");
+            return modelMap;
+        }
+        return modelMap;
+    }
+
+    /**
+     * 获取计划验收列表.
+     * @param bid 验收id
+     * @return
+     */
+    @RequestMapping(value="/getDataByZJId", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value="计划验收详情", notes = "查看验收计划详情。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bid", value = "主表id", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "query")
+    })
+    public Map<String,Object> getDataByZJId(Integer bid,String fileType) {
+        Map<String,Object> map = new HashMap<String, Object>();
+        List<BusinessFile> fileList= businessFileService.getByBid(bid, fileType, null, null);
+        map.put("fileList", fileList);
+        return map;
+    }
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessApprovalMapper.java

@@ -0,0 +1,34 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessApproval;
+import com.chinaitop.depot.business.model.BusinessApprovalExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BusinessApprovalMapper {
+    int countByExample(BusinessApprovalExample example);
+
+    int deleteByExample(BusinessApprovalExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessApproval record);
+
+    int insertSelective(BusinessApproval record);
+
+    List<BusinessApproval> selectByExample(BusinessApprovalExample example);
+
+    BusinessApproval selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessApproval record, @Param("example") BusinessApprovalExample example);
+
+    int updateByExample(@Param("record") BusinessApproval record, @Param("example") BusinessApprovalExample example);
+
+    int updateByPrimaryKeySelective(BusinessApproval record);
+
+    int updateByPrimaryKey(BusinessApproval record);
+
+	List<BusinessApproval> queryByMap(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessApprovalMapper.xml

@@ -0,0 +1,744 @@
+<?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.chinaitop.depot.business.mapper.BusinessApprovalMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessApproval" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="is_deleted" property="isDeleted" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="content" property="content" jdbcType="VARCHAR" />
+    <result column="from_department" property="fromDepartment" jdbcType="VARCHAR" />
+    <result column="from_people" property="fromPeople" jdbcType="VARCHAR" />
+    <result column="from_user_name" property="fromUserName" jdbcType="VARCHAR" />
+    <result column="last_people" property="lastPeople" jdbcType="VARCHAR" />
+    <result column="operate_time" property="operateTime" jdbcType="VARCHAR" />
+    <result column="operator" property="operator" jdbcType="VARCHAR" />
+    <result column="operator_name" property="operatorName" jdbcType="VARCHAR" />
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+    <result column="project_id" property="projectId" jdbcType="INTEGER" />
+    <result column="project_name" property="projectName" jdbcType="VARCHAR" />
+    <result column="result" property="result" jdbcType="VARCHAR" />
+    <result column="task_id" property="taskId" jdbcType="VARCHAR" />
+    <result column="task_info" property="taskInfo" jdbcType="VARCHAR" />
+    <result column="task_name" property="taskName" jdbcType="VARCHAR" />
+    <result column="task_type" property="taskType" jdbcType="VARCHAR" />
+    <result column="title" property="title" jdbcType="VARCHAR" />
+    <result column="version" property="version" jdbcType="INTEGER" />
+    <result column="task_type_name" property="taskTypeName" jdbcType="VARCHAR" />
+    <result column="is_hide" property="isHide" jdbcType="INTEGER" />
+    <result column="is_countersign" property="isCountersign" jdbcType="INTEGER" />
+    <result column="apply_name" property="applyName" jdbcType="VARCHAR" />
+    <result column="apply_name_id" property="applyNameId" jdbcType="VARCHAR" />
+    <result column="apply_time" property="applyTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    id, create_time, is_deleted, remark, update_time, content, from_department, from_people, 
+    from_user_name, last_people, operate_time, operator, operator_name, process_instance_id, 
+    project_id, project_name, result, task_id, task_info, task_name, task_type, title, 
+    version, task_type_name, is_hide, is_countersign, apply_name, apply_name_id, apply_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessApprovalExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_approval
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from business_approval
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    delete from business_approval
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessApprovalExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    delete from business_approval
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessApproval" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    insert into business_approval (id, create_time, is_deleted, 
+      remark, update_time, content, 
+      from_department, from_people, from_user_name, 
+      last_people, operate_time, operator, 
+      operator_name, process_instance_id, project_id, 
+      project_name, result, task_id, 
+      task_info, task_name, task_type, 
+      title, version, task_type_name, 
+      is_hide, is_countersign, apply_name, 
+      apply_name_id, apply_time)
+    values (#{id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{content,jdbcType=VARCHAR}, 
+      #{fromDepartment,jdbcType=VARCHAR}, #{fromPeople,jdbcType=VARCHAR}, #{fromUserName,jdbcType=VARCHAR}, 
+      #{lastPeople,jdbcType=VARCHAR}, #{operateTime,jdbcType=VARCHAR}, #{operator,jdbcType=VARCHAR}, 
+      #{operatorName,jdbcType=VARCHAR}, #{processInstanceId,jdbcType=VARCHAR}, #{projectId,jdbcType=INTEGER}, 
+      #{projectName,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR}, 
+      #{taskInfo,jdbcType=VARCHAR}, #{taskName,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, 
+      #{title,jdbcType=VARCHAR}, #{version,jdbcType=INTEGER}, #{taskTypeName,jdbcType=VARCHAR}, 
+      #{isHide,jdbcType=INTEGER}, #{isCountersign,jdbcType=INTEGER}, #{applyName,jdbcType=VARCHAR}, 
+      #{applyNameId,jdbcType=VARCHAR}, #{applyTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessApproval" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    insert into business_approval
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="isDeleted != null" >
+        is_deleted,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="content != null" >
+        content,
+      </if>
+      <if test="fromDepartment != null" >
+        from_department,
+      </if>
+      <if test="fromPeople != null" >
+        from_people,
+      </if>
+      <if test="fromUserName != null" >
+        from_user_name,
+      </if>
+      <if test="lastPeople != null" >
+        last_people,
+      </if>
+      <if test="operateTime != null" >
+        operate_time,
+      </if>
+      <if test="operator != null" >
+        operator,
+      </if>
+      <if test="operatorName != null" >
+        operator_name,
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id,
+      </if>
+      <if test="projectId != null" >
+        project_id,
+      </if>
+      <if test="projectName != null" >
+        project_name,
+      </if>
+      <if test="result != null" >
+        result,
+      </if>
+      <if test="taskId != null" >
+        task_id,
+      </if>
+      <if test="taskInfo != null" >
+        task_info,
+      </if>
+      <if test="taskName != null" >
+        task_name,
+      </if>
+      <if test="taskType != null" >
+        task_type,
+      </if>
+      <if test="title != null" >
+        title,
+      </if>
+      <if test="version != null" >
+        version,
+      </if>
+      <if test="taskTypeName != null" >
+        task_type_name,
+      </if>
+      <if test="isHide != null" >
+        is_hide,
+      </if>
+      <if test="isCountersign != null" >
+        is_countersign,
+      </if>
+      <if test="applyName != null" >
+        apply_name,
+      </if>
+      <if test="applyNameId != null" >
+        apply_name_id,
+      </if>
+      <if test="applyTime != null" >
+        apply_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDeleted != null" >
+        #{isDeleted,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null" >
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="fromDepartment != null" >
+        #{fromDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="fromPeople != null" >
+        #{fromPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="fromUserName != null" >
+        #{fromUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="lastPeople != null" >
+        #{lastPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null" >
+        #{operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null" >
+        #{operator,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorName != null" >
+        #{operatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="processInstanceId != null" >
+        #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null" >
+        #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="projectName != null" >
+        #{projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null" >
+        #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="taskId != null" >
+        #{taskId,jdbcType=VARCHAR},
+      </if>
+      <if test="taskInfo != null" >
+        #{taskInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="taskName != null" >
+        #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskType != null" >
+        #{taskType,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null" >
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="version != null" >
+        #{version,jdbcType=INTEGER},
+      </if>
+      <if test="taskTypeName != null" >
+        #{taskTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="isHide != null" >
+        #{isHide,jdbcType=INTEGER},
+      </if>
+      <if test="isCountersign != null" >
+        #{isCountersign,jdbcType=INTEGER},
+      </if>
+      <if test="applyName != null" >
+        #{applyName,jdbcType=VARCHAR},
+      </if>
+      <if test="applyNameId != null" >
+        #{applyNameId,jdbcType=VARCHAR},
+      </if>
+      <if test="applyTime != null" >
+        #{applyTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessApprovalExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    select count(*) from business_approval
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    update business_approval
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.isDeleted != null" >
+        is_deleted = #{record.isDeleted,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.content != null" >
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fromDepartment != null" >
+        from_department = #{record.fromDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fromPeople != null" >
+        from_people = #{record.fromPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fromUserName != null" >
+        from_user_name = #{record.fromUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lastPeople != null" >
+        last_people = #{record.lastPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateTime != null" >
+        operate_time = #{record.operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operator != null" >
+        operator = #{record.operator,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operatorName != null" >
+        operator_name = #{record.operatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.processInstanceId != null" >
+        process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectId != null" >
+        project_id = #{record.projectId,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectName != null" >
+        project_name = #{record.projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.result != null" >
+        result = #{record.result,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskId != null" >
+        task_id = #{record.taskId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskInfo != null" >
+        task_info = #{record.taskInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskName != null" >
+        task_name = #{record.taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskType != null" >
+        task_type = #{record.taskType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null" >
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.version != null" >
+        version = #{record.version,jdbcType=INTEGER},
+      </if>
+      <if test="record.taskTypeName != null" >
+        task_type_name = #{record.taskTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isHide != null" >
+        is_hide = #{record.isHide,jdbcType=INTEGER},
+      </if>
+      <if test="record.isCountersign != null" >
+        is_countersign = #{record.isCountersign,jdbcType=INTEGER},
+      </if>
+      <if test="record.applyName != null" >
+        apply_name = #{record.applyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.applyNameId != null" >
+        apply_name_id = #{record.applyNameId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.applyTime != null" >
+        apply_time = #{record.applyTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    update business_approval
+    set id = #{record.id,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      is_deleted = #{record.isDeleted,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      content = #{record.content,jdbcType=VARCHAR},
+      from_department = #{record.fromDepartment,jdbcType=VARCHAR},
+      from_people = #{record.fromPeople,jdbcType=VARCHAR},
+      from_user_name = #{record.fromUserName,jdbcType=VARCHAR},
+      last_people = #{record.lastPeople,jdbcType=VARCHAR},
+      operate_time = #{record.operateTime,jdbcType=VARCHAR},
+      operator = #{record.operator,jdbcType=VARCHAR},
+      operator_name = #{record.operatorName,jdbcType=VARCHAR},
+      process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=INTEGER},
+      project_name = #{record.projectName,jdbcType=VARCHAR},
+      result = #{record.result,jdbcType=VARCHAR},
+      task_id = #{record.taskId,jdbcType=VARCHAR},
+      task_info = #{record.taskInfo,jdbcType=VARCHAR},
+      task_name = #{record.taskName,jdbcType=VARCHAR},
+      task_type = #{record.taskType,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      version = #{record.version,jdbcType=INTEGER},
+      task_type_name = #{record.taskTypeName,jdbcType=VARCHAR},
+      is_hide = #{record.isHide,jdbcType=INTEGER},
+      is_countersign = #{record.isCountersign,jdbcType=INTEGER},
+      apply_name = #{record.applyName,jdbcType=VARCHAR},
+      apply_name_id = #{record.applyNameId,jdbcType=VARCHAR},
+      apply_time = #{record.applyTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessApproval" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    update business_approval
+    <set >
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isDeleted != null" >
+        is_deleted = #{isDeleted,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="content != null" >
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="fromDepartment != null" >
+        from_department = #{fromDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="fromPeople != null" >
+        from_people = #{fromPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="fromUserName != null" >
+        from_user_name = #{fromUserName,jdbcType=VARCHAR},
+      </if>
+      <if test="lastPeople != null" >
+        last_people = #{lastPeople,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null" >
+        operate_time = #{operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null" >
+        operator = #{operator,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorName != null" >
+        operator_name = #{operatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null" >
+        project_id = #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="projectName != null" >
+        project_name = #{projectName,jdbcType=VARCHAR},
+      </if>
+      <if test="result != null" >
+        result = #{result,jdbcType=VARCHAR},
+      </if>
+      <if test="taskId != null" >
+        task_id = #{taskId,jdbcType=VARCHAR},
+      </if>
+      <if test="taskInfo != null" >
+        task_info = #{taskInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="taskName != null" >
+        task_name = #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskType != null" >
+        task_type = #{taskType,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null" >
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="version != null" >
+        version = #{version,jdbcType=INTEGER},
+      </if>
+      <if test="taskTypeName != null" >
+        task_type_name = #{taskTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="isHide != null" >
+        is_hide = #{isHide,jdbcType=INTEGER},
+      </if>
+      <if test="isCountersign != null" >
+        is_countersign = #{isCountersign,jdbcType=INTEGER},
+      </if>
+      <if test="applyName != null" >
+        apply_name = #{applyName,jdbcType=VARCHAR},
+      </if>
+      <if test="applyNameId != null" >
+        apply_name_id = #{applyNameId,jdbcType=VARCHAR},
+      </if>
+      <if test="applyTime != null" >
+        apply_time = #{applyTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessApproval" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Oct 26 14:47:31 CST 2017.
+    -->
+    update business_approval
+    set create_time = #{createTime,jdbcType=TIMESTAMP},
+      is_deleted = #{isDeleted,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      content = #{content,jdbcType=VARCHAR},
+      from_department = #{fromDepartment,jdbcType=VARCHAR},
+      from_people = #{fromPeople,jdbcType=VARCHAR},
+      from_user_name = #{fromUserName,jdbcType=VARCHAR},
+      last_people = #{lastPeople,jdbcType=VARCHAR},
+      operate_time = #{operateTime,jdbcType=VARCHAR},
+      operator = #{operator,jdbcType=VARCHAR},
+      operator_name = #{operatorName,jdbcType=VARCHAR},
+      process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      project_id = #{projectId,jdbcType=INTEGER},
+      project_name = #{projectName,jdbcType=VARCHAR},
+      result = #{result,jdbcType=VARCHAR},
+      task_id = #{taskId,jdbcType=VARCHAR},
+      task_info = #{taskInfo,jdbcType=VARCHAR},
+      task_name = #{taskName,jdbcType=VARCHAR},
+      task_type = #{taskType,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      version = #{version,jdbcType=INTEGER},
+      task_type_name = #{taskTypeName,jdbcType=VARCHAR},
+      is_hide = #{isHide,jdbcType=INTEGER},
+      is_countersign = #{isCountersign,jdbcType=INTEGER},
+      apply_name = #{applyName,jdbcType=VARCHAR},
+      apply_name_id = #{applyNameId,jdbcType=VARCHAR},
+      apply_time = #{applyTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+   <select id="queryByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
+	select 
+		MAX(ba.create_time),
+	    ba.*,
+        dp.id dpId,
+        dp.audit_state auditState,
+        du.id duId,
+        du.state state
+     from business_approval ba
+      LEFT JOIN business_plan p on ba.project_id = p.id
+      LEFT JOIN business_contract c on ba.project_id = c.id
+      LEFT JOIN business_delivery_storage_notice n on ba.project_id = n.id
+      LEFT JOIN business_drug_purchase dp ON ba.task_type_name = dp.apply_number
+      LEFT JOIN business_drug_useapply du ON ba.task_type_name = du.apply_number
+      
+     <where>
+     (ba.task_type='plan' 
+     or ba.task_type='contract'
+      or ba.task_type='storageNotice'
+        or ba.task_type='deliveryNotice'
+         or ba.task_type='contractChange'
+         or ba.task_type='drugUseApply'
+         or ba.task_type='drugPurchase')
+     and 1=1
+     	 <if test="taskType!= null" >
+      		AND ba.task_type = #{taskType}
+         </if>
+     	 <if test="projectName!= null" >
+      		AND ba.project_name like CONCAT('%',#{projectName,jdbcType=VARCHAR},'%')
+         </if>
+     	 <if test="applyName!= null" >
+      		AND ba.apply_name like CONCAT('%',#{applyName,jdbcType=VARCHAR},'%')
+         </if>
+     	 <if test="taskId!= null" >
+      		AND ba.task_id = #{taskId}
+         </if>
+     	 <if test="projectId!= null" >
+      		AND ba.project_id = #{projectId}
+         </if>
+         <if test="'todo'==type"> <!-- 待办 -->
+	         <if test="userId!= null" >
+	           AND (
+	           		  (result = '待审批' and operator = #{userId} and 
+		              ((c.audit_state=0 or c.audit_state=3 or c.audit_state=1)
+	                  or (p.audit_state=0 or p.audit_state=3 or p.audit_state=1)
+	                  or (n.audit_state=0 or n.audit_state=3 or n.audit_state=1)
+	                  OR (dp.audit_state = 0 OR dp.audit_state = 3 )
+					  OR (du.state = 0 OR du.state = 3 ))) <!-- 待审批 是审批人是当前登录人 -->
+					  
+	           Or  (result = '驳回' and apply_name_id = #{userId} and 
+	           		((c.audit_state=0 or c.audit_state=3)
+                  or (p.audit_state=0 or p.audit_state=3)
+                  or (n.audit_state=0 or n.audit_state=3)
+                  OR (dp.audit_state = 0 OR dp.audit_state = 3 )
+				  OR (du.state = 0 OR du.state = 3 )))) <!-- 驳回 是申请人是当前登录人 -->
+			   GROUP BY ba.task_type_name
+	         </if>
+         </if>
+         <if test="'complete'==type"> <!-- 已办 -->
+          <if test="userId!= null" >
+          	AND ((result = '同意' and operator =#{userId}) 
+          	or (result = '拒绝' and operator =#{userId}) 
+          	or (result = '已审批' and operator =#{userId}) 
+          	or (result = '审批结束' and operator =#{userId}) 
+          	or (result = '驳回' and operator =#{userId})) 
+          	 <!-- 1、当前登录人是创建者的时候，驳回时申请人是当前登录人2、当前 审批人驳回时，已办是审批人是当前登录人-->
+          	and ((c.audit_state=2 or c.audit_state=4 or c.audit_state=3 or c.audit_state=1)
+                  or (p.audit_state=2 or p.audit_state=4 or p.audit_state=3 or p.audit_state=1)
+                  or (n.audit_state=2 or n.audit_state=4 or n.audit_state=3 or n.audit_state=1)
+                  OR (dp.audit_state = 2 OR dp.audit_state = 4 OR dp.audit_state = 3 OR dp.audit_state = 1)
+				  OR (du.state = 2 OR du.state = 4 OR du.state = 3 OR du.state = 1))
+			GROUP BY ba.task_type_name
+          </if>
+         </if>
+     </where>
+     ORDER BY apply_time desc		
+
+	</select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractMapper.java

@@ -0,0 +1,60 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessContract;
+import com.chinaitop.depot.business.model.BusinessContractExample;
+import com.chinaitop.depot.business.model.vo.BusinessContractAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessContractMapper {
+    int countByExample(BusinessContractExample example);
+
+    int deleteByExample(BusinessContractExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessContract record);
+
+    int insertSelective(BusinessContract record);
+
+    List<BusinessContract> selectByExample(BusinessContractExample example);
+
+    BusinessContract selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessContract record, @Param("example") BusinessContractExample example);
+
+    int updateByExample(@Param("record") BusinessContract record, @Param("example") BusinessContractExample example);
+
+    int updateByPrimaryKeySelective(BusinessContract record);
+
+    int updateByPrimaryKey(BusinessContract record);
+    
+    
+    /**
+     * @param paramMap
+     * @return
+     */
+    List<BusinessContractAuditVO> getApprovalList(Map<String, Object> paramMap);
+
+    /**
+     * @param paramMap
+     */
+    void updateApplicationByPlanBid(Map<String, Object> paramMap);
+
+    /**
+     * @param example
+     * @return
+     */
+    List<BusinessContractAuditVO> selectByExampleToVO(
+            BusinessContractExample example);
+
+    List<Map<String,Object>> selectBusinessByOrgId(String orgId);
+
+    //根据通知单状态查询合同数据
+    List<Map<String,Object>> contractData(Map<String,Object> map);
+
+	/*List<BusinessContract> getAllContractInfo();*/
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractPayReceviceMapper.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessContractPayRecevice;
+import com.chinaitop.depot.business.model.BusinessContractPayReceviceExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessContractPayReceviceMapper {
+    int countByExample(BusinessContractPayReceviceExample example);
+
+    int deleteByExample(BusinessContractPayReceviceExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessContractPayRecevice record);
+
+    int insertSelective(BusinessContractPayRecevice record);
+
+    List<BusinessContractPayRecevice> selectByExample(BusinessContractPayReceviceExample example);
+
+    BusinessContractPayRecevice selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessContractPayRecevice record, @Param("example") BusinessContractPayReceviceExample example);
+
+    int updateByExample(@Param("record") BusinessContractPayRecevice record, @Param("example") BusinessContractPayReceviceExample example);
+
+    int updateByPrimaryKeySelective(BusinessContractPayRecevice record);
+
+    int updateByPrimaryKey(BusinessContractPayRecevice record);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessContractPayReceviceMapper.xml

@@ -0,0 +1,258 @@
+<?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.chinaitop.depot.business.mapper.BusinessContractPayReceviceMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessContractPayRecevice" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="zid" property="zid" jdbcType="INTEGER" />
+    <result column="contract_num" property="contractNum" jdbcType="VARCHAR" />
+    <result column="contract_title" property="contractTitle" jdbcType="VARCHAR" />
+    <result column="contract_type" property="contractType" jdbcType="INTEGER" />
+    <result column="pay_status" property="payStatus" jdbcType="INTEGER" />
+    <result column="money" property="money" jdbcType="VARCHAR" />
+    <result column="time" property="time" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, zid, contract_num, contract_title, contract_type, pay_status, money, time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessContractPayReceviceExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_contract_pay_recevice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_contract_pay_recevice
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_contract_pay_recevice
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessContractPayReceviceExample" >
+    delete from business_contract_pay_recevice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessContractPayRecevice" >
+    insert into business_contract_pay_recevice (id, zid, contract_num, 
+      contract_title, contract_type, pay_status, 
+      money, time)
+    values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{contractNum,jdbcType=VARCHAR}, 
+      #{contractTitle,jdbcType=VARCHAR}, #{contractType,jdbcType=INTEGER}, #{payStatus,jdbcType=INTEGER}, 
+      #{money,jdbcType=VARCHAR}, #{time,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessContractPayRecevice" >
+    insert into business_contract_pay_recevice
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="zid != null" >
+        zid,
+      </if>
+      <if test="contractNum != null" >
+        contract_num,
+      </if>
+      <if test="contractTitle != null" >
+        contract_title,
+      </if>
+      <if test="contractType != null" >
+        contract_type,
+      </if>
+      <if test="payStatus != null" >
+        pay_status,
+      </if>
+      <if test="money != null" >
+        money,
+      </if>
+      <if test="time != null" >
+        time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="zid != null" >
+        #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="contractNum != null" >
+        #{contractNum,jdbcType=VARCHAR},
+      </if>
+      <if test="contractTitle != null" >
+        #{contractTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null" >
+        #{contractType,jdbcType=INTEGER},
+      </if>
+      <if test="payStatus != null" >
+        #{payStatus,jdbcType=INTEGER},
+      </if>
+      <if test="money != null" >
+        #{money,jdbcType=VARCHAR},
+      </if>
+      <if test="time != null" >
+        #{time,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessContractPayReceviceExample" resultType="java.lang.Integer" >
+    select count(*) from business_contract_pay_recevice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_contract_pay_recevice
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.zid != null" >
+        zid = #{record.zid,jdbcType=INTEGER},
+      </if>
+      <if test="record.contractNum != null" >
+        contract_num = #{record.contractNum,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractTitle != null" >
+        contract_title = #{record.contractTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractType != null" >
+        contract_type = #{record.contractType,jdbcType=INTEGER},
+      </if>
+      <if test="record.payStatus != null" >
+        pay_status = #{record.payStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.money != null" >
+        money = #{record.money,jdbcType=VARCHAR},
+      </if>
+      <if test="record.time != null" >
+        time = #{record.time,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_contract_pay_recevice
+    set id = #{record.id,jdbcType=INTEGER},
+      zid = #{record.zid,jdbcType=INTEGER},
+      contract_num = #{record.contractNum,jdbcType=VARCHAR},
+      contract_title = #{record.contractTitle,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=INTEGER},
+      pay_status = #{record.payStatus,jdbcType=INTEGER},
+      money = #{record.money,jdbcType=VARCHAR},
+      time = #{record.time,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessContractPayRecevice" >
+    update business_contract_pay_recevice
+    <set >
+      <if test="zid != null" >
+        zid = #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="contractNum != null" >
+        contract_num = #{contractNum,jdbcType=VARCHAR},
+      </if>
+      <if test="contractTitle != null" >
+        contract_title = #{contractTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null" >
+        contract_type = #{contractType,jdbcType=INTEGER},
+      </if>
+      <if test="payStatus != null" >
+        pay_status = #{payStatus,jdbcType=INTEGER},
+      </if>
+      <if test="money != null" >
+        money = #{money,jdbcType=VARCHAR},
+      </if>
+      <if test="time != null" >
+        time = #{time,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessContractPayRecevice" >
+    update business_contract_pay_recevice
+    set zid = #{zid,jdbcType=INTEGER},
+      contract_num = #{contractNum,jdbcType=VARCHAR},
+      contract_title = #{contractTitle,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=INTEGER},
+      pay_status = #{payStatus,jdbcType=INTEGER},
+      money = #{money,jdbcType=VARCHAR},
+      time = #{time,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.java

@@ -0,0 +1,58 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice;
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
+import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessDeliveryStorageNoticeMapper {
+    int countByExample(BusinessDeliveryStorageNoticeExample example);
+
+    int deleteByExample(BusinessDeliveryStorageNoticeExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessDeliveryStorageNotice record);
+
+    int insertSelective(BusinessDeliveryStorageNotice record);
+
+    List<BusinessDeliveryStorageNotice> selectByExample(BusinessDeliveryStorageNoticeExample example);
+
+    BusinessDeliveryStorageNotice selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessDeliveryStorageNotice record, @Param("example") BusinessDeliveryStorageNoticeExample example);
+
+    int updateByExample(@Param("record") BusinessDeliveryStorageNotice record, @Param("example") BusinessDeliveryStorageNoticeExample example);
+
+    int updateByPrimaryKeySelective(BusinessDeliveryStorageNotice record);
+
+    int updateByPrimaryKey(BusinessDeliveryStorageNotice record);
+
+    /**
+     * @param paramMap
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> getApprovalList(Map<String, Object> paramMap);
+
+    /**
+     * @param paramMap
+     */
+    void updateApplication(Map<String, Object> paramMap);
+
+    /**
+     * @param example
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> selectByExampleToVO(
+            BusinessDeliveryStorageNoticeExample example);
+
+    //统计出入库数据
+	List<BusinessDeliveryStorageNotice> countTj();
+
+	//根据通知单状态查询数据--主表
+    List<Map<String,Object>> uploadNoticeData(Map<String,Object> map);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessDeliveryStorageNoticeMapper.xml

@@ -0,0 +1,947 @@
+<?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.chinaitop.depot.business.mapper.BusinessDeliveryStorageNoticeMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="bill_type" property="billType" jdbcType="VARCHAR" />
+    <result column="bill_type_id" property="billTypeId" jdbcType="INTEGER" />
+    <result column="bill_number" property="billNumber" jdbcType="VARCHAR" />
+    <result column="shiping_count" property="shipingCount" jdbcType="VARCHAR" />
+    <result column="finished_count" property="finishedCount" jdbcType="VARCHAR" />
+    <result column="received_money" property="receivedMoney" jdbcType="VARCHAR" />
+    <result column="customer_bid" property="customerBid" jdbcType="INTEGER" />
+    <result column="customer_number" property="customerNumber" jdbcType="VARCHAR" />
+    <result column="mobile" property="mobile" jdbcType="VARCHAR" />
+    <result column="delivery_customer" property="deliveryCustomer" jdbcType="VARCHAR" />
+    <result column="contract" property="contract" jdbcType="VARCHAR" />
+    <result column="contract_bid" property="contractBid" jdbcType="INTEGER" />
+    <result column="plan_number" property="planNumber" jdbcType="VARCHAR" />
+    <result column="plan_bid" property="planBid" jdbcType="INTEGER" />
+    <result column="bill_memo" property="billMemo" jdbcType="VARCHAR" />
+    <result column="grain_price" property="grainPrice" jdbcType="VARCHAR" />
+    <result column="money_quantity" property="moneyQuantity" jdbcType="VARCHAR" />
+    <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
+    <result column="warehouse" property="warehouse" jdbcType="INTEGER" />
+    <result column="goods_location" property="goodsLocation" jdbcType="INTEGER" />
+    <result column="audit_state" property="auditState" jdbcType="VARCHAR" />
+    <result column="storage_time" property="storageTime" jdbcType="TIMESTAMP" />
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+    <result column="process_definition_id" property="processDefinitionId" jdbcType="VARCHAR" />
+    <result column="quality_standard" property="qualityStandard" jdbcType="VARCHAR" />
+    <result column="agree_time" property="agreeTime" jdbcType="TIMESTAMP" />
+    <result column="bill_man" property="billMan" jdbcType="VARCHAR" />
+    <result column="bill_date" property="billDate" jdbcType="TIMESTAMP" />
+    <result column="bill_unit" property="billUnit" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="house_name" property="houseName" jdbcType="VARCHAR" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_unit" property="createUnit" jdbcType="VARCHAR" />
+    <result column="create_depot" property="createDepot" jdbcType="VARCHAR" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="in_application" property="inApplication" jdbcType="INTEGER" />
+    <result column="creater_id" property="createrId" jdbcType="INTEGER" />
+    <result column="root_contract_bid" property="rootContractBid" jdbcType="INTEGER" />
+    <result column="identification" property="identification" jdbcType="VARCHAR" />
+    <result column="carNumber" property="carnumber" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, bill_type, bill_type_id, bill_number, shiping_count, finished_count, received_money, 
+    customer_bid, customer_number, mobile, delivery_customer, contract, contract_bid, 
+    plan_number, plan_bid, bill_memo, grain_price, money_quantity, grain_annual, warehouse, 
+    goods_location, audit_state, storage_time, process_instance_id, process_definition_id, 
+    quality_standard, agree_time, bill_man, bill_date, bill_unit, house_id, house_name, 
+    warehouse_id, warehouse_name, creater, create_time, create_unit, create_depot, update_time, 
+    org_id, in_application, creater_id, root_contract_bid, identification, carNumber
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_delivery_storage_notice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_delivery_storage_notice
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_delivery_storage_notice
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
+    delete from business_delivery_storage_notice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
+   <!--<selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
+      SELECT LAST_INSERT_ID()
+    </selectKey>-->
+    insert into business_delivery_storage_notice (id, bill_type, bill_type_id, 
+      bill_number, shiping_count, finished_count, 
+      received_money, customer_bid, customer_number, 
+      mobile, delivery_customer, contract, 
+      contract_bid, plan_number, plan_bid, 
+      bill_memo, grain_price, money_quantity, 
+      grain_annual, warehouse, goods_location, 
+      audit_state, storage_time, process_instance_id, 
+      process_definition_id, quality_standard, agree_time, 
+      bill_man, bill_date, bill_unit, 
+      house_id, house_name, warehouse_id, 
+      warehouse_name, creater, create_time, 
+      create_unit, create_depot, update_time, 
+      org_id, in_application, creater_id, 
+      root_contract_bid, identification, carNumber
+      )
+    values (#{id,jdbcType=INTEGER}, #{billType,jdbcType=VARCHAR}, #{billTypeId,jdbcType=INTEGER}, 
+      #{billNumber,jdbcType=VARCHAR}, #{shipingCount,jdbcType=VARCHAR}, #{finishedCount,jdbcType=VARCHAR}, 
+      #{receivedMoney,jdbcType=VARCHAR}, #{customerBid,jdbcType=INTEGER}, #{customerNumber,jdbcType=VARCHAR}, 
+      #{mobile,jdbcType=VARCHAR}, #{deliveryCustomer,jdbcType=VARCHAR}, #{contract,jdbcType=VARCHAR}, 
+      #{contractBid,jdbcType=INTEGER}, #{planNumber,jdbcType=VARCHAR}, #{planBid,jdbcType=INTEGER}, 
+      #{billMemo,jdbcType=VARCHAR}, #{grainPrice,jdbcType=VARCHAR}, #{moneyQuantity,jdbcType=VARCHAR}, 
+      #{grainAnnual,jdbcType=INTEGER}, #{warehouse,jdbcType=INTEGER}, #{goodsLocation,jdbcType=INTEGER}, 
+      #{auditState,jdbcType=VARCHAR}, #{storageTime,jdbcType=TIMESTAMP}, #{processInstanceId,jdbcType=VARCHAR}, 
+      #{processDefinitionId,jdbcType=VARCHAR}, #{qualityStandard,jdbcType=VARCHAR}, #{agreeTime,jdbcType=TIMESTAMP}, 
+      #{billMan,jdbcType=VARCHAR}, #{billDate,jdbcType=TIMESTAMP}, #{billUnit,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
+      #{warehouseName,jdbcType=VARCHAR}, #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{createUnit,jdbcType=VARCHAR}, #{createDepot,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, #{createrId,jdbcType=INTEGER}, 
+      #{rootContractBid,jdbcType=INTEGER}, #{identification,jdbcType=VARCHAR}, #{carnumber,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
+    insert into business_delivery_storage_notice
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="billType != null" >
+        bill_type,
+      </if>
+      <if test="billTypeId != null" >
+        bill_type_id,
+      </if>
+      <if test="billNumber != null" >
+        bill_number,
+      </if>
+      <if test="shipingCount != null" >
+        shiping_count,
+      </if>
+      <if test="finishedCount != null" >
+        finished_count,
+      </if>
+      <if test="receivedMoney != null" >
+        received_money,
+      </if>
+      <if test="customerBid != null" >
+        customer_bid,
+      </if>
+      <if test="customerNumber != null" >
+        customer_number,
+      </if>
+      <if test="mobile != null" >
+        mobile,
+      </if>
+      <if test="deliveryCustomer != null" >
+        delivery_customer,
+      </if>
+      <if test="contract != null" >
+        contract,
+      </if>
+      <if test="contractBid != null" >
+        contract_bid,
+      </if>
+      <if test="planNumber != null" >
+        plan_number,
+      </if>
+      <if test="planBid != null" >
+        plan_bid,
+      </if>
+      <if test="billMemo != null" >
+        bill_memo,
+      </if>
+      <if test="grainPrice != null" >
+        grain_price,
+      </if>
+      <if test="moneyQuantity != null" >
+        money_quantity,
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual,
+      </if>
+      <if test="warehouse != null" >
+        warehouse,
+      </if>
+      <if test="goodsLocation != null" >
+        goods_location,
+      </if>
+      <if test="auditState != null" >
+        audit_state,
+      </if>
+      <if test="storageTime != null" >
+        storage_time,
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id,
+      </if>
+      <if test="processDefinitionId != null" >
+        process_definition_id,
+      </if>
+      <if test="qualityStandard != null" >
+        quality_standard,
+      </if>
+      <if test="agreeTime != null" >
+        agree_time,
+      </if>
+      <if test="billMan != null" >
+        bill_man,
+      </if>
+      <if test="billDate != null" >
+        bill_date,
+      </if>
+      <if test="billUnit != null" >
+        bill_unit,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="houseName != null" >
+        house_name,
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id,
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="createUnit != null" >
+        create_unit,
+      </if>
+      <if test="createDepot != null" >
+        create_depot,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="inApplication != null" >
+        in_application,
+      </if>
+      <if test="createrId != null" >
+        creater_id,
+      </if>
+      <if test="rootContractBid != null" >
+        root_contract_bid,
+      </if>
+      <if test="identification != null" >
+        identification,
+      </if>
+      <if test="carnumber != null" >
+        carNumber,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="billType != null" >
+        #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="billTypeId != null" >
+        #{billTypeId,jdbcType=INTEGER},
+      </if>
+      <if test="billNumber != null" >
+        #{billNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="shipingCount != null" >
+        #{shipingCount,jdbcType=VARCHAR},
+      </if>
+      <if test="finishedCount != null" >
+        #{finishedCount,jdbcType=VARCHAR},
+      </if>
+      <if test="receivedMoney != null" >
+        #{receivedMoney,jdbcType=VARCHAR},
+      </if>
+      <if test="customerBid != null" >
+        #{customerBid,jdbcType=INTEGER},
+      </if>
+      <if test="customerNumber != null" >
+        #{customerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null" >
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryCustomer != null" >
+        #{deliveryCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="contract != null" >
+        #{contract,jdbcType=VARCHAR},
+      </if>
+      <if test="contractBid != null" >
+        #{contractBid,jdbcType=INTEGER},
+      </if>
+      <if test="planNumber != null" >
+        #{planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planBid != null" >
+        #{planBid,jdbcType=INTEGER},
+      </if>
+      <if test="billMemo != null" >
+        #{billMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="grainPrice != null" >
+        #{grainPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyQuantity != null" >
+        #{moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="grainAnnual != null" >
+        #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="warehouse != null" >
+        #{warehouse,jdbcType=INTEGER},
+      </if>
+      <if test="goodsLocation != null" >
+        #{goodsLocation,jdbcType=INTEGER},
+      </if>
+      <if test="auditState != null" >
+        #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="storageTime != null" >
+        #{storageTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="processInstanceId != null" >
+        #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="processDefinitionId != null" >
+        #{processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="qualityStandard != null" >
+        #{qualityStandard,jdbcType=VARCHAR},
+      </if>
+      <if test="agreeTime != null" >
+        #{agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billMan != null" >
+        #{billMan,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null" >
+        #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billUnit != null" >
+        #{billUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUnit != null" >
+        #{createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="createDepot != null" >
+        #{createDepot,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inApplication != null" >
+        #{inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="createrId != null" >
+        #{createrId,jdbcType=INTEGER},
+      </if>
+      <if test="rootContractBid != null" >
+        #{rootContractBid,jdbcType=INTEGER},
+      </if>
+      <if test="identification != null" >
+        #{identification,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        #{carnumber,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" resultType="java.lang.Integer" >
+    select count(*) from business_delivery_storage_notice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_delivery_storage_notice
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.billType != null" >
+        bill_type = #{record.billType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billTypeId != null" >
+        bill_type_id = #{record.billTypeId,jdbcType=INTEGER},
+      </if>
+      <if test="record.billNumber != null" >
+        bill_number = #{record.billNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shipingCount != null" >
+        shiping_count = #{record.shipingCount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.finishedCount != null" >
+        finished_count = #{record.finishedCount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.receivedMoney != null" >
+        received_money = #{record.receivedMoney,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerBid != null" >
+        customer_bid = #{record.customerBid,jdbcType=INTEGER},
+      </if>
+      <if test="record.customerNumber != null" >
+        customer_number = #{record.customerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mobile != null" >
+        mobile = #{record.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deliveryCustomer != null" >
+        delivery_customer = #{record.deliveryCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contract != null" >
+        contract = #{record.contract,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractBid != null" >
+        contract_bid = #{record.contractBid,jdbcType=INTEGER},
+      </if>
+      <if test="record.planNumber != null" >
+        plan_number = #{record.planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planBid != null" >
+        plan_bid = #{record.planBid,jdbcType=INTEGER},
+      </if>
+      <if test="record.billMemo != null" >
+        bill_memo = #{record.billMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.grainPrice != null" >
+        grain_price = #{record.grainPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.moneyQuantity != null" >
+        money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.grainAnnual != null" >
+        grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouse != null" >
+        warehouse = #{record.warehouse,jdbcType=INTEGER},
+      </if>
+      <if test="record.goodsLocation != null" >
+        goods_location = #{record.goodsLocation,jdbcType=INTEGER},
+      </if>
+      <if test="record.auditState != null" >
+        audit_state = #{record.auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storageTime != null" >
+        storage_time = #{record.storageTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.processInstanceId != null" >
+        process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.processDefinitionId != null" >
+        process_definition_id = #{record.processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qualityStandard != null" >
+        quality_standard = #{record.qualityStandard,jdbcType=VARCHAR},
+      </if>
+      <if test="record.agreeTime != null" >
+        agree_time = #{record.agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.billMan != null" >
+        bill_man = #{record.billMan,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billDate != null" >
+        bill_date = #{record.billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.billUnit != null" >
+        bill_unit = #{record.billUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseName != null" >
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseName != null" >
+        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUnit != null" >
+        create_unit = #{record.createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDepot != null" >
+        create_depot = #{record.createDepot,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inApplication != null" >
+        in_application = #{record.inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="record.createrId != null" >
+        creater_id = #{record.createrId,jdbcType=INTEGER},
+      </if>
+      <if test="record.rootContractBid != null" >
+        root_contract_bid = #{record.rootContractBid,jdbcType=INTEGER},
+      </if>
+      <if test="record.identification != null" >
+        identification = #{record.identification,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carnumber != null" >
+        carNumber = #{record.carnumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_delivery_storage_notice
+    set id = #{record.id,jdbcType=INTEGER},
+      bill_type = #{record.billType,jdbcType=VARCHAR},
+      bill_type_id = #{record.billTypeId,jdbcType=INTEGER},
+      bill_number = #{record.billNumber,jdbcType=VARCHAR},
+      shiping_count = #{record.shipingCount,jdbcType=VARCHAR},
+      finished_count = #{record.finishedCount,jdbcType=VARCHAR},
+      received_money = #{record.receivedMoney,jdbcType=VARCHAR},
+      customer_bid = #{record.customerBid,jdbcType=INTEGER},
+      customer_number = #{record.customerNumber,jdbcType=VARCHAR},
+      mobile = #{record.mobile,jdbcType=VARCHAR},
+      delivery_customer = #{record.deliveryCustomer,jdbcType=VARCHAR},
+      contract = #{record.contract,jdbcType=VARCHAR},
+      contract_bid = #{record.contractBid,jdbcType=INTEGER},
+      plan_number = #{record.planNumber,jdbcType=VARCHAR},
+      plan_bid = #{record.planBid,jdbcType=INTEGER},
+      bill_memo = #{record.billMemo,jdbcType=VARCHAR},
+      grain_price = #{record.grainPrice,jdbcType=VARCHAR},
+      money_quantity = #{record.moneyQuantity,jdbcType=VARCHAR},
+      grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      warehouse = #{record.warehouse,jdbcType=INTEGER},
+      goods_location = #{record.goodsLocation,jdbcType=INTEGER},
+      audit_state = #{record.auditState,jdbcType=VARCHAR},
+      storage_time = #{record.storageTime,jdbcType=TIMESTAMP},
+      process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      process_definition_id = #{record.processDefinitionId,jdbcType=VARCHAR},
+      quality_standard = #{record.qualityStandard,jdbcType=VARCHAR},
+      agree_time = #{record.agreeTime,jdbcType=TIMESTAMP},
+      bill_man = #{record.billMan,jdbcType=VARCHAR},
+      bill_date = #{record.billDate,jdbcType=TIMESTAMP},
+      bill_unit = #{record.billUnit,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      house_name = #{record.houseName,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_unit = #{record.createUnit,jdbcType=VARCHAR},
+      create_depot = #{record.createDepot,jdbcType=VARCHAR},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      in_application = #{record.inApplication,jdbcType=INTEGER},
+      creater_id = #{record.createrId,jdbcType=INTEGER},
+      root_contract_bid = #{record.rootContractBid,jdbcType=INTEGER},
+      identification = #{record.identification,jdbcType=VARCHAR},
+      carNumber = #{record.carnumber,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
+    update business_delivery_storage_notice
+    <set >
+      <if test="billType != null" >
+        bill_type = #{billType,jdbcType=VARCHAR},
+      </if>
+      <if test="billTypeId != null" >
+        bill_type_id = #{billTypeId,jdbcType=INTEGER},
+      </if>
+      <if test="billNumber != null" >
+        bill_number = #{billNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="shipingCount != null" >
+        shiping_count = #{shipingCount,jdbcType=VARCHAR},
+      </if>
+      <if test="finishedCount != null" >
+        finished_count = #{finishedCount,jdbcType=VARCHAR},
+      </if>
+      <if test="receivedMoney != null" >
+        received_money = #{receivedMoney,jdbcType=VARCHAR},
+      </if>
+      <if test="customerBid != null" >
+        customer_bid = #{customerBid,jdbcType=INTEGER},
+      </if>
+      <if test="customerNumber != null" >
+        customer_number = #{customerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null" >
+        mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryCustomer != null" >
+        delivery_customer = #{deliveryCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="contract != null" >
+        contract = #{contract,jdbcType=VARCHAR},
+      </if>
+      <if test="contractBid != null" >
+        contract_bid = #{contractBid,jdbcType=INTEGER},
+      </if>
+      <if test="planNumber != null" >
+        plan_number = #{planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planBid != null" >
+        plan_bid = #{planBid,jdbcType=INTEGER},
+      </if>
+      <if test="billMemo != null" >
+        bill_memo = #{billMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="grainPrice != null" >
+        grain_price = #{grainPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="moneyQuantity != null" >
+        money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="warehouse != null" >
+        warehouse = #{warehouse,jdbcType=INTEGER},
+      </if>
+      <if test="goodsLocation != null" >
+        goods_location = #{goodsLocation,jdbcType=INTEGER},
+      </if>
+      <if test="auditState != null" >
+        audit_state = #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="storageTime != null" >
+        storage_time = #{storageTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="processDefinitionId != null" >
+        process_definition_id = #{processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="qualityStandard != null" >
+        quality_standard = #{qualityStandard,jdbcType=VARCHAR},
+      </if>
+      <if test="agreeTime != null" >
+        agree_time = #{agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billMan != null" >
+        bill_man = #{billMan,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null" >
+        bill_date = #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="billUnit != null" >
+        bill_unit = #{billUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUnit != null" >
+        create_unit = #{createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="createDepot != null" >
+        create_depot = #{createDepot,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inApplication != null" >
+        in_application = #{inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="createrId != null" >
+        creater_id = #{createrId,jdbcType=INTEGER},
+      </if>
+      <if test="rootContractBid != null" >
+        root_contract_bid = #{rootContractBid,jdbcType=INTEGER},
+      </if>
+      <if test="identification != null" >
+        identification = #{identification,jdbcType=VARCHAR},
+      </if>
+      <if test="carnumber != null" >
+        carNumber = #{carnumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNotice" >
+    update business_delivery_storage_notice
+    set bill_type = #{billType,jdbcType=VARCHAR},
+      bill_type_id = #{billTypeId,jdbcType=INTEGER},
+      bill_number = #{billNumber,jdbcType=VARCHAR},
+      shiping_count = #{shipingCount,jdbcType=VARCHAR},
+      finished_count = #{finishedCount,jdbcType=VARCHAR},
+      received_money = #{receivedMoney,jdbcType=VARCHAR},
+      customer_bid = #{customerBid,jdbcType=INTEGER},
+      customer_number = #{customerNumber,jdbcType=VARCHAR},
+      mobile = #{mobile,jdbcType=VARCHAR},
+      delivery_customer = #{deliveryCustomer,jdbcType=VARCHAR},
+      contract = #{contract,jdbcType=VARCHAR},
+      contract_bid = #{contractBid,jdbcType=INTEGER},
+      plan_number = #{planNumber,jdbcType=VARCHAR},
+      plan_bid = #{planBid,jdbcType=INTEGER},
+      bill_memo = #{billMemo,jdbcType=VARCHAR},
+      grain_price = #{grainPrice,jdbcType=VARCHAR},
+      money_quantity = #{moneyQuantity,jdbcType=VARCHAR},
+      grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      warehouse = #{warehouse,jdbcType=INTEGER},
+      goods_location = #{goodsLocation,jdbcType=INTEGER},
+      audit_state = #{auditState,jdbcType=VARCHAR},
+      storage_time = #{storageTime,jdbcType=TIMESTAMP},
+      process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      process_definition_id = #{processDefinitionId,jdbcType=VARCHAR},
+      quality_standard = #{qualityStandard,jdbcType=VARCHAR},
+      agree_time = #{agreeTime,jdbcType=TIMESTAMP},
+      bill_man = #{billMan,jdbcType=VARCHAR},
+      bill_date = #{billDate,jdbcType=TIMESTAMP},
+      bill_unit = #{billUnit,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      house_name = #{houseName,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_unit = #{createUnit,jdbcType=VARCHAR},
+      create_depot = #{createDepot,jdbcType=VARCHAR},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      in_application = #{inApplication,jdbcType=INTEGER},
+      creater_id = #{createrId,jdbcType=INTEGER},
+      root_contract_bid = #{rootContractBid,jdbcType=INTEGER},
+      identification = #{identification,jdbcType=VARCHAR},
+      carNumber = #{carnumber,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+   <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO" extends="BaseResultMap">
+    <result column="task_id" property="taskId" jdbcType="VARCHAR" />
+    <result column="task_name" property="taskName" jdbcType="VARCHAR" />
+    <result column="result" property="result" jdbcType="VARCHAR" />
+    <result column="auditId" property="auditId" jdbcType="INTEGER" />
+  </resultMap>
+ 
+ 
+  <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
+    select
+        a.id id, a.bill_type bill_type, a.bill_number bill_number,
+        a.contract contract,
+        a.plan_number plan_number,
+        a.delivery_customer delivery_customer,
+        a.money_quantity money_quantity,
+        a.bill_date bill_date,
+        a.process_instance_id process_instance_id,
+        a.process_definition_id process_definition_id,
+        b.id auditId,
+        b.result result,
+        b.task_id task_id,
+        b.task_name task_name
+    from business_delivery_storage_notice a, business_approval b
+    <where>
+        a.process_instance_id = b.process_instance_id
+        and
+        a.audit_state != 0
+        <if test="operator != null">
+            and b.operator = #{operator}
+        </if>
+        <if test="billType != null">
+            and a.bill_type = #{billType}
+        </if>
+        <if test="result != null">
+            and b.result = #{result}
+        </if>
+        order by FIELD(b.result, '待审批', '同意', '驳回', '拒绝'), b.create_time desc
+    </where>
+  </select>
+ 
+  <update id="updateApplication" parameterType="java.util.Map">
+     update business_delivery_storage_notice
+     set in_application = #{inApplication}
+     where
+     1=1
+     <!-- 不能修改已经执行完毕的启动状态  -->
+     and in_application != 2
+     <if test="planBid != null" >
+        and plan_bid =  #{planBid}
+    </if>
+    <if test="contractBid != null" >
+        and contract_bid = #{contractBid}
+    </if>
+    <if test="rootContractBid != null" >
+        and root_contract_bid = #{rootContractBid}
+    </if>
+  </update>
+ 
+  <select id="selectByExampleToVO" resultMap="approvalResultMap" parameterType="com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_delivery_storage_notice
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+
+  <select id="uploadNoticeData" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+        notice.*,
+        customer.address, <!-- 地址 -->
+        customer.identification,<!-- 身份证号 -->
+        customer.mobile,<!-- 手机号 -->
+        customer.social_credit_code identification,<!-- 社会信用代码 -->
+        customer.enterprise_phone mobile<!-- 企业电话 -->
+    FROM
+        business_delivery_storage_notice notice
+    left join business_customer customer on customer.id=notice.customer_bid
+    WHERE ((notice.audit_state=2) or (notice.bill_type=2)) and 1 = 1 <!-- 审批通过的,中转通知单没有审批 -->
+    <if test="orgId != null" ><!--用house_id 区分是哪个库的 house_id是代储库 orgId 是主库 -->
+      AND notice.house_id = #{orgId,jdbcType=INTEGER}
+    </if>
+    <if test="inApplication != null" >
+      AND notice.in_Application = #{inApplication,jdbcType=INTEGER}
+    </if>
+    <if test="ids != null" >
+      AND notice.id not in
+      <foreach collection="ids" item="listItem" open="(" close=")" separator="," >
+        #{listItem}
+      </foreach>
+    </if>
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessFileMapper.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessFile;
+import com.chinaitop.depot.business.model.BusinessFileExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BusinessFileMapper {
+    int countByExample(BusinessFileExample example);
+
+    int deleteByExample(BusinessFileExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessFile record);
+
+    int insertSelective(BusinessFile record);
+
+    List<BusinessFile> selectByExample(BusinessFileExample example);
+
+    BusinessFile selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessFile record, @Param("example") BusinessFileExample example);
+
+    int updateByExample(@Param("record") BusinessFile record, @Param("example") BusinessFileExample example);
+
+    int updateByPrimaryKeySelective(BusinessFile record);
+
+    int updateByPrimaryKey(BusinessFile record);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessFileMapper.xml

@@ -0,0 +1,338 @@
+<?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.chinaitop.depot.business.mapper.BusinessFileMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessFile" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="bid" property="bid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="file_name" property="fileName" jdbcType="VARCHAR" />
+    <result column="original_file_name" property="originalFileName" jdbcType="VARCHAR" />
+    <result column="file_type" property="fileType" jdbcType="VARCHAR" />
+    <result column="source" property="source" jdbcType="VARCHAR" />
+    <result column="remarks" property="remarks" jdbcType="VARCHAR" />
+    <result column="file_path" property="filePath" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="creater" property="creater" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, bid, type, file_name, original_file_name, file_type, source, remarks, file_path, 
+    create_time, update_time, creater, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessFileExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_file
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_file
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessFileExample" >
+    delete from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessFile" >
+    insert into business_file (id, bid, type, 
+      file_name, original_file_name, file_type, 
+      source, remarks, file_path, 
+      create_time, update_time, creater, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{bid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{fileName,jdbcType=VARCHAR}, #{originalFileName,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR}, 
+      #{source,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=INTEGER}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessFile" >
+    insert into business_file
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="bid != null" >
+        bid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="fileName != null" >
+        file_name,
+      </if>
+      <if test="originalFileName != null" >
+        original_file_name,
+      </if>
+      <if test="fileType != null" >
+        file_type,
+      </if>
+      <if test="source != null" >
+        source,
+      </if>
+      <if test="remarks != null" >
+        remarks,
+      </if>
+      <if test="filePath != null" >
+        file_path,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updateTime != null" >
+        update_time,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="bid != null" >
+        #{bid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="originalFileName != null" >
+        #{originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null" >
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessFileExample" resultType="java.lang.Integer" >
+    select count(*) from business_file
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_file
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.bid != null" >
+        bid = #{record.bid,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileName != null" >
+        file_name = #{record.fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originalFileName != null" >
+        original_file_name = #{record.originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileType != null" >
+        file_type = #{record.fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.source != null" >
+        source = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null" >
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.filePath != null" >
+        file_path = #{record.filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null" >
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_file
+    set id = #{record.id,jdbcType=INTEGER},
+      bid = #{record.bid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      file_name = #{record.fileName,jdbcType=VARCHAR},
+      original_file_name = #{record.originalFileName,jdbcType=VARCHAR},
+      file_type = #{record.fileType,jdbcType=VARCHAR},
+      source = #{record.source,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      file_path = #{record.filePath,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      creater = #{record.creater,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessFile" >
+    update business_file
+    <set >
+      <if test="bid != null" >
+        bid = #{bid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        file_name = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="originalFileName != null" >
+        original_file_name = #{originalFileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        file_type = #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null" >
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        file_path = #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null" >
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessFile" >
+    update business_file
+    set bid = #{bid,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      file_name = #{fileName,jdbcType=VARCHAR},
+      original_file_name = #{originalFileName,jdbcType=VARCHAR},
+      file_type = #{fileType,jdbcType=VARCHAR},
+      source = #{source,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      file_path = #{filePath,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      creater = #{creater,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessLadingMapper.java

@@ -0,0 +1,34 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessLading;
+import com.chinaitop.depot.business.model.BusinessLadingExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessLadingMapper {
+    int countByExample(BusinessLadingExample example);
+
+    int deleteByExample(BusinessLadingExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessLading record);
+
+    int insertSelective(BusinessLading record);
+
+    List<BusinessLading> selectByExample(BusinessLadingExample example);
+
+    BusinessLading selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessLading record, @Param("example") BusinessLadingExample example);
+
+    int updateByExample(@Param("record") BusinessLading record, @Param("example") BusinessLadingExample example);
+
+    int updateByPrimaryKeySelective(BusinessLading record);
+
+    int updateByPrimaryKey(BusinessLading record);
+
+	List<Map<String, Object>> getLadingDatas(Map<String, Object> mapCondition);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessLadingMapper.xml

@@ -0,0 +1,519 @@
+<?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.chinaitop.depot.business.mapper.BusinessLadingMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessLading" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="lading_number" property="ladingNumber" jdbcType="VARCHAR" />
+    <result column="inbound_number" property="inboundNumber" jdbcType="VARCHAR" />
+    <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="train_number" property="trainNumber" jdbcType="VARCHAR" />
+    <result column="grain_kind" property="grainKind" jdbcType="INTEGER" />
+    <result column="model" property="model" jdbcType="VARCHAR" />
+    <result column="unload_number" property="unloadNumber" jdbcType="DOUBLE" />
+    <result column="platform" property="platform" jdbcType="VARCHAR" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <result column="goods_number" property="goodsNumber" jdbcType="DOUBLE" />
+    <result column="measurement_method" property="measurementMethod" jdbcType="INTEGER" />
+    <result column="business_type" property="businessType" jdbcType="VARCHAR" />
+    <result column="sales_type" property="salesType" jdbcType="VARCHAR" />
+    <result column="sales_department" property="salesDepartment" jdbcType="VARCHAR" />
+    <result column="transport_station" property="transportStation" jdbcType="VARCHAR" />
+    <result column="delivery_date" property="deliveryDate" jdbcType="TIMESTAMP" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
+    <result column="bill_date" property="billDate" jdbcType="TIMESTAMP" />
+    <result column="carNumber" property="carnumber" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, lading_number, inbound_number, customer_name, train_number, grain_kind, model, 
+    unload_number, platform, warehouse_name, goods_number, measurement_method, business_type, 
+    sales_type, sales_department, transport_station, delivery_date, creater, bill_date, 
+    carNumber, updatetime, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessLadingExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_lading
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_lading
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_lading
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessLadingExample" >
+    delete from business_lading
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessLading" >
+    insert into business_lading (id, lading_number, inbound_number, 
+      customer_name, train_number, grain_kind, 
+      model, unload_number, platform, 
+      warehouse_name, goods_number, measurement_method, 
+      business_type, sales_type, sales_department, 
+      transport_station, delivery_date, creater, 
+      bill_date, carNumber, updatetime, 
+      org_id)
+    values (#{id,jdbcType=INTEGER}, #{ladingNumber,jdbcType=VARCHAR}, #{inboundNumber,jdbcType=VARCHAR}, 
+      #{customerName,jdbcType=VARCHAR}, #{trainNumber,jdbcType=VARCHAR}, #{grainKind,jdbcType=INTEGER}, 
+      #{model,jdbcType=VARCHAR}, #{unloadNumber,jdbcType=DOUBLE}, #{platform,jdbcType=VARCHAR}, 
+      #{warehouseName,jdbcType=VARCHAR}, #{goodsNumber,jdbcType=DOUBLE}, #{measurementMethod,jdbcType=INTEGER}, 
+      #{businessType,jdbcType=VARCHAR}, #{salesType,jdbcType=VARCHAR}, #{salesDepartment,jdbcType=VARCHAR}, 
+      #{transportStation,jdbcType=VARCHAR}, #{deliveryDate,jdbcType=TIMESTAMP}, #{creater,jdbcType=VARCHAR}, 
+      #{billDate,jdbcType=TIMESTAMP}, #{carnumber,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessLading" >
+    insert into business_lading
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="ladingNumber != null" >
+        lading_number,
+      </if>
+      <if test="inboundNumber != null" >
+        inbound_number,
+      </if>
+      <if test="customerName != null" >
+        customer_name,
+      </if>
+      <if test="trainNumber != null" >
+        train_number,
+      </if>
+      <if test="grainKind != null" >
+        grain_kind,
+      </if>
+      <if test="model != null" >
+        model,
+      </if>
+      <if test="unloadNumber != null" >
+        unload_number,
+      </if>
+      <if test="platform != null" >
+        platform,
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name,
+      </if>
+      <if test="goodsNumber != null" >
+        goods_number,
+      </if>
+      <if test="measurementMethod != null" >
+        measurement_method,
+      </if>
+      <if test="businessType != null" >
+        business_type,
+      </if>
+      <if test="salesType != null" >
+        sales_type,
+      </if>
+      <if test="salesDepartment != null" >
+        sales_department,
+      </if>
+      <if test="transportStation != null" >
+        transport_station,
+      </if>
+      <if test="deliveryDate != null" >
+        delivery_date,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="billDate != null" >
+        bill_date,
+      </if>
+      <if test="carnumber != null" >
+        carNumber,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="ladingNumber != null" >
+        #{ladingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="inboundNumber != null" >
+        #{inboundNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="customerName != null" >
+        #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="trainNumber != null" >
+        #{trainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="grainKind != null" >
+        #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="model != null" >
+        #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="unloadNumber != null" >
+        #{unloadNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="platform != null" >
+        #{platform,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null" >
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsNumber != null" >
+        #{goodsNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="measurementMethod != null" >
+        #{measurementMethod,jdbcType=INTEGER},
+      </if>
+      <if test="businessType != null" >
+        #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="salesType != null" >
+        #{salesType,jdbcType=VARCHAR},
+      </if>
+      <if test="salesDepartment != null" >
+        #{salesDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="transportStation != null" >
+        #{transportStation,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryDate != null" >
+        #{deliveryDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null" >
+        #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carnumber != null" >
+        #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessLadingExample" resultType="java.lang.Integer" >
+    select count(*) from business_lading
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_lading
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.ladingNumber != null" >
+        lading_number = #{record.ladingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inboundNumber != null" >
+        inbound_number = #{record.inboundNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerName != null" >
+        customer_name = #{record.customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.trainNumber != null" >
+        train_number = #{record.trainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.grainKind != null" >
+        grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="record.model != null" >
+        model = #{record.model,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unloadNumber != null" >
+        unload_number = #{record.unloadNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="record.platform != null" >
+        platform = #{record.platform,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseName != null" >
+        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.goodsNumber != null" >
+        goods_number = #{record.goodsNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="record.measurementMethod != null" >
+        measurement_method = #{record.measurementMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.businessType != null" >
+        business_type = #{record.businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.salesType != null" >
+        sales_type = #{record.salesType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.salesDepartment != null" >
+        sales_department = #{record.salesDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="record.transportStation != null" >
+        transport_station = #{record.transportStation,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deliveryDate != null" >
+        delivery_date = #{record.deliveryDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.billDate != null" >
+        bill_date = #{record.billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.carnumber != null" >
+        carNumber = #{record.carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_lading
+    set id = #{record.id,jdbcType=INTEGER},
+      lading_number = #{record.ladingNumber,jdbcType=VARCHAR},
+      inbound_number = #{record.inboundNumber,jdbcType=VARCHAR},
+      customer_name = #{record.customerName,jdbcType=VARCHAR},
+      train_number = #{record.trainNumber,jdbcType=VARCHAR},
+      grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      model = #{record.model,jdbcType=VARCHAR},
+      unload_number = #{record.unloadNumber,jdbcType=DOUBLE},
+      platform = #{record.platform,jdbcType=VARCHAR},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      goods_number = #{record.goodsNumber,jdbcType=DOUBLE},
+      measurement_method = #{record.measurementMethod,jdbcType=INTEGER},
+      business_type = #{record.businessType,jdbcType=VARCHAR},
+      sales_type = #{record.salesType,jdbcType=VARCHAR},
+      sales_department = #{record.salesDepartment,jdbcType=VARCHAR},
+      transport_station = #{record.transportStation,jdbcType=VARCHAR},
+      delivery_date = #{record.deliveryDate,jdbcType=TIMESTAMP},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      bill_date = #{record.billDate,jdbcType=TIMESTAMP},
+      carNumber = #{record.carnumber,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessLading" >
+    update business_lading
+    <set >
+      <if test="ladingNumber != null" >
+        lading_number = #{ladingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="inboundNumber != null" >
+        inbound_number = #{inboundNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="customerName != null" >
+        customer_name = #{customerName,jdbcType=VARCHAR},
+      </if>
+      <if test="trainNumber != null" >
+        train_number = #{trainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="grainKind != null" >
+        grain_kind = #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="model != null" >
+        model = #{model,jdbcType=VARCHAR},
+      </if>
+      <if test="unloadNumber != null" >
+        unload_number = #{unloadNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="platform != null" >
+        platform = #{platform,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="goodsNumber != null" >
+        goods_number = #{goodsNumber,jdbcType=DOUBLE},
+      </if>
+      <if test="measurementMethod != null" >
+        measurement_method = #{measurementMethod,jdbcType=INTEGER},
+      </if>
+      <if test="businessType != null" >
+        business_type = #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="salesType != null" >
+        sales_type = #{salesType,jdbcType=VARCHAR},
+      </if>
+      <if test="salesDepartment != null" >
+        sales_department = #{salesDepartment,jdbcType=VARCHAR},
+      </if>
+      <if test="transportStation != null" >
+        transport_station = #{transportStation,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryDate != null" >
+        delivery_date = #{deliveryDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="billDate != null" >
+        bill_date = #{billDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="carnumber != null" >
+        carNumber = #{carnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessLading" >
+    update business_lading
+    set lading_number = #{ladingNumber,jdbcType=VARCHAR},
+      inbound_number = #{inboundNumber,jdbcType=VARCHAR},
+      customer_name = #{customerName,jdbcType=VARCHAR},
+      train_number = #{trainNumber,jdbcType=VARCHAR},
+      grain_kind = #{grainKind,jdbcType=INTEGER},
+      model = #{model,jdbcType=VARCHAR},
+      unload_number = #{unloadNumber,jdbcType=DOUBLE},
+      platform = #{platform,jdbcType=VARCHAR},
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      goods_number = #{goodsNumber,jdbcType=DOUBLE},
+      measurement_method = #{measurementMethod,jdbcType=INTEGER},
+      business_type = #{businessType,jdbcType=VARCHAR},
+      sales_type = #{salesType,jdbcType=VARCHAR},
+      sales_department = #{salesDepartment,jdbcType=VARCHAR},
+      transport_station = #{transportStation,jdbcType=VARCHAR},
+      delivery_date = #{deliveryDate,jdbcType=TIMESTAMP},
+      creater = #{creater,jdbcType=VARCHAR},
+      bill_date = #{billDate,jdbcType=TIMESTAMP},
+      carNumber = #{carnumber,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <select id="getLadingDatas" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+		id,
+		org_id,
+		lading_number thdh,
+		carNumber qcph,
+		customer_name khmc,
+		train_number glhcph,
+		model ggxh,
+		unload_number js,
+		warehouse_name hw,
+		goods_number thjs,
+		transport_station fyz,
+		DATE_FORMAT(
+			delivery_date,
+			'%Y-%m-%d %T'
+		) fhrq,
+		DATE_FORMAT(bill_date, '%Y-%m-%d %T') zdrq,
+		inbound_number rzdh,
+		grain_kind lypz,
+		platform zt,
+		measurement_method jlfs,
+		creater zdr,
+		sales_department djzl
+   FROM
+	   business_lading
+    WHERE 1 = 1
+    <if test="orgId != null" >
+      AND org_id = #{orgId,jdbcType=INTEGER}
+    </if>
+    <if test="thdhs != null" >
+      AND lading_number not in
+      <foreach collection="thdhs" item="listItem" open="(" close=")" separator="," >
+        #{listItem}
+      </foreach>
+    </if>
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.java

@@ -0,0 +1,50 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessPlan;
+import com.chinaitop.depot.business.model.BusinessPlanExample;
+import com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessPlanMapper {
+    int countByExample(BusinessPlanExample example);
+
+    int deleteByExample(BusinessPlanExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessPlan record);
+
+    int insertSelective(BusinessPlan record);
+
+    List<BusinessPlan> selectByExample(BusinessPlanExample example);
+
+    BusinessPlan selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
+
+    int updateByExample(@Param("record") BusinessPlan record, @Param("example") BusinessPlanExample example);
+
+    int updateByPrimaryKeySelective(BusinessPlan record);
+
+    int updateByPrimaryKey(BusinessPlan record);
+    
+    //自增
+    List<BusinessPlanAuditVO> getApprovalList(Map<String, Object> paramMap);
+    List<BusinessPlanAuditVO> selectByExampleToVO(BusinessPlanExample example);
+
+    List<BusinessPlanAuditVO> getAcceptanceList(Map<String, Object> paramMap);
+    int addAcceptance(Map<String, String> paramMap);
+    int addAcceptanceDetail(Map<String, String> paramMap);
+
+	void updateByStatus(Integer id);
+
+	List<Map<String, Object>> queryAcceptanceList(Map<String, Object> map);
+	//架空期带出数据
+	List<Map<String, Object>> getjkqPlanList(Map<String, Object> map);
+
+	List<Map<String, Object>> getjkqDayList(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessPlanMapper.xml

@@ -0,0 +1,837 @@
+<?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.chinaitop.depot.business.mapper.BusinessPlanMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessPlan" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="plan_number" property="planNumber" jdbcType="VARCHAR" />
+    <result column="plan_title" property="planTitle" jdbcType="VARCHAR" />
+    <result column="reference_number" property="referenceNumber" jdbcType="VARCHAR" />
+    <result column="plan_desc" property="planDesc" jdbcType="VARCHAR" />
+    <result column="execute_type" property="executeType" jdbcType="INTEGER" />
+    <result column="out_amount" property="outAmount" jdbcType="VARCHAR" />
+    <result column="in_amount" property="inAmount" jdbcType="VARCHAR" />
+    <result column="out_total_price" property="outTotalPrice" jdbcType="VARCHAR" />
+    <result column="in_total_price" property="inTotalPrice" jdbcType="VARCHAR" />
+    <result column="customer_plan_state" property="customerPlanState" jdbcType="VARCHAR" />
+    <result column="plan_customer" property="planCustomer" jdbcType="VARCHAR" />
+    <result column="audit_state" property="auditState" jdbcType="VARCHAR" />
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+    <result column="process_definition_id" property="processDefinitionId" jdbcType="VARCHAR" />
+    <result column="current_approve_path" property="currentApprovePath" jdbcType="VARCHAR" />
+    <result column="agree_time" property="agreeTime" jdbcType="TIMESTAMP" />
+    <result column="creater_id" property="createrId" jdbcType="INTEGER" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_unit" property="createUnit" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="in_application" property="inApplication" jdbcType="INTEGER" />
+    <result column="total_quantity" property="totalQuantity" jdbcType="VARCHAR" />
+    <result column="report_date" property="reportDate" jdbcType="TIMESTAMP" />
+    <result column="send_date" property="sendDate" jdbcType="TIMESTAMP" />
+    <result column="province_remark" property="provinceRemark" jdbcType="VARCHAR" />
+    <result column="enterprise_remark" property="enterpriseRemark" jdbcType="VARCHAR" />
+    <result column="attribute_type" property="attributeType" jdbcType="INTEGER" />
+    <result column="refuse_reason" property="refuseReason" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <resultMap id="approvalResultMap" type="com.chinaitop.depot.business.model.vo.BusinessPlanAuditVO" extends="BaseResultMap">
+
+    <result column="process_instance_id" property="processInstanceId" jdbcType="VARCHAR" />
+
+    <result column="task_id" property="taskId" jdbcType="VARCHAR" />
+
+    <result column="result" property="result" jdbcType="VARCHAR" />
+
+    <result column="task_name" property="taskName" jdbcType="VARCHAR" />
+
+    <result column="auditId" property="auditId" jdbcType="INTEGER" />
+
+    <result column="applicationDate" property="applicationDate" jdbcType="VARCHAR" />
+
+    <result column="acceptanceType" property="acceptanceType" jdbcType="VARCHAR" />
+
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+
+  </resultMap>
+  
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, plan_number, plan_title, reference_number, plan_desc, execute_type, out_amount, 
+    in_amount, out_total_price, in_total_price, customer_plan_state, plan_customer, audit_state, 
+    process_instance_id, process_definition_id, current_approve_path, agree_time, creater_id, 
+    creater, create_time, create_unit, org_id, in_application, total_quantity, report_date, 
+    send_date, province_remark, enterprise_remark, attribute_type, refuse_reason
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_plan
+    <!-- a.id, a.plan_number, a.plan_title, a.reference_number, a.plan_desc, a.execute_type, a.out_amount,
+    a.in_amount, a.out_total_price, a.in_total_price, a.customer_plan_state,a.plan_customer, a.audit_state,
+    a.process_instance_id, a.process_definition_id, a.current_approve_path, a.agree_time, a.creater_id,
+    a.creater, a.create_time, a.create_unit, org_id, a.in_application, a.total_quantity, a.report_date,
+    a.send_date, a.province_remark, a.enterprise_remark, a.attribute_type, a.refuse_reason,
+    acceptance.acceptance_number acceptanceNumber
+    from business_plan a
+    LEFT JOIN business_plan_acceptance acceptance ON acceptance.plan_id = a.id -->
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_plan
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_plan
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >
+    delete from business_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
+    insert into business_plan (id, plan_number, plan_title, 
+      reference_number, plan_desc, execute_type, 
+      out_amount, in_amount, out_total_price, 
+      in_total_price, customer_plan_state, plan_customer, 
+      audit_state, process_instance_id, process_definition_id, 
+      current_approve_path, agree_time, creater_id, 
+      creater, create_time, create_unit, 
+      org_id, in_application, total_quantity, 
+      report_date, send_date, province_remark, 
+      enterprise_remark, attribute_type, refuse_reason
+      )
+    values (#{id,jdbcType=INTEGER}, #{planNumber,jdbcType=VARCHAR}, #{planTitle,jdbcType=VARCHAR}, 
+      #{referenceNumber,jdbcType=VARCHAR}, #{planDesc,jdbcType=VARCHAR}, #{executeType,jdbcType=INTEGER}, 
+      #{outAmount,jdbcType=VARCHAR}, #{inAmount,jdbcType=VARCHAR}, #{outTotalPrice,jdbcType=VARCHAR}, 
+      #{inTotalPrice,jdbcType=VARCHAR}, #{customerPlanState,jdbcType=VARCHAR}, #{planCustomer,jdbcType=VARCHAR}, 
+      #{auditState,jdbcType=VARCHAR}, #{processInstanceId,jdbcType=VARCHAR}, #{processDefinitionId,jdbcType=VARCHAR}, 
+      #{currentApprovePath,jdbcType=VARCHAR}, #{agreeTime,jdbcType=TIMESTAMP}, #{createrId,jdbcType=INTEGER}, 
+      #{creater,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUnit,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{inApplication,jdbcType=INTEGER}, #{totalQuantity,jdbcType=VARCHAR}, 
+      #{reportDate,jdbcType=TIMESTAMP}, #{sendDate,jdbcType=TIMESTAMP}, #{provinceRemark,jdbcType=VARCHAR}, 
+      #{enterpriseRemark,jdbcType=VARCHAR}, #{attributeType,jdbcType=INTEGER}, #{refuseReason,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
+    insert into business_plan
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="planNumber != null" >
+        plan_number,
+      </if>
+      <if test="planTitle != null" >
+        plan_title,
+      </if>
+      <if test="referenceNumber != null" >
+        reference_number,
+      </if>
+      <if test="planDesc != null" >
+        plan_desc,
+      </if>
+      <if test="executeType != null" >
+        execute_type,
+      </if>
+      <if test="outAmount != null" >
+        out_amount,
+      </if>
+      <if test="inAmount != null" >
+        in_amount,
+      </if>
+      <if test="outTotalPrice != null" >
+        out_total_price,
+      </if>
+      <if test="inTotalPrice != null" >
+        in_total_price,
+      </if>
+      <if test="customerPlanState != null" >
+        customer_plan_state,
+      </if>
+      <if test="planCustomer != null" >
+        plan_customer,
+      </if>
+      <if test="auditState != null" >
+        audit_state,
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id,
+      </if>
+      <if test="processDefinitionId != null" >
+        process_definition_id,
+      </if>
+      <if test="currentApprovePath != null" >
+        current_approve_path,
+      </if>
+      <if test="agreeTime != null" >
+        agree_time,
+      </if>
+      <if test="createrId != null" >
+        creater_id,
+      </if>
+      <if test="creater != null" >
+        creater,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="createUnit != null" >
+        create_unit,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="inApplication != null" >
+        in_application,
+      </if>
+      <if test="totalQuantity != null" >
+        total_quantity,
+      </if>
+      <if test="reportDate != null" >
+        report_date,
+      </if>
+      <if test="sendDate != null" >
+        send_date,
+      </if>
+      <if test="provinceRemark != null" >
+        province_remark,
+      </if>
+      <if test="enterpriseRemark != null" >
+        enterprise_remark,
+      </if>
+      <if test="attributeType != null" >
+        attribute_type,
+      </if>
+      <if test="refuseReason != null" >
+        refuse_reason,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="planNumber != null" >
+        #{planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planTitle != null" >
+        #{planTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="referenceNumber != null" >
+        #{referenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planDesc != null" >
+        #{planDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="executeType != null" >
+        #{executeType,jdbcType=INTEGER},
+      </if>
+      <if test="outAmount != null" >
+        #{outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="inAmount != null" >
+        #{inAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="outTotalPrice != null" >
+        #{outTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inTotalPrice != null" >
+        #{inTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="customerPlanState != null" >
+        #{customerPlanState,jdbcType=VARCHAR},
+      </if>
+      <if test="planCustomer != null" >
+        #{planCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="auditState != null" >
+        #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="processInstanceId != null" >
+        #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="processDefinitionId != null" >
+        #{processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="currentApprovePath != null" >
+        #{currentApprovePath,jdbcType=VARCHAR},
+      </if>
+      <if test="agreeTime != null" >
+        #{agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createrId != null" >
+        #{createrId,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null" >
+        #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUnit != null" >
+        #{createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inApplication != null" >
+        #{inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="totalQuantity != null" >
+        #{totalQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="reportDate != null" >
+        #{reportDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sendDate != null" >
+        #{sendDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="provinceRemark != null" >
+        #{provinceRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseRemark != null" >
+        #{enterpriseRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="attributeType != null" >
+        #{attributeType,jdbcType=INTEGER},
+      </if>
+      <if test="refuseReason != null" >
+        #{refuseReason,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" resultType="java.lang.Integer" >
+    select count(*) from business_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_plan
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.planNumber != null" >
+        plan_number = #{record.planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planTitle != null" >
+        plan_title = #{record.planTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.referenceNumber != null" >
+        reference_number = #{record.referenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planDesc != null" >
+        plan_desc = #{record.planDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.executeType != null" >
+        execute_type = #{record.executeType,jdbcType=INTEGER},
+      </if>
+      <if test="record.outAmount != null" >
+        out_amount = #{record.outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inAmount != null" >
+        in_amount = #{record.inAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outTotalPrice != null" >
+        out_total_price = #{record.outTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inTotalPrice != null" >
+        in_total_price = #{record.inTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customerPlanState != null" >
+        customer_plan_state = #{record.customerPlanState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.planCustomer != null" >
+        plan_customer = #{record.planCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="record.auditState != null" >
+        audit_state = #{record.auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.processInstanceId != null" >
+        process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.processDefinitionId != null" >
+        process_definition_id = #{record.processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.currentApprovePath != null" >
+        current_approve_path = #{record.currentApprovePath,jdbcType=VARCHAR},
+      </if>
+      <if test="record.agreeTime != null" >
+        agree_time = #{record.agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createrId != null" >
+        creater_id = #{record.createrId,jdbcType=INTEGER},
+      </if>
+      <if test="record.creater != null" >
+        creater = #{record.creater,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUnit != null" >
+        create_unit = #{record.createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.inApplication != null" >
+        in_application = #{record.inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="record.totalQuantity != null" >
+        total_quantity = #{record.totalQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reportDate != null" >
+        report_date = #{record.reportDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sendDate != null" >
+        send_date = #{record.sendDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.provinceRemark != null" >
+        province_remark = #{record.provinceRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.enterpriseRemark != null" >
+        enterprise_remark = #{record.enterpriseRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.attributeType != null" >
+        attribute_type = #{record.attributeType,jdbcType=INTEGER},
+      </if>
+      <if test="record.refuseReason != null" >
+        refuse_reason = #{record.refuseReason,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_plan
+    set id = #{record.id,jdbcType=INTEGER},
+      plan_number = #{record.planNumber,jdbcType=VARCHAR},
+      plan_title = #{record.planTitle,jdbcType=VARCHAR},
+      reference_number = #{record.referenceNumber,jdbcType=VARCHAR},
+      plan_desc = #{record.planDesc,jdbcType=VARCHAR},
+      execute_type = #{record.executeType,jdbcType=INTEGER},
+      out_amount = #{record.outAmount,jdbcType=VARCHAR},
+      in_amount = #{record.inAmount,jdbcType=VARCHAR},
+      out_total_price = #{record.outTotalPrice,jdbcType=VARCHAR},
+      in_total_price = #{record.inTotalPrice,jdbcType=VARCHAR},
+      customer_plan_state = #{record.customerPlanState,jdbcType=VARCHAR},
+      plan_customer = #{record.planCustomer,jdbcType=VARCHAR},
+      audit_state = #{record.auditState,jdbcType=VARCHAR},
+      process_instance_id = #{record.processInstanceId,jdbcType=VARCHAR},
+      process_definition_id = #{record.processDefinitionId,jdbcType=VARCHAR},
+      current_approve_path = #{record.currentApprovePath,jdbcType=VARCHAR},
+      agree_time = #{record.agreeTime,jdbcType=TIMESTAMP},
+      creater_id = #{record.createrId,jdbcType=INTEGER},
+      creater = #{record.creater,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_unit = #{record.createUnit,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      in_application = #{record.inApplication,jdbcType=INTEGER},
+      total_quantity = #{record.totalQuantity,jdbcType=VARCHAR},
+      report_date = #{record.reportDate,jdbcType=TIMESTAMP},
+      send_date = #{record.sendDate,jdbcType=TIMESTAMP},
+      province_remark = #{record.provinceRemark,jdbcType=VARCHAR},
+      enterprise_remark = #{record.enterpriseRemark,jdbcType=VARCHAR},
+      attribute_type = #{record.attributeType,jdbcType=INTEGER},
+      refuse_reason = #{record.refuseReason,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
+    update business_plan
+    <set >
+      <if test="planNumber != null" >
+        plan_number = #{planNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planTitle != null" >
+        plan_title = #{planTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="referenceNumber != null" >
+        reference_number = #{referenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="planDesc != null" >
+        plan_desc = #{planDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="executeType != null" >
+        execute_type = #{executeType,jdbcType=INTEGER},
+      </if>
+      <if test="outAmount != null" >
+        out_amount = #{outAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="inAmount != null" >
+        in_amount = #{inAmount,jdbcType=VARCHAR},
+      </if>
+      <if test="outTotalPrice != null" >
+        out_total_price = #{outTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inTotalPrice != null" >
+        in_total_price = #{inTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="customerPlanState != null" >
+        customer_plan_state = #{customerPlanState,jdbcType=VARCHAR},
+      </if>
+      <if test="planCustomer != null" >
+        plan_customer = #{planCustomer,jdbcType=VARCHAR},
+      </if>
+      <if test="auditState != null" >
+        audit_state = #{auditState,jdbcType=VARCHAR},
+      </if>
+      <if test="processInstanceId != null" >
+        process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      </if>
+      <if test="processDefinitionId != null" >
+        process_definition_id = #{processDefinitionId,jdbcType=VARCHAR},
+      </if>
+      <if test="currentApprovePath != null" >
+        current_approve_path = #{currentApprovePath,jdbcType=VARCHAR},
+      </if>
+      <if test="agreeTime != null" >
+        agree_time = #{agreeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createrId != null" >
+        creater_id = #{createrId,jdbcType=INTEGER},
+      </if>
+      <if test="creater != null" >
+        creater = #{creater,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUnit != null" >
+        create_unit = #{createUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="inApplication != null" >
+        in_application = #{inApplication,jdbcType=INTEGER},
+      </if>
+      <if test="totalQuantity != null" >
+        total_quantity = #{totalQuantity,jdbcType=VARCHAR},
+      </if>
+      <if test="reportDate != null" >
+        report_date = #{reportDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sendDate != null" >
+        send_date = #{sendDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="provinceRemark != null" >
+        province_remark = #{provinceRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="enterpriseRemark != null" >
+        enterprise_remark = #{enterpriseRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="attributeType != null" >
+        attribute_type = #{attributeType,jdbcType=INTEGER},
+      </if>
+      <if test="refuseReason != null" >
+        refuse_reason = #{refuseReason,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessPlan" >
+    update business_plan
+    set plan_number = #{planNumber,jdbcType=VARCHAR},
+      plan_title = #{planTitle,jdbcType=VARCHAR},
+      reference_number = #{referenceNumber,jdbcType=VARCHAR},
+      plan_desc = #{planDesc,jdbcType=VARCHAR},
+      execute_type = #{executeType,jdbcType=INTEGER},
+      out_amount = #{outAmount,jdbcType=VARCHAR},
+      in_amount = #{inAmount,jdbcType=VARCHAR},
+      out_total_price = #{outTotalPrice,jdbcType=VARCHAR},
+      in_total_price = #{inTotalPrice,jdbcType=VARCHAR},
+      customer_plan_state = #{customerPlanState,jdbcType=VARCHAR},
+      plan_customer = #{planCustomer,jdbcType=VARCHAR},
+      audit_state = #{auditState,jdbcType=VARCHAR},
+      process_instance_id = #{processInstanceId,jdbcType=VARCHAR},
+      process_definition_id = #{processDefinitionId,jdbcType=VARCHAR},
+      current_approve_path = #{currentApprovePath,jdbcType=VARCHAR},
+      agree_time = #{agreeTime,jdbcType=TIMESTAMP},
+      creater_id = #{createrId,jdbcType=INTEGER},
+      creater = #{creater,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_unit = #{createUnit,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      in_application = #{inApplication,jdbcType=INTEGER},
+      total_quantity = #{totalQuantity,jdbcType=VARCHAR},
+      report_date = #{reportDate,jdbcType=TIMESTAMP},
+      send_date = #{sendDate,jdbcType=TIMESTAMP},
+      province_remark = #{provinceRemark,jdbcType=VARCHAR},
+      enterprise_remark = #{enterpriseRemark,jdbcType=VARCHAR},
+      attribute_type = #{attributeType,jdbcType=INTEGER},
+      refuse_reason = #{refuseReason,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  
+  <select id="getApprovalList" resultMap="approvalResultMap" parameterType="java.util.Map" >
+    select
+        a.id id, a.plan_number plan_number, a.reference_number reference_number, a.execute_type execute_type,
+        a.in_amount in_amount,a.out_amount out_amount, a.create_time create_time,
+        a.process_instance_id process_instance_id,
+        a.process_definition_id process_definition_id,
+        b.id auditId,
+        b.result result, b.task_id task_id,b.task_name task_name
+    from business_plan a, business_approval b
+    <where>
+        a.process_instance_id = b.process_instance_id
+        and
+        a.audit_state != 0
+        <if test="operator != null">
+           and b.operator = #{operator}
+        </if>
+        <if test="result != null">
+           and b.result = #{result}
+        </if>
+        <if test="planNumber != null">
+           and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
+        </if>
+        <if test="attributeType != null">
+           and a.attribute_type = #{attributeType}
+        </if>
+        order by FIELD(b.result, '待审批', '同意', '驳回', '拒绝'), b.create_time desc
+    </where>
+  </select>
+
+  <select id="selectByExampleToVO" resultMap="approvalResultMap" parameterType="com.chinaitop.depot.business.model.BusinessPlanExample" >select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_plan
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+
+  <update id="updateByStatus" parameterType="java.lang.Integer">
+  	update business_plan set customer_plan_state=1 where id=#{id};
+  </update>
+
+ <!-- 审批结束的(audit_state = 2),终止(in_application = 3),已上报的(customer_plan_state=50)的轮换计划(execute_type=3156)-->
+  <select id="getAcceptanceList" resultMap="approvalResultMap" parameterType="java.util.Map" >
+    SELECT
+      a.id id,a.plan_number plan_number,a.reference_number reference_number,
+      a.execute_type execute_type,
+      a.customer_plan_state customer_plan_state,
+      a.in_application in_application,
+      detail.grain_kind grain_kind,
+      detail.grain_attribute grain_attribute,
+      detail.grain_annual grain_annual,
+      detail.house_id house_id,
+      detail.warehouse_id warehouse_id,
+      a.create_time create_time,
+      a.process_instance_id process_instance_id,
+      a.process_definition_id process_definition_id,
+      a.plan_title plan_title,
+      acceptance.application_date applicationDate,
+      acceptance.acceptance_type acceptanceType
+    FROM
+      business_plan a
+    LEFT JOIN business_plan_acceptance acceptance ON acceptance.plan_id = a.id
+    LEFT JOIN business_store_ware_detail detail ON detail.zid = a.id
+    <where>
+      a.audit_state = 2 AND a.in_application = 3 AND a.execute_type=3156 AND customer_plan_state=50
+      <if test="planTitle != null">
+        and a.plan_title LIKE CONCAT(CONCAT('%', #{planTitle}), '%')
+      </if>
+      <if test="planNumber != null">
+        and a.plan_number LIKE CONCAT(CONCAT('%', #{planNumber}), '%')
+      </if>
+      order by a.create_time desc
+    </where>
+  </select>
+
+  <insert id="addAcceptance" useGeneratedKeys="true" keyProperty="id"  parameterType="java.util.Map">
+      INSERT INTO business_plan_acceptance (plan_id, application_date, acceptance_number,acceptance_type) VALUES
+      ${sql}
+  </insert>
+
+  <insert id="addAcceptanceDetail" parameterType="java.util.Map">
+      INSERT INTO business_plan_acceptance_detail (acceptance_id, qualitycheck_id) VALUES
+      ${sqlDetail}
+  </insert>
+
+  <select id="getDataByZJId" resultMap="BaseResultMap" parameterType="java.util.Map" >
+    SELECT
+        quality.*,house.storehouse_name storehouseName,warehouse.warehouse_name wareHouseName, acceptance.id acceptanceId
+    FROM
+        business_plan_acceptance acceptance
+    INNER JOIN business_plan_acceptance_detail detail ON detail.acceptance_id = acceptance.id
+    INNER JOIN storage_qualitycheck quality ON quality.id = detail.qualitycheck_id
+    INNER JOIN basic_storehouse house ON house.storehouse_id = quality.house_id
+    INNER JOIN basic_warehouse warehouse ON warehouse.warehouse_id = quality.warehouse_id
+     where acceptance.plan_id = #{id,jdbcType=VARCHAR}
+  </select>
+  
+  
+  <select id="queryAcceptanceList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+    select * from business_plan_acceptance a left join business_plan p on a.plan_id=p.id 
+    <!-- left join business_plan_acceptance_detail pa on pa.acceptance_id = a.id -->
+    <where>
+     p.creater_id = #{userId} and p.org_id = #{orgId}
+    	<if test="planTitle != null">
+          and p.plan_title LIKE CONCAT('%',#{planTitle,jdbcType=VARCHAR},'%')
+         </if>
+        <if test="planNumber != null">
+        and p.plan_number LIKE CONCAT('%',#{planNumber,jdbcType=VARCHAR},'%')
+        </if>     		       
+        <if test="customerPlanState != null">
+        and p.customer_plan_state = #{customerPlanState}
+        </if>
+        order by p.create_time desc
+    </where>
+  </select>
+  
+  <!-- 架空期查询 -->
+   <select id="getjkqPlanList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+	SELECT
+	a.ch,
+	a.hwh,
+	a.wjh
+	FROM
+		lsreport_ts.data_kcgl_fcbgz_default a
+	LEFT JOIN lsreport_ts.data_kcgl_xckc_default b ON a.DataID = b.DataID
+	LEFT JOIN depot.business_delivery_storage_notice c ON b.tzdh = c.bill_number
+	LEFT JOIN depot.business_plan d ON  c.plan_number = d.plan_number
+	<where>
+	<if test="orgId != null">
+	AND d.org_id = #{orgId}
+	</if>
+	<if test="executeType != null">
+	AND d.execute_type = #{executeType}
+	</if>
+	<if test="cjsjA != null and cjsjB != null and cjsjA != '' and cjsjB != ''" >
+	AND a.cjsj between #{cjsjA} and #{cjsjB}
+	</if>
+	<if test="rqA != null and rqB != null and rqA != '' and rqB != ''" >
+	AND a.rq between #{rqA} and #{rqB}
+	</if>
+	</where>
+  </select>
+  <!-- 查询轮换日期 -->
+  <select id="getjkqDayList" parameterType="java.util.Map" resultType="java.util.HashMap" >
+	SELECT
+	distinct
+	a.cjsj AS modifydate,
+	a.ch,
+	a.hwh,
+	a.mxpz,
+	a.hwxz,
+	a.zcsl,
+	SUM(a.srsl) AS srsl,
+	c.bill_number,
+	c.plan_number AS jhbh,
+	(IFNULL(d.customer_plan_state,7))  AS planSp,
+	DATE_FORMAT(DATE_ADD(a.cjsj,INTERVAL 1 DAY),'%Y-%m-%d') AS jkqStart,
+	DATE_FORMAT(DATE_ADD(a.cjsj,INTERVAL 1 DAY),'%Y-%m-%d') AS jkqEnd,
+	a.rq
+	FROM
+		lsreport_ts.data_kcgl_fcbgz_default a
+	LEFT JOIN lsreport_ts.data_kcgl_xckc_default b ON a.DataID = b.DataID
+	LEFT JOIN depot.business_delivery_storage_notice c ON b.tzdh = c.bill_number
+	LEFT JOIN depot.business_plan d ON c.plan_number = d.plan_number
+	<where>
+	<if test="orgId != null">
+	AND d.org_id = #{orgId}
+	</if>
+	<if test="ch != null">
+	AND a.ch = #{ch}
+	</if>
+	<if test="hwh != null">
+	AND a.hwh = #{hwh}
+	</if>
+	<if test="wjh != null">
+	AND c.plan_number = #{wjh}
+	</if>
+	<if test="executeType != null">
+	AND d.execute_type = #{executeType}
+	</if>
+	<if test="cjsjA != null and cjsjB != null and cjsjA != '' and cjsjB != ''" >
+	AND a.cjsj between #{cjsjA} and #{cjsjB}
+	</if>
+	<if test="rqA != null and rqB != null and rqA != '' and rqB != ''" >
+	AND a.rq between #{rqA} and #{rqB}
+	</if>
+	</where>
+	ORDER BY
+	a.rq DESC
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessSceduleMapper.java

@@ -0,0 +1,49 @@
+/*package com.chinaitop.depot.business.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.chinaitop.depot.business.model.BusinessScedule;
+
+
+*//**
+ * 粮库业务管理与出入库系统关联mapper.
+* <p>Title: BusinessSceduleMapper</p>
+* <p>Description: </p>
+* @author yaoyabin
+* @date 2017年11月20日 上午10:58:55
+ *//*
+public interface BusinessSceduleMapper {
+
+    *//**
+     * 通过多个计划id,获取这多个计划的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     *//*
+    List<BusinessScedule> getPlanSceduleInPlanId(@Param("planIds")String planIds);
+    
+    *//**
+     * 通过多个合同id,获取这多个合同的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     *//*
+    List<BusinessScedule> getContractSceduleInContractId(@Param("contractIds")String contractIds);
+    
+    *//**
+     * 通过多个通知单id,获取这多个通知单的出入库类型，出库总数量，入库总数量.
+     * @param planIds
+     * @return
+     *//*
+    List<BusinessScedule> getNoticeSceduleInNoticeId(@Param("noticeIds")String noticeIds);
+
+    *//**
+     * 根据粮库业务管理中出入库通知单id,修改出入库系统中，通知单状态. 
+     * 修改出入库表  data_crkyw_tzdxx_default中tzdh等于 这边的 通知单id获取到DataID 
+     * 通过DataID 链接 fl_bill_relation 修改字段FLOWSTATUS
+     * @param paramMap 通知单id. 通知单状态.
+     *//*
+    void updateNoticeStatus(Map<String, Object> paramMap);
+    
+}*/

src/main/java/com/chinaitop/depot/business/mapper/BusinessSceduleMapper.xml

@@ -0,0 +1,47 @@
+<?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.chinaitop.depot.business.mapper.BusinessSceduleMapper" >
+  <select id="getPlanSceduleInPlanId" parameterType="java.lang.String" resultType="com.chinaitop.depot.business.model.BusinessScedule">
+  	SELECT
+		x.kybgh jhId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		data_kcgl_xckc_default x,
+		data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid
+		and x.kybgh IN ${planIds} GROUP BY x.kybgh, x.cazylx;
+  </select>
+  
+  <select id="getContractSceduleInContractId" parameterType="java.lang.String" resultType="com.chinaitop.depot.business.model.BusinessScedule">
+  	SELECT
+		x.htbh htId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		data_kcgl_xckc_default x,
+		data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid
+		and x.htbh IN ${contractIds} GROUP BY x.htbh, x.cazylx;
+  </select>
+  
+  <select id="getNoticeSceduleInNoticeId" parameterType="java.lang.String" resultType="com.chinaitop.depot.business.model.BusinessScedule">
+  	SELECT
+		x.tzdh tzdId, x.cazylx crkLx, sum(f.srsl) sumRksl, sum(f.zcsl) sumCksl
+	FROM
+		data_kcgl_xckc_default x,
+		data_kcgl_fcbgz_default f
+	WHERE
+		x.DataID = f.stockdataid
+		and x.tzdh IN ${noticeIds} GROUP BY x.tzdh, x.cazylx;
+  </select>
+  
+  <update id="updateNoticeStatus" parameterType="java.util.Map">
+  	UPDATE 
+  		fl_bill_relation 
+  	SET 
+  		FLOWSTATUS = ${FLOWSTATUS}
+	WHERE 
+		DATAID IN (SELECT DataID FROM data_crkyw_tzdxx_default WHERE tzdh = ${tzdh})
+		<!-- 不能修改已经执行完毕的通知单的状态  -->
+		and FLOWSTATUS != 2
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.java

@@ -0,0 +1,69 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.BusinessDeliveryStorageNoticeExample;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetail;
+import com.chinaitop.depot.business.model.BusinessStoreWareDetailExample;
+import com.chinaitop.depot.business.model.vo.BusinessDeliveryStorageNoticeAuditVO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessStoreWareDetailMapper {
+    int countByExample(BusinessStoreWareDetailExample example);
+
+    int deleteByExample(BusinessStoreWareDetailExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessStoreWareDetail record);
+
+    int insertSelective(BusinessStoreWareDetail record);
+
+    List<BusinessStoreWareDetail> selectByExample(BusinessStoreWareDetailExample example);
+
+    BusinessStoreWareDetail selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
+
+    int updateByExample(@Param("record") BusinessStoreWareDetail record, @Param("example") BusinessStoreWareDetailExample example);
+
+    int updateByPrimaryKeySelective(BusinessStoreWareDetail record);
+
+    int updateByPrimaryKey(BusinessStoreWareDetail record);
+    
+    /**
+     * @param paramMap
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> getApprovalList(Map<String, Object> paramMap);
+
+    /**
+     * @param paramMap
+     */
+    void updateApplication(Map<String, Object> paramMap);
+
+    /**
+     * @param example
+     * @return
+     */
+    List<BusinessDeliveryStorageNoticeAuditVO> selectByExampleToVO(
+            BusinessDeliveryStorageNoticeExample example);
+
+    /**
+     * 根据计划ID查询数据计划子表数据中计划的使用数量
+     * 
+     * @param map 参数集合
+     * @return
+     */
+    List<Map<String, Object>> selectPlanUseCount(Map<String, Object> map);
+
+    /**
+     * 根据合同ID查询数据计划子表数据中计划的使用数量
+     * 
+     * @param map 参数集合
+     * @return
+     */
+    List<Map<String, Object>> selectContractUseCount(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.xml

@@ -0,0 +1,575 @@
+<?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.chinaitop.depot.business.mapper.BusinessStoreWareDetailMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="zid" property="zid" jdbcType="INTEGER" />
+    <result column="type" property="type" jdbcType="VARCHAR" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="house_name" property="houseName" jdbcType="VARCHAR" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_name" property="warehouseName" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="grain_kind" property="grainKind" jdbcType="INTEGER" />
+    <result column="grain_detail_kind" property="grainDetailKind" jdbcType="INTEGER" />
+    <result column="grain_grade" property="grainGrade" jdbcType="INTEGER" />
+    <result column="grain_attribute" property="grainAttribute" jdbcType="INTEGER" />
+    <result column="grain_annual" property="grainAnnual" jdbcType="INTEGER" />
+    <result column="grain_producing_area" property="grainProducingArea" jdbcType="INTEGER" />
+    <result column="in_price" property="inPrice" jdbcType="VARCHAR" />
+    <result column="in_count" property="inCount" jdbcType="VARCHAR" />
+    <result column="in_detail_total_price" property="inDetailTotalPrice" jdbcType="VARCHAR" />
+    <result column="input_time" property="inputTime" jdbcType="TIMESTAMP" />
+    <result column="state" property="state" jdbcType="INTEGER" />
+    <result column="productive_year" property="productiveYear" jdbcType="INTEGER" />
+    <result column="remaining_number" property="remainingNumber" jdbcType="VARCHAR" />
+    <result column="out_price" property="outPrice" jdbcType="VARCHAR" />
+    <result column="out_count" property="outCount" jdbcType="VARCHAR" />
+    <result column="out_detail_total_price" property="outDetailTotalPrice" jdbcType="VARCHAR" />
+    <result column="out_remaining_number" property="outRemainingNumber" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    id, zid, type, house_id, house_name, warehouse_id, warehouse_name, create_time, org_id, 
+    grain_kind, grain_detail_kind, grain_grade, grain_attribute, grain_annual, grain_producing_area, 
+    in_price, in_count, in_detail_total_price, input_time, state, productive_year, remaining_number, 
+    out_price, out_count, out_detail_total_price, out_remaining_number
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from business_store_ware_detail
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_store_ware_detail
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" >
+    delete from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    insert into business_store_ware_detail (id, zid, type, 
+      house_id, house_name, warehouse_id, 
+      warehouse_name, create_time, org_id, 
+      grain_kind, grain_detail_kind, grain_grade, 
+      grain_attribute, grain_annual, grain_producing_area, 
+      in_price, in_count, in_detail_total_price, 
+      input_time, state, productive_year, 
+      remaining_number, out_price, out_count, 
+      out_detail_total_price, out_remaining_number
+      )
+    values (#{id,jdbcType=INTEGER}, #{zid,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, 
+      #{houseId,jdbcType=INTEGER}, #{houseName,jdbcType=VARCHAR}, #{warehouseId,jdbcType=INTEGER}, 
+      #{warehouseName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, 
+      #{grainKind,jdbcType=INTEGER}, #{grainDetailKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
+      #{grainAttribute,jdbcType=INTEGER}, #{grainAnnual,jdbcType=INTEGER}, #{grainProducingArea,jdbcType=INTEGER}, 
+      #{inPrice,jdbcType=VARCHAR}, #{inCount,jdbcType=VARCHAR}, #{inDetailTotalPrice,jdbcType=VARCHAR}, 
+      #{inputTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{productiveYear,jdbcType=INTEGER}, 
+      #{remainingNumber,jdbcType=VARCHAR}, #{outPrice,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR}, 
+      #{outDetailTotalPrice,jdbcType=VARCHAR}, #{outRemainingNumber,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    insert into business_store_ware_detail
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="zid != null" >
+        zid,
+      </if>
+      <if test="type != null" >
+        type,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="houseName != null" >
+        house_name,
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id,
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="grainKind != null" >
+        grain_kind,
+      </if>
+      <if test="grainDetailKind != null" >
+        grain_detail_kind,
+      </if>
+      <if test="grainGrade != null" >
+        grain_grade,
+      </if>
+      <if test="grainAttribute != null" >
+        grain_attribute,
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual,
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area,
+      </if>
+      <if test="inPrice != null" >
+        in_price,
+      </if>
+      <if test="inCount != null" >
+        in_count,
+      </if>
+      <if test="inDetailTotalPrice != null" >
+        in_detail_total_price,
+      </if>
+      <if test="inputTime != null" >
+        input_time,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+      <if test="productiveYear != null" >
+        productive_year,
+      </if>
+      <if test="remainingNumber != null" >
+        remaining_number,
+      </if>
+      <if test="outPrice != null" >
+        out_price,
+      </if>
+      <if test="outCount != null" >
+        out_count,
+      </if>
+      <if test="outDetailTotalPrice != null" >
+        out_detail_total_price,
+      </if>
+      <if test="outRemainingNumber != null" >
+        out_remaining_number,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="zid != null" >
+        #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="grainKind != null" >
+        #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainDetailKind != null" >
+        #{grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainGrade != null" >
+        #{grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="grainAttribute != null" >
+        #{grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="grainAnnual != null" >
+        #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        #{grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="inPrice != null" >
+        #{inPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inCount != null" >
+        #{inCount,jdbcType=VARCHAR},
+      </if>
+      <if test="inDetailTotalPrice != null" >
+        #{inDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=INTEGER},
+      </if>
+      <if test="productiveYear != null" >
+        #{productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="remainingNumber != null" >
+        #{remainingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="outPrice != null" >
+        #{outPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="outCount != null" >
+        #{outCount,jdbcType=VARCHAR},
+      </if>
+      <if test="outDetailTotalPrice != null" >
+        #{outDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="outRemainingNumber != null" >
+        #{outRemainingNumber,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetailExample" resultType="java.lang.Integer" >
+    select count(*) from business_store_ware_detail
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_store_ware_detail
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.zid != null" >
+        zid = #{record.zid,jdbcType=INTEGER},
+      </if>
+      <if test="record.type != null" >
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseName != null" >
+        house_name = #{record.houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseName != null" >
+        warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainKind != null" >
+        grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainDetailKind != null" >
+        grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainGrade != null" >
+        grain_grade = #{record.grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainAttribute != null" >
+        grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainAnnual != null" >
+        grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainProducingArea != null" >
+        grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="record.inPrice != null" >
+        in_price = #{record.inPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inCount != null" >
+        in_count = #{record.inCount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inDetailTotalPrice != null" >
+        in_detail_total_price = #{record.inDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputTime != null" >
+        input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.state != null" >
+        state = #{record.state,jdbcType=INTEGER},
+      </if>
+      <if test="record.productiveYear != null" >
+        productive_year = #{record.productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="record.remainingNumber != null" >
+        remaining_number = #{record.remainingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outPrice != null" >
+        out_price = #{record.outPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outCount != null" >
+        out_count = #{record.outCount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outDetailTotalPrice != null" >
+        out_detail_total_price = #{record.outDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outRemainingNumber != null" >
+        out_remaining_number = #{record.outRemainingNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_store_ware_detail
+    set id = #{record.id,jdbcType=INTEGER},
+      zid = #{record.zid,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      house_name = #{record.houseName,jdbcType=VARCHAR},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{record.warehouseName,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      grain_kind = #{record.grainKind,jdbcType=INTEGER},
+      grain_detail_kind = #{record.grainDetailKind,jdbcType=INTEGER},
+      grain_grade = #{record.grainGrade,jdbcType=INTEGER},
+      grain_attribute = #{record.grainAttribute,jdbcType=INTEGER},
+      grain_annual = #{record.grainAnnual,jdbcType=INTEGER},
+      grain_producing_area = #{record.grainProducingArea,jdbcType=INTEGER},
+      in_price = #{record.inPrice,jdbcType=VARCHAR},
+      in_count = #{record.inCount,jdbcType=VARCHAR},
+      in_detail_total_price = #{record.inDetailTotalPrice,jdbcType=VARCHAR},
+      input_time = #{record.inputTime,jdbcType=TIMESTAMP},
+      state = #{record.state,jdbcType=INTEGER},
+      productive_year = #{record.productiveYear,jdbcType=INTEGER},
+      remaining_number = #{record.remainingNumber,jdbcType=VARCHAR},
+      out_price = #{record.outPrice,jdbcType=VARCHAR},
+      out_count = #{record.outCount,jdbcType=VARCHAR},
+      out_detail_total_price = #{record.outDetailTotalPrice,jdbcType=VARCHAR},
+      out_remaining_number = #{record.outRemainingNumber,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    update business_store_ware_detail
+    <set >
+      <if test="zid != null" >
+        zid = #{zid,jdbcType=INTEGER},
+      </if>
+      <if test="type != null" >
+        type = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="houseName != null" >
+        house_name = #{houseName,jdbcType=VARCHAR},
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseName != null" >
+        warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="grainKind != null" >
+        grain_kind = #{grainKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainDetailKind != null" >
+        grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
+      </if>
+      <if test="grainGrade != null" >
+        grain_grade = #{grainGrade,jdbcType=INTEGER},
+      </if>
+      <if test="grainAttribute != null" >
+        grain_attribute = #{grainAttribute,jdbcType=INTEGER},
+      </if>
+      <if test="grainAnnual != null" >
+        grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      </if>
+      <if test="grainProducingArea != null" >
+        grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      </if>
+      <if test="inPrice != null" >
+        in_price = #{inPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inCount != null" >
+        in_count = #{inCount,jdbcType=VARCHAR},
+      </if>
+      <if test="inDetailTotalPrice != null" >
+        in_detail_total_price = #{inDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="inputTime != null" >
+        input_time = #{inputTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=INTEGER},
+      </if>
+      <if test="productiveYear != null" >
+        productive_year = #{productiveYear,jdbcType=INTEGER},
+      </if>
+      <if test="remainingNumber != null" >
+        remaining_number = #{remainingNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="outPrice != null" >
+        out_price = #{outPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="outCount != null" >
+        out_count = #{outCount,jdbcType=VARCHAR},
+      </if>
+      <if test="outDetailTotalPrice != null" >
+        out_detail_total_price = #{outDetailTotalPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="outRemainingNumber != null" >
+        out_remaining_number = #{outRemainingNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.BusinessStoreWareDetail" >
+    update business_store_ware_detail
+    set zid = #{zid,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
+      house_id = #{houseId,jdbcType=INTEGER},
+      house_name = #{houseName,jdbcType=VARCHAR},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      warehouse_name = #{warehouseName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      grain_kind = #{grainKind,jdbcType=INTEGER},
+      grain_detail_kind = #{grainDetailKind,jdbcType=INTEGER},
+      grain_grade = #{grainGrade,jdbcType=INTEGER},
+      grain_attribute = #{grainAttribute,jdbcType=INTEGER},
+      grain_annual = #{grainAnnual,jdbcType=INTEGER},
+      grain_producing_area = #{grainProducingArea,jdbcType=INTEGER},
+      in_price = #{inPrice,jdbcType=VARCHAR},
+      in_count = #{inCount,jdbcType=VARCHAR},
+      in_detail_total_price = #{inDetailTotalPrice,jdbcType=VARCHAR},
+      input_time = #{inputTime,jdbcType=TIMESTAMP},
+      state = #{state,jdbcType=INTEGER},
+      productive_year = #{productiveYear,jdbcType=INTEGER},
+      remaining_number = #{remainingNumber,jdbcType=VARCHAR},
+      out_price = #{outPrice,jdbcType=VARCHAR},
+      out_count = #{outCount,jdbcType=VARCHAR},
+      out_detail_total_price = #{outDetailTotalPrice,jdbcType=VARCHAR},
+      out_remaining_number = #{outRemainingNumber,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <!-- 通过计划ID获取计划子表数据的已使用数量 -->
+  <select id="selectPlanUseCount" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT detail.plan_id, detail.id, detail.house_id,detail.warehouse_id, SUM(detail.in_count) in_count, SUM(detail.out_count) out_count FROM (
+	SELECT c.id plan_id, a.id, a.house_id,a.warehouse_id,a.in_count,a.out_count FROM business_store_ware_detail a
+	LEFT JOIN business_contract b on b.id=a.zid
+	LEFT JOIN business_plan c on c.id=b.plan_bid
+	WHERE 1=1 AND a.type='contract' AND b.audit_state!=4 AND b.changing=0
+	UNION
+	SELECT c.id plan_id, a.id, a.house_id,a.warehouse_id,a.in_count,a.out_count FROM business_store_ware_detail a
+	LEFT JOIN business_delivery_storage_notice b on b.id=a.zid
+	LEFT JOIN business_plan c on c.id=b.plan_bid
+	WHERE 1=1 AND a.type='notice' AND b.audit_state!=4 AND IFNULL(b.contract_bid, 0)=0 
+	) detail
+	WHERE detail.plan_id=#{plan_id}
+	GROUP BY detail.plan_id,detail.house_id,detail.warehouse_id
+	ORDER BY detail.id;
+  </select>
+  <!-- 通过合同ID获取合同子表数据的已使用数量 -->
+  <select id="selectContractUseCount" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT detail.contract_id, detail.id, detail.house_id,detail.warehouse_id, SUM(detail.in_count) in_count, SUM(detail.out_count) out_count FROM 
+	(
+	SELECT c.id contract_id,a.id, a.house_id,a.warehouse_id,a.in_count,a.out_count FROM business_store_ware_detail a
+	LEFT JOIN business_delivery_storage_notice b on b.id=a.zid
+	LEFT JOIN business_contract c ON c.id=b.contract_bid
+	WHERE 1=1 AND a.type='notice' AND b.audit_state!=4
+	) detail
+	WHERE detail.contract_id=#{contract_id} 
+	GROUP BY detail.contract_id,detail.house_id,detail.warehouse_id
+	ORDER BY detail.id
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/OrgInfoMapper.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.OrgInfo;
+import com.chinaitop.depot.business.model.OrgInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrgInfoMapper {
+    int countByExample(OrgInfoExample example);
+
+    int deleteByExample(OrgInfoExample example);
+
+    int deleteByPrimaryKey(Integer orgId);
+
+    int insert(OrgInfo record);
+
+    int insertSelective(OrgInfo record);
+
+    List<OrgInfo> selectByExample(OrgInfoExample example);
+
+    OrgInfo selectByPrimaryKey(Integer orgId);
+
+    int updateByExampleSelective(@Param("record") OrgInfo record, @Param("example") OrgInfoExample example);
+
+    int updateByExample(@Param("record") OrgInfo record, @Param("example") OrgInfoExample example);
+
+    int updateByPrimaryKeySelective(OrgInfo record);
+
+    int updateByPrimaryKey(OrgInfo record);
+}

src/main/java/com/chinaitop/depot/business/mapper/OrgInfoMapper.xml

@@ -0,0 +1,845 @@
+<?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.chinaitop.depot.business.mapper.OrgInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.OrgInfo" >
+    <id column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="org_name" property="orgName" jdbcType="VARCHAR" />
+    <result column="short_name" property="shortName" jdbcType="VARCHAR" />
+    <result column="org_code" property="orgCode" jdbcType="VARCHAR" />
+    <result column="org_class_id" property="orgClassId" jdbcType="INTEGER" />
+    <result column="company_nature" property="companyNature" jdbcType="INTEGER" />
+    <result column="busi_type" property="busiType" jdbcType="INTEGER" />
+    <result column="address" property="address" jdbcType="VARCHAR" />
+    <result column="contact" property="contact" jdbcType="VARCHAR" />
+    <result column="fax" property="fax" jdbcType="VARCHAR" />
+    <result column="charge_person" property="chargePerson" jdbcType="VARCHAR" />
+    <result column="longitude" property="longitude" jdbcType="VARCHAR" />
+    <result column="latitude" property="latitude" jdbcType="VARCHAR" />
+    <result column="regist_capital" property="registCapital" jdbcType="INTEGER" />
+    <result column="work_number" property="workNumber" jdbcType="INTEGER" />
+    <result column="area_code" property="areaCode" jdbcType="INTEGER" />
+    <result column="area_name" property="areaName" jdbcType="VARCHAR" />
+    <result column="post" property="post" jdbcType="INTEGER" />
+    <result column="depot_class" property="depotClass" jdbcType="INTEGER" />
+    <result column="design_capacity" property="designCapacity" jdbcType="INTEGER" />
+    <result column="effective_capacity" property="effectiveCapacity" jdbcType="INTEGER" />
+    <result column="depot_area" property="depotArea" jdbcType="REAL" />
+    <result column="complete_date" property="completeDate" jdbcType="TIMESTAMP" />
+    <result column="use_date" property="useDate" jdbcType="TIMESTAMP" />
+    <result column="company_org_code" property="companyOrgCode" jdbcType="VARCHAR" />
+    <result column="credit_code" property="creditCode" jdbcType="VARCHAR" />
+    <result column="regist_type" property="registType" jdbcType="INTEGER" />
+    <result column="qualification" property="qualification" jdbcType="INTEGER" />
+    <result column="independent_corporation" property="independentCorporation" jdbcType="INTEGER" />
+    <result column="legal_person" property="legalPerson" jdbcType="VARCHAR" />
+    <result column="whether_rent" property="whetherRent" jdbcType="INTEGER" />
+    <result column="info_regist" property="infoRegist" jdbcType="VARCHAR" />
+    <result column="regist_date" property="registDate" jdbcType="TIMESTAMP" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="status" property="status" jdbcType="INTEGER" />
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
+    <result column="birds_eye" property="birdsEye" jdbcType="VARCHAR" />
+    <result column="birds_Remote" property="birdsRemote" jdbcType="VARCHAR" />
+    <result column="brief_introduction" property="briefIntroduction" jdbcType="VARCHAR" />
+    <result column="invoice_title" property="invoiceTitle" jdbcType="VARCHAR" />
+    <result column="regist_number" property="registNumber" jdbcType="VARCHAR" />
+    <result column="bank_name" property="bankName" jdbcType="VARCHAR" />
+    <result column="account_name" property="accountName" jdbcType="VARCHAR" />
+    <result column="account_number" property="accountNumber" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    org_id, org_name, short_name, org_code, org_class_id, company_nature, busi_type, 
+    address, contact, fax, charge_person, longitude, latitude, regist_capital, work_number, 
+    area_code, area_name, post, depot_class, design_capacity, effective_capacity, depot_area, 
+    complete_date, use_date, company_org_code, credit_code, regist_type, qualification, 
+    independent_corporation, legal_person, whether_rent, info_regist, regist_date, remark, 
+    parent_id, status, del_flag, birds_eye, birds_Remote, brief_introduction, invoice_title, 
+    regist_number, bank_name, account_name, account_number
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.OrgInfoExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from org_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from org_info
+    where org_id = #{orgId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from org_info
+    where org_id = #{orgId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.OrgInfoExample" >
+    delete from org_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.OrgInfo" >
+    insert into org_info (org_id, org_name, short_name, 
+      org_code, org_class_id, company_nature, 
+      busi_type, address, contact, 
+      fax, charge_person, longitude, 
+      latitude, regist_capital, work_number, 
+      area_code, area_name, post, 
+      depot_class, design_capacity, effective_capacity, 
+      depot_area, complete_date, use_date, 
+      company_org_code, credit_code, regist_type, 
+      qualification, independent_corporation, 
+      legal_person, whether_rent, info_regist, 
+      regist_date, remark, parent_id, 
+      status, del_flag, birds_eye, 
+      birds_Remote, brief_introduction, invoice_title, 
+      regist_number, bank_name, account_name, 
+      account_number)
+    values (#{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, 
+      #{orgCode,jdbcType=VARCHAR}, #{orgClassId,jdbcType=INTEGER}, #{companyNature,jdbcType=INTEGER}, 
+      #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
+      #{fax,jdbcType=VARCHAR}, #{chargePerson,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
+      #{latitude,jdbcType=VARCHAR}, #{registCapital,jdbcType=INTEGER}, #{workNumber,jdbcType=INTEGER}, 
+      #{areaCode,jdbcType=INTEGER}, #{areaName,jdbcType=VARCHAR}, #{post,jdbcType=INTEGER}, 
+      #{depotClass,jdbcType=INTEGER}, #{designCapacity,jdbcType=INTEGER}, #{effectiveCapacity,jdbcType=INTEGER}, 
+      #{depotArea,jdbcType=REAL}, #{completeDate,jdbcType=TIMESTAMP}, #{useDate,jdbcType=TIMESTAMP}, 
+      #{companyOrgCode,jdbcType=VARCHAR}, #{creditCode,jdbcType=VARCHAR}, #{registType,jdbcType=INTEGER}, 
+      #{qualification,jdbcType=INTEGER}, #{independentCorporation,jdbcType=INTEGER}, 
+      #{legalPerson,jdbcType=VARCHAR}, #{whetherRent,jdbcType=INTEGER}, #{infoRegist,jdbcType=VARCHAR}, 
+      #{registDate,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
+      #{status,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{birdsEye,jdbcType=VARCHAR}, 
+      #{birdsRemote,jdbcType=VARCHAR}, #{briefIntroduction,jdbcType=VARCHAR}, #{invoiceTitle,jdbcType=VARCHAR}, 
+      #{registNumber,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR}, 
+      #{accountNumber,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.OrgInfo" >
+    insert into org_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="orgName != null" >
+        org_name,
+      </if>
+      <if test="shortName != null" >
+        short_name,
+      </if>
+      <if test="orgCode != null" >
+        org_code,
+      </if>
+      <if test="orgClassId != null" >
+        org_class_id,
+      </if>
+      <if test="companyNature != null" >
+        company_nature,
+      </if>
+      <if test="busiType != null" >
+        busi_type,
+      </if>
+      <if test="address != null" >
+        address,
+      </if>
+      <if test="contact != null" >
+        contact,
+      </if>
+      <if test="fax != null" >
+        fax,
+      </if>
+      <if test="chargePerson != null" >
+        charge_person,
+      </if>
+      <if test="longitude != null" >
+        longitude,
+      </if>
+      <if test="latitude != null" >
+        latitude,
+      </if>
+      <if test="registCapital != null" >
+        regist_capital,
+      </if>
+      <if test="workNumber != null" >
+        work_number,
+      </if>
+      <if test="areaCode != null" >
+        area_code,
+      </if>
+      <if test="areaName != null" >
+        area_name,
+      </if>
+      <if test="post != null" >
+        post,
+      </if>
+      <if test="depotClass != null" >
+        depot_class,
+      </if>
+      <if test="designCapacity != null" >
+        design_capacity,
+      </if>
+      <if test="effectiveCapacity != null" >
+        effective_capacity,
+      </if>
+      <if test="depotArea != null" >
+        depot_area,
+      </if>
+      <if test="completeDate != null" >
+        complete_date,
+      </if>
+      <if test="useDate != null" >
+        use_date,
+      </if>
+      <if test="companyOrgCode != null" >
+        company_org_code,
+      </if>
+      <if test="creditCode != null" >
+        credit_code,
+      </if>
+      <if test="registType != null" >
+        regist_type,
+      </if>
+      <if test="qualification != null" >
+        qualification,
+      </if>
+      <if test="independentCorporation != null" >
+        independent_corporation,
+      </if>
+      <if test="legalPerson != null" >
+        legal_person,
+      </if>
+      <if test="whetherRent != null" >
+        whether_rent,
+      </if>
+      <if test="infoRegist != null" >
+        info_regist,
+      </if>
+      <if test="registDate != null" >
+        regist_date,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="status != null" >
+        status,
+      </if>
+      <if test="delFlag != null" >
+        del_flag,
+      </if>
+      <if test="birdsEye != null" >
+        birds_eye,
+      </if>
+      <if test="birdsRemote != null" >
+        birds_Remote,
+      </if>
+      <if test="briefIntroduction != null" >
+        brief_introduction,
+      </if>
+      <if test="invoiceTitle != null" >
+        invoice_title,
+      </if>
+      <if test="registNumber != null" >
+        regist_number,
+      </if>
+      <if test="bankName != null" >
+        bank_name,
+      </if>
+      <if test="accountName != null" >
+        account_name,
+      </if>
+      <if test="accountNumber != null" >
+        account_number,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="orgName != null" >
+        #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="shortName != null" >
+        #{shortName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null" >
+        #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="orgClassId != null" >
+        #{orgClassId,jdbcType=INTEGER},
+      </if>
+      <if test="companyNature != null" >
+        #{companyNature,jdbcType=INTEGER},
+      </if>
+      <if test="busiType != null" >
+        #{busiType,jdbcType=INTEGER},
+      </if>
+      <if test="address != null" >
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="contact != null" >
+        #{contact,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null" >
+        #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="chargePerson != null" >
+        #{chargePerson,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="registCapital != null" >
+        #{registCapital,jdbcType=INTEGER},
+      </if>
+      <if test="workNumber != null" >
+        #{workNumber,jdbcType=INTEGER},
+      </if>
+      <if test="areaCode != null" >
+        #{areaCode,jdbcType=INTEGER},
+      </if>
+      <if test="areaName != null" >
+        #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="post != null" >
+        #{post,jdbcType=INTEGER},
+      </if>
+      <if test="depotClass != null" >
+        #{depotClass,jdbcType=INTEGER},
+      </if>
+      <if test="designCapacity != null" >
+        #{designCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCapacity != null" >
+        #{effectiveCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="depotArea != null" >
+        #{depotArea,jdbcType=REAL},
+      </if>
+      <if test="completeDate != null" >
+        #{completeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="useDate != null" >
+        #{useDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyOrgCode != null" >
+        #{companyOrgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registType != null" >
+        #{registType,jdbcType=INTEGER},
+      </if>
+      <if test="qualification != null" >
+        #{qualification,jdbcType=INTEGER},
+      </if>
+      <if test="independentCorporation != null" >
+        #{independentCorporation,jdbcType=INTEGER},
+      </if>
+      <if test="legalPerson != null" >
+        #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="whetherRent != null" >
+        #{whetherRent,jdbcType=INTEGER},
+      </if>
+      <if test="infoRegist != null" >
+        #{infoRegist,jdbcType=VARCHAR},
+      </if>
+      <if test="registDate != null" >
+        #{registDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="birdsEye != null" >
+        #{birdsEye,jdbcType=VARCHAR},
+      </if>
+      <if test="birdsRemote != null" >
+        #{birdsRemote,jdbcType=VARCHAR},
+      </if>
+      <if test="briefIntroduction != null" >
+        #{briefIntroduction,jdbcType=VARCHAR},
+      </if>
+      <if test="invoiceTitle != null" >
+        #{invoiceTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="registNumber != null" >
+        #{registNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null" >
+        #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="accountName != null" >
+        #{accountName,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        #{accountNumber,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.OrgInfoExample" resultType="java.lang.Integer" >
+    select count(*) from org_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update org_info
+    <set >
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgName != null" >
+        org_name = #{record.orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shortName != null" >
+        short_name = #{record.shortName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgCode != null" >
+        org_code = #{record.orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgClassId != null" >
+        org_class_id = #{record.orgClassId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyNature != null" >
+        company_nature = #{record.companyNature,jdbcType=INTEGER},
+      </if>
+      <if test="record.busiType != null" >
+        busi_type = #{record.busiType,jdbcType=INTEGER},
+      </if>
+      <if test="record.address != null" >
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contact != null" >
+        contact = #{record.contact,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fax != null" >
+        fax = #{record.fax,jdbcType=VARCHAR},
+      </if>
+      <if test="record.chargePerson != null" >
+        charge_person = #{record.chargePerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.longitude != null" >
+        longitude = #{record.longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.latitude != null" >
+        latitude = #{record.latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="record.registCapital != null" >
+        regist_capital = #{record.registCapital,jdbcType=INTEGER},
+      </if>
+      <if test="record.workNumber != null" >
+        work_number = #{record.workNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.areaCode != null" >
+        area_code = #{record.areaCode,jdbcType=INTEGER},
+      </if>
+      <if test="record.areaName != null" >
+        area_name = #{record.areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.post != null" >
+        post = #{record.post,jdbcType=INTEGER},
+      </if>
+      <if test="record.depotClass != null" >
+        depot_class = #{record.depotClass,jdbcType=INTEGER},
+      </if>
+      <if test="record.designCapacity != null" >
+        design_capacity = #{record.designCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="record.effectiveCapacity != null" >
+        effective_capacity = #{record.effectiveCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="record.depotArea != null" >
+        depot_area = #{record.depotArea,jdbcType=REAL},
+      </if>
+      <if test="record.completeDate != null" >
+        complete_date = #{record.completeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.useDate != null" >
+        use_date = #{record.useDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.companyOrgCode != null" >
+        company_org_code = #{record.companyOrgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creditCode != null" >
+        credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.registType != null" >
+        regist_type = #{record.registType,jdbcType=INTEGER},
+      </if>
+      <if test="record.qualification != null" >
+        qualification = #{record.qualification,jdbcType=INTEGER},
+      </if>
+      <if test="record.independentCorporation != null" >
+        independent_corporation = #{record.independentCorporation,jdbcType=INTEGER},
+      </if>
+      <if test="record.legalPerson != null" >
+        legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.whetherRent != null" >
+        whether_rent = #{record.whetherRent,jdbcType=INTEGER},
+      </if>
+      <if test="record.infoRegist != null" >
+        info_regist = #{record.infoRegist,jdbcType=VARCHAR},
+      </if>
+      <if test="record.registDate != null" >
+        regist_date = #{record.registDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentId != null" >
+        parent_id = #{record.parentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null" >
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null" >
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.birdsEye != null" >
+        birds_eye = #{record.birdsEye,jdbcType=VARCHAR},
+      </if>
+      <if test="record.birdsRemote != null" >
+        birds_Remote = #{record.birdsRemote,jdbcType=VARCHAR},
+      </if>
+      <if test="record.briefIntroduction != null" >
+        brief_introduction = #{record.briefIntroduction,jdbcType=VARCHAR},
+      </if>
+      <if test="record.invoiceTitle != null" >
+        invoice_title = #{record.invoiceTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.registNumber != null" >
+        regist_number = #{record.registNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bankName != null" >
+        bank_name = #{record.bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountName != null" >
+        account_name = #{record.accountName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountNumber != null" >
+        account_number = #{record.accountNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update org_info
+    set org_id = #{record.orgId,jdbcType=INTEGER},
+      org_name = #{record.orgName,jdbcType=VARCHAR},
+      short_name = #{record.shortName,jdbcType=VARCHAR},
+      org_code = #{record.orgCode,jdbcType=VARCHAR},
+      org_class_id = #{record.orgClassId,jdbcType=INTEGER},
+      company_nature = #{record.companyNature,jdbcType=INTEGER},
+      busi_type = #{record.busiType,jdbcType=INTEGER},
+      address = #{record.address,jdbcType=VARCHAR},
+      contact = #{record.contact,jdbcType=VARCHAR},
+      fax = #{record.fax,jdbcType=VARCHAR},
+      charge_person = #{record.chargePerson,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      regist_capital = #{record.registCapital,jdbcType=INTEGER},
+      work_number = #{record.workNumber,jdbcType=INTEGER},
+      area_code = #{record.areaCode,jdbcType=INTEGER},
+      area_name = #{record.areaName,jdbcType=VARCHAR},
+      post = #{record.post,jdbcType=INTEGER},
+      depot_class = #{record.depotClass,jdbcType=INTEGER},
+      design_capacity = #{record.designCapacity,jdbcType=INTEGER},
+      effective_capacity = #{record.effectiveCapacity,jdbcType=INTEGER},
+      depot_area = #{record.depotArea,jdbcType=REAL},
+      complete_date = #{record.completeDate,jdbcType=TIMESTAMP},
+      use_date = #{record.useDate,jdbcType=TIMESTAMP},
+      company_org_code = #{record.companyOrgCode,jdbcType=VARCHAR},
+      credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      regist_type = #{record.registType,jdbcType=INTEGER},
+      qualification = #{record.qualification,jdbcType=INTEGER},
+      independent_corporation = #{record.independentCorporation,jdbcType=INTEGER},
+      legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      whether_rent = #{record.whetherRent,jdbcType=INTEGER},
+      info_regist = #{record.infoRegist,jdbcType=VARCHAR},
+      regist_date = #{record.registDate,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      parent_id = #{record.parentId,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      birds_eye = #{record.birdsEye,jdbcType=VARCHAR},
+      birds_Remote = #{record.birdsRemote,jdbcType=VARCHAR},
+      brief_introduction = #{record.briefIntroduction,jdbcType=VARCHAR},
+      invoice_title = #{record.invoiceTitle,jdbcType=VARCHAR},
+      regist_number = #{record.registNumber,jdbcType=VARCHAR},
+      bank_name = #{record.bankName,jdbcType=VARCHAR},
+      account_name = #{record.accountName,jdbcType=VARCHAR},
+      account_number = #{record.accountNumber,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.OrgInfo" >
+    update org_info
+    <set >
+      <if test="orgName != null" >
+        org_name = #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="shortName != null" >
+        short_name = #{shortName,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null" >
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="orgClassId != null" >
+        org_class_id = #{orgClassId,jdbcType=INTEGER},
+      </if>
+      <if test="companyNature != null" >
+        company_nature = #{companyNature,jdbcType=INTEGER},
+      </if>
+      <if test="busiType != null" >
+        busi_type = #{busiType,jdbcType=INTEGER},
+      </if>
+      <if test="address != null" >
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="contact != null" >
+        contact = #{contact,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null" >
+        fax = #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="chargePerson != null" >
+        charge_person = #{chargePerson,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        longitude = #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        latitude = #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="registCapital != null" >
+        regist_capital = #{registCapital,jdbcType=INTEGER},
+      </if>
+      <if test="workNumber != null" >
+        work_number = #{workNumber,jdbcType=INTEGER},
+      </if>
+      <if test="areaCode != null" >
+        area_code = #{areaCode,jdbcType=INTEGER},
+      </if>
+      <if test="areaName != null" >
+        area_name = #{areaName,jdbcType=VARCHAR},
+      </if>
+      <if test="post != null" >
+        post = #{post,jdbcType=INTEGER},
+      </if>
+      <if test="depotClass != null" >
+        depot_class = #{depotClass,jdbcType=INTEGER},
+      </if>
+      <if test="designCapacity != null" >
+        design_capacity = #{designCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="effectiveCapacity != null" >
+        effective_capacity = #{effectiveCapacity,jdbcType=INTEGER},
+      </if>
+      <if test="depotArea != null" >
+        depot_area = #{depotArea,jdbcType=REAL},
+      </if>
+      <if test="completeDate != null" >
+        complete_date = #{completeDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="useDate != null" >
+        use_date = #{useDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyOrgCode != null" >
+        company_org_code = #{companyOrgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        credit_code = #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="registType != null" >
+        regist_type = #{registType,jdbcType=INTEGER},
+      </if>
+      <if test="qualification != null" >
+        qualification = #{qualification,jdbcType=INTEGER},
+      </if>
+      <if test="independentCorporation != null" >
+        independent_corporation = #{independentCorporation,jdbcType=INTEGER},
+      </if>
+      <if test="legalPerson != null" >
+        legal_person = #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="whetherRent != null" >
+        whether_rent = #{whetherRent,jdbcType=INTEGER},
+      </if>
+      <if test="infoRegist != null" >
+        info_regist = #{infoRegist,jdbcType=VARCHAR},
+      </if>
+      <if test="registDate != null" >
+        regist_date = #{registDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null" >
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="birdsEye != null" >
+        birds_eye = #{birdsEye,jdbcType=VARCHAR},
+      </if>
+      <if test="birdsRemote != null" >
+        birds_Remote = #{birdsRemote,jdbcType=VARCHAR},
+      </if>
+      <if test="briefIntroduction != null" >
+        brief_introduction = #{briefIntroduction,jdbcType=VARCHAR},
+      </if>
+      <if test="invoiceTitle != null" >
+        invoice_title = #{invoiceTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="registNumber != null" >
+        regist_number = #{registNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="bankName != null" >
+        bank_name = #{bankName,jdbcType=VARCHAR},
+      </if>
+      <if test="accountName != null" >
+        account_name = #{accountName,jdbcType=VARCHAR},
+      </if>
+      <if test="accountNumber != null" >
+        account_number = #{accountNumber,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where org_id = #{orgId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.OrgInfo" >
+    update org_info
+    set org_name = #{orgName,jdbcType=VARCHAR},
+      short_name = #{shortName,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      org_class_id = #{orgClassId,jdbcType=INTEGER},
+      company_nature = #{companyNature,jdbcType=INTEGER},
+      busi_type = #{busiType,jdbcType=INTEGER},
+      address = #{address,jdbcType=VARCHAR},
+      contact = #{contact,jdbcType=VARCHAR},
+      fax = #{fax,jdbcType=VARCHAR},
+      charge_person = #{chargePerson,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      regist_capital = #{registCapital,jdbcType=INTEGER},
+      work_number = #{workNumber,jdbcType=INTEGER},
+      area_code = #{areaCode,jdbcType=INTEGER},
+      area_name = #{areaName,jdbcType=VARCHAR},
+      post = #{post,jdbcType=INTEGER},
+      depot_class = #{depotClass,jdbcType=INTEGER},
+      design_capacity = #{designCapacity,jdbcType=INTEGER},
+      effective_capacity = #{effectiveCapacity,jdbcType=INTEGER},
+      depot_area = #{depotArea,jdbcType=REAL},
+      complete_date = #{completeDate,jdbcType=TIMESTAMP},
+      use_date = #{useDate,jdbcType=TIMESTAMP},
+      company_org_code = #{companyOrgCode,jdbcType=VARCHAR},
+      credit_code = #{creditCode,jdbcType=VARCHAR},
+      regist_type = #{registType,jdbcType=INTEGER},
+      qualification = #{qualification,jdbcType=INTEGER},
+      independent_corporation = #{independentCorporation,jdbcType=INTEGER},
+      legal_person = #{legalPerson,jdbcType=VARCHAR},
+      whether_rent = #{whetherRent,jdbcType=INTEGER},
+      info_regist = #{infoRegist,jdbcType=VARCHAR},
+      regist_date = #{registDate,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      birds_eye = #{birdsEye,jdbcType=VARCHAR},
+      birds_Remote = #{birdsRemote,jdbcType=VARCHAR},
+      brief_introduction = #{briefIntroduction,jdbcType=VARCHAR},
+      invoice_title = #{invoiceTitle,jdbcType=VARCHAR},
+      regist_number = #{registNumber,jdbcType=VARCHAR},
+      bank_name = #{bankName,jdbcType=VARCHAR},
+      account_name = #{accountName,jdbcType=VARCHAR},
+      account_number = #{accountNumber,jdbcType=VARCHAR}
+    where org_id = #{orgId,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/RoleInfoMapper.java

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.RoleInfo;
+import com.chinaitop.depot.business.model.RoleInfoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface RoleInfoMapper {
+    int countByExample(RoleInfoExample example);
+
+    int deleteByExample(RoleInfoExample example);
+
+    int deleteByPrimaryKey(Integer roleId);
+
+    int insert(RoleInfo record);
+
+    int insertSelective(RoleInfo record);
+
+    List<RoleInfo> selectByExample(RoleInfoExample example);
+
+    RoleInfo selectByPrimaryKey(Integer roleId);
+
+    int updateByExampleSelective(@Param("record") RoleInfo record, @Param("example") RoleInfoExample example);
+
+    int updateByExample(@Param("record") RoleInfo record, @Param("example") RoleInfoExample example);
+
+    int updateByPrimaryKeySelective(RoleInfo record);
+
+    int updateByPrimaryKey(RoleInfo record);
+}

src/main/java/com/chinaitop/depot/business/mapper/RoleInfoMapper.xml

@@ -0,0 +1,228 @@
+<?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.chinaitop.depot.business.mapper.RoleInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.RoleInfo" >
+    <id column="role_id" property="roleId" jdbcType="INTEGER" />
+    <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="INTEGER" />
+    <result column="remark" property="remark" jdbcType="VARCHAR" />
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    role_id, role_name, parent_id, remark, del_flag, org_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.RoleInfoExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from role_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from role_info
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from role_info
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.RoleInfoExample" >
+    delete from role_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.RoleInfo" >
+    insert into role_info (role_id, role_name, parent_id, 
+      remark, del_flag, org_id
+      )
+    values (#{roleId,jdbcType=INTEGER}, #{roleName,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER}, 
+      #{remark,jdbcType=VARCHAR}, #{delFlag,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.RoleInfo" >
+    insert into role_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
+        role_id,
+      </if>
+      <if test="roleName != null" >
+        role_name,
+      </if>
+      <if test="parentId != null" >
+        parent_id,
+      </if>
+      <if test="remark != null" >
+        remark,
+      </if>
+      <if test="delFlag != null" >
+        del_flag,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+      <if test="roleName != null" >
+        #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null" >
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.RoleInfoExample" resultType="java.lang.Integer" >
+    select count(*) from role_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update role_info
+    <set >
+      <if test="record.roleId != null" >
+        role_id = #{record.roleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.roleName != null" >
+        role_name = #{record.roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentId != null" >
+        parent_id = #{record.parentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.remark != null" >
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.delFlag != null" >
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update role_info
+    set role_id = #{record.roleId,jdbcType=INTEGER},
+      role_name = #{record.roleName,jdbcType=VARCHAR},
+      parent_id = #{record.parentId,jdbcType=INTEGER},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.RoleInfo" >
+    update role_info
+    <set >
+      <if test="roleName != null" >
+        role_name = #{roleName,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null" >
+        parent_id = #{parentId,jdbcType=INTEGER},
+      </if>
+      <if test="remark != null" >
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="delFlag != null" >
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.RoleInfo" >
+    update role_info
+    set role_name = #{roleName,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=INTEGER},
+      remark = #{remark,jdbcType=VARCHAR},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER}
+    where role_id = #{roleId,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/UserInfoMapper.java

@@ -0,0 +1,34 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.UserInfo;
+import com.chinaitop.depot.business.model.UserInfoExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+
+public interface UserInfoMapper {
+    int countByExample(UserInfoExample example);
+
+    int deleteByExample(UserInfoExample example);
+
+    int deleteByPrimaryKey(Integer userId);
+
+    int insert(UserInfo record);
+
+    int insertSelective(UserInfo record);
+
+    List<UserInfo> selectByExample(UserInfoExample example);
+
+    UserInfo selectByPrimaryKey(Integer userId);
+
+    int updateByExampleSelective(@Param("record") UserInfo record, @Param("example") UserInfoExample example);
+
+    int updateByExample(@Param("record") UserInfo record, @Param("example") UserInfoExample example);
+
+    int updateByPrimaryKeySelective(UserInfo record);
+
+    int updateByPrimaryKey(UserInfo record);
+
+	List<UserInfo> queryAll(HashMap<Object, Object> map);
+}

src/main/java/com/chinaitop/depot/business/mapper/UserInfoMapper.xml

@@ -0,0 +1,485 @@
+<?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.chinaitop.depot.business.mapper.UserInfoMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.UserInfo">
+    <id column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
+    <result column="password" jdbcType="VARCHAR" property="password" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="real_name" jdbcType="VARCHAR" property="realName" />
+    <result column="user_alias" jdbcType="VARCHAR" property="userAlias" />
+    <result column="sex" jdbcType="INTEGER" property="sex" />
+    <result column="telphone" jdbcType="VARCHAR" property="telphone" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="qq_number" jdbcType="VARCHAR" property="qqNumber" />
+    <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
+    <result column="signature" jdbcType="VARCHAR" property="signature" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="create_user_id" jdbcType="INTEGER" property="createUserId" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="update_user_id" jdbcType="INTEGER" property="updateUserId" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    user_id, username, password, org_id, real_name, user_alias, sex, telphone, mobile, address, email, 
+    qq_number, img_url, signature, create_time, create_user_id, update_time, update_user_id, 
+    status, del_flag
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.business.model.UserInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from user_info
+    where user_id = #{userId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from user_info
+    where user_id = #{userId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.UserInfoExample">
+    delete from user_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" useGeneratedKeys="true" keyProperty="userId" parameterType="com.chinaitop.depot.business.model.UserInfo">
+    insert into user_info (user_id, username, password, 
+      org_id, real_name, user_alias, sex, 
+      telphone, mobile, address, 
+      email, qq_number, img_url, 
+      signature, create_time, create_user_id, 
+      update_time, update_user_id, status, 
+      del_flag)
+    values (#{userId,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{realName,jdbcType=VARCHAR}, #{userAlias,jdbcType=VARCHAR}, #{sex,jdbcType=INTEGER}, 
+      #{telphone,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
+      #{email,jdbcType=VARCHAR}, #{qqNumber,jdbcType=VARCHAR}, #{imgUrl,jdbcType=VARCHAR}, 
+      #{signature,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{createUserId,jdbcType=INTEGER}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{updateUserId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, 
+      #{delFlag,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.UserInfo" useGeneratedKeys="true" keyProperty="userId">
+    insert into user_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="username != null">
+        username,
+      </if>
+      <if test="password != null">
+        password,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="realName != null">
+        real_name,
+      </if>
+      <if test="userAlias != null" >
+        user_alias,
+      </if>
+      <if test="sex != null">
+        sex,
+      </if>
+      <if test="telphone != null">
+        telphone,
+      </if>
+      <if test="mobile != null">
+        mobile,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="email != null">
+        email,
+      </if>
+      <if test="qqNumber != null">
+        qq_number,
+      </if>
+      <if test="imgUrl != null">
+        img_url,
+      </if>
+      <if test="signature != null">
+        signature,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="createUserId != null">
+        create_user_id,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="updateUserId != null">
+        update_user_id,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="userId != null">
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="username != null">
+        #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="realName != null">
+        #{realName,jdbcType=VARCHAR},
+      </if>
+      <if test="userAlias != null" >
+        #{userAlias,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="telphone != null">
+        #{telphone,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="qqNumber != null">
+        #{qqNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="imgUrl != null">
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="signature != null">
+        #{signature,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUserId != null">
+        #{createUserId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUserId != null">
+        #{updateUserId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.UserInfoExample" resultType="java.lang.Integer">
+    select count(*) from user_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update user_info
+    <set>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.username != null">
+        username = #{record.username,jdbcType=VARCHAR},
+      </if>
+      <if test="record.password != null">
+        password = #{record.password,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.realName != null">
+        real_name = #{record.realName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userAlias != null" >
+        user_alias = #{record.userAlias,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sex != null">
+        sex = #{record.sex,jdbcType=INTEGER},
+      </if>
+      <if test="record.telphone != null">
+        telphone = #{record.telphone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mobile != null">
+        mobile = #{record.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.email != null">
+        email = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qqNumber != null">
+        qq_number = #{record.qqNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.imgUrl != null">
+        img_url = #{record.imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.signature != null">
+        signature = #{record.signature,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createUserId != null">
+        create_user_id = #{record.createUserId,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUserId != null">
+        update_user_id = #{record.updateUserId,jdbcType=INTEGER},
+      </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update user_info
+    set user_id = #{record.userId,jdbcType=INTEGER},
+      username = #{record.username,jdbcType=VARCHAR},
+      password = #{record.password,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      real_name = #{record.realName,jdbcType=VARCHAR},
+      user_alias = #{record.userAlias,jdbcType=VARCHAR},
+      sex = #{record.sex,jdbcType=INTEGER},
+      telphone = #{record.telphone,jdbcType=VARCHAR},
+      mobile = #{record.mobile,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      email = #{record.email,jdbcType=VARCHAR},
+      qq_number = #{record.qqNumber,jdbcType=VARCHAR},
+      img_url = #{record.imgUrl,jdbcType=VARCHAR},
+      signature = #{record.signature,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      create_user_id = #{record.createUserId,jdbcType=INTEGER},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      update_user_id = #{record.updateUserId,jdbcType=INTEGER},
+      status = #{record.status,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.UserInfo">
+    update user_info
+    <set>
+      <if test="username != null">
+        username = #{username,jdbcType=VARCHAR},
+      </if>
+      <if test="password != null">
+        password = #{password,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="realName != null">
+        real_name = #{realName,jdbcType=VARCHAR},
+      </if>
+      <if test="userAlias != null" >
+        user_alias = #{userAlias,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null">
+        sex = #{sex,jdbcType=INTEGER},
+      </if>
+      <if test="telphone != null">
+        telphone = #{telphone,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null">
+        mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null">
+        email = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="qqNumber != null">
+        qq_number = #{qqNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="imgUrl != null">
+        img_url = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="signature != null">
+        signature = #{signature,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUserId != null">
+        create_user_id = #{createUserId,jdbcType=INTEGER},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUserId != null">
+        update_user_id = #{updateUserId,jdbcType=INTEGER},
+      </if>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+    </set>
+    where user_id = #{userId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.UserInfo">
+    update user_info
+    set username = #{username,jdbcType=VARCHAR},
+      password = #{password,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      real_name = #{realName,jdbcType=VARCHAR},
+      user_alias = #{userAlias,jdbcType=VARCHAR},
+      sex = #{sex,jdbcType=INTEGER},
+      telphone = #{telphone,jdbcType=VARCHAR},
+      mobile = #{mobile,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      email = #{email,jdbcType=VARCHAR},
+      qq_number = #{qqNumber,jdbcType=VARCHAR},
+      img_url = #{imgUrl,jdbcType=VARCHAR},
+      signature = #{signature,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      create_user_id = #{createUserId,jdbcType=INTEGER},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      update_user_id = #{updateUserId,jdbcType=INTEGER},
+      status = #{status,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER}
+    where user_id = #{userId,jdbcType=INTEGER}
+  </update>
+   <resultMap id="UserRoleOrgMap" type="com.chinaitop.depot.business.model.UserInfo">
+    <id column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="username" jdbcType="VARCHAR" property="username" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="real_name" jdbcType="VARCHAR" property="realName" />
+    <result column="telphone" jdbcType="VARCHAR" property="telphone" />
+  </resultMap>
+  <select id="queryAll" resultMap="UserRoleOrgMap" parameterType="map">
+		 SELECT
+			ui.user_id,
+			ui.real_name,
+			ui.username,
+			ui.telphone,
+			oi.org_name,
+			GROUP_CONCAT(ri.role_name)roleNames
+		FROM
+			user_info ui
+		LEFT JOIN user_role ur ON ui.user_id = ur.user_id
+		LEFT JOIN role_info ri ON ur.role_id = ri.role_id
+		LEFT JOIN org_info oi ON oi.org_id = ui.org_id
+		 <where>
+				<if test="username!=null">
+					and username like '%${username}%'
+				</if>
+				<if test="realName!=null">
+					and real_name like '%${realName}%'
+				</if>
+				<if test="orgIds!=null">
+                 and ui.org_id in
+                 <foreach collection="orgIds" index="index" item="item" open="(" separator="," close=")">
+                    #{item}
+                 </foreach>
+               </if>
+		</where>
+		GROUP BY
+			ui.user_id 
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/business/mapper/UserRoleMapper.java

@@ -0,0 +1,33 @@
+package com.chinaitop.depot.business.mapper;
+
+import com.chinaitop.depot.business.model.UserRole;
+import com.chinaitop.depot.business.model.UserRoleExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface UserRoleMapper {
+    int countByExample(UserRoleExample example);
+
+    int deleteByExample(UserRoleExample example);
+
+    int deleteByPrimaryKey(Integer urId);
+
+    int insert(UserRole record);
+
+    int insertSelective(UserRole record);
+
+    List<UserRole> selectByExample(UserRoleExample example);
+
+    UserRole selectByPrimaryKey(Integer urId);
+
+    int updateByExampleSelective(@Param("record") UserRole record, @Param("example") UserRoleExample example);
+
+    int updateByExample(@Param("record") UserRole record, @Param("example") UserRoleExample example);
+
+    int updateByPrimaryKeySelective(UserRole record);
+
+    int updateByPrimaryKey(UserRole record);
+
+	void deleteById(Integer userId);
+}

src/main/java/com/chinaitop/depot/business/mapper/UserRoleMapper.xml

@@ -0,0 +1,184 @@
+<?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.chinaitop.depot.business.mapper.UserRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.business.model.UserRole" >
+    <id column="ur_id" property="urId" jdbcType="INTEGER" />
+    <result column="user_id" property="userId" jdbcType="INTEGER" />
+    <result column="role_id" property="roleId" jdbcType="INTEGER" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    ur_id, user_id, role_id
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.UserRoleExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from user_role
+    where ur_id = #{urId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from user_role
+    where ur_id = #{urId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.business.model.UserRoleExample" >
+    delete from user_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.business.model.UserRole">
+    insert into user_role (ur_id, user_id, role_id
+      )
+    values (#{urId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{roleId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.UserRole" >
+    insert into user_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="urId != null" >
+        ur_id,
+      </if>
+      <if test="userId != null" >
+        user_id,
+      </if>
+      <if test="roleId != null" >
+        role_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="urId != null" >
+        #{urId,jdbcType=INTEGER},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.business.model.UserRoleExample" resultType="java.lang.Integer" >
+    select count(*) from user_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update user_role
+    <set >
+      <if test="record.urId != null" >
+        ur_id = #{record.urId,jdbcType=INTEGER},
+      </if>
+      <if test="record.userId != null" >
+        user_id = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.roleId != null" >
+        role_id = #{record.roleId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update user_role
+    set ur_id = #{record.urId,jdbcType=INTEGER},
+      user_id = #{record.userId,jdbcType=INTEGER},
+      role_id = #{record.roleId,jdbcType=INTEGER}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.business.model.UserRole" >
+    update user_role
+    <set >
+      <if test="userId != null" >
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="roleId != null" >
+        role_id = #{roleId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where ur_id = #{urId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.business.model.UserRole" >
+    update user_role
+    set user_id = #{userId,jdbcType=INTEGER},
+      role_id = #{roleId,jdbcType=INTEGER}
+    where ur_id = #{urId,jdbcType=INTEGER}
+  </update>
+  <delete id="deleteById" parameterType="java.lang.Integer">
+  	delete from user_role where user_id=#{userId};
+  </delete>
+</mapper>

src/main/java/com/chinaitop/depot/business/model/BusinessApproval.java

@@ -0,0 +1,559 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessApproval {
+    private Integer id;
+
+    private Date createTime;
+
+    private Integer isDeleted;
+
+    private String remark;
+
+    private Date updateTime;
+
+    private String content;
+
+    private String fromDepartment;
+
+    private String fromPeople;
+
+    private String fromUserName;
+
+    private String lastPeople;
+
+    private String operateTime;
+
+    private String operator;
+
+    private String operatorName;
+
+    private String processInstanceId;
+
+    private Integer projectId;
+
+    private String projectName;
+
+    private String result;
+
+    private String taskId;
+
+    private String taskInfo;
+
+    private String taskName;
+
+    private String taskType;
+
+    private String title;
+
+    private Integer version;
+
+    private String taskTypeName;
+
+    private Integer isHide;
+
+    private Integer isCountersign;
+
+    private String applyName;
+
+    private String applyNameId;
+
+    private Date applyTime;
+
+    // 药剂采购主键id
+    private Integer dpId;
+    private Integer auditState;
+    // 药剂申请主键id
+    private Integer duId;
+    private String state;
+
+    public Integer getDpId() {
+        return dpId;
+    }
+    public void setDpId(Integer dpId) {
+        this.dpId = dpId;
+    }
+    public Integer getDuId() {
+        return duId;
+    }
+    public void setDuId(Integer duId) {
+        this.duId = duId;
+    }
+    public Integer getAuditState() {
+        return auditState;
+    }
+    public void setAuditState(Integer auditState) {
+        this.auditState = auditState;
+    }
+    public String getState() {
+        return state;
+    }
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 中间表创建时间
+     * @return create_time 中间表创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 中间表创建时间
+     * @param createTime 中间表创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 
+     * @return is_deleted 
+     */
+    public Integer getIsDeleted() {
+        return isDeleted;
+    }
+
+    /**
+     * 
+     * @param isDeleted 
+     */
+    public void setIsDeleted(Integer isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    /**
+     * 
+     * @return remark 
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 
+     * @param remark 
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 
+     * @return update_time 
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 
+     * @param updateTime 
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 
+     * @return content 
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * 
+     * @param content 
+     */
+    public void setContent(String content) {
+        this.content = content == null ? null : content.trim();
+    }
+
+    /**
+     * 
+     * @return from_department 
+     */
+    public String getFromDepartment() {
+        return fromDepartment;
+    }
+
+    /**
+     * 
+     * @param fromDepartment 
+     */
+    public void setFromDepartment(String fromDepartment) {
+        this.fromDepartment = fromDepartment == null ? null : fromDepartment.trim();
+    }
+
+    /**
+     * 
+     * @return from_people 
+     */
+    public String getFromPeople() {
+        return fromPeople;
+    }
+
+    /**
+     * 
+     * @param fromPeople 
+     */
+    public void setFromPeople(String fromPeople) {
+        this.fromPeople = fromPeople == null ? null : fromPeople.trim();
+    }
+
+    /**
+     * 
+     * @return from_user_name 
+     */
+    public String getFromUserName() {
+        return fromUserName;
+    }
+
+    /**
+     * 
+     * @param fromUserName 
+     */
+    public void setFromUserName(String fromUserName) {
+        this.fromUserName = fromUserName == null ? null : fromUserName.trim();
+    }
+
+    /**
+     * 
+     * @return last_people 
+     */
+    public String getLastPeople() {
+        return lastPeople;
+    }
+
+    /**
+     * 
+     * @param lastPeople 
+     */
+    public void setLastPeople(String lastPeople) {
+        this.lastPeople = lastPeople == null ? null : lastPeople.trim();
+    }
+
+    /**
+     * 
+     * @return operate_time 
+     */
+    public String getOperateTime() {
+        return operateTime;
+    }
+
+    /**
+     * 
+     * @param operateTime 
+     */
+    public void setOperateTime(String operateTime) {
+        this.operateTime = operateTime == null ? null : operateTime.trim();
+    }
+
+    /**
+     * 
+     * @return operator 
+     */
+    public String getOperator() {
+        return operator;
+    }
+
+    /**
+     * 
+     * @param operator 
+     */
+    public void setOperator(String operator) {
+        this.operator = operator == null ? null : operator.trim();
+    }
+
+    /**
+     * 
+     * @return operator_name 
+     */
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    /**
+     * 
+     * @param operatorName 
+     */
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName == null ? null : operatorName.trim();
+    }
+
+    /**
+     * 
+     * @return process_instance_id 
+     */
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    /**
+     * 
+     * @param processInstanceId 
+     */
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId == null ? null : processInstanceId.trim();
+    }
+
+    /**
+     * 
+     * @return project_id 
+     */
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * 
+     * @param projectId 
+     */
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+
+    /**
+     * 
+     * @return project_name 
+     */
+    public String getProjectName() {
+        return projectName;
+    }
+
+    /**
+     * 
+     * @param projectName 
+     */
+    public void setProjectName(String projectName) {
+        this.projectName = projectName == null ? null : projectName.trim();
+    }
+
+    /**
+     * 
+     * @return result 
+     */
+    public String getResult() {
+        return result;
+    }
+
+    /**
+     * 
+     * @param result 
+     */
+    public void setResult(String result) {
+        this.result = result == null ? null : result.trim();
+    }
+
+    /**
+     * 
+     * @return task_id 
+     */
+    public String getTaskId() {
+        return taskId;
+    }
+
+    /**
+     * 
+     * @param taskId 
+     */
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    /**
+     * 
+     * @return task_info 
+     */
+    public String getTaskInfo() {
+        return taskInfo;
+    }
+
+    /**
+     * 
+     * @param taskInfo 
+     */
+    public void setTaskInfo(String taskInfo) {
+        this.taskInfo = taskInfo == null ? null : taskInfo.trim();
+    }
+
+    /**
+     * 
+     * @return task_name 
+     */
+    public String getTaskName() {
+        return taskName;
+    }
+
+    /**
+     * 
+     * @param taskName 
+     */
+    public void setTaskName(String taskName) {
+        this.taskName = taskName == null ? null : taskName.trim();
+    }
+
+    /**
+     * 
+     * @return task_type 
+     */
+    public String getTaskType() {
+        return taskType;
+    }
+
+    /**
+     * 
+     * @param taskType 
+     */
+    public void setTaskType(String taskType) {
+        this.taskType = taskType == null ? null : taskType.trim();
+    }
+
+    /**
+     * 
+     * @return title 
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 
+     * @param title 
+     */
+    public void setTitle(String title) {
+        this.title = title == null ? null : title.trim();
+    }
+
+    /**
+     * 
+     * @return version 
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 
+     * @param version 
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 
+     * @return task_type_name 
+     */
+    public String getTaskTypeName() {
+        return taskTypeName;
+    }
+
+    /**
+     * 
+     * @param taskTypeName 
+     */
+    public void setTaskTypeName(String taskTypeName) {
+        this.taskTypeName = taskTypeName == null ? null : taskTypeName.trim();
+    }
+
+    /**
+     * 是否隐藏
+     * @return is_hide 是否隐藏
+     */
+    public Integer getIsHide() {
+        return isHide;
+    }
+
+    /**
+     * 是否隐藏
+     * @param isHide 是否隐藏
+     */
+    public void setIsHide(Integer isHide) {
+        this.isHide = isHide;
+    }
+
+    /**
+     * 
+     * @return is_countersign 
+     */
+    public Integer getIsCountersign() {
+        return isCountersign;
+    }
+
+    /**
+     * 
+     * @param isCountersign 
+     */
+    public void setIsCountersign(Integer isCountersign) {
+        this.isCountersign = isCountersign;
+    }
+
+    /**
+     * 申请人
+     * @return apply_name 申请人
+     */
+    public String getApplyName() {
+        return applyName;
+    }
+
+    /**
+     * 申请人
+     * @param applyName 申请人
+     */
+    public void setApplyName(String applyName) {
+        this.applyName = applyName == null ? null : applyName.trim();
+    }
+
+    /**
+     * 申请人id
+     * @return apply_name_id 申请人id
+     */
+    public String getApplyNameId() {
+        return applyNameId;
+    }
+
+    /**
+     * 申请人id
+     * @param applyNameId 申请人id
+     */
+    public void setApplyNameId(String applyNameId) {
+        this.applyNameId = applyNameId == null ? null : applyNameId.trim();
+    }
+
+    /**
+     * 申请时间
+     * @return apply_time 申请时间
+     */
+    public Date getApplyTime() {
+        return applyTime;
+    }
+
+    /**
+     * 申请时间
+     * @param applyTime 申请时间
+     */
+    public void setApplyTime(Date applyTime) {
+        this.applyTime = applyTime;
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessContract.java

@@ -0,0 +1,923 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessContract {
+    private Integer id;
+
+    private String contractNumber;
+
+    private String contractTitle;
+
+    private String customerId;
+
+    private Integer customerBid;
+
+    private String customerNumber;
+
+    private String customerName;
+
+    private String grainQuantity;
+
+    private String moneyQuantity;
+
+    private String signingMan;
+
+    private Date signingTime;
+
+    private Date enableDate;
+
+    private Date disableDate;
+
+    private Integer contractType;
+
+    private String originalContract;
+
+    private Integer originalContractBid;
+
+    private Integer rootContractBid;
+
+    private Integer shippingType;
+
+    private Integer contractPayType;
+
+    private String finishedQuantity;
+
+    private String moneyOfFinishedQuantity;
+
+    private String remark;
+
+    private String plantAcreage;
+
+    private String planNumber;
+
+    private String mobile;
+
+    private String bankName;
+
+    private String accountName;
+
+    private String accountNumber;
+
+    private String breachLiability;
+
+    private String dissolutionConditions;
+
+    private String disputeSettlementMethod;
+
+    private String changeRecordFlag;
+
+    private String changeReason;
+
+    private Date changeTime;
+
+    private String changeContent;
+
+    private String changing;
+
+    private Integer planBid;
+
+    private String auditState;
+
+    private String processInstanceId;
+
+    private String processDefinitionId;
+
+    private Date agreeTime;
+
+    private String createMan;
+
+    private String creater;
+
+    private Date createTime;
+
+    private String createUnit;
+
+    private String createDepot;
+
+    private Date updateTime;
+
+    private Integer orgId;
+
+    private Integer inApplication;
+
+    private Integer createrId;
+
+    private String identification;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 合同编号
+     * @return contract_number 合同编号
+     */
+    public String getContractNumber() {
+        return contractNumber;
+    }
+
+    /**
+     * 合同编号
+     * @param contractNumber 合同编号
+     */
+    public void setContractNumber(String contractNumber) {
+        this.contractNumber = contractNumber == null ? null : contractNumber.trim();
+    }
+
+    /**
+     * 合同名称
+     * @return contract_title 合同名称
+     */
+    public String getContractTitle() {
+        return contractTitle;
+    }
+
+    /**
+     * 合同名称
+     * @param contractTitle 合同名称
+     */
+    public void setContractTitle(String contractTitle) {
+        this.contractTitle = contractTitle == null ? null : contractTitle.trim();
+    }
+
+    /**
+     * 合同客户编号
+     * @return customer_id 合同客户编号
+     */
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    /**
+     * 合同客户编号
+     * @param customerId 合同客户编号
+     */
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId == null ? null : customerId.trim();
+    }
+
+    /**
+     * 客户id
+     * @return customer_bid 客户id
+     */
+    public Integer getCustomerBid() {
+        return customerBid;
+    }
+
+    /**
+     * 客户id
+     * @param customerBid 客户id
+     */
+    public void setCustomerBid(Integer customerBid) {
+        this.customerBid = customerBid;
+    }
+
+    /**
+     * 客户编号
+     * @return customer_number 客户编号
+     */
+    public String getCustomerNumber() {
+        return customerNumber;
+    }
+
+    /**
+     * 客户编号
+     * @param customerNumber 客户编号
+     */
+    public void setCustomerNumber(String customerNumber) {
+        this.customerNumber = customerNumber == null ? null : customerNumber.trim();
+    }
+
+    /**
+     * 合同客户名称
+     * @return customer_name 合同客户名称
+     */
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    /**
+     * 合同客户名称
+     * @param customerName 合同客户名称
+     */
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName == null ? null : customerName.trim();
+    }
+
+    /**
+     * 合同粮食数量(吨)
+     * @return grain_quantity 合同粮食数量(吨)
+     */
+    public String getGrainQuantity() {
+        return grainQuantity;
+    }
+
+    /**
+     * 合同粮食数量(吨)
+     * @param grainQuantity 合同粮食数量(吨)
+     */
+    public void setGrainQuantity(String grainQuantity) {
+        this.grainQuantity = grainQuantity == null ? null : grainQuantity.trim();
+    }
+
+    /**
+     * 总金额(元)
+     * @return money_quantity 总金额(元)
+     */
+    public String getMoneyQuantity() {
+        return moneyQuantity;
+    }
+
+    /**
+     * 总金额(元)
+     * @param moneyQuantity 总金额(元)
+     */
+    public void setMoneyQuantity(String moneyQuantity) {
+        this.moneyQuantity = moneyQuantity == null ? null : moneyQuantity.trim();
+    }
+
+    /**
+     * 合同签订人
+     * @return signing_man 合同签订人
+     */
+    public String getSigningMan() {
+        return signingMan;
+    }
+
+    /**
+     * 合同签订人
+     * @param signingMan 合同签订人
+     */
+    public void setSigningMan(String signingMan) {
+        this.signingMan = signingMan == null ? null : signingMan.trim();
+    }
+
+    /**
+     * 合同签订时间
+     * @return signing_time 合同签订时间
+     */
+    public Date getSigningTime() {
+        return signingTime;
+    }
+
+    /**
+     * 合同签订时间
+     * @param signingTime 合同签订时间
+     */
+    public void setSigningTime(Date signingTime) {
+        this.signingTime = signingTime;
+    }
+
+    /**
+     * 合同生效日期
+     * @return enable_date 合同生效日期
+     */
+    public Date getEnableDate() {
+        return enableDate;
+    }
+
+    /**
+     * 合同生效日期
+     * @param enableDate 合同生效日期
+     */
+    public void setEnableDate(Date enableDate) {
+        this.enableDate = enableDate;
+    }
+
+    /**
+     * 合同截止日期
+     * @return disable_date 合同截止日期
+     */
+    public Date getDisableDate() {
+        return disableDate;
+    }
+
+    /**
+     * 合同截止日期
+     * @param disableDate 合同截止日期
+     */
+    public void setDisableDate(Date disableDate) {
+        this.disableDate = disableDate;
+    }
+
+    /**
+     * 合同类型
+     * @return contract_type 合同类型
+     */
+    public Integer getContractType() {
+        return contractType;
+    }
+
+    /**
+     * 合同类型
+     * @param contractType 合同类型
+     */
+    public void setContractType(Integer contractType) {
+        this.contractType = contractType;
+    }
+
+    /**
+     * 原合同编号
+     * @return original_contract 原合同编号
+     */
+    public String getOriginalContract() {
+        return originalContract;
+    }
+
+    /**
+     * 原合同编号
+     * @param originalContract 原合同编号
+     */
+    public void setOriginalContract(String originalContract) {
+        this.originalContract = originalContract == null ? null : originalContract.trim();
+    }
+
+    /**
+     * 原合同id
+     * @return original_contract_bid 原合同id
+     */
+    public Integer getOriginalContractBid() {
+        return originalContractBid;
+    }
+
+    /**
+     * 原合同id
+     * @param originalContractBid 原合同id
+     */
+    public void setOriginalContractBid(Integer originalContractBid) {
+        this.originalContractBid = originalContractBid;
+    }
+
+    /**
+     * 起始合同id
+     * @return root_contract_bid 起始合同id
+     */
+    public Integer getRootContractBid() {
+        return rootContractBid;
+    }
+
+    /**
+     * 起始合同id
+     * @param rootContractBid 起始合同id
+     */
+    public void setRootContractBid(Integer rootContractBid) {
+        this.rootContractBid = rootContractBid;
+    }
+
+    /**
+     * 运输方式
+     * @return shipping_type 运输方式
+     */
+    public Integer getShippingType() {
+        return shippingType;
+    }
+
+    /**
+     * 运输方式
+     * @param shippingType 运输方式
+     */
+    public void setShippingType(Integer shippingType) {
+        this.shippingType = shippingType;
+    }
+
+    /**
+     * 支付方式
+     * @return contract_pay_type 支付方式
+     */
+    public Integer getContractPayType() {
+        return contractPayType;
+    }
+
+    /**
+     * 支付方式
+     * @param contractPayType 支付方式
+     */
+    public void setContractPayType(Integer contractPayType) {
+        this.contractPayType = contractPayType;
+    }
+
+    /**
+     * 已完成数量
+     * @return finished_quantity 已完成数量
+     */
+    public String getFinishedQuantity() {
+        return finishedQuantity;
+    }
+
+    /**
+     * 已完成数量
+     * @param finishedQuantity 已完成数量
+     */
+    public void setFinishedQuantity(String finishedQuantity) {
+        this.finishedQuantity = finishedQuantity == null ? null : finishedQuantity.trim();
+    }
+
+    /**
+     * 已完成数量金额
+     * @return money_of_finished_quantity 已完成数量金额
+     */
+    public String getMoneyOfFinishedQuantity() {
+        return moneyOfFinishedQuantity;
+    }
+
+    /**
+     * 已完成数量金额
+     * @param moneyOfFinishedQuantity 已完成数量金额
+     */
+    public void setMoneyOfFinishedQuantity(String moneyOfFinishedQuantity) {
+        this.moneyOfFinishedQuantity = moneyOfFinishedQuantity == null ? null : moneyOfFinishedQuantity.trim();
+    }
+
+    /**
+     * 合同备注
+     * @return remark 合同备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 合同备注
+     * @param remark 合同备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 客户种粮面积(亩)
+     * @return plant_acreage 客户种粮面积(亩)
+     */
+    public String getPlantAcreage() {
+        return plantAcreage;
+    }
+
+    /**
+     * 客户种粮面积(亩)
+     * @param plantAcreage 客户种粮面积(亩)
+     */
+    public void setPlantAcreage(String plantAcreage) {
+        this.plantAcreage = plantAcreage == null ? null : plantAcreage.trim();
+    }
+
+    /**
+     * 计划编号
+     * @return plan_number 计划编号
+     */
+    public String getPlanNumber() {
+        return planNumber;
+    }
+
+    /**
+     * 计划编号
+     * @param planNumber 计划编号
+     */
+    public void setPlanNumber(String planNumber) {
+        this.planNumber = planNumber == null ? null : planNumber.trim();
+    }
+
+    /**
+     * 客户联系方式
+     * @return mobile 客户联系方式
+     */
+    public String getMobile() {
+        return mobile;
+    }
+
+    /**
+     * 客户联系方式
+     * @param mobile 客户联系方式
+     */
+    public void setMobile(String mobile) {
+        this.mobile = mobile == null ? null : mobile.trim();
+    }
+
+    /**
+     * 开户行名称
+     * @return bank_name 开户行名称
+     */
+    public String getBankName() {
+        return bankName;
+    }
+
+    /**
+     * 开户行名称
+     * @param bankName 开户行名称
+     */
+    public void setBankName(String bankName) {
+        this.bankName = bankName == null ? null : bankName.trim();
+    }
+
+    /**
+     * 银行账户名称
+     * @return account_name 银行账户名称
+     */
+    public String getAccountName() {
+        return accountName;
+    }
+
+    /**
+     * 银行账户名称
+     * @param accountName 银行账户名称
+     */
+    public void setAccountName(String accountName) {
+        this.accountName = accountName == null ? null : accountName.trim();
+    }
+
+    /**
+     * 开户账号
+     * @return account_number 开户账号
+     */
+    public String getAccountNumber() {
+        return accountNumber;
+    }
+
+    /**
+     * 开户账号
+     * @param accountNumber 开户账号
+     */
+    public void setAccountNumber(String accountNumber) {
+        this.accountNumber = accountNumber == null ? null : accountNumber.trim();
+    }
+
+    /**
+     * 违约责任
+     * @return breach_liability 违约责任
+     */
+    public String getBreachLiability() {
+        return breachLiability;
+    }
+
+    /**
+     * 违约责任
+     * @param breachLiability 违约责任
+     */
+    public void setBreachLiability(String breachLiability) {
+        this.breachLiability = breachLiability == null ? null : breachLiability.trim();
+    }
+
+    /**
+     * 解除条件
+     * @return dissolution_conditions 解除条件
+     */
+    public String getDissolutionConditions() {
+        return dissolutionConditions;
+    }
+
+    /**
+     * 解除条件
+     * @param dissolutionConditions 解除条件
+     */
+    public void setDissolutionConditions(String dissolutionConditions) {
+        this.dissolutionConditions = dissolutionConditions == null ? null : dissolutionConditions.trim();
+    }
+
+    /**
+     * 争议解决方式
+     * @return dispute_settlement_method 争议解决方式
+     */
+    public String getDisputeSettlementMethod() {
+        return disputeSettlementMethod;
+    }
+
+    /**
+     * 争议解决方式
+     * @param disputeSettlementMethod 争议解决方式
+     */
+    public void setDisputeSettlementMethod(String disputeSettlementMethod) {
+        this.disputeSettlementMethod = disputeSettlementMethod == null ? null : disputeSettlementMethod.trim();
+    }
+
+    /**
+     * 合同的变更记录标志
+     * @return change_record_flag 合同的变更记录标志
+     */
+    public String getChangeRecordFlag() {
+        return changeRecordFlag;
+    }
+
+    /**
+     * 合同的变更记录标志
+     * @param changeRecordFlag 合同的变更记录标志
+     */
+    public void setChangeRecordFlag(String changeRecordFlag) {
+        this.changeRecordFlag = changeRecordFlag == null ? null : changeRecordFlag.trim();
+    }
+
+    /**
+     * 合同变更原因
+     * @return change_reason 合同变更原因
+     */
+    public String getChangeReason() {
+        return changeReason;
+    }
+
+    /**
+     * 合同变更原因
+     * @param changeReason 合同变更原因
+     */
+    public void setChangeReason(String changeReason) {
+        this.changeReason = changeReason == null ? null : changeReason.trim();
+    }
+
+    /**
+     * 变更时间
+     * @return change_time 变更时间
+     */
+    public Date getChangeTime() {
+        return changeTime;
+    }
+
+    /**
+     * 变更时间
+     * @param changeTime 变更时间
+     */
+    public void setChangeTime(Date changeTime) {
+        this.changeTime = changeTime;
+    }
+
+    /**
+     * 变更内容
+     * @return change_content 变更内容
+     */
+    public String getChangeContent() {
+        return changeContent;
+    }
+
+    /**
+     * 变更内容
+     * @param changeContent 变更内容
+     */
+    public void setChangeContent(String changeContent) {
+        this.changeContent = changeContent == null ? null : changeContent.trim();
+    }
+
+    /**
+     * 是否在被变更中(0否；1是；2变更成功)
+     * @return changing 是否在被变更中(0否；1是；2变更成功)
+     */
+    public String getChanging() {
+        return changing;
+    }
+
+    /**
+     * 是否在被变更中(0否；1是；2变更成功)
+     * @param changing 是否在被变更中(0否；1是；2变更成功)
+     */
+    public void setChanging(String changing) {
+        this.changing = changing == null ? null : changing.trim();
+    }
+
+    /**
+     * 计划id
+     * @return plan_bid 计划id
+     */
+    public Integer getPlanBid() {
+        return planBid;
+    }
+
+    /**
+     * 计划id
+     * @param planBid 计划id
+     */
+    public void setPlanBid(Integer planBid) {
+        this.planBid = planBid;
+    }
+
+    /**
+     * 审批状态（0待提交，1审批中，2同意，3驳回，4拒绝）
+     * @return audit_state 审批状态（0待提交，1审批中，2同意，3驳回，4拒绝）
+     */
+    public String getAuditState() {
+        return auditState;
+    }
+
+    /**
+     * 审批状态（0待提交，1审批中，2同意，3驳回，4拒绝）
+     * @param auditState 审批状态（0待提交，1审批中，2同意，3驳回，4拒绝）
+     */
+    public void setAuditState(String auditState) {
+        this.auditState = auditState == null ? null : auditState.trim();
+    }
+
+    /**
+     * 流程实例id
+     * @return process_instance_id 流程实例id
+     */
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    /**
+     * 流程实例id
+     * @param processInstanceId 流程实例id
+     */
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId == null ? null : processInstanceId.trim();
+    }
+
+    /**
+     * 流程定义id
+     * @return process_definition_id 流程定义id
+     */
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    /**
+     * 流程定义id
+     * @param processDefinitionId 流程定义id
+     */
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId == null ? null : processDefinitionId.trim();
+    }
+
+    /**
+     * 审批完成时间
+     * @return agree_time 审批完成时间
+     */
+    public Date getAgreeTime() {
+        return agreeTime;
+    }
+
+    /**
+     * 审批完成时间
+     * @param agreeTime 审批完成时间
+     */
+    public void setAgreeTime(Date agreeTime) {
+        this.agreeTime = agreeTime;
+    }
+
+    /**
+     * 合同创建人(数据传输使用）
+     * @return create_man 合同创建人(数据传输使用）
+     */
+    public String getCreateMan() {
+        return createMan;
+    }
+
+    /**
+     * 合同创建人(数据传输使用）
+     * @param createMan 合同创建人(数据传输使用）
+     */
+    public void setCreateMan(String createMan) {
+        this.createMan = createMan == null ? null : createMan.trim();
+    }
+
+    /**
+     * 创建人
+     * @return creater 创建人
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * 创建人
+     * @param creater 创建人
+     */
+    public void setCreater(String creater) {
+        this.creater = creater == null ? null : creater.trim();
+    }
+
+    /**
+     * 合同创建时间
+     * @return create_time 合同创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 合同创建时间
+     * @param createTime 合同创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 创建部门
+     * @return create_unit 创建部门
+     */
+    public String getCreateUnit() {
+        return createUnit;
+    }
+
+    /**
+     * 创建部门
+     * @param createUnit 创建部门
+     */
+    public void setCreateUnit(String createUnit) {
+        this.createUnit = createUnit == null ? null : createUnit.trim();
+    }
+
+    /**
+     * 
+     * @return create_depot 
+     */
+    public String getCreateDepot() {
+        return createDepot;
+    }
+
+    /**
+     * 
+     * @param createDepot 
+     */
+    public void setCreateDepot(String createDepot) {
+        this.createDepot = createDepot == null ? null : createDepot.trim();
+    }
+
+    /**
+     * 修改时间
+     * @return update_time 修改时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 修改时间
+     * @param updateTime 修改时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     * @return in_application 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     */
+    public Integer getInApplication() {
+        return inApplication;
+    }
+
+    /**
+     * 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     * @param inApplication 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     */
+    public void setInApplication(Integer inApplication) {
+        this.inApplication = inApplication;
+    }
+
+    /**
+     * 
+     * @return creater_id 
+     */
+    public Integer getCreaterId() {
+        return createrId;
+    }
+
+    /**
+     * 
+     * @param createrId 
+     */
+    public void setCreaterId(Integer createrId) {
+        this.createrId = createrId;
+    }
+
+    /**
+     * 证件号
+     * @return identification 证件号
+     */
+    public String getIdentification() {
+        return identification;
+    }
+
+    /**
+     * 证件号
+     * @param identification 证件号
+     */
+    public void setIdentification(String identification) {
+        this.identification = identification == null ? null : identification.trim();
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessContractPayRecevice.java

@@ -0,0 +1,149 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessContractPayRecevice {
+    private Integer id;
+
+    private Integer zid;
+
+    private String contractNum;
+
+    private String contractTitle;
+
+    private Integer contractType;
+
+    private Integer payStatus;
+
+    private String money;
+
+    private Date time;
+
+    /**
+     * 合同收付款表
+     * @return id 合同收付款表
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 合同收付款表
+     * @param id 合同收付款表
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 合同id
+     * @return zid 合同id
+     */
+    public Integer getZid() {
+        return zid;
+    }
+
+    /**
+     * 合同id
+     * @param zid 合同id
+     */
+    public void setZid(Integer zid) {
+        this.zid = zid;
+    }
+
+    /**
+     * 合同编号
+     * @return contract_num 合同编号
+     */
+    public String getContractNum() {
+        return contractNum;
+    }
+
+    /**
+     * 合同编号
+     * @param contractNum 合同编号
+     */
+    public void setContractNum(String contractNum) {
+        this.contractNum = contractNum == null ? null : contractNum.trim();
+    }
+
+    /**
+     * 合同名称
+     * @return contract_title 合同名称
+     */
+    public String getContractTitle() {
+        return contractTitle;
+    }
+
+    /**
+     * 合同名称
+     * @param contractTitle 合同名称
+     */
+    public void setContractTitle(String contractTitle) {
+        this.contractTitle = contractTitle == null ? null : contractTitle.trim();
+    }
+
+    /**
+     * 合同类型
+     * @return contract_type 合同类型
+     */
+    public Integer getContractType() {
+        return contractType;
+    }
+
+    /**
+     * 合同类型
+     * @param contractType 合同类型
+     */
+    public void setContractType(Integer contractType) {
+        this.contractType = contractType;
+    }
+
+    /**
+     * 收付款状态（0：收；1：付）
+     * @return pay_status 收付款状态（0：收；1：付）
+     */
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    /**
+     * 收付款状态（0：收；1：付）
+     * @param payStatus 收付款状态（0：收；1：付）
+     */
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    /**
+     * 收付款的数目
+     * @return money 收付款的数目
+     */
+    public String getMoney() {
+        return money;
+    }
+
+    /**
+     * 收付款的数目
+     * @param money 收付款的数目
+     */
+    public void setMoney(String money) {
+        this.money = money == null ? null : money.trim();
+    }
+
+    /**
+     * 时间
+     * @return time 时间
+     */
+    public Date getTime() {
+        return time;
+    }
+
+    /**
+     * 时间
+     * @param time 时间
+     */
+    public void setTime(Date time) {
+        this.time = time;
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessContractPayReceviceExample.java

@@ -0,0 +1,729 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessContractPayReceviceExample {
+    /**
+     * business_contract_pay_recevice
+     */
+    protected String orderByClause;
+
+    /**
+     * business_contract_pay_recevice
+     */
+    protected boolean distinct;
+
+    /**
+     * business_contract_pay_recevice
+     */
+    protected List<Criteria> oredCriteria;
+
+    public BusinessContractPayReceviceExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * business_contract_pay_recevice 2018-10-17
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIsNull() {
+            addCriterion("zid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIsNotNull() {
+            addCriterion("zid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidEqualTo(Integer value) {
+            addCriterion("zid =", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotEqualTo(Integer value) {
+            addCriterion("zid <>", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidGreaterThan(Integer value) {
+            addCriterion("zid >", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("zid >=", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidLessThan(Integer value) {
+            addCriterion("zid <", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidLessThanOrEqualTo(Integer value) {
+            addCriterion("zid <=", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIn(List<Integer> values) {
+            addCriterion("zid in", values, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotIn(List<Integer> values) {
+            addCriterion("zid not in", values, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidBetween(Integer value1, Integer value2) {
+            addCriterion("zid between", value1, value2, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotBetween(Integer value1, Integer value2) {
+            addCriterion("zid not between", value1, value2, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumIsNull() {
+            addCriterion("contract_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumIsNotNull() {
+            addCriterion("contract_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumEqualTo(String value) {
+            addCriterion("contract_num =", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumNotEqualTo(String value) {
+            addCriterion("contract_num <>", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumGreaterThan(String value) {
+            addCriterion("contract_num >", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_num >=", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumLessThan(String value) {
+            addCriterion("contract_num <", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumLessThanOrEqualTo(String value) {
+            addCriterion("contract_num <=", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumLike(String value) {
+            addCriterion("contract_num like", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumNotLike(String value) {
+            addCriterion("contract_num not like", value, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumIn(List<String> values) {
+            addCriterion("contract_num in", values, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumNotIn(List<String> values) {
+            addCriterion("contract_num not in", values, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumBetween(String value1, String value2) {
+            addCriterion("contract_num between", value1, value2, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNumNotBetween(String value1, String value2) {
+            addCriterion("contract_num not between", value1, value2, "contractNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleIsNull() {
+            addCriterion("contract_title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleIsNotNull() {
+            addCriterion("contract_title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleEqualTo(String value) {
+            addCriterion("contract_title =", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleNotEqualTo(String value) {
+            addCriterion("contract_title <>", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleGreaterThan(String value) {
+            addCriterion("contract_title >", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_title >=", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleLessThan(String value) {
+            addCriterion("contract_title <", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleLessThanOrEqualTo(String value) {
+            addCriterion("contract_title <=", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleLike(String value) {
+            addCriterion("contract_title like", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleNotLike(String value) {
+            addCriterion("contract_title not like", value, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleIn(List<String> values) {
+            addCriterion("contract_title in", values, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleNotIn(List<String> values) {
+            addCriterion("contract_title not in", values, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleBetween(String value1, String value2) {
+            addCriterion("contract_title between", value1, value2, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTitleNotBetween(String value1, String value2) {
+            addCriterion("contract_title not between", value1, value2, "contractTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIsNull() {
+            addCriterion("contract_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIsNotNull() {
+            addCriterion("contract_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeEqualTo(Integer value) {
+            addCriterion("contract_type =", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotEqualTo(Integer value) {
+            addCriterion("contract_type <>", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeGreaterThan(Integer value) {
+            addCriterion("contract_type >", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("contract_type >=", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeLessThan(Integer value) {
+            addCriterion("contract_type <", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("contract_type <=", value, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeIn(List<Integer> values) {
+            addCriterion("contract_type in", values, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotIn(List<Integer> values) {
+            addCriterion("contract_type not in", values, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeBetween(Integer value1, Integer value2) {
+            addCriterion("contract_type between", value1, value2, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("contract_type not between", value1, value2, "contractType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIsNull() {
+            addCriterion("pay_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIsNotNull() {
+            addCriterion("pay_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusEqualTo(Integer value) {
+            addCriterion("pay_status =", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotEqualTo(Integer value) {
+            addCriterion("pay_status <>", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThan(Integer value) {
+            addCriterion("pay_status >", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_status >=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThan(Integer value) {
+            addCriterion("pay_status <", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_status <=", value, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusIn(List<Integer> values) {
+            addCriterion("pay_status in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotIn(List<Integer> values) {
+            addCriterion("pay_status not in", values, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusBetween(Integer value1, Integer value2) {
+            addCriterion("pay_status between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_status not between", value1, value2, "payStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyIsNull() {
+            addCriterion("money is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyIsNotNull() {
+            addCriterion("money is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyEqualTo(String value) {
+            addCriterion("money =", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyNotEqualTo(String value) {
+            addCriterion("money <>", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyGreaterThan(String value) {
+            addCriterion("money >", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyGreaterThanOrEqualTo(String value) {
+            addCriterion("money >=", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyLessThan(String value) {
+            addCriterion("money <", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyLessThanOrEqualTo(String value) {
+            addCriterion("money <=", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyLike(String value) {
+            addCriterion("money like", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyNotLike(String value) {
+            addCriterion("money not like", value, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyIn(List<String> values) {
+            addCriterion("money in", values, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyNotIn(List<String> values) {
+            addCriterion("money not in", values, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyBetween(String value1, String value2) {
+            addCriterion("money between", value1, value2, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andMoneyNotBetween(String value1, String value2) {
+            addCriterion("money not between", value1, value2, "money");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNull() {
+            addCriterion("time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNotNull() {
+            addCriterion("time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeEqualTo(Date value) {
+            addCriterion("time =", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotEqualTo(Date value) {
+            addCriterion("time <>", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThan(Date value) {
+            addCriterion("time >", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("time >=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThan(Date value) {
+            addCriterion("time <", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThanOrEqualTo(Date value) {
+            addCriterion("time <=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIn(List<Date> values) {
+            addCriterion("time in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotIn(List<Date> values) {
+            addCriterion("time not in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeBetween(Date value1, Date value2) {
+            addCriterion("time between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotBetween(Date value1, Date value2) {
+            addCriterion("time not between", value1, value2, "time");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * business_contract_pay_recevice
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * business_contract_pay_recevice 2018-10-17
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryNoticeDetail.java

@@ -0,0 +1,357 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessDeliveryNoticeDetail {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.zid
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer zid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.warehouse
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer warehouse;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.goods_location
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer goodsLocation;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.shiping_count
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private String shipingCount;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.create_time
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Date createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.org_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer orgId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.house_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer houseId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.house_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private String houseName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.warehouse_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private Integer warehouseId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column business_delivery_notice_detail.warehouse_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    private String warehouseName;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.id
+     *
+     * @return the value of business_delivery_notice_detail.id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.id
+     *
+     * @param id the value for business_delivery_notice_detail.id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.zid
+     *
+     * @return the value of business_delivery_notice_detail.zid
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getZid() {
+        return zid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.zid
+     *
+     * @param zid the value for business_delivery_notice_detail.zid
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setZid(Integer zid) {
+        this.zid = zid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.warehouse
+     *
+     * @return the value of business_delivery_notice_detail.warehouse
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getWarehouse() {
+        return warehouse;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.warehouse
+     *
+     * @param warehouse the value for business_delivery_notice_detail.warehouse
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setWarehouse(Integer warehouse) {
+        this.warehouse = warehouse;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.goods_location
+     *
+     * @return the value of business_delivery_notice_detail.goods_location
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getGoodsLocation() {
+        return goodsLocation;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.goods_location
+     *
+     * @param goodsLocation the value for business_delivery_notice_detail.goods_location
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setGoodsLocation(Integer goodsLocation) {
+        this.goodsLocation = goodsLocation;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.shiping_count
+     *
+     * @return the value of business_delivery_notice_detail.shiping_count
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public String getShipingCount() {
+        return shipingCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.shiping_count
+     *
+     * @param shipingCount the value for business_delivery_notice_detail.shiping_count
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setShipingCount(String shipingCount) {
+        this.shipingCount = shipingCount == null ? null : shipingCount.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.create_time
+     *
+     * @return the value of business_delivery_notice_detail.create_time
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.create_time
+     *
+     * @param createTime the value for business_delivery_notice_detail.create_time
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.org_id
+     *
+     * @return the value of business_delivery_notice_detail.org_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.org_id
+     *
+     * @param orgId the value for business_delivery_notice_detail.org_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.house_id
+     *
+     * @return the value of business_delivery_notice_detail.house_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.house_id
+     *
+     * @param houseId the value for business_delivery_notice_detail.house_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.house_name
+     *
+     * @return the value of business_delivery_notice_detail.house_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public String getHouseName() {
+        return houseName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.house_name
+     *
+     * @param houseName the value for business_delivery_notice_detail.house_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setHouseName(String houseName) {
+        this.houseName = houseName == null ? null : houseName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.warehouse_id
+     *
+     * @return the value of business_delivery_notice_detail.warehouse_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.warehouse_id
+     *
+     * @param warehouseId the value for business_delivery_notice_detail.warehouse_id
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column business_delivery_notice_detail.warehouse_name
+     *
+     * @return the value of business_delivery_notice_detail.warehouse_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column business_delivery_notice_detail.warehouse_name
+     *
+     * @param warehouseName the value for business_delivery_notice_detail.warehouse_name
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryNoticeDetailExample.java

@@ -0,0 +1,993 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessDeliveryNoticeDetailExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public BusinessDeliveryNoticeDetailExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIsNull() {
+            addCriterion("zid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIsNotNull() {
+            addCriterion("zid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidEqualTo(Integer value) {
+            addCriterion("zid =", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotEqualTo(Integer value) {
+            addCriterion("zid <>", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidGreaterThan(Integer value) {
+            addCriterion("zid >", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("zid >=", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidLessThan(Integer value) {
+            addCriterion("zid <", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidLessThanOrEqualTo(Integer value) {
+            addCriterion("zid <=", value, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidIn(List<Integer> values) {
+            addCriterion("zid in", values, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotIn(List<Integer> values) {
+            addCriterion("zid not in", values, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidBetween(Integer value1, Integer value2) {
+            addCriterion("zid between", value1, value2, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andZidNotBetween(Integer value1, Integer value2) {
+            addCriterion("zid not between", value1, value2, "zid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIsNull() {
+            addCriterion("warehouse is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIsNotNull() {
+            addCriterion("warehouse is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseEqualTo(Integer value) {
+            addCriterion("warehouse =", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNotEqualTo(Integer value) {
+            addCriterion("warehouse <>", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseGreaterThan(Integer value) {
+            addCriterion("warehouse >", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse >=", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseLessThan(Integer value) {
+            addCriterion("warehouse <", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse <=", value, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIn(List<Integer> values) {
+            addCriterion("warehouse in", values, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNotIn(List<Integer> values) {
+            addCriterion("warehouse not in", values, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse between", value1, value2, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse not between", value1, value2, "warehouse");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationIsNull() {
+            addCriterion("goods_location is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationIsNotNull() {
+            addCriterion("goods_location is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationEqualTo(Integer value) {
+            addCriterion("goods_location =", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationNotEqualTo(Integer value) {
+            addCriterion("goods_location <>", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationGreaterThan(Integer value) {
+            addCriterion("goods_location >", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationGreaterThanOrEqualTo(Integer value) {
+            addCriterion("goods_location >=", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationLessThan(Integer value) {
+            addCriterion("goods_location <", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationLessThanOrEqualTo(Integer value) {
+            addCriterion("goods_location <=", value, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationIn(List<Integer> values) {
+            addCriterion("goods_location in", values, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationNotIn(List<Integer> values) {
+            addCriterion("goods_location not in", values, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationBetween(Integer value1, Integer value2) {
+            addCriterion("goods_location between", value1, value2, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andGoodsLocationNotBetween(Integer value1, Integer value2) {
+            addCriterion("goods_location not between", value1, value2, "goodsLocation");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountIsNull() {
+            addCriterion("shiping_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountIsNotNull() {
+            addCriterion("shiping_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountEqualTo(String value) {
+            addCriterion("shiping_count =", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountNotEqualTo(String value) {
+            addCriterion("shiping_count <>", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountGreaterThan(String value) {
+            addCriterion("shiping_count >", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountGreaterThanOrEqualTo(String value) {
+            addCriterion("shiping_count >=", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountLessThan(String value) {
+            addCriterion("shiping_count <", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountLessThanOrEqualTo(String value) {
+            addCriterion("shiping_count <=", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountLike(String value) {
+            addCriterion("shiping_count like", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountNotLike(String value) {
+            addCriterion("shiping_count not like", value, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountIn(List<String> values) {
+            addCriterion("shiping_count in", values, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountNotIn(List<String> values) {
+            addCriterion("shiping_count not in", values, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountBetween(String value1, String value2) {
+            addCriterion("shiping_count between", value1, value2, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andShipingCountNotBetween(String value1, String value2) {
+            addCriterion("shiping_count not between", value1, value2, "shipingCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNull() {
+            addCriterion("org_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIsNotNull() {
+            addCriterion("org_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdEqualTo(Integer value) {
+            addCriterion("org_id =", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotEqualTo(Integer value) {
+            addCriterion("org_id <>", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThan(Integer value) {
+            addCriterion("org_id >", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("org_id >=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThan(Integer value) {
+            addCriterion("org_id <", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
+            addCriterion("org_id <=", value, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdIn(List<Integer> values) {
+            addCriterion("org_id in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotIn(List<Integer> values) {
+            addCriterion("org_id not in", values, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
+            addCriterion("org_id between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("org_id not between", value1, value2, "orgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNull() {
+            addCriterion("house_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIsNotNull() {
+            addCriterion("house_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdEqualTo(Integer value) {
+            addCriterion("house_id =", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotEqualTo(Integer value) {
+            addCriterion("house_id <>", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThan(Integer value) {
+            addCriterion("house_id >", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("house_id >=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThan(Integer value) {
+            addCriterion("house_id <", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("house_id <=", value, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdIn(List<Integer> values) {
+            addCriterion("house_id in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotIn(List<Integer> values) {
+            addCriterion("house_id not in", values, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("house_id between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("house_id not between", value1, value2, "houseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameIsNull() {
+            addCriterion("house_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameIsNotNull() {
+            addCriterion("house_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameEqualTo(String value) {
+            addCriterion("house_name =", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotEqualTo(String value) {
+            addCriterion("house_name <>", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameGreaterThan(String value) {
+            addCriterion("house_name >", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("house_name >=", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLessThan(String value) {
+            addCriterion("house_name <", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLessThanOrEqualTo(String value) {
+            addCriterion("house_name <=", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameLike(String value) {
+            addCriterion("house_name like", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotLike(String value) {
+            addCriterion("house_name not like", value, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameIn(List<String> values) {
+            addCriterion("house_name in", values, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotIn(List<String> values) {
+            addCriterion("house_name not in", values, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameBetween(String value1, String value2) {
+            addCriterion("house_name between", value1, value2, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andHouseNameNotBetween(String value1, String value2) {
+            addCriterion("house_name not between", value1, value2, "houseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNull() {
+            addCriterion("warehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIsNotNull() {
+            addCriterion("warehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdEqualTo(Integer value) {
+            addCriterion("warehouse_id =", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotEqualTo(Integer value) {
+            addCriterion("warehouse_id <>", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThan(Integer value) {
+            addCriterion("warehouse_id >", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id >=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThan(Integer value) {
+            addCriterion("warehouse_id <", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("warehouse_id <=", value, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdIn(List<Integer> values) {
+            addCriterion("warehouse_id in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotIn(List<Integer> values) {
+            addCriterion("warehouse_id not in", values, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("warehouse_id not between", value1, value2, "warehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIsNull() {
+            addCriterion("warehouse_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIsNotNull() {
+            addCriterion("warehouse_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameEqualTo(String value) {
+            addCriterion("warehouse_name =", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotEqualTo(String value) {
+            addCriterion("warehouse_name <>", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameGreaterThan(String value) {
+            addCriterion("warehouse_name >", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameGreaterThanOrEqualTo(String value) {
+            addCriterion("warehouse_name >=", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLessThan(String value) {
+            addCriterion("warehouse_name <", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLessThanOrEqualTo(String value) {
+            addCriterion("warehouse_name <=", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameLike(String value) {
+            addCriterion("warehouse_name like", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotLike(String value) {
+            addCriterion("warehouse_name not like", value, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameIn(List<String> values) {
+            addCriterion("warehouse_name in", values, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotIn(List<String> values) {
+            addCriterion("warehouse_name not in", values, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameBetween(String value1, String value2) {
+            addCriterion("warehouse_name between", value1, value2, "warehouseName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarehouseNameNotBetween(String value1, String value2) {
+            addCriterion("warehouse_name not between", value1, value2, "warehouseName");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Oct 31 21:14:31 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table business_delivery_notice_detail
+     *
+     * @mbggenerated Tue Oct 31 21:14:31 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessDeliveryStorageNotice.java

@@ -0,0 +1,828 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessDeliveryStorageNotice {
+    private Integer id;
+
+    private String billType;
+
+    private Integer billTypeId;
+
+    private String billNumber;
+
+    private String shipingCount;
+
+    private String finishedCount;
+
+    private String receivedMoney;
+
+    private Integer customerBid;
+
+    private String customerNumber;
+
+    private String mobile;
+
+    private String deliveryCustomer;
+
+    private String contract;
+
+    private Integer contractBid;
+
+    private String planNumber;
+
+    private Integer planBid;
+
+    private String billMemo;
+
+    private String grainPrice;
+
+    private String moneyQuantity;
+
+    private Integer grainAnnual;
+
+    private Integer warehouse;
+
+    private Integer goodsLocation;
+
+    private String auditState;
+
+    private Date storageTime;
+
+    private String processInstanceId;
+
+    private String processDefinitionId;
+
+    private String qualityStandard;
+
+    private Date agreeTime;
+
+    private String billMan;
+
+    private Date billDate;
+
+    private String billUnit;
+
+    private Integer houseId;
+
+    private String houseName;
+
+    private Integer warehouseId;
+
+    private String warehouseName;
+
+    private String creater;
+
+    private Date createTime;
+
+    private String createUnit;
+
+    private String createDepot;
+
+    private Date updateTime;
+
+    private Integer orgId;
+
+    private Integer inApplication;
+
+    private Integer createrId;
+
+    private Integer rootContractBid;
+
+    private String identification;
+
+    private String carnumber;
+    
+    //业务字段(用于通知单新增)
+    private Integer grainProducingArea;
+    
+    
+
+    public Integer getGrainProducingArea() {
+		return grainProducingArea;
+	}
+
+	public void setGrainProducingArea(Integer grainProducingArea) {
+		this.grainProducingArea = grainProducingArea;
+	}
+
+	/**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 凭证类型(1 入库凭证；3 出库凭证)
+     * @return bill_type 凭证类型(1 入库凭证；3 出库凭证)
+     */
+    public String getBillType() {
+        return billType;
+    }
+
+    /**
+     * 凭证类型(1 入库凭证；3 出库凭证)
+     * @param billType 凭证类型(1 入库凭证；3 出库凭证)
+     */
+    public void setBillType(String billType) {
+        this.billType = billType == null ? null : billType.trim();
+    }
+
+    /**
+     * 出入库通知单类型id
+     * @return bill_type_id 出入库通知单类型id
+     */
+    public Integer getBillTypeId() {
+        return billTypeId;
+    }
+
+    /**
+     * 出入库通知单类型id
+     * @param billTypeId 出入库通知单类型id
+     */
+    public void setBillTypeId(Integer billTypeId) {
+        this.billTypeId = billTypeId;
+    }
+
+    /**
+     * 通知单编号
+     * @return bill_number 通知单编号
+     */
+    public String getBillNumber() {
+        return billNumber;
+    }
+
+    /**
+     * 通知单编号
+     * @param billNumber 通知单编号
+     */
+    public void setBillNumber(String billNumber) {
+        this.billNumber = billNumber == null ? null : billNumber.trim();
+    }
+
+    /**
+     * 数量
+     * @return shiping_count 数量
+     */
+    public String getShipingCount() {
+        return shipingCount;
+    }
+
+    /**
+     * 数量
+     * @param shipingCount 数量
+     */
+    public void setShipingCount(String shipingCount) {
+        this.shipingCount = shipingCount == null ? null : shipingCount.trim();
+    }
+
+    /**
+     * 完成数量
+     * @return finished_count 完成数量
+     */
+    public String getFinishedCount() {
+        return finishedCount;
+    }
+
+    /**
+     * 完成数量
+     * @param finishedCount 完成数量
+     */
+    public void setFinishedCount(String finishedCount) {
+        this.finishedCount = finishedCount == null ? null : finishedCount.trim();
+    }
+
+    /**
+     * 已收到总金额
+     * @return received_money 已收到总金额
+     */
+    public String getReceivedMoney() {
+        return receivedMoney;
+    }
+
+    /**
+     * 已收到总金额
+     * @param receivedMoney 已收到总金额
+     */
+    public void setReceivedMoney(String receivedMoney) {
+        this.receivedMoney = receivedMoney == null ? null : receivedMoney.trim();
+    }
+
+    /**
+     * 客户id
+     * @return customer_bid 客户id
+     */
+    public Integer getCustomerBid() {
+        return customerBid;
+    }
+
+    /**
+     * 客户id
+     * @param customerBid 客户id
+     */
+    public void setCustomerBid(Integer customerBid) {
+        this.customerBid = customerBid;
+    }
+
+    /**
+     * 
+     * @return customer_number 
+     */
+    public String getCustomerNumber() {
+        return customerNumber;
+    }
+
+    /**
+     * 
+     * @param customerNumber 
+     */
+    public void setCustomerNumber(String customerNumber) {
+        this.customerNumber = customerNumber == null ? null : customerNumber.trim();
+    }
+
+    /**
+     * 联系电话
+     * @return mobile 联系电话
+     */
+    public String getMobile() {
+        return mobile;
+    }
+
+    /**
+     * 联系电话
+     * @param mobile 联系电话
+     */
+    public void setMobile(String mobile) {
+        this.mobile = mobile == null ? null : mobile.trim();
+    }
+
+    /**
+     * 单位名称(提货单的提货单位；或者是发货单的发货单位)
+     * @return delivery_customer 单位名称(提货单的提货单位；或者是发货单的发货单位)
+     */
+    public String getDeliveryCustomer() {
+        return deliveryCustomer;
+    }
+
+    /**
+     * 单位名称(提货单的提货单位；或者是发货单的发货单位)
+     * @param deliveryCustomer 单位名称(提货单的提货单位；或者是发货单的发货单位)
+     */
+    public void setDeliveryCustomer(String deliveryCustomer) {
+        this.deliveryCustomer = deliveryCustomer == null ? null : deliveryCustomer.trim();
+    }
+
+    /**
+     * 合同编号
+     * @return contract 合同编号
+     */
+    public String getContract() {
+        return contract;
+    }
+
+    /**
+     * 合同编号
+     * @param contract 合同编号
+     */
+    public void setContract(String contract) {
+        this.contract = contract == null ? null : contract.trim();
+    }
+
+    /**
+     * 合同id
+     * @return contract_bid 合同id
+     */
+    public Integer getContractBid() {
+        return contractBid;
+    }
+
+    /**
+     * 合同id
+     * @param contractBid 合同id
+     */
+    public void setContractBid(Integer contractBid) {
+        this.contractBid = contractBid;
+    }
+
+    /**
+     * 计划编号
+     * @return plan_number 计划编号
+     */
+    public String getPlanNumber() {
+        return planNumber;
+    }
+
+    /**
+     * 计划编号
+     * @param planNumber 计划编号
+     */
+    public void setPlanNumber(String planNumber) {
+        this.planNumber = planNumber == null ? null : planNumber.trim();
+    }
+
+    /**
+     * 计划id
+     * @return plan_bid 计划id
+     */
+    public Integer getPlanBid() {
+        return planBid;
+    }
+
+    /**
+     * 计划id
+     * @param planBid 计划id
+     */
+    public void setPlanBid(Integer planBid) {
+        this.planBid = planBid;
+    }
+
+    /**
+     * 备注
+     * @return bill_memo 备注
+     */
+    public String getBillMemo() {
+        return billMemo;
+    }
+
+    /**
+     * 备注
+     * @param billMemo 备注
+     */
+    public void setBillMemo(String billMemo) {
+        this.billMemo = billMemo == null ? null : billMemo.trim();
+    }
+
+    /**
+     * 
+     * @return grain_price 
+     */
+    public String getGrainPrice() {
+        return grainPrice;
+    }
+
+    /**
+     * 
+     * @param grainPrice 
+     */
+    public void setGrainPrice(String grainPrice) {
+        this.grainPrice = grainPrice == null ? null : grainPrice.trim();
+    }
+
+    /**
+     * 金额
+     * @return money_quantity 金额
+     */
+    public String getMoneyQuantity() {
+        return moneyQuantity;
+    }
+
+    /**
+     * 金额
+     * @param moneyQuantity 金额
+     */
+    public void setMoneyQuantity(String moneyQuantity) {
+        this.moneyQuantity = moneyQuantity == null ? null : moneyQuantity.trim();
+    }
+
+    /**
+     * 粮食年期
+     * @return grain_annual 粮食年期
+     */
+    public Integer getGrainAnnual() {
+        return grainAnnual;
+    }
+
+    /**
+     * 粮食年期
+     * @param grainAnnual 粮食年期
+     */
+    public void setGrainAnnual(Integer grainAnnual) {
+        this.grainAnnual = grainAnnual;
+    }
+
+    /**
+     * 绑定的仓库
+     * @return warehouse 绑定的仓库
+     */
+    public Integer getWarehouse() {
+        return warehouse;
+    }
+
+    /**
+     * 绑定的仓库
+     * @param warehouse 绑定的仓库
+     */
+    public void setWarehouse(Integer warehouse) {
+        this.warehouse = warehouse;
+    }
+
+    /**
+     * 绑定的仓房货位
+     * @return goods_location 绑定的仓房货位
+     */
+    public Integer getGoodsLocation() {
+        return goodsLocation;
+    }
+
+    /**
+     * 绑定的仓房货位
+     * @param goodsLocation 绑定的仓房货位
+     */
+    public void setGoodsLocation(Integer goodsLocation) {
+        this.goodsLocation = goodsLocation;
+    }
+
+    /**
+     * 审批状态 0待提交，1审批中，2同意，3驳回，4拒绝
+     * @return audit_state 审批状态 0待提交，1审批中，2同意，3驳回，4拒绝
+     */
+    public String getAuditState() {
+        return auditState;
+    }
+
+    /**
+     * 审批状态 0待提交，1审批中，2同意，3驳回，4拒绝
+     * @param auditState 审批状态 0待提交，1审批中，2同意，3驳回，4拒绝
+     */
+    public void setAuditState(String auditState) {
+        this.auditState = auditState == null ? null : auditState.trim();
+    }
+
+    /**
+     * 入库时间
+     * @return storage_time 入库时间
+     */
+    public Date getStorageTime() {
+        return storageTime;
+    }
+
+    /**
+     * 入库时间
+     * @param storageTime 入库时间
+     */
+    public void setStorageTime(Date storageTime) {
+        this.storageTime = storageTime;
+    }
+
+    /**
+     * 流程实例id
+     * @return process_instance_id 流程实例id
+     */
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    /**
+     * 流程实例id
+     * @param processInstanceId 流程实例id
+     */
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId == null ? null : processInstanceId.trim();
+    }
+
+    /**
+     * 流程定义id
+     * @return process_definition_id 流程定义id
+     */
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    /**
+     * 流程定义id
+     * @param processDefinitionId 流程定义id
+     */
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId == null ? null : processDefinitionId.trim();
+    }
+
+    /**
+     * 质量标准
+     * @return quality_standard 质量标准
+     */
+    public String getQualityStandard() {
+        return qualityStandard;
+    }
+
+    /**
+     * 质量标准
+     * @param qualityStandard 质量标准
+     */
+    public void setQualityStandard(String qualityStandard) {
+        this.qualityStandard = qualityStandard == null ? null : qualityStandard.trim();
+    }
+
+    /**
+     * 审批完成时间
+     * @return agree_time 审批完成时间
+     */
+    public Date getAgreeTime() {
+        return agreeTime;
+    }
+
+    /**
+     * 审批完成时间
+     * @param agreeTime 审批完成时间
+     */
+    public void setAgreeTime(Date agreeTime) {
+        this.agreeTime = agreeTime;
+    }
+
+    /**
+     * 开单人名称
+     * @return bill_man 开单人名称
+     */
+    public String getBillMan() {
+        return billMan;
+    }
+
+    /**
+     * 开单人名称
+     * @param billMan 开单人名称
+     */
+    public void setBillMan(String billMan) {
+        this.billMan = billMan == null ? null : billMan.trim();
+    }
+
+    /**
+     * 开单日期
+     * @return bill_date 开单日期
+     */
+    public Date getBillDate() {
+        return billDate;
+    }
+
+    /**
+     * 开单日期
+     * @param billDate 开单日期
+     */
+    public void setBillDate(Date billDate) {
+        this.billDate = billDate;
+    }
+
+    /**
+     * 开单单位
+     * @return bill_unit 开单单位
+     */
+    public String getBillUnit() {
+        return billUnit;
+    }
+
+    /**
+     * 开单单位
+     * @param billUnit 开单单位
+     */
+    public void setBillUnit(String billUnit) {
+        this.billUnit = billUnit == null ? null : billUnit.trim();
+    }
+
+    /**
+     * 仓房编号 仓房id
+     * @return house_id 仓房编号 仓房id
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房编号 仓房id
+     * @param houseId 仓房编号 仓房id
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 仓房名称
+     * @return house_name 仓房名称
+     */
+    public String getHouseName() {
+        return houseName;
+    }
+
+    /**
+     * 仓房名称
+     * @param houseName 仓房名称
+     */
+    public void setHouseName(String houseName) {
+        this.houseName = houseName == null ? null : houseName.trim();
+    }
+
+    /**
+     * 货位号  货位id
+     * @return warehouse_id 货位号  货位id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位号  货位id
+     * @param warehouseId 货位号  货位id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 货位名称
+     * @return warehouse_name 货位名称
+     */
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    /**
+     * 货位名称
+     * @param warehouseName 货位名称
+     */
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName == null ? null : warehouseName.trim();
+    }
+
+    /**
+     * 
+     * @return creater 
+     */
+    public String getCreater() {
+        return creater;
+    }
+
+    /**
+     * 
+     * @param creater 
+     */
+    public void setCreater(String creater) {
+        this.creater = creater == null ? null : creater.trim();
+    }
+
+    /**
+     * 
+     * @return create_time 
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 
+     * @param createTime 
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 
+     * @return create_unit 
+     */
+    public String getCreateUnit() {
+        return createUnit;
+    }
+
+    /**
+     * 
+     * @param createUnit 
+     */
+    public void setCreateUnit(String createUnit) {
+        this.createUnit = createUnit == null ? null : createUnit.trim();
+    }
+
+    /**
+     * 
+     * @return create_depot 
+     */
+    public String getCreateDepot() {
+        return createDepot;
+    }
+
+    /**
+     * 
+     * @param createDepot 
+     */
+    public void setCreateDepot(String createDepot) {
+        this.createDepot = createDepot == null ? null : createDepot.trim();
+    }
+
+    /**
+     * 
+     * @return update_time 
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 
+     * @param updateTime 
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     * @return in_application 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     */
+    public Integer getInApplication() {
+        return inApplication;
+    }
+
+    /**
+     * 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     * @param inApplication 启用状态 0 : 未执行,1 : 执行中,2 : 执行完毕,3 : 终止,4 : 暂停
+     */
+    public void setInApplication(Integer inApplication) {
+        this.inApplication = inApplication;
+    }
+
+    /**
+     * 
+     * @return creater_id 
+     */
+    public Integer getCreaterId() {
+        return createrId;
+    }
+
+    /**
+     * 
+     * @param createrId 
+     */
+    public void setCreaterId(Integer createrId) {
+        this.createrId = createrId;
+    }
+
+    /**
+     * 起始合同id
+     * @return root_contract_bid 起始合同id
+     */
+    public Integer getRootContractBid() {
+        return rootContractBid;
+    }
+
+    /**
+     * 起始合同id
+     * @param rootContractBid 起始合同id
+     */
+    public void setRootContractBid(Integer rootContractBid) {
+        this.rootContractBid = rootContractBid;
+    }
+
+    /**
+     * 证件号
+     * @return identification 证件号
+     */
+    public String getIdentification() {
+        return identification;
+    }
+
+    /**
+     * 证件号
+     * @param identification 证件号
+     */
+    public void setIdentification(String identification) {
+        this.identification = identification == null ? null : identification.trim();
+    }
+
+    /**
+     * 
+     * @return carNumber 
+     */
+    public String getCarnumber() {
+        return carnumber;
+    }
+
+    /**
+     * 
+     * @param carnumber 
+     */
+    public void setCarnumber(String carnumber) {
+        this.carnumber = carnumber == null ? null : carnumber.trim();
+    }
+}

src/main/java/com/chinaitop/depot/business/model/BusinessFile.java

@@ -0,0 +1,239 @@
+package com.chinaitop.depot.business.model;
+
+import java.util.Date;
+
+public class BusinessFile {
+    private Integer id;
+
+    private Integer bid;
+
+    private String type;
+
+    private String fileName;
+
+    private String originalFileName;
+
+    private String fileType;
+
+    private String source;
+
+    private String remarks;
+
+    private String filePath;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private Integer creater;
+
+    private Integer orgId;
+
+    /**
+     * 主键id
+     * @return id 主键id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键id
+     * @param id 主键id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 数据id
+     * @return bid 数据id
+     */
+    public Integer getBid() {
+        return bid;
+    }
+
+    /**
+     * 数据id
+     * @param bid 数据id
+     */
+    public void setBid(Integer bid) {
+        this.bid = bid;
+    }
+
+    /**
+     * 业务类型
+     * @return type 业务类型
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 业务类型
+     * @param type 业务类型
+     */
+    public void setType(String type) {
+        this.type = type == null ? null : type.trim();
+    }
+
+    /**
+     * 文件名称
+     * @return file_name 文件名称
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * 文件名称
+     * @param fileName 文件名称
+     */
+    public void setFileName(String fileName) {
+        this.fileName = fileName == null ? null : fileName.trim();
+    }
+
+    /**
+     * 文件原始名称
+     * @return original_file_name 文件原始名称
+     */
+    public String getOriginalFileName() {
+        return originalFileName;
+    }
+
+    /**
+     * 文件原始名称
+     * @param originalFileName 文件原始名称
+     */
+    public void setOriginalFileName(String originalFileName) {
+        this.originalFileName = originalFileName == null ? null : originalFileName.trim();
+    }
+
+    /**
+     * 文件类型
+     * @return file_type 文件类型
+     */
+    public String getFileType() {
+        return fileType;
+    }
+
+    /**
+     * 文件类型
+     * @param fileType 文件类型
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType == null ? null : fileType.trim();
+    }
+
+    /**
+     * 来源
+     * @return source 来源
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * 来源
+     * @param source 来源
+     */
+    public void setSource(String source) {
+        this.source = source == null ? null : source.trim();
+    }
+
+    /**
+     * 备注
+     * @return remarks 备注
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * 备注
+     * @param remarks 备注
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    /**
+     * 文件上传路径
+     * @return file_path 文件上传路径
+     */
+    public String getFilePath() {
+        return filePath;
+    }
+
+    /**
+     * 文件上传路径
+     * @param filePath 文件上传路径
+     */
+    public void setFilePath(String filePath) {
+        this.filePath = filePath == null ? null : filePath.trim();
+    }
+
+    /**
+     * 
+     * @return create_time 
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 
+     * @param createTime 
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 
+     * @return update_time 
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 
+     * @param updateTime 
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 
+     * @return creater 
+     */
+    public Integer getCreater() {
+        return creater;
+    }
+
+    /**
+     * 
+     * @param creater 
+     */
+    public void setCreater(Integer creater) {
+        this.creater = creater;
+    }
+
+    /**
+     * 
+     * @return org_id 
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 
+     * @param orgId 
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+}