new data

Dockerfile

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

pom.xml

@@ -0,0 +1,210 @@
+<?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-agent</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+	<name>depot-agent</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/>
+    </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.RELEASE</spring-cloud.version>
+	</properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+        <dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+        <!-- 引入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-client</artifactId>
+        </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>
+
+        <!-- 阿里巴巴json -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.37</version>
+        </dependency>
+        <dependency>    
+		    <groupId>net.sf.json-lib</groupId>    
+		    <artifactId>json-lib</artifactId>    
+		    <version>2.4</version>    
+		    <classifier>jdk15</classifier>    
+		</dependency>
+
+		<!-- gbase依赖包 -->  
+		<dependency>
+	      	<groupId>com.gbase8s</groupId>
+	      	<artifactId>ifxjdbc</artifactId>
+	      	<version>1.0</version>
+	    </dependency>
+    	<dependency>
+      		<groupId>com.gbase</groupId>
+      		<artifactId>druid</artifactId>
+      		<version>1.0.28</version>
+    	</dependency>
+    	
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.9</version>
+        </dependency>
+
+        <!-- 加载mybatis逆向生成工具包 -->
+        <dependency>
+		    <groupId>org.mybatis.generator</groupId>
+		    <artifactId>mybatis-generator-core</artifactId>
+		    <!-- 注意版本.这里我使用的是1.3.2 -->
+		    <version>1.3.2</version>
+		</dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.boot</groupId>-->
+            <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
+            <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+    </dependencies>
+
+    <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-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </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/DepotAgentApplication.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot;
+
+import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+@EnableEurekaClient
+@EnableDiscoveryClient
+@SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
+@MapperScan(basePackages = {"com.chinaitop.depot.agent.*.mapper"})
+public class DepotAgentApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DepotAgentApplication.class, args);
+	}
+}

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

@@ -0,0 +1,12 @@
+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(DepotAgentApplication.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.agent.*.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("智能粮库管理平台api文档")
+                .description("代储库管理")
+                .termsOfServiceUrl("http://192.168.80.25:9001")
+                .version("1.0")
+                .build();
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentController.java

@@ -0,0 +1,251 @@
+package com.chinaitop.depot.agent.basic.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 com.chinaitop.depot.agent.basic.model.*;
+import com.chinaitop.depot.agent.basic.service.agentDepotService;
+import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
+import com.chinaitop.depot.agent.basic.service.agentStorehouseService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 com.chinaitop.depot.agent.basic.service.agentService;
+import com.chinaitop.utils.ParameterUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping(value = "/agent")
+@Api(description = "代储点信息管理")
+public class AgentController {
+
+    @Resource
+    private agentService agentService;
+
+
+    @Resource
+    private agentDepotService agentDepotService;
+
+    @Resource
+    private agentStorehouseService agentStorehouseService;
+
+    @Resource
+    private agentStoreWareService agentStoreWareService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    /**
+     * 查询代储点信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentList", 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 = "agentName", value = "代储点名称", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public PageInfo<BusinessAgent> getAgentList(Integer pageNum, Integer pageSize,String agentName,String orgid){
+
+        BusinessAgentExample example = new BusinessAgentExample();
+        BusinessAgentExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.valueOf(orgid));
+        criteria.andDelFlagEqualTo(1);
+        if(ParameterUtil.isnotnull(agentName)){
+            criteria.andAgentNameLike("%"+agentName+"%");
+        }
+        example.setOrderByClause("updatetime desc");
+        PageHelper.startPage(pageNum, pageSize);
+        List<BusinessAgent> list = agentService.getAgentList(example);
+        PageInfo<BusinessAgent> pageInfo = new PageInfo<BusinessAgent>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 代储点查询信息--代储库列表转化用
+     * @return
+     */
+    @RequestMapping(value = "/getQueryAgentList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储点查询信息", notes = "代储点信息记录列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public Map<Integer, Object> getQueryAgentList(String orgId){
+        BusinessAgentExample example = new BusinessAgentExample();
+        BusinessAgentExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
+        criteria.andDelFlagEqualTo(1);
+        List<BusinessAgent> list = agentService.getAgentList(example);
+        Map<Integer, Object> agentData = new HashMap<Integer, Object>();
+        for (BusinessAgent obj : list) {
+            agentData.put(obj.getId(), obj);
+        }
+        return agentData;
+    }
+
+    /**
+     * 保存代储点信息
+     * @param agentJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgent", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存代储点信息", notes = "保存代储点详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentJson", value = "代储点信息", paramType = "form")
+    })
+    public Map<String, Object> saveAgent(String agentJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgent agent = (BusinessAgent)mapper.readValue(agentJson, BusinessAgent.class);
+        if (agent.getId() == null) {
+            agent.setOrgId(orgId);
+            agent.setDelFlag(1);
+            agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
+            agentService.add(agent);
+        } else {
+            agentService.update(agent);
+        }
+        modelMap.put("agentId", agent.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除代储点信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgent", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除代储点信息", notes = "删除代储点信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgent(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+//            this.removeDepotList(id);
+            agentService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找代储点信息
+     * @param id 主键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 BusinessAgent edit(Integer id) {
+        BusinessAgent agent = new BusinessAgent();
+        if (id != null) {
+            agent = agentService.findById(id);
+        }
+        return agent;
+    }
+
+
+    //根据库id删除粮库
+    public void removeDepotList(Integer agentId){
+        BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+        BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentIdEqualTo(agentId.toString());
+        List<BusinessAgentDepot> depotList = agentDepotService.getAgentDepotList(example);
+        for (BusinessAgentDepot depotData:depotList) {
+            agentDepotService.updateDeleteById(depotData.getId(),2);
+
+            this.removeWareList(depotData.getId());
+        }
+    }
+    //根据库id删除仓房
+    public void removeStoreList(Integer depotId){
+        BusinessAgentStorehouseExample example = new BusinessAgentStorehouseExample();
+        BusinessAgentStorehouseExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentDepotIdEqualTo(depotId);
+        List<BusinessAgentStorehouse> storeList = agentStorehouseService.getStoreDataList(example);
+        for (BusinessAgentStorehouse storeData:storeList) {
+            agentStorehouseService.updateStoreDeleteById(storeData.getId(),2);
+
+            this.removeWareList(storeData.getId());
+        }
+    }
+
+    //根据仓房id删除货位
+    public void removeWareList(Integer storeHouseId){
+        BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+        BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentStorehouseIdEqualTo(storeHouseId);
+        List<BusinessAgentWarehouse> wareList = agentStoreWareService.getWareDataList(example);
+        for (BusinessAgentWarehouse wareData:wareList) {
+            agentStoreWareService.removeAgentWare(wareData.getId(),2);
+        }
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"代储点名称", "法定代表人", "统一社会信用代码", "代储点性质", "代储点类型", "仓容",
+                "人员", "信用", "经度", "纬度", "所属行政区划分"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false, false,
+                true, true, false, true, true};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,0);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentService.importData(list, orgId);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentDepotController.java

@@ -0,0 +1,445 @@
+package com.chinaitop.depot.agent.basic.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.chinaitop.depot.agent.basic.model.*;
+import com.chinaitop.depot.agent.basic.service.agentDepotService;
+import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
+import com.chinaitop.depot.agent.basic.service.agentStorehouseService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+@RestController
+@RequestMapping(value = "/agentDepot")
+@Api(description = "代储点信息管理")
+public class AgentDepotController {
+
+    @Resource
+    private agentDepotService agentDepotService;
+
+    @Resource
+    private agentStorehouseService agentStorehouseService;
+
+    @Resource
+    private agentStoreWareService agentStoreWareService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    /**
+     * 代储库信息信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentDepotList", 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 = "agentDepotName", value = "代储库名称", paramType = "query"),
+            @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public PageInfo<BusinessAgentDepot> getAgentDepotList(Integer pageNum, Integer pageSize,String agentDepotName,String orgid, String agentId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgid);
+        if(ParameterUtil.isnotnull(agentDepotName)){
+            map.put("agentDepotName","%" + agentDepotName + "%");
+        }
+        if(ParameterUtil.isnotnull(agentId)){
+            map.put("agentId",agentId);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<BusinessAgentDepot> list = agentDepotService.getAgentList(map);
+        PageInfo<BusinessAgentDepot> pageInfo = new PageInfo<BusinessAgentDepot>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 代储库信息信息记录--仓房用
+     * @return
+     */
+    @RequestMapping(value = "/getAgentDepotHouse", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储库信息", notes = "代储点粮库信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentDepotName", value = "代储库名称", paramType = "query"),
+            @ApiImplicitParam(name = "agentId", value = "代储点id", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public List<BusinessAgentDepot> getAgentDepotHouse(String agentDepotName,String orgid, String agentId){
+        BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+        BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.parseInt(orgid));
+        criteria.andDepotIdEqualTo(0);
+        criteria.andDelFlagEqualTo(1);
+        if(ParameterUtil.isnotnull(agentDepotName)){
+            criteria.andAgentDepotNameLike("%" + agentDepotName + "%");
+        }
+        if(ParameterUtil.isnotnull(agentId)){
+            criteria.andAgentIdEqualTo(agentId);
+        }
+
+        List<BusinessAgentDepot> list = agentDepotService.getAgentDepotList(example);
+        return list;
+    }
+
+    /**
+     * 保存代储点信息
+     * @param agentJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgentDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存代储点信息", notes = "保存代储点详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentJson", value = "代储库信息", paramType = "form")
+    })
+    public Map<String, Object> saveAgentDepot(String agentJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentDepot agentDepot = (BusinessAgentDepot)mapper.readValue(agentJson, BusinessAgentDepot.class);
+        agentDepot.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+        if (agentDepot.getId() == null) {
+            agentDepot.setOrgId(orgId);
+            agentDepot.setDelFlag(1);
+            agentDepot.setDepotId(0);
+            agentDepotService.add(agentDepot);
+        } else {
+            agentDepotService.update(agentDepot);
+        }
+        modelMap.put("agentId", agentDepot.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除代储库信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除代储库信息", notes = "删除代储库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgentDepot(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentDepotService.updateDeleteById(id,2);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找代储点信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/editDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id查找代储点信息", notes = "根据id查找代储点信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
+    })
+    public BusinessAgentDepot editDepot(Integer id) {
+        BusinessAgentDepot agentDepot = new BusinessAgentDepot();
+        if (id != null) {
+            agentDepot = agentDepotService.findById(id);
+        }
+        return agentDepot;
+    }
+
+    /**
+     * 代储库查询信息--列表转化用
+     * @return
+     */
+    @RequestMapping(value = "/getQueryAgentDepotList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储库查询信息", notes = "代储库信息记录列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public Map<Integer, Object> getQueryAgentDepotList(String orgId,Integer depotId){
+        BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+        BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
+        criteria.andDelFlagEqualTo(1);
+        if(depotId!=null && depotId!=000){
+        	criteria.andDepotIdEqualTo(depotId);
+        }
+        if(depotId!=null && depotId==000){ //去掉手动新增的库点
+        	criteria.andDepotIdNotEqualTo(0);
+        }
+        List<BusinessAgentDepot> list = agentDepotService.getAgentDepotList(example);
+        Map<Integer, Object> agentData = new HashMap<Integer, Object>();
+        for (BusinessAgentDepot obj : list) {
+            agentData.put(obj.getId(), obj);
+        }
+        return agentData;
+    }
+
+    /**
+     * 查找所有粮库
+     * @param orgName 组织机构名称
+     * @return
+     */
+    @RequestMapping(value="/getDepotList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查找所有粮库", notes = "查找所有粮库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="orgId", value="组织机构id", paramType="query"),
+            @ApiImplicitParam(name="storehouseId", value="仓房id", paramType="query"),
+            @ApiImplicitParam(name="orgName", value="组织机构名称", paramType="query")
+    })
+    public List<List<Map<String, Object>>> getDepotList(String orgId,String storehouseId,String orgName) {
+        //查询所有粮库
+        Map<String,Object> map = new HashMap<>();
+        map.put("agentDepotId",orgId);
+        map.put("storehouseId",storehouseId);
+
+        if(ParameterUtil.isnotnull(orgName)){
+            map.put("orgName","%" + orgName + "%");
+        }
+        //查出来的数据
+        List<Map<String, Object>> list = agentDepotService.getDepotList(map);
+        //准备处理，每六条数据一个list
+        List<List<Map<String, Object>>> dataList = new ArrayList<List<Map<String, Object>>>();
+        List<Map<String, Object>> six = new ArrayList<Map<String, Object>>();
+        for (int i = 0;i<list.size();i++){
+            six.add(list.get(i));
+            //如果查出来的数据小于六条则直接加入总数据返回
+            if(ParameterUtil.isequal(six.size(),list.size())){
+                dataList.add(six);
+            }
+            if(ParameterUtil.isequal((i+1)%6,0)){
+                dataList.add(six);
+                six = new ArrayList<Map<String, Object>>();;
+            }
+        }
+        return dataList;
+    }
+
+//    /**
+//     * 保存已有粮库代储库信息----老--2019/20/23号，3个月后无改动可删除
+//     * @param depotList 已有粮库
+//     * @return
+//     * @throws Exception
+//     */
+//    @RequestMapping(value="/saveLaoDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+//    @ApiOperation(value="保存已有粮库代储库信息", notes = "保存已有粮库代储库信息")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "depotList", value = "已有粮库", paramType = "form"),
+//            @ApiImplicitParam(name = "agentId", value = "代储点Id", paramType = "form"),
+//            @ApiImplicitParam(name = "orgId", value = "组织结构id", paramType = "form")
+//    })
+//    public Map<String, Object> saveLaoDepot(String depotList,String agentId,Integer orgId) throws Exception {
+//        Map<String, Object> modelMap = new HashMap<String, Object>();
+//        // JSON字符串转对象s
+//        List<String> depotLists= JSONArray.parseArray(depotList,String.class);
+//        for (String data:depotLists) {
+//            List<String> six= JSONArray.parseArray(data,String.class);
+//            for (String sixdata:six) {
+//                Map<String, String> map = ParameterUtil.stringToMap(sixdata.substring(1,sixdata.length()-1),":",",");
+//                if(ParameterUtil.isnotnull(map.get("stateLao")) && ParameterUtil.isequal(map.get("stateLao"),"1")){//判断库是否已经是代储库
+//                    //如果是代储库判断是否有改动
+//                    if(ParameterUtil.isequal(map.get("stateValue"),"0") || ParameterUtil.isequal(map.get("stateValue"),"false")){
+//                        this.removeStoreList(Integer.parseInt(map.get("id")));
+//                        //有改动直接修改状态为删除---1正常，2删除
+//                        agentDepotService.updateDeleteById(Integer.parseInt(map.get("id")),2);
+//                    }
+//                }else if(ParameterUtil.isequal(map.get("stateValue"),"true")){
+//                    //去数据库中查询，看看是否已经添加，但是删除的数据
+//                    Map<String,Object> getDepot = new HashMap<>();
+//                    getDepot.put("depotId",Integer.parseInt(map.get("orgId")));
+//                    List<Map<String,Object>> dataList = agentDepotService.getDepot(getDepot);
+//                    if(!ParameterUtil.isequal(dataList.size(),0)){//如果有已经添加但是删除的数据则回复成正常数据
+//                        agentDepotService.updateDeleteById(Integer.parseInt(dataList.get(0).get("id").toString()),1);
+//                    }else{//如果没有则新增
+//                        BusinessAgentDepot agentDepot = new BusinessAgentDepot();
+//                        agentDepot.setOrgId(orgId);
+//                        agentDepot.setDelFlag(1);
+//                        agentDepot.setAgentId(agentId);
+//                        agentDepot.setAgentDepotName(map.get("orgName").substring(1,map.get("orgName").length()-1));
+//                        agentDepot.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+//                        agentDepot.setDepotId(Integer.parseInt(map.get("orgId")));
+//                        agentDepotService.add(agentDepot);
+//                    }
+//                }
+//            }
+//        }
+//
+//        modelMap.put("status", "success");
+//        return modelMap;
+//    }
+
+    /**
+     * 保存已有粮库代储库信息
+     * @param agentDepotId 选中粮库
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveLaoDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存已有粮库代储库信息", notes = "保存已有粮库代储库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentDepotId", value = "已有粮库", paramType = "form"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "form"),
+            @ApiImplicitParam(name = "warehouIds", value = "货位id集合", paramType = "form"),
+            @ApiImplicitParam(name = "orgName", value = "组织结构名称", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "组织结构id", paramType = "form")
+    })
+    public Map<String, Object> saveLaoDepot(Integer agentDepotId,Integer storehouseId,String warehouIds,String orgName,Integer orgId) throws Exception {
+        //添加代储库
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        //查询是否已经添加过此粮库，如果添加过则过滤，不再添加
+        BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+        BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(agentDepotId);
+        criteria.andDepotIdEqualTo(orgId);
+        List<BusinessAgentDepot> depotNum = agentDepotService.selectIdNum(example);
+        //添加仓房
+        BusinessAgentStorehouse agentStorehouse = new BusinessAgentStorehouse();
+        agentStorehouse.setOrgId(agentDepotId);
+        agentStorehouse.setDelFlag(1);
+
+        if(depotNum.size() == 0){
+            BusinessAgentDepot agentDepot = new BusinessAgentDepot();
+            agentDepot.setOrgId(agentDepotId);
+            agentDepot.setDelFlag(1);
+            agentDepot.setAgentDepotName(orgName);
+            agentDepot.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+            agentDepot.setDepotId(orgId);
+            agentDepotService.add(agentDepot);
+            agentStorehouse.setAgentDepotId(agentDepot.getId());
+        }else if(depotNum.get(0).getDelFlag() == 2){
+            agentDepotService.updateDeleteById(depotNum.get(0).getId(),1);
+            agentStorehouse.setAgentDepotId(depotNum.get(0).getId());
+        }else{
+            agentStorehouse.setAgentDepotId(depotNum.get(0).getId());
+        }
+
+        agentStorehouse.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+        agentStorehouse.setStorehouseId(storehouseId);
+        agentStorehouseService.add(agentStorehouse);
+
+        //添加货位
+        String[] wareIds = warehouIds.split("\\|");
+        for (String wareId: wareIds ) {
+            BusinessAgentWarehouse agentWarehouse = new BusinessAgentWarehouse();
+            agentWarehouse.setWarehouseId(Integer.parseInt(wareId));
+            agentWarehouse.setAgentStorehouseId(agentStorehouse.getId());
+            agentWarehouse.setOrgId(agentDepotId);
+            agentWarehouse.setDelFlag(1);
+            agentWarehouse.setCreateTime(ParameterUtil.string2datetime(ParameterUtil.getSysDateTime()));//修改时间
+            agentWarehouse.setBgmxzTbsj(ParameterUtil.string2datetime(ParameterUtil.getSysDateTime()));
+            agentWarehouse.setQccrkTbsj(ParameterUtil.string2datetime(ParameterUtil.getSysDateTime()));
+            agentWarehouse.setHccrkTbsj(ParameterUtil.string2datetime(ParameterUtil.getSysDateTime()));
+            agentStoreWareService.addWareHouse(agentWarehouse);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 保存粮库代储企业信息
+     * @param agentId 选中粮库
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/addAgentId", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存粮库代储企业信息", notes = "保存粮库代储企业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "代储库id", paramType = "form"),
+            @ApiImplicitParam(name = "agentId", value = "代储企业id", paramType = "form")
+    })
+    public Map<String, Object> addAgentId(Integer id,String agentId) throws Exception {
+        //添加代储库
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        BusinessAgentDepot agentDepot = new BusinessAgentDepot();
+        agentDepot.setId(id);
+        agentDepot.setAgentId(agentId);
+        agentDepotService.updateByPrimaryKeySelective(agentDepot);
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importDepotFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importDepotFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"库点名称","代储点名称", "库点类别", "设计仓容", "地址","电话","经度", "纬度", "所属行政区划分"};//第一行的title
+        boolean[] emptyArr = {false, false, false, true, true, true, true, true, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,0);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentDepotService.importData(list, orgId);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+
+    //根据库id删除仓房
+    public void removeStoreList(Integer depotId){
+        BusinessAgentStorehouseExample example = new BusinessAgentStorehouseExample();
+        BusinessAgentStorehouseExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentDepotIdEqualTo(depotId);
+        List<BusinessAgentStorehouse> storeList = agentStorehouseService.getStoreDataList(example);
+        for (BusinessAgentStorehouse storeData:storeList) {
+            agentStorehouseService.updateStoreDeleteById(storeData.getId(),2);
+
+            this.removeWareList(storeData.getId());
+        }
+    }
+
+    //根据仓房id删除货位
+    public void removeWareList(Integer storeHouseId){
+        BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+        BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentStorehouseIdEqualTo(storeHouseId);
+        List<BusinessAgentWarehouse> wareList = agentStoreWareService.getWareDataList(example);
+        for (BusinessAgentWarehouse wareData:wareList) {
+            agentStoreWareService.removeAgentWare(wareData.getId(),2);
+        }
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentPeopleController.java

@@ -0,0 +1,127 @@
+package com.chinaitop.depot.agent.basic.controller;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeople;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample;
+import com.chinaitop.depot.agent.basic.service.agentPeopleService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/agentPeople")
+@Api(description = "人员信息管理")
+public class AgentPeopleController {
+
+    @Resource
+    private agentPeopleService agentPeopleService;
+
+    /**
+     * 查询人员信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentPeopleList", 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 = "PeopleName", value = "人员名称", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public PageInfo<BusinessAgentPeople> getAgentPeopleList(Integer pageNum, Integer pageSize,String PeopleName,String orgId){
+
+        BusinessAgentPeopleExample example = new BusinessAgentPeopleExample();
+        BusinessAgentPeopleExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
+        if(ParameterUtil.isnotnull(PeopleName)){
+            criteria.andPeopleNameLike("%"+PeopleName+"%");
+        }
+        example.setOrderByClause("updatetime desc");
+        PageHelper.startPage(pageNum, pageSize);
+        List<BusinessAgentPeople> list = agentPeopleService.getAgentList(example);
+        PageInfo<BusinessAgentPeople> pageInfo = new PageInfo<BusinessAgentPeople>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存人员信息
+     * @param agentJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgentPeople", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存人员信息", notes = "保存人员详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentJson", value = "人员信息", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public Map<String, Object> saveAgentPeople(String agentJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentPeople agentPeople = (BusinessAgentPeople)mapper.readValue(agentJson, BusinessAgentPeople.class);
+        agentPeople.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+        if (agentPeople.getId() == null) {
+            agentPeople.setOrgId(orgId);
+            agentPeopleService.add(agentPeople);
+        } else {
+            agentPeopleService.update(agentPeople);
+        }
+        modelMap.put("agentId", agentPeople.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除代储点信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentPeople", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除人员信息", notes = "删除人员信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgentPeople(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentPeopleService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找人员信息
+     * @param id 主键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 BusinessAgentPeople edit(Integer id) {
+        BusinessAgentPeople agentPeople = new BusinessAgentPeople();
+        if (id != null) {
+            agentPeople = agentPeopleService.findById(id);
+        }
+        return agentPeople;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentStoreWareController.java

@@ -0,0 +1,113 @@
+package com.chinaitop.depot.agent.basic.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+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.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
+import com.chinaitop.utils.ParameterUtil;
+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 = "/agentStoreWare")
+@Api(description = "代储货位信息管理")
+public class AgentStoreWareController {
+
+    @Resource
+    private agentStoreWareService agentStoreWareService;
+
+    /**
+     * 货位列表
+     * @return
+     */
+    @RequestMapping(value = "/getWareList", 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 = "warehouseName", value = "货位名称", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public PageInfo<Map<String,Object>> getWareList(Integer pageNum, Integer pageSize, String warehouseName, String storehouseId, String orgId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        if(ParameterUtil.isnotnull(warehouseName)){
+            map.put("warehouseName","%" + warehouseName + "%");
+        }
+        if(ParameterUtil.isnotnull(storehouseId)){
+            map.put("storehouseId",storehouseId);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String,Object>> list = agentStoreWareService.getWareList(map);
+        PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(list);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> page_list = ParameterUtil.slashCapitals(pageInfo.getList());
+        pageInfo.setList(page_list);
+        return pageInfo;
+    }
+
+    /**
+     * 根据agent_storehouse_id(仓房id)和orgId 获取货位的列表
+     */
+    @RequestMapping(value = "/getAgentWarehouseList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储库的货位信息", notes = "代储库的货位信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+            @ApiImplicitParam(name = "agentStorehouseId", value = "仓房id", paramType = "query")
+    })
+    public List<Map<String, Object>> getAgentWarehouseList(Integer orgId,Integer agentStorehouseId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        map.put("agentStorehouseId",agentStorehouseId);
+        List<Map<String, Object>> list = agentStoreWareService.getAgentStoreWare(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        return listDatas;
+    }
+
+    /**
+     * 查询已有货位
+     */
+    @RequestMapping(value="/getWarehouse", method = RequestMethod.GET)
+    @ApiOperation(value="根据单位和仓房查询货位信息（货位对外接口）", notes = "根据单位和仓房查询货位信息（货位对外接口）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "unitId", value = "单位ID", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房ID", paramType = "query")
+    })
+    public Map<String, Object> getWarehouse(Integer unitId, Integer storehouseId) {
+        Map<String, Object> map = null;
+
+        map = agentStoreWareService.getWarehouse(unitId, storehouseId);
+        //处理驼峰命名大写问题
+        Map<String, Object> mapData = ParameterUtil.slashCapitals(map);
+        return mapData;
+    }
+    
+    /**
+     * 除去代储货位的本库货位
+     */
+    @RequestMapping(value = "/getAgentWareHouseId", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="除去代储货位的本库货位", notes = "除去代储货位的本库货位")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public List<Integer> getAgentwareHouseId(Integer orgId){
+        return agentStoreWareService.getAgentwareHouseId(orgId);
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentStorehouseController.java

@@ -0,0 +1,224 @@
+package com.chinaitop.depot.agent.basic.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import com.chinaitop.depot.agent.basic.service.agentDepotService;
+import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
+import com.chinaitop.depot.agent.basic.service.agentStorehouseService;
+import com.chinaitop.utils.ParameterUtil;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/agentStorehouse")
+@Api(description = "代储仓房信息管理")
+public class AgentStorehouseController {
+
+    @Resource
+    private agentDepotService agentDepotService;
+
+    @Resource
+    private agentStorehouseService agentStorehouseService;
+
+    @Resource
+    private agentStoreWareService agentStoreWareService;
+
+    /**
+     * 代储库信息
+     * @return
+     */
+    @RequestMapping(value = "/getDepotInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储库信息", notes = "代储点粮库信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public List<Map<String,Object>> getDepotInfo(String orgId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        List<Map<String,Object>> list = agentDepotService.getDepotLaoList(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        return listDatas;
+    }
+
+    /**
+     * 代储仓房信息
+     * @return
+     */
+    @RequestMapping(value = "/getAgentStoreInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储仓房信息", notes = "代储点仓房信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+            @ApiImplicitParam(name = "depotId", value = "代储库id", paramType = "query")
+    })
+    public List<Map<String,Object>> getAgentStoreInfo(String depotId, String orgId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        map.put("depotId",depotId);
+        List<Map<String,Object>> list = agentStorehouseService.getAgentStoreInfo(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        return listDatas;
+    }
+
+    /**
+     * 获取代储库下边的仓房信息，已有粮库和手加粮库都有
+     * @return
+     */
+    @RequestMapping(value = "/getDepotToStoreList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储仓房信息", notes = "代储点仓房信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query"),
+            @ApiImplicitParam(name = "depotId", value = "代储库id", paramType = "query")
+    })
+    public List<Map<String,Object>> getDepotToStoreList(String orgId, String depotId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        map.put("depotId",depotId);
+        List<Map<String,Object>> list = agentStorehouseService.getDepotToStoreList(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        return listDatas;
+    }
+
+    /**
+     * 仓房列表
+     * @return
+     */
+    @RequestMapping(value = "/getStoreList", 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 = "agentDepotName", value = "代储库名称", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public PageInfo<Map<String,Object>> getStoreList(Integer pageNum, Integer pageSize, String agentDepotName, String orgId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        if(ParameterUtil.isnotnull(agentDepotName)){
+            map.put("agentDepotName","%" + agentDepotName + "%");
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String,Object>> list = agentStorehouseService.getStoreList(map);
+        PageInfo<Map<String,Object>> pageInfo = new PageInfo<Map<String,Object>>(list);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> page_list = ParameterUtil.slashCapitals(pageInfo.getList());
+        pageInfo.setList(page_list);
+        return pageInfo;
+    }
+
+    /**
+     * 查找粮库下仓房
+     * @param orgId 组织机构名称
+     * @return
+     */
+    @RequestMapping(value="/getStorehouseList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查找粮库下仓房", notes = "查找粮库下仓房信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="orgId", value="组织机构id", paramType="query"),
+            @ApiImplicitParam(name="depotId", value="代储点Id", paramType="query")
+    })
+    public List<List<Map<String, Object>>> getStorehouseList(String orgId,String depotId) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        if(ParameterUtil.isnotnull(depotId)){
+            map.put("depotId",depotId);
+        }
+        //查出来的数据
+        List<Map<String, Object>> list = agentStorehouseService.getStorehouseList(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        //准备处理，每六条数据一个list
+        List<List<Map<String, Object>>> dataList = new ArrayList<List<Map<String, Object>>>();
+        List<Map<String, Object>> six = new ArrayList<Map<String, Object>>();
+        for (int i = 0;i<listDatas.size();i++){
+            six.add(listDatas.get(i));
+            //如果查出来的数据小于六条则直接加入总数据返回
+            if(ParameterUtil.isequal(six.size(),listDatas.size())){
+                dataList.add(six);
+            }
+            if(ParameterUtil.isequal((i+1)%6,0)){
+                dataList.add(six);
+                six = new ArrayList<Map<String, Object>>();;
+            }
+        }
+        return dataList;
+    }
+
+    /**
+     * 根据agent_depot_id、orgId 获取仓房信息
+     * @return
+     */
+    @RequestMapping(value = "/getAgentStorehouseInfo", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="代储仓房信息", notes = "代储点仓房信息列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public List<Map<String, Object>> getAgentStorehouseInfo(Integer orgId,Integer agentDepotId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgId);
+        map.put("agentDepotId",agentDepotId);
+        List<Map<String, Object>> list = agentStorehouseService.getAgentStorehouse(map);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+        return listDatas;
+    }
+
+    //根据仓房id删除仓房
+    @RequestMapping(value="/removeStoreHouse", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除仓房", notes = "根据仓房id删除仓房")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "depotId", value = "代储粮库id", paramType = "form"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "form")
+    })
+    public void removeStoreHouse(Integer depotId,Integer storehouseId){
+        agentDepotService.updateDeleteById(depotId,2);
+        agentStorehouseService.updateStoreDeleteById(storehouseId,2);
+        this.removeWareList(storehouseId);
+    }
+
+    //根据仓房id删除货位
+    public void removeWareList(Integer storeHouseId){
+        BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+        BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+        criteria.andAgentStorehouseIdEqualTo(storeHouseId);
+        List<BusinessAgentWarehouse> wareList = agentStoreWareService.getWareDataList(example);
+        for (BusinessAgentWarehouse wareData:wareList) {
+            agentStoreWareService.removeAgentWare(wareData.getId(),2);
+        }
+    }
+    
+    
+    /**
+     * 获取本库的代储仓房(启用着的)
+     * @return
+     */
+    @RequestMapping(value = "/getAgentHouseId", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取本库的代储仓房(启用着的)", notes = "获取本库的代储仓房(启用着的)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public List<Integer> getAgentHouseId(Integer orgId){
+         
+        return agentDepotService.getAgentHouseId(orgId);
+    }
+    
+}

src/main/java/com/chinaitop/depot/agent/basic/controller/AgentTankController.java

@@ -0,0 +1,175 @@
+package com.chinaitop.depot.agent.basic.controller;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
+import com.chinaitop.depot.agent.basic.service.agentTankService;
+import com.chinaitop.depot.agent.basic.service.agentTankService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/agentTank")
+@Api(description = "油罐信息管理")
+public class AgentTankController {
+
+    @Resource
+    private agentTankService agentTankService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    /**
+     * 查询油罐信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentTankList", 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 = "tankNumber", value = "油罐编号", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public PageInfo<BusinessAgentTank> getAgentList(Integer pageNum, Integer pageSize,String tankNumber,String orgId){
+
+        BusinessAgentTankExample example = new BusinessAgentTankExample();
+        BusinessAgentTankExample.Criteria criteria = example.createCriteria();
+        criteria.andOrgIdEqualTo(Integer.valueOf(orgId));
+        if(ParameterUtil.isnotnull(tankNumber)){
+            criteria.andTankNumberLike("%" + tankNumber +"%");
+        }
+        example.setOrderByClause("updatetime desc");
+        PageHelper.startPage(pageNum, pageSize);
+        List<BusinessAgentTank> list = agentTankService.getAgentList(example);
+        PageInfo<BusinessAgentTank> pageInfo = new PageInfo<BusinessAgentTank>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存代储点信息
+     * @param agentJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgentTank", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存油罐信息", notes = "保存油罐详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentJson", value = "油罐信息", paramType = "form"),
+            @ApiImplicitParam(name = "orgId", value = "组织id", paramType = "query")
+    })
+    public Map<String, Object> saveAgent(String agentJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentTank agent = (BusinessAgentTank)mapper.readValue(agentJson, BusinessAgentTank.class);
+        agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
+        if (ParameterUtil.isnull(agent.getId())) {
+            agent.setOrgId(orgId);
+            agentTankService.add(agent);
+        } else {
+            agentTankService.update(agent);
+        }
+        modelMap.put("agentId", agent.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除油罐信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentTank", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除油罐信息", notes = "删除油罐信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgent(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentTankService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找代储点信息
+     * @param id 主键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 BusinessAgentTank edit(Integer id) {
+        BusinessAgentTank agent = new BusinessAgentTank();
+        if (id != null) {
+            agent = agentTankService.findById(id);
+        }
+        return agent;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"粮库名称","油罐编号", "设计容量", "设计年限", "是否国债投资", "启用日期", "当前状态", "责任保管员"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false, false, false, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,0);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentTankService.importData(list, orgId);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.java

@@ -0,0 +1,40 @@
+package com.chinaitop.depot.agent.basic.mapper;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentDepotMapper {
+    int countByExample(BusinessAgentDepotExample example);
+
+    int deleteByExample(BusinessAgentDepotExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentDepot record);
+
+    int insertSelective(BusinessAgentDepot record);
+
+    List<BusinessAgentDepot> selectByExample(BusinessAgentDepotExample example);
+
+    BusinessAgentDepot selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentDepot record, @Param("example") BusinessAgentDepotExample example);
+
+    int updateByExample(@Param("record") BusinessAgentDepot record, @Param("example") BusinessAgentDepotExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentDepot record);
+
+    int updateByPrimaryKey(BusinessAgentDepot record);
+
+    List<Map<String,Object>> getDepotList(Map<String,Object> map);
+
+    List<Map<String,Object>> getDepot(Map<String,Object> map);
+
+    List<BusinessAgentDepot> getByExample(Map<String,Object> map);
+
+    List<Map<String,Object>> getDepotLaoList(Map<String,Object> map);
+}

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.xml

@@ -0,0 +1,468 @@
+<?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.agent.basic.mapper.BusinessAgentDepotMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentDepot" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="agent_id" property="agentId" jdbcType="VARCHAR" />
+    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
+    <result column="agent_depot_name" property="agentDepotName" jdbcType="VARCHAR" />
+    <result column="depot_type" property="depotType" jdbcType="VARCHAR" />
+    <result column="design_storage" property="designStorage" jdbcType="VARCHAR" />
+    <result column="address" property="address" jdbcType="VARCHAR" />
+    <result column="phone" property="phone" jdbcType="VARCHAR" />
+    <result column="longitude" property="longitude" jdbcType="VARCHAR" />
+    <result column="latitude" property="latitude" jdbcType="VARCHAR" />
+    <result column="administrative_area" property="administrativeArea" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" 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, agent_id, depot_id, agent_depot_name, depot_type, design_storage, address, phone, 
+    longitude, latitude, administrative_area, org_id, del_flag, create_time, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_depot
+    <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_agent_depot
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_depot
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample" >
+    delete from business_agent_depot
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepot" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_depot.nextVal from dual
+    </selectKey>
+    insert into business_agent_depot (id, agent_id, depot_id, 
+      agent_depot_name, depot_type, design_storage, 
+      address, phone, longitude, 
+      latitude, administrative_area, org_id, 
+      del_flag, create_time, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=VARCHAR}, #{depotId,jdbcType=INTEGER},
+      #{agentDepotName,jdbcType=VARCHAR}, #{depotType,jdbcType=VARCHAR}, #{designStorage,jdbcType=VARCHAR}, 
+      #{address,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
+      #{latitude,jdbcType=VARCHAR}, #{administrativeArea,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, 
+      #{delFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepot" >
+    insert into business_agent_depot
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="agentId != null" >
+        agent_id,
+      </if>
+      <if test="depotId != null" >
+        depot_id,
+      </if>
+      <if test="agentDepotName != null" >
+        agent_depot_name,
+      </if>
+      <if test="depotType != null" >
+        depot_type,
+      </if>
+      <if test="designStorage != null" >
+        design_storage,
+      </if>
+      <if test="address != null" >
+        address,
+      </if>
+      <if test="phone != null" >
+        phone,
+      </if>
+      <if test="longitude != null" >
+        longitude,
+      </if>
+      <if test="latitude != null" >
+        latitude,
+      </if>
+      <if test="administrativeArea != null" >
+        administrative_area,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="delFlag != null" >
+        del_flag,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        #{agentId,jdbcType=VARCHAR},
+      </if>
+      <if test="depotId != null" >
+        #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotName != null" >
+        #{agentDepotName,jdbcType=VARCHAR},
+      </if>
+      <if test="depotType != null" >
+        #{depotType,jdbcType=VARCHAR},
+      </if>
+      <if test="designStorage != null" >
+        #{designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="administrativeArea != null" >
+        #{administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_depot
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_depot
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null" >
+        agent_id = #{record.agentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.depotId != null" >
+        depot_id = #{record.depotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentDepotName != null" >
+        agent_depot_name = #{record.agentDepotName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.depotType != null" >
+        depot_type = #{record.depotType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.designStorage != null" >
+        design_storage = #{record.designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null" >
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null" >
+        phone = #{record.phone,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.administrativeArea != null" >
+        administrative_area = #{record.administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null" >
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_depot
+    set id = #{record.id,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=VARCHAR},
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      agent_depot_name = #{record.agentDepotName,jdbcType=VARCHAR},
+      depot_type = #{record.depotType,jdbcType=VARCHAR},
+      design_storage = #{record.designStorage,jdbcType=VARCHAR},
+      address = #{record.address,jdbcType=VARCHAR},
+      phone = #{record.phone,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      administrative_area = #{record.administrativeArea,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepot" >
+    update business_agent_depot
+    <set >
+      <if test="agentId != null" >
+        agent_id = #{agentId,jdbcType=VARCHAR},
+      </if>
+      <if test="depotId != null" >
+        depot_id = #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotName != null" >
+        agent_depot_name = #{agentDepotName,jdbcType=VARCHAR},
+      </if>
+      <if test="depotType != null" >
+        depot_type = #{depotType,jdbcType=VARCHAR},
+      </if>
+      <if test="designStorage != null" >
+        design_storage = #{designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        phone = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        longitude = #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        latitude = #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="administrativeArea != null" >
+        administrative_area = #{administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentDepot" >
+    update business_agent_depot
+    set agent_id = #{agentId,jdbcType=VARCHAR},
+      depot_id = #{depotId,jdbcType=INTEGER},
+      agent_depot_name = #{agentDepotName,jdbcType=VARCHAR},
+      depot_type = #{depotType,jdbcType=VARCHAR},
+      design_storage = #{designStorage,jdbcType=VARCHAR},
+      address = #{address,jdbcType=VARCHAR},
+      phone = #{phone,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      administrative_area = #{administrativeArea,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getDepotList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        store.id,
+        store.agent_depot_id depot_id,
+        org.org_id,
+        org.org_name,
+        NVL2(store.id,'true','false') state_value,
+        NVL2(store.id,org.org_code,null) org_code,
+        NVL2(store.id,org.area_name,null) area_name
+    FROM
+        org_info org
+    LEFT JOIN business_agent_storehouse store ON store.org_id = org.org_id
+        AND store.del_flag = 1 AND store.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    WHERE org.org_class_id = 5318
+    <if test="orgName != null">
+      AND org.org_name LIKE #{orgName,jdbcType=VARCHAR}
+    </if>
+  </select>
+  <select id="getByExample" resultMap="BaseResultMap" parameterType="java.util.Map">
+    SELECT
+    *
+    FROM
+    (
+    SELECT
+    depot.id,
+    depot.depot_id,
+    depot.agent_depot_name,
+    depot.agent_id,
+    depot.depot_type,
+    depot.design_storage,
+    depot.address,
+    depot.administrative_area,
+    depot.updatetime
+    FROM
+    business_agent_depot depot
+    WHERE
+    depot.depot_id = 0 AND depot.del_flag = 1 AND depot.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentDepotName != null">
+      AND depot.agent_depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
+    </if>
+    <if test="agentId != null">
+      AND depot.agent_id LIKE #{agentId,jdbcType=VARCHAR}
+    </if>
+    UNION ALL
+    SELECT
+    depot.id,
+    depot.depot_id,
+    depot.agent_depot_name,
+    depot.agent_id,
+    depotType.enumName,
+    org.design_capacity design_storage,
+    org.address,
+    org.area_name administrative_area,
+    depot.updatetime
+    FROM
+    business_agent_depot depot
+    LEFT JOIN org_info org ON org.org_id = depot.depot_id
+    LEFT JOIN basic_enum depotType ON depotType.enumId = org.company_nature
+    WHERE depot.org_id = #{orgId,jdbcType=INTEGER} AND depot.del_flag = 1
+    AND depot.depot_id != 0
+    <if test="agentDepotName != null">
+      AND depot.agent_depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
+    </if>
+    <if test="agentId != null">
+      AND depot.agent_id = #{agentId,jdbcType=VARCHAR}
+    </if>
+    ) t
+    ORDER BY
+    t.updatetime DESC
+  </select>
+  <select id="getDepotLaoList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        depot.id,
+        depot.depot_id,
+        depot.agent_depot_name,
+        depot.agent_id,
+        depotType.enumName depot_type,
+        org.design_capacity design_storage,
+        org.address,
+        org.area_name administrative_area,
+        depot.updatetime
+    FROM
+        business_agent_depot depot
+    LEFT JOIN org_info org ON org.org_id = depot.depot_id
+    LEFT JOIN basic_enum depotType ON depotType.enumId = org.company_nature
+    WHERE depot.depot_id != 0 AND depot.del_flag = 1 AND depot.org_id = #{orgId,jdbcType=INTEGER}
+  </select>
+  <select id="getDepot" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        id
+    FROM
+        business_agent_depot
+    WHERE
+        depot_id != 0 AND depot_id = #{depotId,jdbcType=VARCHAR}
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentMapper.java

@@ -0,0 +1,43 @@
+package com.chinaitop.depot.agent.basic.mapper;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgent;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentMapper {
+    int countByExample(BusinessAgentExample example);
+
+    int deleteByExample(BusinessAgentExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgent record);
+
+    int insertSelective(BusinessAgent record);
+
+    List<BusinessAgent> selectByExample(BusinessAgentExample example);
+
+    BusinessAgent selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgent record, @Param("example") BusinessAgentExample example);
+
+    int updateByExample(@Param("record") BusinessAgent record, @Param("example") BusinessAgentExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgent record);
+
+    int updateByPrimaryKey(BusinessAgent record);
+
+    Map<String,Object> getNameId(Map<String, Object> map);
+    //根据名称查询id
+    Map<String,Object> getEnumId(Map<String, Object> map);
+
+    //根据名称查询子节点id
+    Map<String,Object> getEnumChildId(Map<String, Object> map);
+
+    Map<String,Object> getStorehouseId(Map<String, Object> map);
+
+    Map<String,Object> getWarehouseId(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentMapper.xml

@@ -0,0 +1,460 @@
+<?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.agent.basic.mapper.BusinessAgentMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgent" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="agent_name" property="agentName" jdbcType="VARCHAR" />
+    <result column="legal_person" property="legalPerson" jdbcType="VARCHAR" />
+    <result column="credit_code" property="creditCode" jdbcType="VARCHAR" />
+    <result column="agent_nature" property="agentNature" jdbcType="VARCHAR" />
+    <result column="agent_type" property="agentType" jdbcType="VARCHAR" />
+    <result column="capacity" property="capacity" jdbcType="VARCHAR" />
+    <result column="person" property="person" jdbcType="VARCHAR" />
+    <result column="credit" property="credit" jdbcType="VARCHAR" />
+    <result column="longitude" property="longitude" jdbcType="VARCHAR" />
+    <result column="latitude" property="latitude" jdbcType="VARCHAR" />
+    <result column="administrative_area" property="administrativeArea" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" 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, agent_name, legal_person, credit_code, agent_nature, agent_type, capacity, person, 
+    credit, longitude, latitude, administrative_area, org_id, del_flag, create_time, 
+    updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent
+    <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_agent
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentExample" >
+    delete from business_agent
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgent" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent.nextVal from dual
+    </selectKey>
+    insert into business_agent (id, agent_name, legal_person, 
+      credit_code, agent_nature, agent_type, 
+      capacity, person, credit, 
+      longitude, latitude, administrative_area, 
+      org_id, del_flag, create_time, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{agentName,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR},
+      #{creditCode,jdbcType=VARCHAR}, #{agentNature,jdbcType=VARCHAR}, #{agentType,jdbcType=VARCHAR}, 
+      #{capacity,jdbcType=VARCHAR}, #{person,jdbcType=VARCHAR}, #{credit,jdbcType=VARCHAR}, 
+      #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{administrativeArea,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgent" >
+    insert into business_agent
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="agentName != null" >
+        agent_name,
+      </if>
+      <if test="legalPerson != null" >
+        legal_person,
+      </if>
+      <if test="creditCode != null" >
+        credit_code,
+      </if>
+      <if test="agentNature != null" >
+        agent_nature,
+      </if>
+      <if test="agentType != null" >
+        agent_type,
+      </if>
+      <if test="capacity != null" >
+        capacity,
+      </if>
+      <if test="person != null" >
+        person,
+      </if>
+      <if test="credit != null" >
+        credit,
+      </if>
+      <if test="longitude != null" >
+        longitude,
+      </if>
+      <if test="latitude != null" >
+        latitude,
+      </if>
+      <if test="administrativeArea != null" >
+        administrative_area,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="delFlag != null" >
+        del_flag,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        seq_business_agent.nextVal,
+      </if>
+      <if test="agentName != null" >
+        #{agentName,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPerson != null" >
+        #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="agentNature != null" >
+        #{agentNature,jdbcType=VARCHAR},
+      </if>
+      <if test="agentType != null" >
+        #{agentType,jdbcType=VARCHAR},
+      </if>
+      <if test="capacity != null" >
+        #{capacity,jdbcType=VARCHAR},
+      </if>
+      <if test="person != null" >
+        #{person,jdbcType=VARCHAR},
+      </if>
+      <if test="credit != null" >
+        #{credit,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="administrativeArea != null" >
+        #{administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentName != null" >
+        agent_name = #{record.agentName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.legalPerson != null" >
+        legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creditCode != null" >
+        credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.agentNature != null" >
+        agent_nature = #{record.agentNature,jdbcType=VARCHAR},
+      </if>
+      <if test="record.agentType != null" >
+        agent_type = #{record.agentType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.capacity != null" >
+        capacity = #{record.capacity,jdbcType=VARCHAR},
+      </if>
+      <if test="record.person != null" >
+        person = #{record.person,jdbcType=VARCHAR},
+      </if>
+      <if test="record.credit != null" >
+        credit = #{record.credit,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.administrativeArea != null" >
+        administrative_area = #{record.administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null" >
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent
+    set id = #{record.id,jdbcType=INTEGER},
+      agent_name = #{record.agentName,jdbcType=VARCHAR},
+      legal_person = #{record.legalPerson,jdbcType=VARCHAR},
+      credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      agent_nature = #{record.agentNature,jdbcType=VARCHAR},
+      agent_type = #{record.agentType,jdbcType=VARCHAR},
+      capacity = #{record.capacity,jdbcType=VARCHAR},
+      person = #{record.person,jdbcType=VARCHAR},
+      credit = #{record.credit,jdbcType=VARCHAR},
+      longitude = #{record.longitude,jdbcType=VARCHAR},
+      latitude = #{record.latitude,jdbcType=VARCHAR},
+      administrative_area = #{record.administrativeArea,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgent" >
+    update business_agent
+    <set >
+      <if test="agentName != null" >
+        agent_name = #{agentName,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPerson != null" >
+        legal_person = #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        credit_code = #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="agentNature != null" >
+        agent_nature = #{agentNature,jdbcType=VARCHAR},
+      </if>
+      <if test="agentType != null" >
+        agent_type = #{agentType,jdbcType=VARCHAR},
+      </if>
+      <if test="capacity != null" >
+        capacity = #{capacity,jdbcType=VARCHAR},
+      </if>
+      <if test="person != null" >
+        person = #{person,jdbcType=VARCHAR},
+      </if>
+      <if test="credit != null" >
+        credit = #{credit,jdbcType=VARCHAR},
+      </if>
+      <if test="longitude != null" >
+        longitude = #{longitude,jdbcType=VARCHAR},
+      </if>
+      <if test="latitude != null" >
+        latitude = #{latitude,jdbcType=VARCHAR},
+      </if>
+      <if test="administrativeArea != null" >
+        administrative_area = #{administrativeArea,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgent" >
+    update business_agent
+    set agent_name = #{agentName,jdbcType=VARCHAR},
+      legal_person = #{legalPerson,jdbcType=VARCHAR},
+      credit_code = #{creditCode,jdbcType=VARCHAR},
+      agent_nature = #{agentNature,jdbcType=VARCHAR},
+      agent_type = #{agentType,jdbcType=VARCHAR},
+      capacity = #{capacity,jdbcType=VARCHAR},
+      person = #{person,jdbcType=VARCHAR},
+      credit = #{credit,jdbcType=VARCHAR},
+      longitude = #{longitude,jdbcType=VARCHAR},
+      latitude = #{latitude,jdbcType=VARCHAR},
+      administrative_area = #{administrativeArea,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getNameId" parameterType="java.util.Map" resultType="java.util.HashMap">
+      SELECT
+          agent.id agentId,
+          depot.id depotId
+      FROM
+          business_agent agent
+      INNER JOIN business_agent_depot depot ON depot.agent_id = agent.id
+      WHERE
+          agent.del_flag = 1
+      AND depot.del_flag = 1
+      AND agent.agent_name = #{agentName}
+      AND depot.agent_depot_name = #{agentDepotName}
+  </select>
+  <select id="getEnumId" parameterType="java.util.Map" resultType="java.util.HashMap">
+      SELECT
+          enumId
+      FROM
+          basic_enum
+      WHERE
+          parentId = #{parentId}
+      AND enumName = #{enumName}
+  </select>
+  <select id="getEnumChildId" parameterType="java.util.Map" resultType="java.util.HashMap">
+      SELECT
+          enumId
+      FROM
+          basic_enum
+      WHERE
+          parentId = (
+              SELECT
+                  enumId
+              FROM
+                  basic_enum
+              WHERE
+                  parentId = #{parentId}
+              AND gbCode = (
+                  SELECT
+                      substr(enumCode, 1, 1)
+                  FROM
+                      basic_enum
+                  WHERE
+                      parentId = #{parentId}
+                  AND enumName = #{enumName}
+              )
+          )
+      AND enumName = #{enumName}
+  </select>
+  <select id="getStorehouseId" parameterType="java.util.Map" resultType="java.util.HashMap">
+      SELECT
+          storehouse_id storehouseId
+      FROM
+          basic_storehouse
+      WHERE
+          library_type = '1'
+      AND del_flag = 1
+      AND depot_id = #{depotId}
+      AND storehouse_name = #{storehouseName}
+  </select>
+  <select id="getWarehouseId" parameterType="java.util.Map" resultType="java.util.HashMap">
+      SELECT
+          whouse.warehouse_id warehouseId
+      FROM
+          basic_warehouse whouse
+      LEFT JOIN basic_storehouse shouse ON shouse.storehouse_id = whouse.storehouse_id
+      WHERE
+          whouse.library_type = '1'
+      AND whouse.del_flag = 1
+      AND shouse.del_flag = 1
+      AND whouse.warehouse_name = #{warehouseName}
+      AND shouse.storehouse_name = #{storehouseName}
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentPeopleMapper.java

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

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentPeopleMapper.xml

@@ -0,0 +1,326 @@
+<?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.agent.basic.mapper.BusinessAgentPeopleMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentPeople" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
+    <result column="people_name" property="peopleName" jdbcType="VARCHAR" />
+    <result column="gender" property="gender" jdbcType="VARCHAR" />
+    <result column="credit_code" property="creditCode" jdbcType="VARCHAR" />
+    <result column="id_number" property="idNumber" jdbcType="VARCHAR" />
+    <result column="work_experience" property="workExperience" jdbcType="VARCHAR" />
+    <result column="native_place" property="nativePlace" jdbcType="VARCHAR" />
+    <result column="home_address" property="homeAddress" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" 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, depot_id, people_name, gender, credit_code, id_number, work_experience, native_place, 
+    home_address, org_id, create_time, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_people
+    <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_agent_people
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_people
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample" >
+    delete from business_agent_people
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeople" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_people.nextVal from dual
+    </selectKey>
+    insert into business_agent_people (id, depot_id, people_name, 
+      gender, credit_code, id_number, 
+      work_experience, native_place, home_address, 
+      org_id, create_time, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{depotId,jdbcType=INTEGER}, #{peopleName,jdbcType=VARCHAR},
+      #{gender,jdbcType=VARCHAR}, #{creditCode,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, 
+      #{workExperience,jdbcType=VARCHAR}, #{nativePlace,jdbcType=VARCHAR}, #{homeAddress,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeople" >
+    insert into business_agent_people
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="depotId != null" >
+        depot_id,
+      </if>
+      <if test="peopleName != null" >
+        people_name,
+      </if>
+      <if test="gender != null" >
+        gender,
+      </if>
+      <if test="creditCode != null" >
+        credit_code,
+      </if>
+      <if test="idNumber != null" >
+        id_number,
+      </if>
+      <if test="workExperience != null" >
+        work_experience,
+      </if>
+      <if test="nativePlace != null" >
+        native_place,
+      </if>
+      <if test="homeAddress != null" >
+        home_address,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="depotId != null" >
+        #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="peopleName != null" >
+        #{peopleName,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        #{gender,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="idNumber != null" >
+        #{idNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="workExperience != null" >
+        #{workExperience,jdbcType=VARCHAR},
+      </if>
+      <if test="nativePlace != null" >
+        #{nativePlace,jdbcType=VARCHAR},
+      </if>
+      <if test="homeAddress != null" >
+        #{homeAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_people
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_people
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.depotId != null" >
+        depot_id = #{record.depotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.peopleName != null" >
+        people_name = #{record.peopleName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gender != null" >
+        gender = #{record.gender,jdbcType=VARCHAR},
+      </if>
+      <if test="record.creditCode != null" >
+        credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.idNumber != null" >
+        id_number = #{record.idNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.workExperience != null" >
+        work_experience = #{record.workExperience,jdbcType=VARCHAR},
+      </if>
+      <if test="record.nativePlace != null" >
+        native_place = #{record.nativePlace,jdbcType=VARCHAR},
+      </if>
+      <if test="record.homeAddress != null" >
+        home_address = #{record.homeAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_people
+    set id = #{record.id,jdbcType=INTEGER},
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      people_name = #{record.peopleName,jdbcType=VARCHAR},
+      gender = #{record.gender,jdbcType=VARCHAR},
+      credit_code = #{record.creditCode,jdbcType=VARCHAR},
+      id_number = #{record.idNumber,jdbcType=VARCHAR},
+      work_experience = #{record.workExperience,jdbcType=VARCHAR},
+      native_place = #{record.nativePlace,jdbcType=VARCHAR},
+      home_address = #{record.homeAddress,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeople" >
+    update business_agent_people
+    <set >
+      <if test="depotId != null" >
+        depot_id = #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="peopleName != null" >
+        people_name = #{peopleName,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        gender = #{gender,jdbcType=VARCHAR},
+      </if>
+      <if test="creditCode != null" >
+        credit_code = #{creditCode,jdbcType=VARCHAR},
+      </if>
+      <if test="idNumber != null" >
+        id_number = #{idNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="workExperience != null" >
+        work_experience = #{workExperience,jdbcType=VARCHAR},
+      </if>
+      <if test="nativePlace != null" >
+        native_place = #{nativePlace,jdbcType=VARCHAR},
+      </if>
+      <if test="homeAddress != null" >
+        home_address = #{homeAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentPeople" >
+    update business_agent_people
+    set depot_id = #{depotId,jdbcType=INTEGER},
+      people_name = #{peopleName,jdbcType=VARCHAR},
+      gender = #{gender,jdbcType=VARCHAR},
+      credit_code = #{creditCode,jdbcType=VARCHAR},
+      id_number = #{idNumber,jdbcType=VARCHAR},
+      work_experience = #{workExperience,jdbcType=VARCHAR},
+      native_place = #{nativePlace,jdbcType=VARCHAR},
+      home_address = #{homeAddress,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentStorehouseMapper.java

@@ -0,0 +1,46 @@
+package com.chinaitop.depot.agent.basic.mapper;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentStorehouseMapper {
+    int countByExample(BusinessAgentStorehouseExample example);
+
+    int deleteByExample(BusinessAgentStorehouseExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentStorehouse record);
+
+    int insertSelective(BusinessAgentStorehouse record);
+
+    List<BusinessAgentStorehouse> selectByExample(BusinessAgentStorehouseExample example);
+
+    BusinessAgentStorehouse selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentStorehouse record, @Param("example") BusinessAgentStorehouseExample example);
+
+    int updateByExample(@Param("record") BusinessAgentStorehouse record, @Param("example") BusinessAgentStorehouseExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentStorehouse record);
+
+    int updateByPrimaryKey(BusinessAgentStorehouse record);
+
+    List<Map<String, Object>> getAgentStorehouse(Map<String, Object> map);
+
+    List<Map<String,Object>> getStorehouseList(Map<String,Object> map);
+
+    List<Map<String,Object>> getStoreList(Map<String,Object> map);
+
+    List<Map<String,Object>> getDepotToStoreList(Map<String,Object> map);
+
+    List<Map<String,Object>> getAgentStoreInfo(Map<String,Object> map);
+
+	List<Integer> getAgentHouseId(Integer orgId);
+
+    List<Map<String,Object>> getStore(Map<String,Object> map);
+}

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentStorehouseMapper.xml

@@ -0,0 +1,367 @@
+<?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.agent.basic.mapper.BusinessAgentStorehouseMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="storehouse_id" property="storehouseId" jdbcType="INTEGER" />
+    <result column="agent_depot_id" property="agentDepotId" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" 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, storehouse_id, agent_depot_id, org_id, del_flag, create_time
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_storehouse
+    <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_agent_storehouse
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_storehouse
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample" >
+    delete from business_agent_storehouse
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_storehouse.nextVal from dual
+    </selectKey>
+    insert into business_agent_storehouse (id, storehouse_id, agent_depot_id, 
+      org_id, del_flag, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{storehouseId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER},
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse" >
+    insert into business_agent_storehouse
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="storehouseId != null" >
+        storehouse_id,
+      </if>
+      <if test="agentDepotId != null" >
+        agent_depot_id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="delFlag != null" >
+        del_flag,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null" >
+        #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_storehouse
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_storehouse
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseId != null" >
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentDepotId != null" >
+        agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null" >
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_storehouse
+    set id = #{record.id,jdbcType=INTEGER},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse" >
+    update business_agent_storehouse
+    <set >
+      <if test="storehouseId != null" >
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null" >
+        agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null" >
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse" >
+    update business_agent_storehouse
+    set storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getAgentStorehouse" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+		bs.storehouse_id,
+		bs.storehouse_name,
+		bs.storehouse_code
+	FROM
+		basic_storehouse bs
+	WHERE
+		bs.storehouse_id IN (
+			SELECT
+				storehouse_id
+			FROM
+				business_agent_storehouse
+			WHERE
+				org_id = #{orgId,jdbcType=INTEGER} AND
+			    agent_depot_id = #{agentDepotId,jdbcType=INTEGER} AND
+			    del_flag=1
+		)
+    and bs.del_flag = 1
+  </select>
+  <select id="getStorehouseList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+      store.id,
+      bstore.storehouse_id,
+      bstore.storehouse_name,
+      CASE WHEN ISNULL(store.id) THEN FALSE ELSE TRUE END state_value,
+      CASE WHEN NOT ISNULL (store.id) THEN TRUE END state_lao
+    FROM
+      basic_storehouse bstore
+      LEFT JOIN business_agent_storehouse store ON store.storehouse_id = bstore.storehouse_id
+      AND store.del_flag = 1 AND store.org_id = #{orgId,jdbcType=INTEGER}
+      LEFT JOIN business_agent_depot depot ON depot.depot_id = bstore.org_id
+    WHERE bstore.del_flag = 1 AND depot.id = #{depotId,jdbcType=INTEGER}
+  </select>
+  <select id="getStoreList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+    bstore.storehouse_id,
+    bstore.depot_name,
+    bstore.storehouse_code,
+    bstore.storehouse_name,
+    bstore.storehouse_type_mx,
+    bstore.architecture_type,
+    bstore.design_capacity,
+    bstore.actual_capacity,
+    bstore.dutystoreman,
+    bstore.storehouse_state,
+    bstore.del_flag,
+    bstore.usedate,
+    '0' view_state
+    FROM
+    basic_storehouse bstore
+    WHERE
+    bstore.library_type = 1 AND bstore.del_flag = 1
+    AND bstore.depot_id != bstore.org_id
+    AND bstore.org_id = #{orgId,jdbcType=VARCHAR}
+    <if test="agentDepotName != null">
+      AND bstore.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
+    </if>
+    UNION ALL
+    SELECT
+    bstore.storehouse_id,
+    bstore.depot_name,
+    bstore.storehouse_code,
+    bstore.storehouse_name,
+    bstore.storehouse_type_mx,
+    bstore.architecture_type,
+    bstore.design_capacity,
+    bstore.actual_capacity,
+    bstore.dutystoreman,
+    bstore.storehouse_state,
+    bstore.del_flag,
+    bstore.usedate,
+    '1' view_state
+    FROM
+    business_agent_storehouse store
+    LEFT JOIN basic_storehouse bstore ON store.storehouse_id = bstore.storehouse_id
+    WHERE
+    bstore.del_flag = 1 AND store.del_flag = 1 AND store.org_id = #{orgId,jdbcType=VARCHAR}
+    <if test="agentDepotName != null">
+      AND bstore.depot_name LIKE #{agentDepotName,jdbcType=VARCHAR}
+    </if>
+  </select>
+  <select id="getAgentStoreInfo" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+      store.id,
+      bstore.storehouse_id,
+      bstore.storehouse_name
+    FROM
+      basic_storehouse bstore
+      INNER JOIN business_agent_storehouse store ON store.storehouse_id = bstore.storehouse_id AND store.org_id = #{orgId,jdbcType=INTEGER}
+    WHERE bstore.del_flag = 1 AND store.del_flag=1 AND store.agent_depot_id = #{depotId,jdbcType=INTEGER}
+  </select>
+  <select id="getStore" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        id
+    FROM
+        business_agent_storehouse
+    WHERE
+        storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="getAgentHouseId" resultType="java.lang.Integer" parameterType="java.lang.Integer">
+	SELECT
+		storehouse_id
+	FROM
+		business_agent_storehouse
+	WHERE
+		agent_depot_id in (select id from business_agent_depot where depot_id=#{orgId,jdbcType=INTEGER} and del_flag=1 )
+    and del_flag=1
+  </select>
+  <select id="getDepotToStoreList" resultType="java.util.Map" parameterType="java.util.Map">
+    SELECT
+        store.id,
+        bstore.storehouse_id,
+        bstore.storehouse_name
+    FROM
+        basic_storehouse bstore
+    INNER JOIN business_agent_storehouse store ON store.storehouse_id = bstore.storehouse_id
+    AND store.org_id = #{orgId,jdbcType=INTEGER}
+    WHERE
+        bstore.del_flag = 1
+    AND store.del_flag = 1
+    AND store.agent_depot_id = #{depotId,jdbcType=INTEGER}
+    UNION ALL
+    SELECT
+        bstore.storehouse_id id,
+        bstore.storehouse_id,
+        bstore.storehouse_name
+    FROM
+        basic_storehouse bstore
+    WHERE
+        bstore.del_flag = 1
+    AND bstore.library_type = 1
+    AND bstore.org_id = #{orgId,jdbcType=INTEGER}
+    AND bstore.depot_id = #{depotId,jdbcType=INTEGER}
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.java

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

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankMapper.xml

@@ -0,0 +1,326 @@
+<?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.agent.basic.mapper.BusinessAgentTankMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentTank" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="depot_id" property="depotId" jdbcType="INTEGER" />
+    <result column="tank_number" property="tankNumber" jdbcType="VARCHAR" />
+    <result column="design_storage" property="designStorage" jdbcType="VARCHAR" />
+    <result column="design_year" property="designYear" jdbcType="VARCHAR" />
+    <result column="treasury_bonds" property="treasuryBonds" jdbcType="VARCHAR" />
+    <result column="enable_date" property="enableDate" jdbcType="VARCHAR" />
+    <result column="state" property="state" jdbcType="VARCHAR" />
+    <result column="keeper" property="keeper" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" 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, depot_id, tank_number, design_storage, design_year, treasury_bonds, enable_date, 
+    state, keeper, org_id, create_time, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_tank
+    <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_agent_tank
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_tank
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample" >
+    delete from business_agent_tank
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTank" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_tank.nextVal from dual
+    </selectKey>
+    insert into business_agent_tank (id, depot_id, tank_number, 
+      design_storage, design_year, treasury_bonds, 
+      enable_date, state, keeper, 
+      org_id, create_time, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{depotId,jdbcType=INTEGER}, #{tankNumber,jdbcType=VARCHAR},
+      #{designStorage,jdbcType=VARCHAR}, #{designYear,jdbcType=VARCHAR}, #{treasuryBonds,jdbcType=VARCHAR}, 
+      #{enableDate,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{keeper,jdbcType=VARCHAR}, 
+      #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTank" >
+    insert into business_agent_tank
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="depotId != null" >
+        depot_id,
+      </if>
+      <if test="tankNumber != null" >
+        tank_number,
+      </if>
+      <if test="designStorage != null" >
+        design_storage,
+      </if>
+      <if test="designYear != null" >
+        design_year,
+      </if>
+      <if test="treasuryBonds != null" >
+        treasury_bonds,
+      </if>
+      <if test="enableDate != null" >
+        enable_date,
+      </if>
+      <if test="state != null" >
+        state,
+      </if>
+      <if test="keeper != null" >
+        keeper,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="depotId != null" >
+        #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="tankNumber != null" >
+        #{tankNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="designStorage != null" >
+        #{designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="designYear != null" >
+        #{designYear,jdbcType=VARCHAR},
+      </if>
+      <if test="treasuryBonds != null" >
+        #{treasuryBonds,jdbcType=VARCHAR},
+      </if>
+      <if test="enableDate != null" >
+        #{enableDate,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="keeper != null" >
+        #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_tank
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_tank
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.depotId != null" >
+        depot_id = #{record.depotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.tankNumber != null" >
+        tank_number = #{record.tankNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.designStorage != null" >
+        design_storage = #{record.designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="record.designYear != null" >
+        design_year = #{record.designYear,jdbcType=VARCHAR},
+      </if>
+      <if test="record.treasuryBonds != null" >
+        treasury_bonds = #{record.treasuryBonds,jdbcType=VARCHAR},
+      </if>
+      <if test="record.enableDate != null" >
+        enable_date = #{record.enableDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        state = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.keeper != null" >
+        keeper = #{record.keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_tank
+    set id = #{record.id,jdbcType=INTEGER},
+      depot_id = #{record.depotId,jdbcType=INTEGER},
+      tank_number = #{record.tankNumber,jdbcType=VARCHAR},
+      design_storage = #{record.designStorage,jdbcType=VARCHAR},
+      design_year = #{record.designYear,jdbcType=VARCHAR},
+      treasury_bonds = #{record.treasuryBonds,jdbcType=VARCHAR},
+      enable_date = #{record.enableDate,jdbcType=VARCHAR},
+      state = #{record.state,jdbcType=VARCHAR},
+      keeper = #{record.keeper,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTank" >
+    update business_agent_tank
+    <set >
+      <if test="depotId != null" >
+        depot_id = #{depotId,jdbcType=INTEGER},
+      </if>
+      <if test="tankNumber != null" >
+        tank_number = #{tankNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="designStorage != null" >
+        design_storage = #{designStorage,jdbcType=VARCHAR},
+      </if>
+      <if test="designYear != null" >
+        design_year = #{designYear,jdbcType=VARCHAR},
+      </if>
+      <if test="treasuryBonds != null" >
+        treasury_bonds = #{treasuryBonds,jdbcType=VARCHAR},
+      </if>
+      <if test="enableDate != null" >
+        enable_date = #{enableDate,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        state = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="keeper != null" >
+        keeper = #{keeper,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" useGeneratedKeys="true" keyProperty="id" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTank" >
+    update business_agent_tank
+    set depot_id = #{depotId,jdbcType=INTEGER},
+      tank_number = #{tankNumber,jdbcType=VARCHAR},
+      design_storage = #{designStorage,jdbcType=VARCHAR},
+      design_year = #{designYear,jdbcType=VARCHAR},
+      treasury_bonds = #{treasuryBonds,jdbcType=VARCHAR},
+      enable_date = #{enableDate,jdbcType=VARCHAR},
+      state = #{state,jdbcType=VARCHAR},
+      keeper = #{keeper,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentWarehouseMapper.java

@@ -0,0 +1,42 @@
+package com.chinaitop.depot.agent.basic.mapper;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentWarehouseMapper {
+    int countByExample(BusinessAgentWarehouseExample example);
+
+    int deleteByExample(BusinessAgentWarehouseExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentWarehouse record);
+
+    int insertSelective(BusinessAgentWarehouse record);
+
+    List<BusinessAgentWarehouse> selectByExample(BusinessAgentWarehouseExample example);
+
+    BusinessAgentWarehouse selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentWarehouse record, @Param("example") BusinessAgentWarehouseExample example);
+
+    int updateByExample(@Param("record") BusinessAgentWarehouse record, @Param("example") BusinessAgentWarehouseExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentWarehouse record);
+
+    int updateByPrimaryKey(BusinessAgentWarehouse record);
+    
+    List<Map<String, Object>> getAgentStoreWare(Map<String, Object> map);
+
+    List<Map<String,Object>> getWareList(Map<String,Object> map);
+
+	List<Integer> getAgentwareHouseId(Integer orgId);
+
+    List<Map<String,Object>> getWare(Map<String,Object> map);
+
+    List<Map<String,Object>> getWarehouse(Map<String,Object> map);
+}

src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentWarehouseMapper.xml

@@ -0,0 +1,413 @@
+<?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.agent.basic.mapper.BusinessAgentWarehouseMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="agent_storehouse_id" jdbcType="INTEGER" property="agentStorehouseId" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="bgmxz_tbsj" jdbcType="TIMESTAMP" property="bgmxzTbsj" />
+    <result column="qccrk_tbsj" jdbcType="TIMESTAMP" property="qccrkTbsj" />
+    <result column="hccrk_tbsj" jdbcType="TIMESTAMP" property="hccrkTbsj" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </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">
+    id, warehouse_id, agent_storehouse_id, org_id, del_flag, create_time, bgmxz_tbsj, 
+    qccrk_tbsj, hccrk_tbsj, updatetime
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_warehouse
+    <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 business_agent_warehouse
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from business_agent_warehouse
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample">
+    delete from business_agent_warehouse
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_warehouse.nextVal from dual
+    </selectKey>
+    insert into business_agent_warehouse (id, warehouse_id, agent_storehouse_id, 
+      org_id, del_flag, create_time, 
+      bgmxz_tbsj, qccrk_tbsj, hccrk_tbsj, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{agentStorehouseId,jdbcType=INTEGER},
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{bgmxzTbsj,jdbcType=TIMESTAMP}, #{qccrkTbsj,jdbcType=TIMESTAMP}, #{hccrkTbsj,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse">
+    insert into business_agent_warehouse
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="agentStorehouseId != null">
+        agent_storehouse_id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="delFlag != null">
+        del_flag,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="bgmxzTbsj != null">
+        bgmxz_tbsj,
+      </if>
+      <if test="qccrkTbsj != null">
+        qccrk_tbsj,
+      </if>
+      <if test="hccrkTbsj != null">
+        hccrk_tbsj,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="agentStorehouseId != null">
+        #{agentStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bgmxzTbsj != null">
+        #{bgmxzTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="qccrkTbsj != null">
+        #{qccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hccrkTbsj != null">
+        #{hccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample" resultType="java.lang.Integer">
+    select count(*) from business_agent_warehouse
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update business_agent_warehouse
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentStorehouseId != null">
+        agent_storehouse_id = #{record.agentStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.delFlag != null">
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.bgmxzTbsj != null">
+        bgmxz_tbsj = #{record.bgmxzTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.qccrkTbsj != null">
+        qccrk_tbsj = #{record.qccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.hccrkTbsj != null">
+        hccrk_tbsj = #{record.hccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update business_agent_warehouse
+    set id = #{record.id,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      agent_storehouse_id = #{record.agentStorehouseId,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      bgmxz_tbsj = #{record.bgmxzTbsj,jdbcType=TIMESTAMP},
+      qccrk_tbsj = #{record.qccrkTbsj,jdbcType=TIMESTAMP},
+      hccrk_tbsj = #{record.hccrkTbsj,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse">
+    update business_agent_warehouse
+    <set>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="agentStorehouseId != null">
+        agent_storehouse_id = #{agentStorehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="delFlag != null">
+        del_flag = #{delFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bgmxzTbsj != null">
+        bgmxz_tbsj = #{bgmxzTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="qccrkTbsj != null">
+        qccrk_tbsj = #{qccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="hccrkTbsj != null">
+        hccrk_tbsj = #{hccrkTbsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse">
+    update business_agent_warehouse
+    set warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      agent_storehouse_id = #{agentStorehouseId,jdbcType=INTEGER},
+      org_id = #{orgId,jdbcType=INTEGER},
+      del_flag = #{delFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      bgmxz_tbsj = #{bgmxzTbsj,jdbcType=TIMESTAMP},
+      qccrk_tbsj = #{qccrkTbsj,jdbcType=TIMESTAMP},
+      hccrk_tbsj = #{hccrkTbsj,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="getAgentStoreWare" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+		bw.warehouse_id,
+		bw.warehouse_name,
+		bw.warehouse_code
+	FROM
+		basic_warehouse bw
+	WHERE
+		bw.warehouse_id IN (
+			SELECT
+				warehouse_id
+			FROM
+				business_agent_warehouse
+			WHERE
+				org_id = #{orgId,jdbcType=INTEGER} AND
+			    agent_storehouse_id in (select id from business_agent_storehouse where storehouse_id = #{agentStorehouseId,jdbcType=INTEGER})
+			    AND del_flag=1
+		)
+    and bw.del_flag = 1
+  </select>
+  <select id="getWareList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+    bware.warehouse_id id,
+    bware.storehouse_id,
+    bstore.storehouse_name,
+    bware.warehouse_id,
+    bware.warehouse_name,
+    bware.warehouse_status,
+    bware.del_flag,
+    bware.warehouse_capacity,
+    '0' view_state
+    FROM
+    basic_warehouse bware
+    LEFT JOIN basic_storehouse bstore ON bware.storehouse_id = bstore.storehouse_id
+    WHERE
+    bware.library_type = 1 AND bware.del_flag = 1
+    AND bware.depot_id != bware.org_id
+    AND bware.org_id = #{orgId,jdbcType=VARCHAR}
+    <if test="warehouseName != null">
+      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
+    </if>
+    <if test="agentDepotName != null">
+      AND bware.storehouse_id = #{agentDepotName,jdbcType=VARCHAR}
+    </if>
+    UNION ALL
+    SELECT
+    ware.id,
+    bware.storehouse_id,
+    bstore.storehouse_name,
+    bware.warehouse_id,
+    bware.warehouse_name,
+    bware.warehouse_status,
+    bware.del_flag,
+    bware.warehouse_capacity,
+    '1' view_state
+    FROM
+    business_agent_warehouse ware
+    LEFT JOIN basic_warehouse bware ON ware.warehouse_id = bware.warehouse_id
+    LEFT JOIN basic_storehouse bstore ON bware.storehouse_id = bstore.storehouse_id
+    WHERE
+    bware.del_flag = 1 AND ware.del_flag = 1
+    AND ware.org_id = #{orgId,jdbcType=VARCHAR}
+    <if test="warehouseName != null">
+      AND bware.warehouse_name LIKE #{warehouseName,jdbcType=VARCHAR}
+    </if>
+    <if test="storehouseId != null">
+      AND bware.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    </if>
+  </select>
+  <select id="getWare" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+        id,
+        del_flag
+    FROM
+        business_agent_warehouse
+    WHERE
+        warehouse_id = #{warehouseId,jdbcType=VARCHAR}
+  </select>
+
+  <select id="getAgentwareHouseId" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+	SELECT
+		warehouse_id
+	FROM
+		business_agent_warehouse
+	WHERE
+		agent_storehouse_id IN (
+			SELECT
+				id
+			FROM
+				business_agent_storehouse
+			WHERE
+				agent_depot_id IN (
+					SELECT
+						id
+					FROM
+						business_agent_depot
+					WHERE
+						depot_id = #{orgId}
+					AND del_flag = 1
+				)
+			AND del_flag = 1
+		)
+	AND del_flag = 1
+  </select>
+  <select id="getWarehouse" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT
+        bware.warehouse_id,
+        bware.warehouse_name
+	FROM
+		basic_warehouse bware
+	WHERE bware.del_flag = 1
+    <if test="orgId != null">
+      AND bware.org_id = #{orgId,jdbcType=VARCHAR}
+    </if>
+    <if test="storehouseId != null">
+      AND bware.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
+    </if>
+    ORDER BY warehouse_id ASC
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgent.java

@@ -0,0 +1,165 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgent {
+    private Integer id;
+
+    private String agentName;
+
+    private String legalPerson;
+
+    private String creditCode;
+
+    private String agentNature;
+
+    private String agentType;
+
+    private String capacity;
+
+    private String person;
+
+    private String credit;
+
+    private String longitude;
+
+    private String latitude;
+
+    private String administrativeArea;
+
+    private Integer orgId;
+
+    private Integer delFlag;
+
+    private Date createTime;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName == null ? null : agentName.trim();
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson == null ? null : legalPerson.trim();
+    }
+
+    public String getCreditCode() {
+        return creditCode;
+    }
+
+    public void setCreditCode(String creditCode) {
+        this.creditCode = creditCode == null ? null : creditCode.trim();
+    }
+
+    public String getAgentNature() {
+        return agentNature;
+    }
+
+    public void setAgentNature(String agentNature) {
+        this.agentNature = agentNature == null ? null : agentNature.trim();
+    }
+
+    public String getAgentType() {
+        return agentType;
+    }
+
+    public void setAgentType(String agentType) {
+        this.agentType = agentType == null ? null : agentType.trim();
+    }
+
+    public String getCapacity() {
+        return capacity;
+    }
+
+    public void setCapacity(String capacity) {
+        this.capacity = capacity == null ? null : capacity.trim();
+    }
+
+    public String getPerson() {
+        return person;
+    }
+
+    public void setPerson(String person) {
+        this.person = person == null ? null : person.trim();
+    }
+
+    public String getCredit() {
+        return credit;
+    }
+
+    public void setCredit(String credit) {
+        this.credit = credit == null ? null : credit.trim();
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude == null ? null : longitude.trim();
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude == null ? null : latitude.trim();
+    }
+
+    public String getAdministrativeArea() {
+        return administrativeArea;
+    }
+
+    public void setAdministrativeArea(String administrativeArea) {
+        this.administrativeArea = administrativeArea == null ? null : administrativeArea.trim();
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentDepot.java

@@ -0,0 +1,155 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgentDepot {
+    private Integer id;
+
+    private String agentId;
+
+    private Integer depotId;
+
+    private String agentDepotName;
+
+    private String depotType;
+
+    private String designStorage;
+
+    private String address;
+
+    private String phone;
+
+    private String longitude;
+
+    private String latitude;
+
+    private String administrativeArea;
+
+    private Integer orgId;
+
+    private Integer delFlag;
+
+    private Date createTime;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(String agentId) {
+        this.agentId = agentId == null ? null : agentId.trim();
+    }
+
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    public String getAgentDepotName() {
+        return agentDepotName;
+    }
+
+    public void setAgentDepotName(String agentDepotName) {
+        this.agentDepotName = agentDepotName == null ? null : agentDepotName.trim();
+    }
+
+    public String getDepotType() {
+        return depotType;
+    }
+
+    public void setDepotType(String depotType) {
+        this.depotType = depotType == null ? null : depotType.trim();
+    }
+
+    public String getDesignStorage() {
+        return designStorage;
+    }
+
+    public void setDesignStorage(String designStorage) {
+        this.designStorage = designStorage == null ? null : designStorage.trim();
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address == null ? null : address.trim();
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone == null ? null : phone.trim();
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude == null ? null : longitude.trim();
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude == null ? null : latitude.trim();
+    }
+
+    public String getAdministrativeArea() {
+        return administrativeArea;
+    }
+
+    public void setAdministrativeArea(String administrativeArea) {
+        this.administrativeArea = administrativeArea == null ? null : administrativeArea.trim();
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentPeople.java

@@ -0,0 +1,125 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgentPeople {
+    private Integer id;
+
+    private Integer depotId;
+
+    private String peopleName;
+
+    private String gender;
+
+    private String creditCode;
+
+    private String idNumber;
+
+    private String workExperience;
+
+    private String nativePlace;
+
+    private String homeAddress;
+
+    private Integer orgId;
+
+    private Date createTime;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    public String getPeopleName() {
+        return peopleName;
+    }
+
+    public void setPeopleName(String peopleName) {
+        this.peopleName = peopleName == null ? null : peopleName.trim();
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender == null ? null : gender.trim();
+    }
+
+    public String getCreditCode() {
+        return creditCode;
+    }
+
+    public void setCreditCode(String creditCode) {
+        this.creditCode = creditCode == null ? null : creditCode.trim();
+    }
+
+    public String getIdNumber() {
+        return idNumber;
+    }
+
+    public void setIdNumber(String idNumber) {
+        this.idNumber = idNumber == null ? null : idNumber.trim();
+    }
+
+    public String getWorkExperience() {
+        return workExperience;
+    }
+
+    public void setWorkExperience(String workExperience) {
+        this.workExperience = workExperience == null ? null : workExperience.trim();
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace == null ? null : nativePlace.trim();
+    }
+
+    public String getHomeAddress() {
+        return homeAddress;
+    }
+
+    public void setHomeAddress(String homeAddress) {
+        this.homeAddress = homeAddress == null ? null : homeAddress.trim();
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentPeopleExample.java

@@ -0,0 +1,991 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessAgentPeopleExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public BusinessAgentPeopleExample() {
+        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;
+    }
+
+    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 andDepotIdIsNull() {
+            addCriterion("depot_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIsNotNull() {
+            addCriterion("depot_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdEqualTo(Integer value) {
+            addCriterion("depot_id =", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotEqualTo(Integer value) {
+            addCriterion("depot_id <>", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThan(Integer value) {
+            addCriterion("depot_id >", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("depot_id >=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThan(Integer value) {
+            addCriterion("depot_id <", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThanOrEqualTo(Integer value) {
+            addCriterion("depot_id <=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIn(List<Integer> values) {
+            addCriterion("depot_id in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotIn(List<Integer> values) {
+            addCriterion("depot_id not in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id not between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameIsNull() {
+            addCriterion("people_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameIsNotNull() {
+            addCriterion("people_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameEqualTo(String value) {
+            addCriterion("people_name =", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameNotEqualTo(String value) {
+            addCriterion("people_name <>", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameGreaterThan(String value) {
+            addCriterion("people_name >", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameGreaterThanOrEqualTo(String value) {
+            addCriterion("people_name >=", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameLessThan(String value) {
+            addCriterion("people_name <", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameLessThanOrEqualTo(String value) {
+            addCriterion("people_name <=", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameLike(String value) {
+            addCriterion("people_name like", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameNotLike(String value) {
+            addCriterion("people_name not like", value, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameIn(List<String> values) {
+            addCriterion("people_name in", values, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameNotIn(List<String> values) {
+            addCriterion("people_name not in", values, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameBetween(String value1, String value2) {
+            addCriterion("people_name between", value1, value2, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeopleNameNotBetween(String value1, String value2) {
+            addCriterion("people_name not between", value1, value2, "peopleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNull() {
+            addCriterion("gender is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNotNull() {
+            addCriterion("gender is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderEqualTo(String value) {
+            addCriterion("gender =", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotEqualTo(String value) {
+            addCriterion("gender <>", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThan(String value) {
+            addCriterion("gender >", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThanOrEqualTo(String value) {
+            addCriterion("gender >=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThan(String value) {
+            addCriterion("gender <", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThanOrEqualTo(String value) {
+            addCriterion("gender <=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLike(String value) {
+            addCriterion("gender like", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotLike(String value) {
+            addCriterion("gender not like", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIn(List<String> values) {
+            addCriterion("gender in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotIn(List<String> values) {
+            addCriterion("gender not in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderBetween(String value1, String value2) {
+            addCriterion("gender between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotBetween(String value1, String value2) {
+            addCriterion("gender not between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeIsNull() {
+            addCriterion("credit_code is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeIsNotNull() {
+            addCriterion("credit_code is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeEqualTo(String value) {
+            addCriterion("credit_code =", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeNotEqualTo(String value) {
+            addCriterion("credit_code <>", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeGreaterThan(String value) {
+            addCriterion("credit_code >", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("credit_code >=", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeLessThan(String value) {
+            addCriterion("credit_code <", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeLessThanOrEqualTo(String value) {
+            addCriterion("credit_code <=", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeLike(String value) {
+            addCriterion("credit_code like", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeNotLike(String value) {
+            addCriterion("credit_code not like", value, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeIn(List<String> values) {
+            addCriterion("credit_code in", values, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeNotIn(List<String> values) {
+            addCriterion("credit_code not in", values, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeBetween(String value1, String value2) {
+            addCriterion("credit_code between", value1, value2, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditCodeNotBetween(String value1, String value2) {
+            addCriterion("credit_code not between", value1, value2, "creditCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberIsNull() {
+            addCriterion("id_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberIsNotNull() {
+            addCriterion("id_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberEqualTo(String value) {
+            addCriterion("id_number =", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberNotEqualTo(String value) {
+            addCriterion("id_number <>", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberGreaterThan(String value) {
+            addCriterion("id_number >", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("id_number >=", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberLessThan(String value) {
+            addCriterion("id_number <", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberLessThanOrEqualTo(String value) {
+            addCriterion("id_number <=", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberLike(String value) {
+            addCriterion("id_number like", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberNotLike(String value) {
+            addCriterion("id_number not like", value, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberIn(List<String> values) {
+            addCriterion("id_number in", values, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberNotIn(List<String> values) {
+            addCriterion("id_number not in", values, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberBetween(String value1, String value2) {
+            addCriterion("id_number between", value1, value2, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNumberNotBetween(String value1, String value2) {
+            addCriterion("id_number not between", value1, value2, "idNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceIsNull() {
+            addCriterion("work_experience is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceIsNotNull() {
+            addCriterion("work_experience is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceEqualTo(String value) {
+            addCriterion("work_experience =", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceNotEqualTo(String value) {
+            addCriterion("work_experience <>", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceGreaterThan(String value) {
+            addCriterion("work_experience >", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceGreaterThanOrEqualTo(String value) {
+            addCriterion("work_experience >=", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceLessThan(String value) {
+            addCriterion("work_experience <", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceLessThanOrEqualTo(String value) {
+            addCriterion("work_experience <=", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceLike(String value) {
+            addCriterion("work_experience like", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceNotLike(String value) {
+            addCriterion("work_experience not like", value, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceIn(List<String> values) {
+            addCriterion("work_experience in", values, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceNotIn(List<String> values) {
+            addCriterion("work_experience not in", values, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceBetween(String value1, String value2) {
+            addCriterion("work_experience between", value1, value2, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andWorkExperienceNotBetween(String value1, String value2) {
+            addCriterion("work_experience not between", value1, value2, "workExperience");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceIsNull() {
+            addCriterion("native_place is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceIsNotNull() {
+            addCriterion("native_place is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceEqualTo(String value) {
+            addCriterion("native_place =", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceNotEqualTo(String value) {
+            addCriterion("native_place <>", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceGreaterThan(String value) {
+            addCriterion("native_place >", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceGreaterThanOrEqualTo(String value) {
+            addCriterion("native_place >=", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceLessThan(String value) {
+            addCriterion("native_place <", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceLessThanOrEqualTo(String value) {
+            addCriterion("native_place <=", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceLike(String value) {
+            addCriterion("native_place like", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceNotLike(String value) {
+            addCriterion("native_place not like", value, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceIn(List<String> values) {
+            addCriterion("native_place in", values, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceNotIn(List<String> values) {
+            addCriterion("native_place not in", values, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceBetween(String value1, String value2) {
+            addCriterion("native_place between", value1, value2, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andNativePlaceNotBetween(String value1, String value2) {
+            addCriterion("native_place not between", value1, value2, "nativePlace");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressIsNull() {
+            addCriterion("home_address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressIsNotNull() {
+            addCriterion("home_address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressEqualTo(String value) {
+            addCriterion("home_address =", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressNotEqualTo(String value) {
+            addCriterion("home_address <>", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressGreaterThan(String value) {
+            addCriterion("home_address >", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("home_address >=", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressLessThan(String value) {
+            addCriterion("home_address <", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressLessThanOrEqualTo(String value) {
+            addCriterion("home_address <=", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressLike(String value) {
+            addCriterion("home_address like", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressNotLike(String value) {
+            addCriterion("home_address not like", value, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressIn(List<String> values) {
+            addCriterion("home_address in", values, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressNotIn(List<String> values) {
+            addCriterion("home_address not in", values, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressBetween(String value1, String value2) {
+            addCriterion("home_address between", value1, value2, "homeAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andHomeAddressNotBetween(String value1, String value2) {
+            addCriterion("home_address not between", value1, value2, "homeAddress");
+            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 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 andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    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/agent/basic/model/BusinessAgentStorehouse.java

@@ -0,0 +1,65 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgentStorehouse {
+    private Integer id;
+
+    private Integer storehouseId;
+
+    private Integer agentDepotId;
+
+    private Integer orgId;
+
+    private Integer delFlag;
+
+    private Date createTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    public Integer getAgentDepotId() {
+        return agentDepotId;
+    }
+
+    public void setAgentDepotId(Integer agentDepotId) {
+        this.agentDepotId = agentDepotId;
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentStorehouseExample.java

@@ -0,0 +1,561 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessAgentStorehouseExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public BusinessAgentStorehouseExample() {
+        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;
+    }
+
+    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 andStorehouseIdIsNull() {
+            addCriterion("storehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdIsNotNull() {
+            addCriterion("storehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdEqualTo(Integer value) {
+            addCriterion("storehouse_id =", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdNotEqualTo(Integer value) {
+            addCriterion("storehouse_id <>", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdGreaterThan(Integer value) {
+            addCriterion("storehouse_id >", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("storehouse_id >=", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdLessThan(Integer value) {
+            addCriterion("storehouse_id <", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("storehouse_id <=", value, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdIn(List<Integer> values) {
+            addCriterion("storehouse_id in", values, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdNotIn(List<Integer> values) {
+            addCriterion("storehouse_id not in", values, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("storehouse_id between", value1, value2, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStorehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("storehouse_id not between", value1, value2, "storehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdIsNull() {
+            addCriterion("agent_depot_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdIsNotNull() {
+            addCriterion("agent_depot_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdEqualTo(Integer value) {
+            addCriterion("agent_depot_id =", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdNotEqualTo(Integer value) {
+            addCriterion("agent_depot_id <>", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdGreaterThan(Integer value) {
+            addCriterion("agent_depot_id >", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("agent_depot_id >=", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdLessThan(Integer value) {
+            addCriterion("agent_depot_id <", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdLessThanOrEqualTo(Integer value) {
+            addCriterion("agent_depot_id <=", value, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdIn(List<Integer> values) {
+            addCriterion("agent_depot_id in", values, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdNotIn(List<Integer> values) {
+            addCriterion("agent_depot_id not in", values, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdBetween(Integer value1, Integer value2) {
+            addCriterion("agent_depot_id between", value1, value2, "agentDepotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentDepotIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("agent_depot_id not between", value1, value2, "agentDepotId");
+            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 andDelFlagIsNull() {
+            addCriterion("del_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIsNotNull() {
+            addCriterion("del_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagEqualTo(Integer value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(Integer value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(Integer value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(Integer value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<Integer> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<Integer> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(Integer value1, Integer value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            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 static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    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/agent/basic/model/BusinessAgentTank.java

@@ -0,0 +1,125 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgentTank {
+    private Integer id;
+
+    private Integer depotId;
+
+    private String tankNumber;
+
+    private String designStorage;
+
+    private String designYear;
+
+    private String treasuryBonds;
+
+    private String enableDate;
+
+    private String state;
+
+    private String keeper;
+
+    private Integer orgId;
+
+    private Date createTime;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getDepotId() {
+        return depotId;
+    }
+
+    public void setDepotId(Integer depotId) {
+        this.depotId = depotId;
+    }
+
+    public String getTankNumber() {
+        return tankNumber;
+    }
+
+    public void setTankNumber(String tankNumber) {
+        this.tankNumber = tankNumber == null ? null : tankNumber.trim();
+    }
+
+    public String getDesignStorage() {
+        return designStorage;
+    }
+
+    public void setDesignStorage(String designStorage) {
+        this.designStorage = designStorage == null ? null : designStorage.trim();
+    }
+
+    public String getDesignYear() {
+        return designYear;
+    }
+
+    public void setDesignYear(String designYear) {
+        this.designYear = designYear == null ? null : designYear.trim();
+    }
+
+    public String getTreasuryBonds() {
+        return treasuryBonds;
+    }
+
+    public void setTreasuryBonds(String treasuryBonds) {
+        this.treasuryBonds = treasuryBonds == null ? null : treasuryBonds.trim();
+    }
+
+    public String getEnableDate() {
+        return enableDate;
+    }
+
+    public void setEnableDate(String enableDate) {
+        this.enableDate = enableDate == null ? null : enableDate.trim();
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    public String getKeeper() {
+        return keeper;
+    }
+
+    public void setKeeper(String keeper) {
+        this.keeper = keeper == null ? null : keeper.trim();
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentTankExample.java

@@ -0,0 +1,991 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessAgentTankExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public BusinessAgentTankExample() {
+        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;
+    }
+
+    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 andDepotIdIsNull() {
+            addCriterion("depot_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIsNotNull() {
+            addCriterion("depot_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdEqualTo(Integer value) {
+            addCriterion("depot_id =", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotEqualTo(Integer value) {
+            addCriterion("depot_id <>", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThan(Integer value) {
+            addCriterion("depot_id >", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("depot_id >=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThan(Integer value) {
+            addCriterion("depot_id <", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdLessThanOrEqualTo(Integer value) {
+            addCriterion("depot_id <=", value, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdIn(List<Integer> values) {
+            addCriterion("depot_id in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotIn(List<Integer> values) {
+            addCriterion("depot_id not in", values, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepotIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("depot_id not between", value1, value2, "depotId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberIsNull() {
+            addCriterion("tank_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberIsNotNull() {
+            addCriterion("tank_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberEqualTo(String value) {
+            addCriterion("tank_number =", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberNotEqualTo(String value) {
+            addCriterion("tank_number <>", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberGreaterThan(String value) {
+            addCriterion("tank_number >", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("tank_number >=", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberLessThan(String value) {
+            addCriterion("tank_number <", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberLessThanOrEqualTo(String value) {
+            addCriterion("tank_number <=", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberLike(String value) {
+            addCriterion("tank_number like", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberNotLike(String value) {
+            addCriterion("tank_number not like", value, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberIn(List<String> values) {
+            addCriterion("tank_number in", values, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberNotIn(List<String> values) {
+            addCriterion("tank_number not in", values, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberBetween(String value1, String value2) {
+            addCriterion("tank_number between", value1, value2, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTankNumberNotBetween(String value1, String value2) {
+            addCriterion("tank_number not between", value1, value2, "tankNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageIsNull() {
+            addCriterion("design_storage is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageIsNotNull() {
+            addCriterion("design_storage is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageEqualTo(String value) {
+            addCriterion("design_storage =", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageNotEqualTo(String value) {
+            addCriterion("design_storage <>", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageGreaterThan(String value) {
+            addCriterion("design_storage >", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageGreaterThanOrEqualTo(String value) {
+            addCriterion("design_storage >=", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageLessThan(String value) {
+            addCriterion("design_storage <", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageLessThanOrEqualTo(String value) {
+            addCriterion("design_storage <=", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageLike(String value) {
+            addCriterion("design_storage like", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageNotLike(String value) {
+            addCriterion("design_storage not like", value, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageIn(List<String> values) {
+            addCriterion("design_storage in", values, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageNotIn(List<String> values) {
+            addCriterion("design_storage not in", values, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageBetween(String value1, String value2) {
+            addCriterion("design_storage between", value1, value2, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignStorageNotBetween(String value1, String value2) {
+            addCriterion("design_storage not between", value1, value2, "designStorage");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearIsNull() {
+            addCriterion("design_year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearIsNotNull() {
+            addCriterion("design_year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearEqualTo(String value) {
+            addCriterion("design_year =", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearNotEqualTo(String value) {
+            addCriterion("design_year <>", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearGreaterThan(String value) {
+            addCriterion("design_year >", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearGreaterThanOrEqualTo(String value) {
+            addCriterion("design_year >=", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearLessThan(String value) {
+            addCriterion("design_year <", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearLessThanOrEqualTo(String value) {
+            addCriterion("design_year <=", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearLike(String value) {
+            addCriterion("design_year like", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearNotLike(String value) {
+            addCriterion("design_year not like", value, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearIn(List<String> values) {
+            addCriterion("design_year in", values, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearNotIn(List<String> values) {
+            addCriterion("design_year not in", values, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearBetween(String value1, String value2) {
+            addCriterion("design_year between", value1, value2, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andDesignYearNotBetween(String value1, String value2) {
+            addCriterion("design_year not between", value1, value2, "designYear");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsIsNull() {
+            addCriterion("treasury_bonds is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsIsNotNull() {
+            addCriterion("treasury_bonds is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsEqualTo(String value) {
+            addCriterion("treasury_bonds =", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsNotEqualTo(String value) {
+            addCriterion("treasury_bonds <>", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsGreaterThan(String value) {
+            addCriterion("treasury_bonds >", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsGreaterThanOrEqualTo(String value) {
+            addCriterion("treasury_bonds >=", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsLessThan(String value) {
+            addCriterion("treasury_bonds <", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsLessThanOrEqualTo(String value) {
+            addCriterion("treasury_bonds <=", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsLike(String value) {
+            addCriterion("treasury_bonds like", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsNotLike(String value) {
+            addCriterion("treasury_bonds not like", value, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsIn(List<String> values) {
+            addCriterion("treasury_bonds in", values, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsNotIn(List<String> values) {
+            addCriterion("treasury_bonds not in", values, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsBetween(String value1, String value2) {
+            addCriterion("treasury_bonds between", value1, value2, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andTreasuryBondsNotBetween(String value1, String value2) {
+            addCriterion("treasury_bonds not between", value1, value2, "treasuryBonds");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateIsNull() {
+            addCriterion("enable_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateIsNotNull() {
+            addCriterion("enable_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateEqualTo(String value) {
+            addCriterion("enable_date =", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateNotEqualTo(String value) {
+            addCriterion("enable_date <>", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateGreaterThan(String value) {
+            addCriterion("enable_date >", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateGreaterThanOrEqualTo(String value) {
+            addCriterion("enable_date >=", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateLessThan(String value) {
+            addCriterion("enable_date <", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateLessThanOrEqualTo(String value) {
+            addCriterion("enable_date <=", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateLike(String value) {
+            addCriterion("enable_date like", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateNotLike(String value) {
+            addCriterion("enable_date not like", value, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateIn(List<String> values) {
+            addCriterion("enable_date in", values, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateNotIn(List<String> values) {
+            addCriterion("enable_date not in", values, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateBetween(String value1, String value2) {
+            addCriterion("enable_date between", value1, value2, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableDateNotBetween(String value1, String value2) {
+            addCriterion("enable_date not between", value1, value2, "enableDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("state like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("state not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIsNull() {
+            addCriterion("keeper is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIsNotNull() {
+            addCriterion("keeper is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperEqualTo(String value) {
+            addCriterion("keeper =", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotEqualTo(String value) {
+            addCriterion("keeper <>", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperGreaterThan(String value) {
+            addCriterion("keeper >", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperGreaterThanOrEqualTo(String value) {
+            addCriterion("keeper >=", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLessThan(String value) {
+            addCriterion("keeper <", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLessThanOrEqualTo(String value) {
+            addCriterion("keeper <=", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperLike(String value) {
+            addCriterion("keeper like", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotLike(String value) {
+            addCriterion("keeper not like", value, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperIn(List<String> values) {
+            addCriterion("keeper in", values, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotIn(List<String> values) {
+            addCriterion("keeper not in", values, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperBetween(String value1, String value2) {
+            addCriterion("keeper between", value1, value2, "keeper");
+            return (Criteria) this;
+        }
+
+        public Criteria andKeeperNotBetween(String value1, String value2) {
+            addCriterion("keeper not between", value1, value2, "keeper");
+            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 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 andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    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/agent/basic/model/BusinessAgentWarehouse.java

@@ -0,0 +1,185 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.Date;
+
+public class BusinessAgentWarehouse {
+    private Integer id;
+
+    private Integer warehouseId;
+
+    private Integer agentStorehouseId;
+
+    private Integer orgId;
+
+    private Integer delFlag;
+
+    private Date createTime;
+
+    private Date bgmxzTbsj;
+
+    private Date qccrkTbsj;
+
+    private Date hccrkTbsj;
+
+    private Date updatetime;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 已有货位id
+     * @return warehouse_id 已有货位id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 已有货位id
+     * @param warehouseId 已有货位id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 代储仓房id
+     * @return agent_storehouse_id 代储仓房id
+     */
+    public Integer getAgentStorehouseId() {
+        return agentStorehouseId;
+    }
+
+    /**
+     * 代储仓房id
+     * @param agentStorehouseId 代储仓房id
+     */
+    public void setAgentStorehouseId(Integer agentStorehouseId) {
+        this.agentStorehouseId = agentStorehouseId;
+    }
+
+    /**
+     * 组织机构id
+     * @return org_id 组织机构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织机构id
+     * @param orgId 组织机构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @return del_flag 删除状态(1.正常，2.删除)
+     */
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    /**
+     * 删除状态(1.正常，2.删除)
+     * @param delFlag 删除状态(1.正常，2.删除)
+     */
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 保管明细账最后同步时间
+     * @return bgmxz_tbsj 保管明细账最后同步时间
+     */
+    public Date getBgmxzTbsj() {
+        return bgmxzTbsj;
+    }
+
+    /**
+     * 保管明细账最后同步时间
+     * @param bgmxzTbsj 保管明细账最后同步时间
+     */
+    public void setBgmxzTbsj(Date bgmxzTbsj) {
+        this.bgmxzTbsj = bgmxzTbsj;
+    }
+
+    /**
+     * 汽车出入库最后同步时间
+     * @return qccrk_tbsj 汽车出入库最后同步时间
+     */
+    public Date getQccrkTbsj() {
+        return qccrkTbsj;
+    }
+
+    /**
+     * 汽车出入库最后同步时间
+     * @param qccrkTbsj 汽车出入库最后同步时间
+     */
+    public void setQccrkTbsj(Date qccrkTbsj) {
+        this.qccrkTbsj = qccrkTbsj;
+    }
+
+    /**
+     * 火车出入库最后同步时间
+     * @return hccrk_tbsj 火车出入库最后同步时间
+     */
+    public Date getHccrkTbsj() {
+        return hccrkTbsj;
+    }
+
+    /**
+     * 火车出入库最后同步时间
+     * @param hccrkTbsj 火车出入库最后同步时间
+     */
+    public void setHccrkTbsj(Date hccrkTbsj) {
+        this.hccrkTbsj = hccrkTbsj;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentWarehouseExample.java

@@ -0,0 +1,819 @@
+package com.chinaitop.depot.agent.basic.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessAgentWarehouseExample {
+    /**
+     * business_agent_warehouse
+     */
+    protected String orderByClause;
+
+    /**
+     * business_agent_warehouse
+     */
+    protected boolean distinct;
+
+    /**
+     * business_agent_warehouse
+     */
+    protected List<Criteria> oredCriteria;
+
+    public BusinessAgentWarehouseExample() {
+        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_agent_warehouse 2019-09-19
+     */
+    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 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 andAgentStorehouseIdIsNull() {
+            addCriterion("agent_storehouse_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdIsNotNull() {
+            addCriterion("agent_storehouse_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdEqualTo(Integer value) {
+            addCriterion("agent_storehouse_id =", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdNotEqualTo(Integer value) {
+            addCriterion("agent_storehouse_id <>", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdGreaterThan(Integer value) {
+            addCriterion("agent_storehouse_id >", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("agent_storehouse_id >=", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdLessThan(Integer value) {
+            addCriterion("agent_storehouse_id <", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdLessThanOrEqualTo(Integer value) {
+            addCriterion("agent_storehouse_id <=", value, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdIn(List<Integer> values) {
+            addCriterion("agent_storehouse_id in", values, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdNotIn(List<Integer> values) {
+            addCriterion("agent_storehouse_id not in", values, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdBetween(Integer value1, Integer value2) {
+            addCriterion("agent_storehouse_id between", value1, value2, "agentStorehouseId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentStorehouseIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("agent_storehouse_id not between", value1, value2, "agentStorehouseId");
+            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 andDelFlagIsNull() {
+            addCriterion("del_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIsNotNull() {
+            addCriterion("del_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagEqualTo(Integer value) {
+            addCriterion("del_flag =", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotEqualTo(Integer value) {
+            addCriterion("del_flag <>", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThan(Integer value) {
+            addCriterion("del_flag >", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("del_flag >=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThan(Integer value) {
+            addCriterion("del_flag <", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("del_flag <=", value, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagIn(List<Integer> values) {
+            addCriterion("del_flag in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotIn(List<Integer> values) {
+            addCriterion("del_flag not in", values, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagBetween(Integer value1, Integer value2) {
+            addCriterion("del_flag between", value1, value2, "delFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andDelFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("del_flag not between", value1, value2, "delFlag");
+            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 andBgmxzTbsjIsNull() {
+            addCriterion("bgmxz_tbsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjIsNotNull() {
+            addCriterion("bgmxz_tbsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjEqualTo(Date value) {
+            addCriterion("bgmxz_tbsj =", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjNotEqualTo(Date value) {
+            addCriterion("bgmxz_tbsj <>", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjGreaterThan(Date value) {
+            addCriterion("bgmxz_tbsj >", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjGreaterThanOrEqualTo(Date value) {
+            addCriterion("bgmxz_tbsj >=", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjLessThan(Date value) {
+            addCriterion("bgmxz_tbsj <", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjLessThanOrEqualTo(Date value) {
+            addCriterion("bgmxz_tbsj <=", value, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjIn(List<Date> values) {
+            addCriterion("bgmxz_tbsj in", values, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjNotIn(List<Date> values) {
+            addCriterion("bgmxz_tbsj not in", values, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjBetween(Date value1, Date value2) {
+            addCriterion("bgmxz_tbsj between", value1, value2, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andBgmxzTbsjNotBetween(Date value1, Date value2) {
+            addCriterion("bgmxz_tbsj not between", value1, value2, "bgmxzTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjIsNull() {
+            addCriterion("qccrk_tbsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjIsNotNull() {
+            addCriterion("qccrk_tbsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjEqualTo(Date value) {
+            addCriterion("qccrk_tbsj =", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjNotEqualTo(Date value) {
+            addCriterion("qccrk_tbsj <>", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjGreaterThan(Date value) {
+            addCriterion("qccrk_tbsj >", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjGreaterThanOrEqualTo(Date value) {
+            addCriterion("qccrk_tbsj >=", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjLessThan(Date value) {
+            addCriterion("qccrk_tbsj <", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjLessThanOrEqualTo(Date value) {
+            addCriterion("qccrk_tbsj <=", value, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjIn(List<Date> values) {
+            addCriterion("qccrk_tbsj in", values, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjNotIn(List<Date> values) {
+            addCriterion("qccrk_tbsj not in", values, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjBetween(Date value1, Date value2) {
+            addCriterion("qccrk_tbsj between", value1, value2, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andQccrkTbsjNotBetween(Date value1, Date value2) {
+            addCriterion("qccrk_tbsj not between", value1, value2, "qccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjIsNull() {
+            addCriterion("hccrk_tbsj is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjIsNotNull() {
+            addCriterion("hccrk_tbsj is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjEqualTo(Date value) {
+            addCriterion("hccrk_tbsj =", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjNotEqualTo(Date value) {
+            addCriterion("hccrk_tbsj <>", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjGreaterThan(Date value) {
+            addCriterion("hccrk_tbsj >", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjGreaterThanOrEqualTo(Date value) {
+            addCriterion("hccrk_tbsj >=", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjLessThan(Date value) {
+            addCriterion("hccrk_tbsj <", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjLessThanOrEqualTo(Date value) {
+            addCriterion("hccrk_tbsj <=", value, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjIn(List<Date> values) {
+            addCriterion("hccrk_tbsj in", values, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjNotIn(List<Date> values) {
+            addCriterion("hccrk_tbsj not in", values, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjBetween(Date value1, Date value2) {
+            addCriterion("hccrk_tbsj between", value1, value2, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andHccrkTbsjNotBetween(Date value1, Date value2) {
+            addCriterion("hccrk_tbsj not between", value1, value2, "hccrkTbsj");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * business_agent_warehouse
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * business_agent_warehouse 2019-09-19
+     */
+    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/agent/basic/service/agentDepotService.java

@@ -0,0 +1,54 @@
+package com.chinaitop.depot.agent.basic.service;
+
+import com.chinaitop.depot.agent.basic.model.*;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface agentDepotService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<BusinessAgentDepot> getAgentDepotList(BusinessAgentDepotExample map);
+
+    List<BusinessAgentDepot> getAgentList(Map<String, Object> map);
+
+    List<Map<String,Object>> getDepotLaoList(Map<String, Object> map);
+
+    List<Map<String,Object>> getDepot(Map<String, Object> map);
+
+    void add(BusinessAgentDepot user);
+
+    void update(BusinessAgentDepot user);
+
+    void updateByPrimaryKeySelective(BusinessAgentDepot user);
+
+    void updateDeleteById(Integer id,Integer delFlag);
+
+    BusinessAgentDepot findById(Integer id);
+
+    /**
+     * 查找所有粮库
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getDepotList(Map<String, Object> map);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId);
+
+    List<Integer> getAgentHouseId(Integer orgId);
+    //查询是否已经存在库信息
+    List<BusinessAgentDepot> selectIdNum(BusinessAgentDepotExample example);
+}

src/main/java/com/chinaitop/depot/agent/basic/service/agentPeopleService.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.agent.basic.service;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeople;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample;
+
+import java.util.List;
+
+public interface agentPeopleService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<BusinessAgentPeople> getAgentList(BusinessAgentPeopleExample map);
+
+    void add(BusinessAgentPeople user);
+
+    void update(BusinessAgentPeople user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgentPeople findById(Integer id);
+}

src/main/java/com/chinaitop/depot/agent/basic/service/agentService.java

@@ -0,0 +1,37 @@
+package com.chinaitop.depot.agent.basic.service;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgent;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface agentService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<BusinessAgent> getAgentList(BusinessAgentExample map);
+
+    void add(BusinessAgent user);
+
+    void update(BusinessAgent user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgent findById(Integer id);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId);
+
+    Map<String,Object> getNameId(Map<String,Object> map);
+
+}

src/main/java/com/chinaitop/depot/agent/basic/service/agentStoreWareService.java

@@ -0,0 +1,28 @@
+package com.chinaitop.depot.agent.basic.service;
+
+
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface agentStoreWareService {
+
+	List<Map<String, Object>> getAgentStoreWare(Map<String, Object> map);
+
+	void addWareHouse(BusinessAgentWarehouse user);
+
+	List<Map<String, Object>> getWareList(Map<String, Object> map);
+
+	List<Map<String, Object>> getWare(Map<String, Object> map);
+
+	void removeAgentWare(Integer wareId,Integer delFlag);
+
+	List<BusinessAgentWarehouse> getWareDataList(BusinessAgentWarehouseExample example);
+
+	List<Integer> getAgentwareHouseId(Integer orgId);
+
+	Map<String, Object> getWarehouse(Integer unitId, Integer storehouseId);
+}

src/main/java/com/chinaitop/depot/agent/basic/service/agentStorehouseService.java

@@ -0,0 +1,31 @@
+package com.chinaitop.depot.agent.basic.service;
+
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface agentStorehouseService {
+
+	List<Map<String, Object>> getAgentStorehouse(Map<String, Object> map);
+
+	void updateStoreDeleteById(Integer id,Integer delFlag);
+
+	void add(BusinessAgentStorehouse user);
+
+	List<Map<String, Object>> getStorehouseList(Map<String, Object> map);
+
+	List<Map<String, Object>> getStoreList(Map<String, Object> map);
+
+	List<Map<String, Object>> getDepotToStoreList(Map<String, Object> map);
+
+	List<Map<String, Object>> getAgentStoreInfo(Map<String, Object> map);
+
+	List<Map<String, Object>> getStore(Map<String, Object> map);
+
+	List<BusinessAgentStorehouse> getStoreDataList(BusinessAgentStorehouseExample example);
+}

src/main/java/com/chinaitop/depot/agent/basic/service/agentTankService.java

@@ -0,0 +1,33 @@
+package com.chinaitop.depot.agent.basic.service;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
+
+import java.util.List;
+
+public interface agentTankService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<BusinessAgentTank> getAgentList(BusinessAgentTankExample map);
+
+    void add(BusinessAgentTank user);
+
+    void update(BusinessAgentTank user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgentTank findById(Integer id);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId);
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentDepotServiceImpl.java

@@ -0,0 +1,218 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentDepotMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentStorehouseMapper;
+import com.chinaitop.depot.agent.basic.model.*;
+import com.chinaitop.depot.agent.basic.service.agentDepotService;
+import com.chinaitop.utils.ParameterUtil;
+import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AgentDepotServiceImpl implements agentDepotService {
+
+    @Resource
+    private BusinessAgentDepotMapper BusinessAgentDepotMapper;
+
+    @Resource
+    private BusinessAgentMapper BusinessAgentMapper;
+
+    @Resource
+    private BusinessAgentStorehouseMapper businessAgentStorehouseMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<BusinessAgentDepot> getAgentDepotList(BusinessAgentDepotExample map) {
+        return BusinessAgentDepotMapper.selectByExample(map);
+    }
+
+    @Override
+    public List<BusinessAgentDepot> getAgentList(Map<String, Object> map) {
+        return BusinessAgentDepotMapper.getByExample(map);
+    }
+
+    @Override
+    public List<Map<String,Object>> getDepotLaoList(Map<String, Object> map) {
+        return BusinessAgentDepotMapper.getDepotLaoList(map);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDepotList(Map<String, Object> map) {
+        return BusinessAgentDepotMapper.getDepotList(map);
+    }
+
+    @Override
+    public void add(BusinessAgentDepot agent) {
+        BusinessAgentDepotMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentDepot camera) {
+        BusinessAgentDepotMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateByPrimaryKeySelective(BusinessAgentDepot camera) {
+        BusinessAgentDepotMapper.updateByPrimaryKeySelective(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer depotId,Integer delFlag) {
+        BusinessAgentDepot businessAgentDepot = new BusinessAgentDepot();
+        businessAgentDepot.setId(depotId);
+        businessAgentDepot.setDelFlag(delFlag);
+        BusinessAgentDepotMapper.updateByPrimaryKeySelective(businessAgentDepot);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDepot(Map<String, Object> map) {
+        return BusinessAgentDepotMapper.getDepot(map);
+    }
+
+    @Override
+    public BusinessAgentDepot findById(Integer id) {
+        return BusinessAgentDepotMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public List<BusinessAgentDepot> selectIdNum(BusinessAgentDepotExample example) {
+        return BusinessAgentDepotMapper.selectByExample(example);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId) {
+        Date date = new Date();
+        BusinessAgentDepot agent = null;
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //库点名称
+                        agent = new BusinessAgentDepot();
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 1 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                            agent.setAgentDepotName(revList.get(j));
+                        }
+                        agent.setCreateTime(date);//修改时间
+                        agent.setOrgId(orgId);
+                        break;
+                    case 1:
+                        //代储点名称
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+
+                            BusinessAgentExample example = new BusinessAgentExample();
+                            BusinessAgentExample.Criteria criteria = example.createCriteria();
+                            criteria.andOrgIdEqualTo(orgId);
+                            criteria.andAgentNameEqualTo(revList.get(j));
+                            List<BusinessAgent> agentList = BusinessAgentMapper.selectByExample(example);
+                            if(agentList.size() == 0){
+                                msg = "第 "+(i+1)+" 行第 2 列的值的代储点相关信息没有找到，请确定是否有！";
+                                return msg;
+                            }
+
+                            agent.setAgentId(agentList.get(0).getId().toString());
+                        }
+                        break;
+                    case 2:
+                        //库点类别
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setDepotType(revList.get(j));
+                        break;
+                    case 3:
+                        //设计仓容
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 4 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setDesignStorage(revList.get(j));
+                        break;
+                    case 4:
+                        //地址
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setAddress(revList.get(j));
+                        break;
+                    case 5:
+                        //电话
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 6 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setPhone(revList.get(j));
+                        break;
+                    case 6:
+                        //经度
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 7 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setLongitude(revList.get(j));
+                        break;
+                    case 7:
+                        //纬度
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 8 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setLatitude(revList.get(j));
+                        break;
+                    case 8:
+                        //所属行政区划
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 9 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setAdministrativeArea(revList.get(j));
+                        break;
+                    default :
+                        break;
+                }
+            }
+            agent.setDelFlag(1);
+            agent.setDepotId(0);
+            BusinessAgentDepotMapper.insert(agent);
+        }
+        return msg;
+    }
+
+    @Override
+    public List<Integer> getAgentHouseId(Integer orgId) {
+        return businessAgentStorehouseMapper.getAgentHouseId(orgId);
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentPeopleServiceImpl.java

@@ -0,0 +1,47 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentPeopleMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeople;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentPeopleExample;
+import com.chinaitop.depot.agent.basic.service.agentPeopleService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class AgentPeopleServiceImpl implements agentPeopleService {
+
+    @Resource
+    private BusinessAgentPeopleMapper BusinessAgentPeopleMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<BusinessAgentPeople> getAgentList(BusinessAgentPeopleExample map) {
+        return BusinessAgentPeopleMapper.selectByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgentPeople agent) {
+        BusinessAgentPeopleMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentPeople camera) {
+        BusinessAgentPeopleMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        BusinessAgentPeopleMapper.deleteByPrimaryKey(agentId);
+    }
+
+    @Override
+    public BusinessAgentPeople findById(Integer id) {
+        return BusinessAgentPeopleMapper.selectByPrimaryKey(id);
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentServiceImpl.java

@@ -0,0 +1,191 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgent;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentExample;
+import com.chinaitop.depot.agent.basic.service.agentService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AgentServiceImpl implements agentService {
+
+    @Resource
+    private BusinessAgentMapper BusinessAgentMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<BusinessAgent> getAgentList(BusinessAgentExample map) {
+        return BusinessAgentMapper.selectByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgent agent) {
+        BusinessAgentMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgent camera) {
+        BusinessAgentMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        BusinessAgent businessAgent = new BusinessAgent();
+        businessAgent.setId(agentId);
+        businessAgent.setDelFlag(2);
+        BusinessAgentMapper.updateByPrimaryKeySelective(businessAgent);
+    }
+
+    @Override
+    public BusinessAgent findById(Integer id) {
+        return BusinessAgentMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public Map<String,Object> getNameId(Map<String,Object> map) {
+        return BusinessAgentMapper.getNameId(map);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId) {
+        Date date = new Date();
+        BusinessAgent agent = null;
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //代储点名称
+                        agent = new BusinessAgent();
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 1 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                            agent.setAgentName(revList.get(j));
+                        }
+                        agent.setCreateTime(date);//修改时间
+                        agent.setOrgId(orgId);
+                        break;
+                    case 1:
+                        //法定代表人
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 2 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setLegalPerson(revList.get(j));
+                        break;
+                    case 2:
+                        //统一社会信用代码
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setCreditCode(revList.get(j));
+                        break;
+                    case 3:
+                        //代储点性质
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 4 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setAgentNature(revList.get(j));
+                        break;
+                    case 4:
+                        //代储点类型
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setAgentType(revList.get(j));
+                        break;
+                    case 5:
+                        //仓容
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setCapacity(revList.get(j));
+                        break;
+                    case 6:
+                        //人员
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setPerson(revList.get(j));
+                        break;
+                    case 7:
+                        //信用
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setCredit(revList.get(j));
+                        break;
+                    case 8:
+                        //经度
+                        len = revList.get(j).length();
+                        if (len > 100) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过100！";
+                            return msg;
+                        }
+                        agent.setLongitude(revList.get(j));
+                        break;
+                    case 9:
+                        //维度
+                        len = revList.get(j).length();
+                        if (len > 100) {
+                            msg = "第 "+(i+1)+" 行第 5 列的值的长度不能超过100！";
+                            return msg;
+                        }
+                        agent.setLatitude(revList.get(j));
+                        break;
+                    case 10:
+                        //所属行政区划
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+1)+" 行第 11 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setAdministrativeArea(revList.get(j));
+                        break;
+                    default :
+                        break;
+                }
+
+            }
+            agent.setDelFlag(1);
+            BusinessAgentMapper.insert(agent);
+        }
+        return msg;
+    }
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentStoreWareServiceImpl.java

@@ -0,0 +1,86 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
+
+import com.chinaitop.utils.ParameterUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class AgentStoreWareServiceImpl implements agentStoreWareService {
+
+    @Resource
+    private BusinessAgentWarehouseMapper businessAgentWarehouseMapper;
+
+    //
+	@Override
+	public List<Map<String, Object>> getAgentStoreWare(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return businessAgentWarehouseMapper.getAgentStoreWare(map);
+	}
+
+	@Override
+	public void addWareHouse(BusinessAgentWarehouse warehouse) {
+		businessAgentWarehouseMapper.insert(warehouse);
+	}
+
+	@Override
+	public List<Map<String, Object>> getWareList(Map<String, Object> map) {
+		return businessAgentWarehouseMapper.getWareList(map);
+	}
+
+	@Override
+	public List<Map<String, Object>> getWare(Map<String, Object> map) {
+		return businessAgentWarehouseMapper.getWare(map);
+	}
+
+	@Override
+	public void removeAgentWare(Integer wareId,Integer delFlag) {
+		BusinessAgentWarehouse businessAgentWarehouse = new BusinessAgentWarehouse();
+		businessAgentWarehouse.setId(wareId);
+		businessAgentWarehouse.setDelFlag(delFlag);
+		businessAgentWarehouseMapper.updateByPrimaryKeySelective(businessAgentWarehouse);
+	}
+
+	@Override
+	public List<BusinessAgentWarehouse> getWareDataList(BusinessAgentWarehouseExample example) {
+		return businessAgentWarehouseMapper.selectByExample(example);
+	}
+
+	@Override
+	public List<Integer> getAgentwareHouseId(Integer orgId) {
+		// TODO Auto-generated method stub
+		return businessAgentWarehouseMapper.getAgentwareHouseId(orgId);
+	}
+
+	@Override
+	public Map<String, Object> getWarehouse(Integer unitId, Integer storehouseId) {
+		Map<String, Object> mapData = new HashMap<String, Object>();
+
+		Map<String,Object> map = new HashMap<>();
+		if(ParameterUtil.isnotnull(unitId)){
+			map.put("orgId",unitId);
+		}
+		if(ParameterUtil.isnotnull(storehouseId)){
+			map.put("storehouseId",storehouseId);
+		}
+
+		List<Map<String, Object>> list = businessAgentWarehouseMapper.getWarehouse(map); //获取库点下的某个仓房中的的货位
+		//处理驼峰命名大写问题
+		List<Map<String, Object>> listDatas = ParameterUtil.slashCapitals(list);
+		mapData.put("wareList", listDatas); //货位下拉列表集合
+
+		return mapData;
+	}
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentStorehouseServiceImpl.java

@@ -0,0 +1,76 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentStorehouseMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouseExample;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.service.agentStorehouseService;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class AgentStorehouseServiceImpl implements agentStorehouseService {
+
+    @Resource
+    private BusinessAgentStorehouseMapper businessAgentStorehouseMapper;
+
+    @Resource
+    private BusinessAgentWarehouseMapper businessAgentWarehouseMapper;
+
+    
+    //获取仓房信息
+	@Override
+	public List<Map<String, Object>> getAgentStorehouse(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		return businessAgentStorehouseMapper.getAgentStorehouse(map);
+	}
+
+	public void updateStoreDeleteById(Integer storeId,Integer delFlag) {
+		BusinessAgentStorehouse businessAgentStorehouse = new BusinessAgentStorehouse();
+		businessAgentStorehouse.setId(storeId);
+		businessAgentStorehouse.setDelFlag(delFlag);
+		businessAgentStorehouseMapper.updateByPrimaryKeySelective(businessAgentStorehouse);
+	}
+
+	@Override
+	public void add(BusinessAgentStorehouse storehouse) {
+		businessAgentStorehouseMapper.insert(storehouse);
+	}
+
+	@Override
+	public List<Map<String, Object>> getStorehouseList(Map<String, Object> map) {
+		return businessAgentStorehouseMapper.getStorehouseList(map);
+	}
+
+	@Override
+	public List<Map<String, Object>> getStoreList(Map<String, Object> map) {
+		return businessAgentStorehouseMapper.getStoreList(map);
+	}
+
+	@Override
+	public List<Map<String, Object>> getAgentStoreInfo(Map<String, Object> map) {
+		return businessAgentStorehouseMapper.getAgentStoreInfo(map);
+	}
+
+	@Override
+	public List<Map<String, Object>> getDepotToStoreList(Map<String, Object> map) {
+		return businessAgentStorehouseMapper.getDepotToStoreList(map);
+	}
+
+	@Override
+	public List<Map<String, Object>> getStore(Map<String, Object> map) {
+		return businessAgentStorehouseMapper.getStore(map);
+	}
+
+	@Override
+	public List<BusinessAgentStorehouse> getStoreDataList(BusinessAgentStorehouseExample example) {
+		return businessAgentStorehouseMapper.selectByExample(example);
+	}
+}

src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankServiceImpl.java

@@ -0,0 +1,188 @@
+package com.chinaitop.depot.agent.basic.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentDepotMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentTankMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTank;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExample;
+import com.chinaitop.depot.agent.basic.service.agentTankService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class AgentTankServiceImpl implements agentTankService {
+
+    @Resource
+    private BusinessAgentTankMapper BusinessAgentTankMapper;
+
+    @Resource
+    private BusinessAgentDepotMapper BusinessAgentDepotMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<BusinessAgentTank> getAgentList(BusinessAgentTankExample map) {
+        return BusinessAgentTankMapper.selectByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgentTank agent) {
+        BusinessAgentTankMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentTank camera) {
+        BusinessAgentTankMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        BusinessAgentTankMapper.deleteByPrimaryKey(agentId);
+    }
+
+    @Override
+    public BusinessAgentTank findById(Integer id) {
+        return BusinessAgentTankMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId) {
+        Date date = new Date();
+        BusinessAgentTank agent = null;
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //粮库名称
+                        agent = new BusinessAgentTank();
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+
+                            //根据粮库名称查询出来相关的粮库id
+                            BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+                            BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+                            criteria.andOrgIdEqualTo(orgId);
+                            criteria.andDelFlagEqualTo(1);//未删除
+                            criteria.andAgentDepotNameEqualTo(revList.get(j));
+                            List<BusinessAgentDepot> agentList = BusinessAgentDepotMapper.selectByExample(example);
+                            if(agentList.size() == 0){
+                                msg = "第 "+(i+1)+" 行第 1 列的值的粮库相关信息没有找到，请确定是否有！";
+                                return msg;
+                            }
+
+                            agent.setDepotId(agentList.get(0).getId());
+                        }
+                        break;
+                    case 1:
+                        //油罐编号
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 2 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                            agent.setTankNumber(revList.get(j));
+                        }
+                        agent.setCreateTime(date);//修改时间
+                        agent.setOrgId(orgId);
+                        break;
+                    case 2:
+                        //设计容量
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 3 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setDesignStorage(revList.get(j));
+                        break;
+                    case 3:
+                        //设计年限
+                        if (revList.get(j) != null && !"".equals(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 30) {
+                                msg = "第 "+(i+1)+" 行第 4 列的值的长度不能超过30！";
+                                return msg;
+                            }
+                        }
+                        agent.setDesignYear(revList.get(j));
+                        break;
+                    case 4:
+                        //是否国债投资
+                        String sf = revList.get(j);
+                        if ("是".equals(sf) || "是" == sf) {
+                            agent.setTreasuryBonds("true");
+                        }else{
+                            agent.setTreasuryBonds("false");
+                        }
+                        break;
+                    case 5:
+                        //启用日期
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 6 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setEnableDate(revList.get(j));
+                        break;
+                    case 6:
+                        //当前状态
+                        switch(revList.get(j)) {
+                            case "完好":
+                                agent.setState("3011");
+                                break;
+                            case "需小修":
+                                agent.setState("3012");
+                                break;
+                            case "需大修":
+                                agent.setState("3013");
+                                break;
+                            case "待报废":
+                                agent.setState("3014");
+                                break;
+                            case "待拆除":
+                                agent.setState("3015");
+                                break;
+                            case "死角仓":
+                                agent.setState("3016");
+                                break;
+                            case "其他":
+                                agent.setState("3017");
+                                break;
+                            default:
+                                msg = "第 "+(i+1)+" 行第 7 列的值并没有在项目中存在请查询后再导入！";
+                                return msg;
+                        }
+                        break;
+                    case 7:
+                        //责任保管员
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+1)+" 行第 8 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setKeeper(revList.get(j));
+                        break;
+                    default :
+                        break;
+                }
+
+            }
+            BusinessAgentTankMapper.insert(agent);
+        }
+        return msg;
+    }
+}

src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentBgmxzController.java

@@ -0,0 +1,295 @@
+package com.chinaitop.depot.agent.bgz.controller;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+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.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+import com.chinaitop.utils.ParameterUtil;
+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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@RestController
+@RequestMapping(value = "/agent_bgmxz")
+@Api(description = "代储库保管明细账控制类")
+public class BusinessAgentBgmxzController {
+
+	@Resource
+	private BusinessAgentBgmxzService bgmxzService;
+
+	@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 = "agentId", value = "代储点ID", paramType = "query"),
+            @ApiImplicitParam(name = "szlkOrgId", value = "代储库ID", paramType = "query"),
+            @ApiImplicitParam(name = "houseId", value = "代储库仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "wareId", value = "代储库货位id", paramType = "query"),
+            @ApiImplicitParam(name = "fssj", value = "业务发生时间", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+    })
+	public PageInfo<BusinessAgentBgmxz> list(Integer pageNum, Integer pageSize, Integer agentId, Integer szlkOrgId,
+			Integer houseId, Integer wareId, String fssj, Integer orgId) {
+		Map<String, Object> param_map = new HashMap<String, Object>();
+		/* 代储点ID */
+		if(ParameterUtil.isnotnull(agentId)){
+			param_map.put("agent_id", agentId);
+		}
+		/* 代储库ID */
+		if(ParameterUtil.isnotnull(szlkOrgId)){
+			param_map.put("szlk_org_id", szlkOrgId);
+		}
+		/* 仓房ID */
+		if(ParameterUtil.isnotnull(houseId)){
+			param_map.put("house_id", houseId);
+		}
+		/* 货位ID */
+		if(ParameterUtil.isnotnull(wareId)){
+			param_map.put("ware_id", wareId);
+		}
+		/* 业务发生时间 */
+		if(ParameterUtil.isnotnull(fssj)){
+			Date startTime = ParameterUtil.string2datetime(fssj+" 00:00:00");
+			Date endTime = ParameterUtil.string2datetime(fssj+" 23:59:59");
+			param_map.put("fssj", fssj);
+			param_map.put("start_time", startTime);
+			param_map.put("end_time", endTime);
+		}
+		if (ParameterUtil.isnotnull(orgId)) {
+			param_map.put("org_id", orgId);
+		}
+
+		/* 分页 */
+		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		List<BusinessAgentBgmxz> list = bgmxzService.findByConditions(param_map);
+		PageInfo<BusinessAgentBgmxz> pageInfo = new PageInfo<BusinessAgentBgmxz>(list);
+		
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/findByMxbgz", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="查看代储库保管明细账信息", notes = "查看代储库保管明细账信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "query")
+    })
+	public BusinessAgentBgmxz findByMxbgz(Integer id) {
+		BusinessAgentBgmxz bgmxz = null;
+		if (null != id) {
+			bgmxz = bgmxzService.findByParmaryKey(id);
+		} else {
+			bgmxz = new BusinessAgentBgmxz();
+		}
+		return bgmxz;
+	}
+
+	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增或修改代储库保管明细账信息", notes = "新增或修改代储库保管明细账信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bgmxzJson", value = "数据对象", paramType = "form")
+    })
+	public Map<String, Object> edit(String bgmxzJson) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			BusinessAgentBgmxz bgmxz = (BusinessAgentBgmxz) mapper.readValue(bgmxzJson, BusinessAgentBgmxz.class);
+			if (bgmxz.getId() != null) {
+				bgmxzService.update(bgmxz);
+			} else {
+				bgmxzService.insert(bgmxz);
+			}
+			modelMap.put("status", "success");
+			modelMap.put("msg", "操作成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "操作失败！");
+		}
+		return modelMap;
+	}
+
+	@RequestMapping(value = "/remove", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增或修改代储库保管明细账信息", notes = "新增或修改代储库保管明细账信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+	public Map<String, Object> remove(Integer id) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		try {
+			if (null != id) {
+				bgmxzService.remove(id);
+				modelMap.put("status", "success");
+				modelMap.put("msg", "操作成功！");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "操作失败！");
+		}
+		return modelMap;
+	}
+	
+	@RequestMapping(value="/getFcbgzList", 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="bgmxzJson", value="数据对象", paramType="query")
+	})
+	public PageInfo<Map<String, Object>> getFcbgzList(Integer pageNum, Integer pageSize, String bgmxzJson) {
+
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+		ObjectMapper mapper = new ObjectMapper();
+		BusinessAgentBgmxz bgmxz = null;
+		try {
+			bgmxz = (BusinessAgentBgmxz) mapper.readValue(bgmxzJson, BusinessAgentBgmxz.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getOrgId())){
+			paramMap.put("orgId", bgmxz.getOrgId());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getAgentId())){
+			paramMap.put("agentId", bgmxz.getAgentId());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getSzlkOrgId())){
+			paramMap.put("szlkOrgId", bgmxz.getSzlkOrgId());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getHouseId())){
+			paramMap.put("houseId", bgmxz.getHouseId());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getWareId())){
+			paramMap.put("wareId", bgmxz.getWareId());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getLspz())){
+			paramMap.put("lspz", bgmxz.getLspz());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getLsxz())){
+			paramMap.put("lsxz", bgmxz.getLsxz());
+		}
+		if(ParameterUtil.isnotnull(bgmxz.getFssj())){
+			paramMap.put("fssj", bgmxz.getFssj());
+		}
+		/* 分页 */
+		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		List<Map<String, Object>> list = bgmxzService.selectFcbgzGroupBy(paramMap);
+		
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+		list = pageInfo.getList();
+		if (null != list && list.size() > 0) {
+			Map<String, Object> detail_map = new HashMap<String, Object>();
+			for (Map<String, Object> map : list) {
+				String fssj = map.get("fssj")+"";
+				map.put("fssj", fssj.substring(0, 10));
+				detail_map = bgmxzService.selectDetail(map);
+				if (null != detail_map) {
+					map.put("agent_name", detail_map.get("agent_name"));
+					map.put("agent_depot_name", detail_map.get("agent_depot_name"));
+					map.put("house_name", detail_map.get("house_name"));
+					map.put("ware_name", detail_map.get("ware_name"));
+					map.put("kcsl", detail_map.get("kcsl"));
+				}
+			}
+			list = ParameterUtil.slashCapitals(list);
+			pageInfo.setList(list);
+		}
+		return pageInfo;
+	}
+
+	@RequestMapping(value="/selectAgentHouseWareList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询代储库正常使用的货位数据信息", notes = "查询代储库正常使用的货位数据信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
+	})
+	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
+
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+
+		paramMap.put("orgId", orgId);
+		List<Map<String, Object>> list = bgmxzService.selectAgentHouseWareList(paramMap);
+
+		return list;
+	}
+	
+	@RequestMapping(value="/addCrkFcbgzData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="把出入库拿来的分仓保管账数据插入到代储库业务的分仓保管账表 中", notes = "把出入库拿来的分仓保管账数据插入到代储库业务的分仓保管账表 中")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="fcbgzData", value="出入库分仓保管账数据", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="form"),
+		@ApiImplicitParam(name="realName", value="当前操作人", paramType="form")
+	})
+	public Map<String, Object> addCrkFcbgzData(String fcbgzData, Integer orgId, String realName) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			JSONArray json = JSONArray.fromObject(fcbgzData);
+			if (json.size() > 0) {
+				BusinessAgentBgmxz bgmxz = null;
+				for (int i = 0; i < json.size(); i++) {
+					bgmxz = new BusinessAgentBgmxz();
+					JSONObject job = json.getJSONObject(i);
+					bgmxz.setOrgId(orgId);
+					Integer dckId = Integer.parseInt(job.get("unitid")+"");
+					BusinessAgentDepot businessAgentDepot = bgmxzService.selectAgentDepotObj(orgId, dckId);
+					bgmxz.setAgentId(Integer.parseInt(businessAgentDepot.getAgentId()));
+					bgmxz.setSzlkOrgId(businessAgentDepot.getId());
+					bgmxz.setHouseId(Integer.parseInt(job.get("ch")+""));
+					bgmxz.setWareId(Integer.parseInt(job.get("hwh")+""));
+					bgmxz.setLspz(Integer.parseInt(job.get("mxpz")+""));
+					bgmxz.setLsxz(Integer.parseInt(job.get("hwxz")+""));
+					bgmxz.setLsdj(Integer.parseInt(job.get("dj")+""));
+					Date fssj =  ParameterUtil.string2datetime(job.get("olddataid") + "");
+					bgmxz.setFssj(fssj);
+					BigDecimal number = new BigDecimal(job.get("srsl")+"");
+					bgmxz.setSrsl(number);
+					number = new BigDecimal(job.get("zcsl")+"");
+					bgmxz.setZcsl(number);
+					number = new BigDecimal(job.get("kcsl")+"");
+					bgmxz.setKcsl(number);
+					bgmxz.setIsJz(1);
+					bgmxz.setSjly(1);
+					bgmxz.setCreatePerson(realName);
+					bgmxz.setCreateDate(fssj);
+
+					//插入代储点的保管明细账表
+					bgmxzService.insert(bgmxz);
+				}
+				//修改代储点货位表的保管明细账最后同步时间
+				bgmxzService.updateAgentDepot(orgId);
+			}
+			map.put("status", "200");
+			map.put("msg", "操作成功！");
+		} catch (NumberFormatException e) {
+			map.put("msg", "操作失败！");
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentBgzzController.java

@@ -0,0 +1,155 @@
+package com.chinaitop.depot.agent.bgz.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+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.agent.bgz.model.BusinessAgentBgzz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample.Criteria;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgzzService;
+import com.chinaitop.utils.ParameterUtil;
+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 = "/agent_bgzz")
+@Api(description = "代储库保管总账控制类")
+public class BusinessAgentBgzzController {
+
+	@Resource
+	private BusinessAgentBgzzService bgzzService;
+
+	@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 = "bgzzJson", value = "条件对象", paramType = "query")
+    })
+	public PageInfo<BusinessAgentBgzz> list(Integer pageNum, Integer pageSize, String bgzzJson) {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		BusinessAgentBgzz bgzz = null;
+		try {
+			bgzz = (BusinessAgentBgzz) mapper.readValue(bgzzJson, BusinessAgentBgzz.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		BusinessAgentBgzzExample example = new BusinessAgentBgzzExample();
+		Criteria criteria = example.createCriteria();
+
+		/* orgId */
+		if(ParameterUtil.isnotnull(bgzz.getOrgId())){
+			criteria.andAgentIdEqualTo(bgzz.getOrgId());
+		}
+		/* 代储点ID */
+		if(ParameterUtil.isnotnull(bgzz.getAgentId())){
+			criteria.andAgentIdEqualTo(bgzz.getAgentId());
+		}
+		/* 代储库ID */
+		if(ParameterUtil.isnotnull(bgzz.getDckId())){
+			criteria.andDckIdEqualTo(bgzz.getDckId());
+		}
+		/* 粮食品种ID */
+		if(ParameterUtil.isnotnull(bgzz.getLspz())){
+			criteria.andLspzEqualTo(bgzz.getLspz());
+		}
+		/* 粮食性质ID */
+		if(ParameterUtil.isnotnull(bgzz.getLsxz())){
+			criteria.andLsxzEqualTo(bgzz.getLsxz());
+		}
+		/* 业务月份 */
+		if(ParameterUtil.isnotnull(bgzz.getFssj())){
+			criteria.andFssjEqualTo(bgzz.getFssj());
+		}
+
+		/* 分页 */
+		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		List<BusinessAgentBgzz> list = bgzzService.findByConditions(example);
+		PageInfo<BusinessAgentBgzz> pageInfo = new PageInfo<BusinessAgentBgzz>(list);
+		
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增或修改代储库保管总账信息", notes = "新增或修改代储库保管总账信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "bgzzJson", value = "数据对象", paramType = "form"),
+        @ApiImplicitParam(name = "type", value = "操作类型", paramType = "form")
+    })
+	public Map<String, Object> edit(String bgzzJson, String type) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			BusinessAgentBgzz bgzz = (BusinessAgentBgzz) mapper.readValue(bgzzJson, BusinessAgentBgzz.class);
+			if (type != null && "shenhe".equals(type)) {
+				bgzzService.update(bgzz);
+			} else {
+				/**
+				 * 实现思路：
+				 * 1、查询是否记过账
+				 * 2、如果记过账则直接修改数据就行，否则就新增记账数据
+				 */
+				BusinessAgentBgzzExample example = new BusinessAgentBgzzExample();
+				Criteria criteria = example.createCriteria();
+
+				/* orgId */
+				if(ParameterUtil.isnotnull(bgzz.getOrgId())){
+					criteria.andOrgIdEqualTo(bgzz.getOrgId());
+				}
+				/* 代储点ID */
+				if(ParameterUtil.isnotnull(bgzz.getAgentId())){
+					criteria.andAgentIdEqualTo(bgzz.getAgentId());
+				}
+				/* 代储库ID */
+				if(ParameterUtil.isnotnull(bgzz.getDckId())){
+					criteria.andDckIdEqualTo(bgzz.getDckId());
+				}
+				/* 粮食品种ID */
+				if(ParameterUtil.isnotnull(bgzz.getLspz())){
+					criteria.andLspzEqualTo(bgzz.getLspz());
+				}
+				/* 粮食性质ID */
+				if(ParameterUtil.isnotnull(bgzz.getLsxz())){
+					criteria.andLsxzEqualTo(bgzz.getLsxz());
+				}
+				/* 业务月份 */
+				if(ParameterUtil.isnotnull(bgzz.getFssj())){
+					criteria.andFssjEqualTo(bgzz.getFssj());
+				}
+				List<BusinessAgentBgzz> list = bgzzService.findByConditions(example);
+				
+				if (null != list && list.size() > 0) {
+					bgzzService.update(bgzz);
+				} else {
+					bgzzService.insert(bgzz);
+				}
+			}
+			modelMap.put("status", "success");
+			modelMap.put("msg", "操作成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "操作失败！");
+		}
+		return modelMap;
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/controller/BusinessAgentFcbgzController.java

@@ -0,0 +1,263 @@
+package com.chinaitop.depot.agent.bgz.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+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.agent.bgz.model.BusinessAgentFcbgz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample.Criteria;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentFcbgzService;
+import com.chinaitop.utils.ParameterUtil;
+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 = "/agent_fcbgz")
+@Api(description = "代储库分仓保管账控制类")
+public class BusinessAgentFcbgzController {
+
+	@Resource
+	private BusinessAgentFcbgzService fcbgzService;
+
+	@Resource
+	private BusinessAgentBgmxzService bgmxzService;
+	
+	@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 = "fcbgzJson", value = "条件对象", paramType = "query")
+    })
+	public PageInfo<BusinessAgentFcbgz> list(Integer pageNum, Integer pageSize, String fcbgzJson) {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		BusinessAgentFcbgz fcbgz = null;
+		try {
+			fcbgz = (BusinessAgentFcbgz) mapper.readValue(fcbgzJson, BusinessAgentFcbgz.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		BusinessAgentFcbgzExample example = new BusinessAgentFcbgzExample();
+		Criteria criteria = example.createCriteria();
+
+		/* orgId */
+		if(ParameterUtil.isnotnull(fcbgz.getOrgId())){
+			criteria.andOrgIdEqualTo(fcbgz.getOrgId());
+		}
+		/* 代储点ID */
+		if(ParameterUtil.isnotnull(fcbgz.getAgentId())){
+			criteria.andAgentIdEqualTo(fcbgz.getAgentId());
+		}
+		/* 代储库ID */
+		if(ParameterUtil.isnotnull(fcbgz.getDckId())){
+			criteria.andDckIdEqualTo(fcbgz.getDckId());
+		}
+		/* 仓房ID */
+		if(ParameterUtil.isnotnull(fcbgz.getHouseId())){
+			criteria.andHouseIdEqualTo(fcbgz.getHouseId());
+		}
+		/* 货位ID */
+		if(ParameterUtil.isnotnull(fcbgz.getWareId())){
+			criteria.andWareIdEqualTo(fcbgz.getWareId());
+		}
+		/* 粮食品种ID */
+		if(ParameterUtil.isnotnull(fcbgz.getLspz())){
+			criteria.andLspzEqualTo(fcbgz.getLspz());
+		}
+		/* 粮食性质ID */
+		if(ParameterUtil.isnotnull(fcbgz.getLsxz())){
+			criteria.andLsxzEqualTo(fcbgz.getLsxz());
+		}
+		/* 业务时间 */
+		if(ParameterUtil.isnotnull(fcbgz.getFssj())){
+			criteria.andFssjEqualTo(fcbgz.getFssj());
+		}
+
+		/* 分页 */
+		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+		List<BusinessAgentFcbgz> list = fcbgzService.findByConditions(example);
+		PageInfo<BusinessAgentFcbgz> pageInfo = new PageInfo<BusinessAgentFcbgz>(list);
+		
+		return pageInfo;
+	}
+
+	@RequestMapping(value = "/edit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增或修改代储库分仓保管账信息", notes = "新增或修改代储库分仓保管账信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "fcbgzJson", value = "数据对象", paramType = "form"),
+        @ApiImplicitParam(name = "type", value = "操作类型", paramType = "form")
+    })
+	public Map<String, Object> edit(String fcbgzJson, String type) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		// JSON字符串转对象
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			BusinessAgentFcbgz fcbgz = (BusinessAgentFcbgz) mapper.readValue(fcbgzJson, BusinessAgentFcbgz.class);
+			if (type != null && "shenhe".equals(type)) {
+				fcbgzService.update(fcbgz);
+			} else {
+				/**
+				 * 实现思路
+				 * 1、先查询有没有记过账
+				 * 2、记过账那么修改数据就行，没记过账就新增
+				 * 3、记账后要把这个业务时间段的保管明细数据设置为已记账
+				 */
+				BusinessAgentFcbgzExample example = new BusinessAgentFcbgzExample();
+				Criteria criteria = example.createCriteria();
+				/* orgId */
+				if(ParameterUtil.isnotnull(fcbgz.getOrgId())){
+					criteria.andOrgIdEqualTo(fcbgz.getOrgId());
+				}
+				/* 代储点ID */
+				if(ParameterUtil.isnotnull(fcbgz.getAgentId())){
+					criteria.andAgentIdEqualTo(fcbgz.getAgentId());
+				}
+				/* 代储库ID */
+				if(ParameterUtil.isnotnull(fcbgz.getDckId())){
+					criteria.andDckIdEqualTo(fcbgz.getDckId());
+				}
+				/* 仓房ID */
+				if(ParameterUtil.isnotnull(fcbgz.getHouseId())){
+					criteria.andHouseIdEqualTo(fcbgz.getHouseId());
+				}
+				/* 货位ID */
+				if(ParameterUtil.isnotnull(fcbgz.getWareId())){
+					criteria.andWareIdEqualTo(fcbgz.getWareId());
+				}
+				/* 粮食品种ID */
+				if(ParameterUtil.isnotnull(fcbgz.getLspz())){
+					criteria.andLspzEqualTo(fcbgz.getLspz());
+				}
+				/* 粮食性质ID */
+				if(ParameterUtil.isnotnull(fcbgz.getLsxz())){
+					criteria.andLsxzEqualTo(fcbgz.getLsxz());
+				}
+				/* 业务时间 */
+				if(ParameterUtil.isnotnull(fcbgz.getFssj())){
+					criteria.andFssjEqualTo(fcbgz.getFssj());
+				}
+				List<BusinessAgentFcbgz> list = fcbgzService.findByConditions(example);
+
+				/* 如果记过账了那么就修改，否则新增 */
+				if (null != list && list.size() != 0) {
+					fcbgzService.update(fcbgz);
+				} else {
+					//新增
+					fcbgzService.insert(fcbgz);
+				}
+
+				//记账后将这天的保管明细账数据设置为已记账，记账后不可修改
+				fcbgzService.updateSfjz(fcbgz);
+			}
+			modelMap.put("status", "success");
+			modelMap.put("msg", "操作成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "操作失败！");
+		}
+		return modelMap;
+	}
+	
+	@RequestMapping(value = "/remove", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除选中分仓保管账信息", notes = "删除选中分仓保管账信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+	public Map<String, Object> remove(Integer id) {
+		Map<String, Object> modelMap = new HashMap<String, Object>();
+		try {
+			if (null != id) {
+				fcbgzService.remove(id);
+				modelMap.put("status", "success");
+				modelMap.put("msg", "操作成功！");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			modelMap.put("status", "error");
+			modelMap.put("msg", "操作失败！");
+		}
+		return modelMap;
+	}
+	
+	@RequestMapping(value="/getBgzzList", 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="bgzzJson", value="数据对象", paramType="query")
+	})
+	public PageInfo<Map<String, Object>> getBgzzList(Integer pageNum, Integer pageSize, String fcbgzJson) {
+
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+		ObjectMapper mapper = new ObjectMapper();
+		BusinessAgentFcbgz fcbgz = null;
+		try {
+			fcbgz = (BusinessAgentFcbgz) mapper.readValue(fcbgzJson, BusinessAgentFcbgz.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getOrgId())){
+			paramMap.put("orgId", fcbgz.getOrgId());
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getAgentId())){
+			paramMap.put("agentId", fcbgz.getAgentId());
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getDckId())){
+			paramMap.put("dckId", fcbgz.getDckId());
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getLspz())){
+			paramMap.put("lspz", fcbgz.getLspz());
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getLsxz())){
+			paramMap.put("lsxz", fcbgz.getLsxz());
+		}
+		if(ParameterUtil.isnotnull(fcbgz.getFssj())){
+			paramMap.put("fssj", fcbgz.getFssj());
+		}
+		/* 分页 */
+		if(ParameterUtil.isnotnull(pageNum) && ParameterUtil.isnotnull(pageSize)){
+			PageHelper.startPage(pageNum, pageSize);
+		}
+
+		List<Map<String, Object>> list = fcbgzService.selectBgzzGroupByList(paramMap);
+
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+		list = pageInfo.getList();
+		if (null != list && list.size() > 0) {
+			Map<String, Object> param_map = null;
+			for (Map<String, Object> map : list) {
+				map.put("fssj", map.get("fssj").toString().substring(0, 7));
+				param_map = fcbgzService.selectBgzzList(map);
+				if (null != param_map) {
+					map.put("agent_name", param_map.get("agent_name"));
+					map.put("agent_depot_name", param_map.get("agent_depot_name"));
+					map.put("kcsl", param_map.get("kcsl"));
+				}
+			}
+			list = ParameterUtil.slashCapitals(list);
+			pageInfo.setList(list);
+			
+		}
+		
+		return pageInfo;
+	}
+}

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.java

@@ -0,0 +1,64 @@
+package com.chinaitop.depot.agent.bgz.mapper;
+
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentBgmxzMapper {
+    int countByExample(BusinessAgentBgmxzExample example);
+
+    int deleteByExample(BusinessAgentBgmxzExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentBgmxz record);
+
+    int insertSelective(BusinessAgentBgmxz record);
+
+    List<BusinessAgentBgmxz> selectByExample(BusinessAgentBgmxzExample example);
+
+    BusinessAgentBgmxz selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentBgmxz record, @Param("example") BusinessAgentBgmxzExample example);
+
+    int updateByExample(@Param("record") BusinessAgentBgmxz record, @Param("example") BusinessAgentBgmxzExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentBgmxz record);
+
+    int updateByPrimaryKey(BusinessAgentBgmxz record);
+
+    /**
+     * 查询分仓保管账分组列表
+     * 
+     * @param map 条件
+     * @return
+     */
+    List<Map<String, Object>> selectFcbgzGroupBy(Map<String, Object> map);
+    
+    /**
+     * 查询分仓保管账列表中的其它数据
+     * 
+     * @param map 条件
+     * @return
+     */
+    Map<String, Object> selectDetail(Map<String, Object> map);
+
+    /**
+     * 查询保管明细账数据
+     * 
+     * @param example
+     * @return
+     */
+    List<BusinessAgentBgmxz> selectByExampleNew(Map<String, Object> parem_map);
+
+    /**
+     * 查询代储库正常使用的货位数据信息
+     * 
+     * @param paramMap 条件
+     * @return
+     */
+    List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap);
+}

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgmxzMapper.xml

@@ -0,0 +1,577 @@
+<?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.agent.bgz.mapper.BusinessAgentBgmxzMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="agent_id" jdbcType="INTEGER" property="agentId" />
+    <result column="szlk_org_id" jdbcType="INTEGER" property="szlkOrgId" />
+    <result column="house_id" jdbcType="INTEGER" property="houseId" />
+    <result column="ware_id" jdbcType="INTEGER" property="wareId" />
+    <result column="lspz" jdbcType="INTEGER" property="lspz" />
+    <result column="lsxz" jdbcType="INTEGER" property="lsxz" />
+    <result column="lsdj" jdbcType="INTEGER" property="lsdj" />
+    <result column="fssj" jdbcType="TIMESTAMP" property="fssj" />
+    <result column="srsl" jdbcType="DECIMAL" property="srsl" />
+    <result column="zcsl" jdbcType="DECIMAL" property="zcsl" />
+    <result column="kcsl" jdbcType="DECIMAL" property="kcsl" />
+    <result column="lqgs_org_id" jdbcType="INTEGER" property="lqgsOrgId" />
+    <result column="is_jz" jdbcType="INTEGER" property="isJz" />
+    <result column="sjly" jdbcType="INTEGER" property="sjly" />
+    <result column="create_person" jdbcType="VARCHAR" property="createPerson" />
+    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </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">
+    id, org_id, agent_id, szlk_org_id, house_id, ware_id, lspz, lsxz, lsdj, fssj, srsl, 
+    zcsl, kcsl, lqgs_org_id, is_jz, sjly, create_person, create_date, updatetime
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_bgmxz
+    <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 business_agent_bgmxz
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from business_agent_bgmxz
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample">
+    delete from business_agent_bgmxz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_bgmxz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_bgmxz (id, org_id, agent_id, 
+      szlk_org_id, house_id, ware_id, 
+      lspz, lsxz, lsdj, fssj, 
+      srsl, zcsl, kcsl, lqgs_org_id, 
+      is_jz, sjly, create_person, 
+      create_date, updatetime)
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, 
+      #{szlkOrgId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{wareId,jdbcType=INTEGER}, 
+      #{lspz,jdbcType=INTEGER}, #{lsxz,jdbcType=INTEGER}, #{lsdj,jdbcType=INTEGER}, #{fssj,jdbcType=TIMESTAMP}, 
+      #{srsl,jdbcType=DECIMAL}, #{zcsl,jdbcType=DECIMAL}, #{kcsl,jdbcType=DECIMAL}, #{lqgsOrgId,jdbcType=INTEGER}, 
+      #{isJz,jdbcType=INTEGER}, #{sjly,jdbcType=INTEGER}, #{createPerson,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_bgmxz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_bgmxz
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="agentId != null">
+        agent_id,
+      </if>
+      <if test="szlkOrgId != null">
+        szlk_org_id,
+      </if>
+      <if test="houseId != null">
+        house_id,
+      </if>
+      <if test="wareId != null">
+        ware_id,
+      </if>
+      <if test="lspz != null">
+        lspz,
+      </if>
+      <if test="lsxz != null">
+        lsxz,
+      </if>
+      <if test="lsdj != null">
+        lsdj,
+      </if>
+      <if test="fssj != null">
+        fssj,
+      </if>
+      <if test="srsl != null">
+        srsl,
+      </if>
+      <if test="zcsl != null">
+        zcsl,
+      </if>
+      <if test="kcsl != null">
+        kcsl,
+      </if>
+      <if test="lqgsOrgId != null">
+        lqgs_org_id,
+      </if>
+      <if test="isJz != null">
+        is_jz,
+      </if>
+      <if test="sjly != null">
+        sjly,
+      </if>
+      <if test="createPerson != null">
+        create_person,
+      </if>
+      <if test="createDate != null">
+        create_date,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null">
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="szlkOrgId != null">
+        #{szlkOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null">
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null">
+        #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null">
+        #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null">
+        #{fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="srsl != null">
+        #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null">
+        #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null">
+        #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="lqgsOrgId != null">
+        #{lqgsOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="isJz != null">
+        #{isJz,jdbcType=INTEGER},
+      </if>
+      <if test="sjly != null">
+        #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="createPerson != null">
+        #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample" resultType="java.lang.Integer">
+    select count(*) from business_agent_bgmxz
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update business_agent_bgmxz
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null">
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.szlkOrgId != null">
+        szlk_org_id = #{record.szlkOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseId != null">
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null">
+        ware_id = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null">
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null">
+        lsxz = #{record.lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsdj != null">
+        lsdj = #{record.lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="record.fssj != null">
+        fssj = #{record.fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.srsl != null">
+        srsl = #{record.srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zcsl != null">
+        zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.kcsl != null">
+        kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.lqgsOrgId != null">
+        lqgs_org_id = #{record.lqgsOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.isJz != null">
+        is_jz = #{record.isJz,jdbcType=INTEGER},
+      </if>
+      <if test="record.sjly != null">
+        sjly = #{record.sjly,jdbcType=INTEGER},
+      </if>
+      <if test="record.createPerson != null">
+        create_person = #{record.createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null">
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update business_agent_bgmxz
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      szlk_org_id = #{record.szlkOrgId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      ware_id = #{record.wareId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      lsdj = #{record.lsdj,jdbcType=INTEGER},
+      fssj = #{record.fssj,jdbcType=TIMESTAMP},
+      srsl = #{record.srsl,jdbcType=DECIMAL},
+      zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      lqgs_org_id = #{record.lqgsOrgId,jdbcType=INTEGER},
+      is_jz = #{record.isJz,jdbcType=INTEGER},
+      sjly = #{record.sjly,jdbcType=INTEGER},
+      create_person = #{record.createPerson,jdbcType=VARCHAR},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz">
+    update business_agent_bgmxz
+    <set>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null">
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="szlkOrgId != null">
+        szlk_org_id = #{szlkOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null">
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null">
+        ware_id = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null">
+        lsxz = #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null">
+        lsdj = #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null">
+        fssj = #{fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="srsl != null">
+        srsl = #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null">
+        zcsl = #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null">
+        kcsl = #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="lqgsOrgId != null">
+        lqgs_org_id = #{lqgsOrgId,jdbcType=INTEGER},
+      </if>
+      <if test="isJz != null">
+        is_jz = #{isJz,jdbcType=INTEGER},
+      </if>
+      <if test="sjly != null">
+        sjly = #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="createPerson != null">
+        create_person = #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz">
+    update business_agent_bgmxz
+    set org_id = #{orgId,jdbcType=INTEGER},
+      agent_id = #{agentId,jdbcType=INTEGER},
+      szlk_org_id = #{szlkOrgId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=INTEGER},
+      ware_id = #{wareId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      lsdj = #{lsdj,jdbcType=INTEGER},
+      fssj = #{fssj,jdbcType=TIMESTAMP},
+      srsl = #{srsl,jdbcType=DECIMAL},
+      zcsl = #{zcsl,jdbcType=DECIMAL},
+      kcsl = #{kcsl,jdbcType=DECIMAL},
+      lqgs_org_id = #{lqgsOrgId,jdbcType=INTEGER},
+      is_jz = #{isJz,jdbcType=INTEGER},
+      sjly = #{sjly,jdbcType=INTEGER},
+      create_person = #{createPerson,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <!-- 查询分仓保管账列表其它数据 -->
+  <select id="selectDetail" parameterType="java.util.Map" resultType="java.util.Map">
+	SELECT * FROM (
+		select
+	        a.fssj fssj,
+			b.agent_name agent_Name,
+			c.agent_depot_name agent_Depot_Name,
+			d.storehouse_name house_Name,
+			e.warehouse_name ware_Name,
+			a.kcsl 
+		from business_agent_bgmxz  a 
+		LEFT JOIN business_agent b ON b.id=agent_id 
+		LEFT JOIN business_agent_depot c ON c.id=szlk_org_id 
+		LEFT JOIN basic_storehouse d ON d.storehouse_id=house_id 
+		LEFT JOIN basic_warehouse e ON e.warehouse_id=ware_id 
+		where 1=1 
+		<if test="orgId != null">
+	        AND a.org_id = #{orgId,jdbcType=INTEGER}
+	    </if>
+		<if test="agent_id != null">
+	        AND a.agent_id = #{agent_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="dck_id != null">
+	        AND a.szlk_org_id = #{dck_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="house_id != null">
+	        AND a.house_id = #{house_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="ware_id != null">
+	        AND a.ware_id = #{ware_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="lspz != null">
+	        AND a.lspz = #{lspz,jdbcType=INTEGER}
+	    </if>
+	    <if test="lsxz != null">
+	        AND a.lsxz = #{lsxz,jdbcType=INTEGER}
+	    </if>
+	    <if test="fssj != null">
+	        AND to_char(a.fssj,'yyyy-mm-dd') = #{fssj}
+	    </if>
+		ORDER BY fssj desc
+	) WHERE ROWNUM = 1 
+  </select>
+
+  <!-- 查询分仓保管账的分组信息 -->
+  <select id="selectFcbgzGroupBy" parameterType="java.util.Map" resultType="java.util.Map">
+	select 
+		a.agent_id agent_Id, 
+		a.szlk_org_id dck_Id, 
+		a.house_id house_Id, 
+		a.ware_id ware_Id, 
+		a.lsxz, 
+		a.lspz, 
+		to_date(a.fssj, 'yyyy-mm-dd') fssj, 
+		min(a.lsdj) lsdj, 
+		sum(a.srsl) as srsl, 
+		sum(a.zcsl) as zcsl,
+		a.org_id 
+	from(
+		SELECT org_id,agent_id, szlk_org_id, house_id, ware_id, lsxz, lspz, to_char(fssj, 'yyyy-mm-dd') fssj, min(lsdj) lsdj, sum(srsl) as srsl, sum(zcsl) as zcsl
+		from business_agent_bgmxz WHERE 1=1 
+	    <if test="orgId != null">
+	        AND org_id = #{orgId, jdbcType=INTEGER}
+	    </if>
+		group by org_id,agent_id, szlk_org_id, house_id, ware_id, lsxz, lspz, fssj
+	) a 
+	where 1=1 
+    <if test="agentId != null">
+        AND a.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="szlkOrgId != null">
+        AND a.szlk_org_id = #{szlkOrgId,jdbcType=INTEGER}
+    </if>
+    <if test="houseId != null">
+        AND a.house_id = #{houseId,jdbcType=INTEGER}
+    </if>
+    <if test="wareId != null">
+        AND a.ware_id = #{wareId,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+        AND a.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+    <if test="lsxz != null">
+        AND a.lsxz = #{lsxz,jdbcType=INTEGER}
+    </if>
+    <if test="fssj != null">
+        AND a.fssj = #{fssj}
+    </if>
+	group by a.org_id, a.agent_id, a.szlk_org_id, a.house_id, a.ware_id, a.lsxz, a.lspz, a.fssj
+	order by a.fssj desc
+  </select>
+
+  <select id="selectByExampleNew" parameterType="java.util.Map" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    a.*,b.agent_name agentName,c.agent_depot_name agentDepotName,d.storehouse_name houseName,e.warehouse_name wareName
+    from business_agent_bgmxz a 
+    LEFT JOIN business_agent b ON b.id=a.agent_id 
+	LEFT JOIN business_agent_depot c ON c.id=a.szlk_org_id 
+	LEFT JOIN basic_storehouse d ON d.storehouse_id=a.house_id 
+	LEFT JOIN basic_warehouse e ON e.warehouse_id=a.ware_id 
+	where 1=1 
+    <if test="agent_id != null">
+      and a.agent_id=#{agent_id, jdbcType=INTEGER}
+    </if>
+    <if test="szlk_org_id != null">
+      and a.szlk_org_id=#{szlk_org_id, jdbcType=INTEGER}
+    </if>
+    <if test="house_id != null">
+      and a.house_id=#{house_id, jdbcType=INTEGER}
+    </if>
+    <if test="ware_id != null">
+      and a.ware_id=#{ware_id, jdbcType=INTEGER}
+    </if>
+    <if test="fssj != null">
+      and a.fssj between #{start_time} and #{end_time} 
+    </if>
+    <if test="org_id != null">
+      and a.org_id=#{org_id, jdbcType=INTEGER} 
+    </if>
+    order by a.fssj desc
+  </select>
+
+  <!-- 查询代储库仓房货位信息 -->
+  <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT 
+    	a.depot_id+"" unitid,
+    	c.warehouse_id hwh,
+    	c.bgmxz_tbsj modifydate
+    FROM business_agent_depot a
+	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
+	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
+	<if test="orgId != null">
+	and c.org_id=#{orgId,jdbcType=INTEGER}
+	</if>
+  </select>
+  
+</mapper>

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgzzMapper.java

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

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentBgzzMapper.xml

@@ -0,0 +1,406 @@
+<?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.agent.bgz.mapper.BusinessAgentBgzzMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="agent_id" property="agentId" jdbcType="INTEGER" />
+    <result column="dck_id" property="dckId" jdbcType="INTEGER" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="lsxz" property="lsxz" jdbcType="INTEGER" />
+    <result column="fssj" property="fssj" jdbcType="VARCHAR" />
+    <result column="srsl" property="srsl" jdbcType="DECIMAL" />
+    <result column="zcsl" property="zcsl" jdbcType="DECIMAL" />
+    <result column="kcsl" property="kcsl" jdbcType="DECIMAL" />
+    <result column="jzr" property="jzr" jdbcType="VARCHAR" />
+    <result column="jzsj" property="jzsj" jdbcType="TIMESTAMP" />
+    <result column="shr" property="shr" jdbcType="VARCHAR" />
+    <result column="shsj" property="shsj" jdbcType="TIMESTAMP" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_person" property="createPerson" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" 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, org_id, agent_id, dck_id, lspz, lsxz, fssj, srsl, zcsl, kcsl, jzr, jzsj, shr, 
+    shsj, create_date, create_person, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_bgzz
+    <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_agent_bgzz
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_bgzz
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample" >
+    delete from business_agent_bgzz
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_bgzz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_bgzz (id, org_id, agent_id, 
+      dck_id, lspz, lsxz, 
+      fssj, srsl, zcsl, kcsl, 
+      jzr, jzsj, shr, shsj, 
+      create_date, create_person, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, 
+      #{dckId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, #{lsxz,jdbcType=INTEGER}, 
+      #{fssj,jdbcType=VARCHAR}, #{srsl,jdbcType=DECIMAL}, #{zcsl,jdbcType=DECIMAL}, #{kcsl,jdbcType=DECIMAL}, 
+      #{jzr,jdbcType=VARCHAR}, #{jzsj,jdbcType=TIMESTAMP}, #{shr,jdbcType=VARCHAR}, #{shsj,jdbcType=TIMESTAMP}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{createPerson,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_bgzz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_bgzz
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="agentId != null" >
+        agent_id,
+      </if>
+      <if test="dckId != null" >
+        dck_id,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="lsxz != null" >
+        lsxz,
+      </if>
+      <if test="fssj != null" >
+        fssj,
+      </if>
+      <if test="srsl != null" >
+        srsl,
+      </if>
+      <if test="zcsl != null" >
+        zcsl,
+      </if>
+      <if test="kcsl != null" >
+        kcsl,
+      </if>
+      <if test="jzr != null" >
+        jzr,
+      </if>
+      <if test="jzsj != null" >
+        jzsj,
+      </if>
+      <if test="shr != null" >
+        shr,
+      </if>
+      <if test="shsj != null" >
+        shsj,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createPerson != null" >
+        create_person,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="dckId != null" >
+        #{dckId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null" >
+        #{fssj,jdbcType=VARCHAR},
+      </if>
+      <if test="srsl != null" >
+        #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null" >
+        #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null" >
+        #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzr != null" >
+        #{jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzsj != null" >
+        #{jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="shr != null" >
+        #{shr,jdbcType=VARCHAR},
+      </if>
+      <if test="shsj != null" >
+        #{shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null" >
+        #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_bgzz
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_bgzz
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null" >
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.dckId != null" >
+        dck_id = #{record.dckId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null" >
+        lsxz = #{record.lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.fssj != null" >
+        fssj = #{record.fssj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.srsl != null" >
+        srsl = #{record.srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zcsl != null" >
+        zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.kcsl != null" >
+        kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.jzr != null" >
+        jzr = #{record.jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jzsj != null" >
+        jzsj = #{record.jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.shr != null" >
+        shr = #{record.shr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shsj != null" >
+        shsj = #{record.shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createDate != null" >
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createPerson != null" >
+        create_person = #{record.createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_bgzz
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      dck_id = #{record.dckId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      fssj = #{record.fssj,jdbcType=VARCHAR},
+      srsl = #{record.srsl,jdbcType=DECIMAL},
+      zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      jzr = #{record.jzr,jdbcType=VARCHAR},
+      jzsj = #{record.jzsj,jdbcType=TIMESTAMP},
+      shr = #{record.shr,jdbcType=VARCHAR},
+      shsj = #{record.shsj,jdbcType=TIMESTAMP},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      create_person = #{record.createPerson,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz" >
+    update business_agent_bgzz
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="dckId != null" >
+        dck_id = #{dckId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        lsxz = #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null" >
+        fssj = #{fssj,jdbcType=VARCHAR},
+      </if>
+      <if test="srsl != null" >
+        srsl = #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null" >
+        zcsl = #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null" >
+        kcsl = #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzr != null" >
+        jzr = #{jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzsj != null" >
+        jzsj = #{jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="shr != null" >
+        shr = #{shr,jdbcType=VARCHAR},
+      </if>
+      <if test="shsj != null" >
+        shsj = #{shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null" >
+        create_person = #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz" >
+    update business_agent_bgzz
+    set org_id = #{orgId,jdbcType=INTEGER},
+      agent_id = #{agentId,jdbcType=INTEGER},
+      dck_id = #{dckId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      fssj = #{fssj,jdbcType=VARCHAR},
+      srsl = #{srsl,jdbcType=DECIMAL},
+      zcsl = #{zcsl,jdbcType=DECIMAL},
+      kcsl = #{kcsl,jdbcType=DECIMAL},
+      jzr = #{jzr,jdbcType=VARCHAR},
+      jzsj = #{jzsj,jdbcType=TIMESTAMP},
+      shr = #{shr,jdbcType=VARCHAR},
+      shsj = #{shsj,jdbcType=TIMESTAMP},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_person = #{createPerson,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentFcbgzMapper.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.agent.bgz.mapper;
+
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentFcbgzMapper {
+    int countByExample(BusinessAgentFcbgzExample example);
+
+    int deleteByExample(BusinessAgentFcbgzExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentFcbgz record);
+
+    int insertSelective(BusinessAgentFcbgz record);
+
+    List<BusinessAgentFcbgz> selectByExample(BusinessAgentFcbgzExample example);
+
+    BusinessAgentFcbgz selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentFcbgz record, @Param("example") BusinessAgentFcbgzExample example);
+
+    int updateByExample(@Param("record") BusinessAgentFcbgz record, @Param("example") BusinessAgentFcbgzExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentFcbgz record);
+
+    int updateByPrimaryKey(BusinessAgentFcbgz record);
+
+    /**
+     * 查询保管总账列表分组信息
+     * 
+     * @param map 参数
+     * @return
+     */
+    List<Map<String, Object>> selectBgzzGroupByList(Map<String, Object> map);
+
+    /**
+     * 查询保管总账列表其它数据
+     * 
+     * @param map 参数
+     * @return
+     */
+    Map<String, Object> selectBgzzList(Map<String, Object> map);
+}

src/main/java/com/chinaitop/depot/agent/bgz/mapper/BusinessAgentFcbgzMapper.xml

@@ -0,0 +1,523 @@
+<?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.agent.bgz.mapper.BusinessAgentFcbgzMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="agent_id" property="agentId" jdbcType="INTEGER" />
+    <result column="dck_id" property="dckId" jdbcType="INTEGER" />
+    <result column="house_id" property="houseId" jdbcType="INTEGER" />
+    <result column="ware_id" property="wareId" jdbcType="INTEGER" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="lsxz" property="lsxz" jdbcType="INTEGER" />
+    <result column="lsdj" property="lsdj" jdbcType="INTEGER" />
+    <result column="fssj" property="fssj" jdbcType="TIMESTAMP" />
+    <result column="srsl" property="srsl" jdbcType="DECIMAL" />
+    <result column="zcsl" property="zcsl" jdbcType="DECIMAL" />
+    <result column="kcsl" property="kcsl" jdbcType="DECIMAL" />
+    <result column="jzr" property="jzr" jdbcType="VARCHAR" />
+    <result column="jzsj" property="jzsj" jdbcType="TIMESTAMP" />
+    <result column="shr" property="shr" jdbcType="VARCHAR" />
+    <result column="shsj" property="shsj" jdbcType="TIMESTAMP" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_person" property="createPerson" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" 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, org_id, agent_id, dck_id, house_id, ware_id, lspz, lsxz, lsdj, fssj, srsl, zcsl, 
+    kcsl, jzr, jzsj, shr, shsj, create_date, create_person, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_fcbgz
+    <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_agent_fcbgz
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_fcbgz
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample" >
+    delete from business_agent_fcbgz
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_fcbgz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_fcbgz (id, org_id, agent_id, 
+      dck_id, house_id, ware_id, 
+      lspz, lsxz, lsdj, fssj, 
+      srsl, zcsl, kcsl, jzr, 
+      jzsj, shr, shsj, 
+      create_date, create_person, updatetime
+      )
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, 
+      #{dckId,jdbcType=INTEGER}, #{houseId,jdbcType=INTEGER}, #{wareId,jdbcType=INTEGER}, 
+      #{lspz,jdbcType=INTEGER}, #{lsxz,jdbcType=INTEGER}, #{lsdj,jdbcType=INTEGER}, #{fssj,jdbcType=TIMESTAMP}, 
+      #{srsl,jdbcType=DECIMAL}, #{zcsl,jdbcType=DECIMAL}, #{kcsl,jdbcType=DECIMAL}, #{jzr,jdbcType=VARCHAR}, 
+      #{jzsj,jdbcType=TIMESTAMP}, #{shr,jdbcType=VARCHAR}, #{shsj,jdbcType=TIMESTAMP}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{createPerson,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+  	select SEQ_business_agent_fcbgz.nextVal from dual
+  	</selectKey>
+    insert into business_agent_fcbgz
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="agentId != null" >
+        agent_id,
+      </if>
+      <if test="dckId != null" >
+        dck_id,
+      </if>
+      <if test="houseId != null" >
+        house_id,
+      </if>
+      <if test="wareId != null" >
+        ware_id,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="lsxz != null" >
+        lsxz,
+      </if>
+      <if test="lsdj != null" >
+        lsdj,
+      </if>
+      <if test="fssj != null" >
+        fssj,
+      </if>
+      <if test="srsl != null" >
+        srsl,
+      </if>
+      <if test="zcsl != null" >
+        zcsl,
+      </if>
+      <if test="kcsl != null" >
+        kcsl,
+      </if>
+      <if test="jzr != null" >
+        jzr,
+      </if>
+      <if test="jzsj != null" >
+        jzsj,
+      </if>
+      <if test="shr != null" >
+        shr,
+      </if>
+      <if test="shsj != null" >
+        shsj,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createPerson != null" >
+        create_person,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="dckId != null" >
+        #{dckId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null" >
+        #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null" >
+        #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null" >
+        #{fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="srsl != null" >
+        #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null" >
+        #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null" >
+        #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzr != null" >
+        #{jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzsj != null" >
+        #{jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="shr != null" >
+        #{shr,jdbcType=VARCHAR},
+      </if>
+      <if test="shsj != null" >
+        #{shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null" >
+        #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_fcbgz
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_fcbgz
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null" >
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.dckId != null" >
+        dck_id = #{record.dckId,jdbcType=INTEGER},
+      </if>
+      <if test="record.houseId != null" >
+        house_id = #{record.houseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.wareId != null" >
+        ware_id = #{record.wareId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null" >
+        lsxz = #{record.lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsdj != null" >
+        lsdj = #{record.lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="record.fssj != null" >
+        fssj = #{record.fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.srsl != null" >
+        srsl = #{record.srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.zcsl != null" >
+        zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.kcsl != null" >
+        kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.jzr != null" >
+        jzr = #{record.jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jzsj != null" >
+        jzsj = #{record.jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.shr != null" >
+        shr = #{record.shr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shsj != null" >
+        shsj = #{record.shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createDate != null" >
+        create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.createPerson != null" >
+        create_person = #{record.createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_fcbgz
+    set id = #{record.id,jdbcType=INTEGER},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      dck_id = #{record.dckId,jdbcType=INTEGER},
+      house_id = #{record.houseId,jdbcType=INTEGER},
+      ware_id = #{record.wareId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      lsdj = #{record.lsdj,jdbcType=INTEGER},
+      fssj = #{record.fssj,jdbcType=TIMESTAMP},
+      srsl = #{record.srsl,jdbcType=DECIMAL},
+      zcsl = #{record.zcsl,jdbcType=DECIMAL},
+      kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      jzr = #{record.jzr,jdbcType=VARCHAR},
+      jzsj = #{record.jzsj,jdbcType=TIMESTAMP},
+      shr = #{record.shr,jdbcType=VARCHAR},
+      shsj = #{record.shsj,jdbcType=TIMESTAMP},
+      create_date = #{record.createDate,jdbcType=TIMESTAMP},
+      create_person = #{record.createPerson,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz" >
+    update business_agent_fcbgz
+    <set >
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="dckId != null" >
+        dck_id = #{dckId,jdbcType=INTEGER},
+      </if>
+      <if test="houseId != null" >
+        house_id = #{houseId,jdbcType=INTEGER},
+      </if>
+      <if test="wareId != null" >
+        ware_id = #{wareId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null" >
+        lsxz = #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="lsdj != null" >
+        lsdj = #{lsdj,jdbcType=INTEGER},
+      </if>
+      <if test="fssj != null" >
+        fssj = #{fssj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="srsl != null" >
+        srsl = #{srsl,jdbcType=DECIMAL},
+      </if>
+      <if test="zcsl != null" >
+        zcsl = #{zcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="kcsl != null" >
+        kcsl = #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzr != null" >
+        jzr = #{jzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzsj != null" >
+        jzsj = #{jzsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="shr != null" >
+        shr = #{shr,jdbcType=VARCHAR},
+      </if>
+      <if test="shsj != null" >
+        shsj = #{shsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createPerson != null" >
+        create_person = #{createPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz" >
+    update business_agent_fcbgz
+    set org_id = #{orgId,jdbcType=INTEGER},
+      agent_id = #{agentId,jdbcType=INTEGER},
+      dck_id = #{dckId,jdbcType=INTEGER},
+      house_id = #{houseId,jdbcType=INTEGER},
+      ware_id = #{wareId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      lsdj = #{lsdj,jdbcType=INTEGER},
+      fssj = #{fssj,jdbcType=TIMESTAMP},
+      srsl = #{srsl,jdbcType=DECIMAL},
+      zcsl = #{zcsl,jdbcType=DECIMAL},
+      kcsl = #{kcsl,jdbcType=DECIMAL},
+      jzr = #{jzr,jdbcType=VARCHAR},
+      jzsj = #{jzsj,jdbcType=TIMESTAMP},
+      shr = #{shr,jdbcType=VARCHAR},
+      shsj = #{shsj,jdbcType=TIMESTAMP},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_person = #{createPerson,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <!-- 查询保管总账列表分组信息 -->
+  <select id="selectBgzzGroupByList" parameterType="java.util.Map" resultType="java.util.Map">
+  	select 
+  	    org_id, agent_id, dck_id, lsxz, lspz, fssj, srsl, zcsl 
+  	from (
+		SELECT 
+	        org_id,
+			agent_id,
+			dck_id,
+			lsxz, 
+			lspz, 
+			substr(fssj, 1, 7) fssj, 
+			sum(srsl) as srsl, 
+			sum(zcsl) as zcsl
+		FROM business_agent_fcbgz fcbgz 
+		where 1=1 AND shr IS NOT NULL 
+		<if test="orgId != null">
+			AND org_id = #{orgId,jdbcType=INTEGER}
+		</if>
+		<if test="agentId != null">
+	        AND agent_id = #{agentId,jdbcType=INTEGER}
+	    </if>
+	    <if test="dckId != null">
+	        AND dck_id = #{dckId,jdbcType=INTEGER}
+	    </if>
+	    <if test="lspz != null">
+	        AND lspz = #{lspz,jdbcType=INTEGER}
+	    </if>
+	    <if test="lsxz != null">
+	        AND lsxz = #{lsxz,jdbcType=INTEGER}
+	    </if>
+	    <if test="fssj != null">
+	        AND substr(fssj, 1, 7) = #{fssj}
+	    </if>
+		group by org_id,agent_id, dck_id, lsxz, lspz, fssj
+	    )  order by to_date(fssj, 'yyyy-mm') desc
+  </select>
+  <!-- 查询保管总账列表其它数据 -->
+  <select id="selectBgzzList" parameterType="java.util.Map" resultType="java.util.Map">
+    select * from (
+	    select 
+	        b.agent_name agent_Name, 
+		    c.agent_depot_name agent_Depot_Name,
+		    a.kcsl 
+		from business_agent_fcbgz a
+		LEFT JOIN business_agent b ON b.id=a.agent_id 
+	    LEFT JOIN business_agent_depot c ON c.id=dck_id
+	    where 1=1 
+	    <if test="org_id != null">
+	        AND a.org_id = #{org_id,jdbcType=INTEGER}
+	    </if>
+		<if test="agent_id != null">
+	        AND a.agent_id = #{agent_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="dck_id != null">
+	        AND a.dck_id = #{dck_id,jdbcType=INTEGER}
+	    </if>
+	    <if test="lspz != null">
+	        AND a.lspz = #{lspz,jdbcType=INTEGER}
+	    </if>
+	    <if test="lsxz != null">
+	        AND a.lsxz = #{lsxz,jdbcType=INTEGER}
+	    </if>
+	    <if test="fssj != null">
+	        AND substr(a.fssj, 1,7) = #{fssj}
+	    </if>
+	    order by to_date(a.fssj, 'yyyy-mm-dd') desc
+	) where ROWNUM=1 
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentBgmxz.java

@@ -0,0 +1,390 @@
+package com.chinaitop.depot.agent.bgz.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BusinessAgentBgmxz {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Integer agentId;
+
+    private Integer szlkOrgId;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer lspz;
+
+    private Integer lsxz;
+
+    private Integer lsdj;
+
+    private Date fssj;
+
+    private BigDecimal srsl;
+
+    private BigDecimal zcsl;
+
+    private BigDecimal kcsl;
+
+    private Integer lqgsOrgId;
+
+    private Integer isJz;
+
+    private Integer sjly;
+
+    private String createPerson;
+
+    private Date createDate;
+
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 代储库点ID
+     * @return agent_id 代储库点ID
+     */
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 代储库点ID
+     * @param agentId 代储库点ID
+     */
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 代储粮库单位ID
+     * @return szlk_org_id 代储粮库单位ID
+     */
+    public Integer getSzlkOrgId() {
+        return szlkOrgId;
+    }
+
+    /**
+     * 代储粮库单位ID
+     * @param szlkOrgId 代储粮库单位ID
+     */
+    public void setSzlkOrgId(Integer szlkOrgId) {
+        this.szlkOrgId = szlkOrgId;
+    }
+
+    /**
+     * 仓房ID
+     * @return house_id 仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param houseId 仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位ID
+     * @return ware_id 货位ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 货位ID
+     * @param wareId 货位ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 粮食性质
+     */
+    public Integer getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 粮食性质
+     */
+    public void setLsxz(Integer lsxz) {
+        this.lsxz = lsxz;
+    }
+
+    /**
+     * 粮食等级
+     * @return lsdj 粮食等级
+     */
+    public Integer getLsdj() {
+        return lsdj;
+    }
+
+    /**
+     * 粮食等级
+     * @param lsdj 粮食等级
+     */
+    public void setLsdj(Integer lsdj) {
+        this.lsdj = lsdj;
+    }
+
+    /**
+     * 业务发生时间
+     * @return fssj 业务发生时间
+     */
+    public Date getFssj() {
+        return fssj;
+    }
+
+    /**
+     * 业务发生时间
+     * @param fssj 业务发生时间
+     */
+    public void setFssj(Date fssj) {
+        this.fssj = fssj;
+    }
+
+    /**
+     * 收入数量
+     * @return srsl 收入数量
+     */
+    public BigDecimal getSrsl() {
+        return srsl;
+    }
+
+    /**
+     * 收入数量
+     * @param srsl 收入数量
+     */
+    public void setSrsl(BigDecimal srsl) {
+        this.srsl = srsl;
+    }
+
+    /**
+     * 支出数量
+     * @return zcsl 支出数量
+     */
+    public BigDecimal getZcsl() {
+        return zcsl;
+    }
+
+    /**
+     * 支出数量
+     * @param zcsl 支出数量
+     */
+    public void setZcsl(BigDecimal zcsl) {
+        this.zcsl = zcsl;
+    }
+
+    /**
+     * 库存数量
+     * @return kcsl 库存数量
+     */
+    public BigDecimal getKcsl() {
+        return kcsl;
+    }
+
+    /**
+     * 库存数量
+     * @param kcsl 库存数量
+     */
+    public void setKcsl(BigDecimal kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    /**
+     * 粮权所属单位ID
+     * @return lqgs_org_id 粮权所属单位ID
+     */
+    public Integer getLqgsOrgId() {
+        return lqgsOrgId;
+    }
+
+    /**
+     * 粮权所属单位ID
+     * @param lqgsOrgId 粮权所属单位ID
+     */
+    public void setLqgsOrgId(Integer lqgsOrgId) {
+        this.lqgsOrgId = lqgsOrgId;
+    }
+
+    /**
+     * 是否记账
+     * @return is_jz 是否记账
+     */
+    public Integer getIsJz() {
+        return isJz;
+    }
+
+    /**
+     * 是否记账
+     * @param isJz 是否记账
+     */
+    public void setIsJz(Integer isJz) {
+        this.isJz = isJz;
+    }
+
+    /**
+     * 数据来源,0手动插入,1同步插入
+     * @return sjly 数据来源,0手动插入,1同步插入
+     */
+    public Integer getSjly() {
+        return sjly;
+    }
+
+    /**
+     * 数据来源,0手动插入,1同步插入
+     * @param sjly 数据来源,0手动插入,1同步插入
+     */
+    public void setSjly(Integer sjly) {
+        this.sjly = sjly;
+    }
+
+    /**
+     * 创建人
+     * @return create_person 创建人
+     */
+    public String getCreatePerson() {
+        return createPerson;
+    }
+
+    /**
+     * 创建人
+     * @param createPerson 创建人
+     */
+    public void setCreatePerson(String createPerson) {
+        this.createPerson = createPerson == null ? null : createPerson.trim();
+    }
+
+    /**
+     * 创建时间
+     * @return create_date 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+    
+    //后加属性
+    private String agentName;
+    
+    private String agentDepotName;
+    
+    private String houseName;
+    
+    private String wareName;
+
+	public String getAgentName() {
+		return agentName;
+	}
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentDepotName() {
+		return agentDepotName;
+	}
+
+	public void setAgentDepotName(String agentDepotName) {
+		this.agentDepotName = agentDepotName;
+	}
+
+	public String getHouseName() {
+		return houseName;
+	}
+
+	public void setHouseName(String houseName) {
+		this.houseName = houseName;
+	}
+
+	public String getWareName() {
+		return wareName;
+	}
+
+	public void setWareName(String wareName) {
+		this.wareName = wareName;
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentBgzz.java

@@ -0,0 +1,334 @@
+package com.chinaitop.depot.agent.bgz.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BusinessAgentBgzz {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Integer agentId;
+
+    private Integer dckId;
+
+    private Integer lspz;
+
+    private Integer lsxz;
+
+    private String fssj;
+
+    private BigDecimal srsl;
+
+    private BigDecimal zcsl;
+
+    private BigDecimal kcsl;
+
+    private String jzr;
+
+    private Date jzsj;
+
+    private String shr;
+
+    private Date shsj;
+
+    private Date createDate;
+
+    private String createPerson;
+
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 代储点ID
+     * @return agent_id 代储点ID
+     */
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 代储点ID
+     * @param agentId 代储点ID
+     */
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 代储库ID
+     * @return dck_id 代储库ID
+     */
+    public Integer getDckId() {
+        return dckId;
+    }
+
+    /**
+     * 代储库ID
+     * @param dckId 代储库ID
+     */
+    public void setDckId(Integer dckId) {
+        this.dckId = dckId;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 粮食性质
+     */
+    public Integer getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 粮食性质
+     */
+    public void setLsxz(Integer lsxz) {
+        this.lsxz = lsxz;
+    }
+
+    /**
+     * 业务发生月份
+     * @return fssj 业务发生月份
+     */
+    public String getFssj() {
+        return fssj;
+    }
+
+    /**
+     * 业务发生月份
+     * @param fssj 业务发生月份
+     */
+    public void setFssj(String fssj) {
+        this.fssj = fssj == null ? null : fssj.trim();
+    }
+
+    /**
+     * 收入数量
+     * @return srsl 收入数量
+     */
+    public BigDecimal getSrsl() {
+        return srsl;
+    }
+
+    /**
+     * 收入数量
+     * @param srsl 收入数量
+     */
+    public void setSrsl(BigDecimal srsl) {
+        this.srsl = srsl;
+    }
+
+    /**
+     * 支出数量
+     * @return zcsl 支出数量
+     */
+    public BigDecimal getZcsl() {
+        return zcsl;
+    }
+
+    /**
+     * 支出数量
+     * @param zcsl 支出数量
+     */
+    public void setZcsl(BigDecimal zcsl) {
+        this.zcsl = zcsl;
+    }
+
+    /**
+     * 库存数量
+     * @return kcsl 库存数量
+     */
+    public BigDecimal getKcsl() {
+        return kcsl;
+    }
+
+    /**
+     * 库存数量
+     * @param kcsl 库存数量
+     */
+    public void setKcsl(BigDecimal kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    /**
+     * 记账人
+     * @return jzr 记账人
+     */
+    public String getJzr() {
+        return jzr;
+    }
+
+    /**
+     * 记账人
+     * @param jzr 记账人
+     */
+    public void setJzr(String jzr) {
+        this.jzr = jzr == null ? null : jzr.trim();
+    }
+
+    /**
+     * 记账时间
+     * @return jzsj 记账时间
+     */
+    public Date getJzsj() {
+        return jzsj;
+    }
+
+    /**
+     * 记账时间
+     * @param jzsj 记账时间
+     */
+    public void setJzsj(Date jzsj) {
+        this.jzsj = jzsj;
+    }
+
+    /**
+     * 审核人
+     * @return shr 审核人
+     */
+    public String getShr() {
+        return shr;
+    }
+
+    /**
+     * 审核人
+     * @param shr 审核人
+     */
+    public void setShr(String shr) {
+        this.shr = shr == null ? null : shr.trim();
+    }
+
+    /**
+     * 审核时间
+     * @return shsj 审核时间
+     */
+    public Date getShsj() {
+        return shsj;
+    }
+
+    /**
+     * 审核时间
+     * @param shsj 审核时间
+     */
+    public void setShsj(Date shsj) {
+        this.shsj = shsj;
+    }
+
+    /**
+     * 创建时间
+     * @return create_date 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 创建人
+     * @return create_person 创建人
+     */
+    public String getCreatePerson() {
+        return createPerson;
+    }
+
+    /**
+     * 创建人
+     * @param createPerson 创建人
+     */
+    public void setCreatePerson(String createPerson) {
+        this.createPerson = createPerson == null ? null : createPerson.trim();
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    //后加
+    private String agentName;
+
+    private String agentDepotName;
+
+	public String getAgentName() {
+		return agentName;
+	}
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentDepotName() {
+		return agentDepotName;
+	}
+
+	public void setAgentDepotName(String agentDepotName) {
+		this.agentDepotName = agentDepotName;
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/model/BusinessAgentFcbgz.java

@@ -0,0 +1,407 @@
+package com.chinaitop.depot.agent.bgz.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class BusinessAgentFcbgz {
+    private Integer id;
+
+    private Integer orgId;
+
+    private Integer agentId;
+
+    private Integer dckId;
+
+    private Integer houseId;
+
+    private Integer wareId;
+
+    private Integer lspz;
+
+    private Integer lsxz;
+
+    private Integer lsdj;
+
+    private String fssj;
+
+    private BigDecimal srsl;
+
+    private BigDecimal zcsl;
+
+    private BigDecimal kcsl;
+
+    private String jzr;
+
+    private Date jzsj;
+
+    private String shr;
+
+    private Date shsj;
+
+    private Date createDate;
+
+    private String createPerson;
+
+    private Date updatetime;
+
+    /**
+     * 主键
+     * @return id 主键
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 主键
+     * @param id 主键
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 单位ID
+     * @return org_id 单位ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 单位ID
+     * @param orgId 单位ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 代储点ID
+     * @return agent_id 代储点ID
+     */
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 代储点ID
+     * @param agentId 代储点ID
+     */
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 代储库ID
+     * @return dck_id 代储库ID
+     */
+    public Integer getDckId() {
+        return dckId;
+    }
+
+    /**
+     * 代储库ID
+     * @param dckId 代储库ID
+     */
+    public void setDckId(Integer dckId) {
+        this.dckId = dckId;
+    }
+
+    /**
+     * 仓房ID
+     * @return house_id 仓房ID
+     */
+    public Integer getHouseId() {
+        return houseId;
+    }
+
+    /**
+     * 仓房ID
+     * @param houseId 仓房ID
+     */
+    public void setHouseId(Integer houseId) {
+        this.houseId = houseId;
+    }
+
+    /**
+     * 货位ID
+     * @return ware_id 货位ID
+     */
+    public Integer getWareId() {
+        return wareId;
+    }
+
+    /**
+     * 货位ID
+     * @param wareId 货位ID
+     */
+    public void setWareId(Integer wareId) {
+        this.wareId = wareId;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 粮食性质
+     */
+    public Integer getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 粮食性质
+     */
+    public void setLsxz(Integer lsxz) {
+        this.lsxz = lsxz;
+    }
+
+    /**
+     * 粮食等级
+     * @return lsdj 粮食等级
+     */
+    public Integer getLsdj() {
+        return lsdj;
+    }
+
+    /**
+     * 粮食等级
+     * @param lsdj 粮食等级
+     */
+    public void setLsdj(Integer lsdj) {
+        this.lsdj = lsdj;
+    }
+
+    /**
+     * 业务发生时间
+     * @return fssj 业务发生时间
+     */
+    public String getFssj() {
+        return fssj;
+    }
+
+    /**
+     * 业务发生时间
+     * @param fssj 业务发生时间
+     */
+    public void setFssj(String fssj) {
+        this.fssj = fssj == null ? null : fssj.trim();
+    }
+
+    /**
+     * 收入数量
+     * @return srsl 收入数量
+     */
+    public BigDecimal getSrsl() {
+        return srsl;
+    }
+
+    /**
+     * 收入数量
+     * @param srsl 收入数量
+     */
+    public void setSrsl(BigDecimal srsl) {
+        this.srsl = srsl;
+    }
+
+    /**
+     * 支出数量
+     * @return zcsl 支出数量
+     */
+    public BigDecimal getZcsl() {
+        return zcsl;
+    }
+
+    /**
+     * 支出数量
+     * @param zcsl 支出数量
+     */
+    public void setZcsl(BigDecimal zcsl) {
+        this.zcsl = zcsl;
+    }
+
+    /**
+     * 库存数量
+     * @return kcsl 库存数量
+     */
+    public BigDecimal getKcsl() {
+        return kcsl;
+    }
+
+    /**
+     * 库存数量
+     * @param kcsl 库存数量
+     */
+    public void setKcsl(BigDecimal kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    /**
+     * 记账人
+     * @return jzr 记账人
+     */
+    public String getJzr() {
+        return jzr;
+    }
+
+    /**
+     * 记账人
+     * @param jzr 记账人
+     */
+    public void setJzr(String jzr) {
+        this.jzr = jzr == null ? null : jzr.trim();
+    }
+
+    /**
+     * 记账时间
+     * @return jzsj 记账时间
+     */
+    public Date getJzsj() {
+        return jzsj;
+    }
+
+    /**
+     * 记账时间
+     * @param jzsj 记账时间
+     */
+    public void setJzsj(Date jzsj) {
+        this.jzsj = jzsj;
+    }
+
+    /**
+     * 审核人
+     * @return shr 审核人
+     */
+    public String getShr() {
+        return shr;
+    }
+
+    /**
+     * 审核人
+     * @param shr 审核人
+     */
+    public void setShr(String shr) {
+        this.shr = shr == null ? null : shr.trim();
+    }
+
+    /**
+     * 审核时间
+     * @return shsj 审核时间
+     */
+    public Date getShsj() {
+        return shsj;
+    }
+
+    /**
+     * 审核时间
+     * @param shsj 审核时间
+     */
+    public void setShsj(Date shsj) {
+        this.shsj = shsj;
+    }
+
+    /**
+     * 创建时间
+     * @return create_date 创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 创建时间
+     * @param createDate 创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 创建人
+     * @return create_person 创建人
+     */
+    public String getCreatePerson() {
+        return createPerson;
+    }
+
+    /**
+     * 创建人
+     * @param createPerson 创建人
+     */
+    public void setCreatePerson(String createPerson) {
+        this.createPerson = createPerson == null ? null : createPerson.trim();
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    //后加属性
+    private String agentName;
+
+    private String agentDepotName;
+
+    private String houseName;
+
+    private String wareName;
+
+	public String getAgentName() {
+		return agentName;
+	}
+
+	public void setAgentName(String agentName) {
+		this.agentName = agentName;
+	}
+
+	public String getAgentDepotName() {
+		return agentDepotName;
+	}
+
+	public void setAgentDepotName(String agentDepotName) {
+		this.agentDepotName = agentDepotName;
+	}
+
+	public String getHouseName() {
+		return houseName;
+	}
+
+	public void setHouseName(String houseName) {
+		this.houseName = houseName;
+	}
+
+	public String getWareName() {
+		return wareName;
+	}
+
+	public void setWareName(String wareName) {
+		this.wareName = wareName;
+	}
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/BusinessAgentBgmxzService.java

@@ -0,0 +1,87 @@
+package com.chinaitop.depot.agent.bgz.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz;
+
+public interface BusinessAgentBgmxzService {
+
+	/**
+	 * 查询保管明细账列表数据
+	 * 
+	 * @param example 条件
+	 * @return
+	 */
+	List<BusinessAgentBgmxz> findByConditions(Map<String, Object> parem_map);
+
+	/**
+	 * 按ID查询一条保管明细账数据
+	 * 
+	 * @param id 数据ID
+	 * @return
+	 */
+	BusinessAgentBgmxz findByParmaryKey(Integer id);
+
+	/**
+	 * 新增保管明细账
+	 * 
+	 * @param bgmxz 数据对象
+	 */
+	void insert(BusinessAgentBgmxz bgmxz);
+
+	/**
+	 * 修改保管明细账
+	 * 
+	 * @param bgmxz 数据对象
+	 */
+	void update(BusinessAgentBgmxz bgmxz);
+
+	/**
+	 * 删除一条保管明细账数据
+	 * 
+	 * @param id 数据ID
+	 */
+	void remove(Integer id);
+
+	/**
+	 * 查询分仓保管账分组列表 
+	 * 
+	 * @param map 条件
+	 * @return
+	 */
+	List<Map<String, Object>> selectFcbgzGroupBy(Map<String, Object> map);
+
+	/**
+	 * 查询分仓保管账列表库存数量等其它数据 
+	 * 
+	 * @param map 条件
+	 * @return
+	 */
+	Map<String, Object> selectDetail(Map<String, Object> map);
+
+	/**
+     * 查询代储库正常使用的货位数据信息
+     * 
+     * @param paramMap 条件
+     * @return
+     */
+    List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap);
+
+    /**
+     * 按条件查询代储库数据
+     * 
+     * @param orgId 当前单位ID
+     * @param dckId 代储库ID
+     * @return
+     */
+    BusinessAgentDepot selectAgentDepotObj(Integer orgId, Integer dckId);
+
+    /**
+     * 修改代储货位表的最后修改时间
+     * 
+     * @param orgId 单位ID
+     */
+	void updateAgentDepot(Integer orgId);
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/BusinessAgentBgzzService.java

@@ -0,0 +1,32 @@
+package com.chinaitop.depot.agent.bgz.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample;
+
+public interface BusinessAgentBgzzService {
+
+	/**
+	 * 按条件查询数据
+	 * 
+	 * @param example 条件
+	 * @return
+	 */
+	List<BusinessAgentBgzz> findByConditions(BusinessAgentBgzzExample example);
+
+	/**
+	 * 更新数据
+	 * 
+	 * @param fcbgz 数据对象
+	 */
+	void update(BusinessAgentBgzz bgzz);
+
+	/**
+	 * 插入数据
+	 * 
+	 * @param fcbgz 数据对象
+	 */
+	void insert(BusinessAgentBgzz bgzz);
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/BusinessAgentFcbgzService.java

@@ -0,0 +1,62 @@
+package com.chinaitop.depot.agent.bgz.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample;
+
+public interface BusinessAgentFcbgzService {
+
+	/**
+	 * 按条件查询数据
+	 * 
+	 * @param example 条件
+	 * @return
+	 */
+	List<BusinessAgentFcbgz> findByConditions(BusinessAgentFcbgzExample example);
+
+	/**
+	 * 更新数据
+	 * 
+	 * @param fcbgz 数据对象
+	 */
+	void update(BusinessAgentFcbgz fcbgz);
+
+	/**
+	 * 插入数据
+	 * 
+	 * @param fcbgz 数据对象
+	 */
+	void insert(BusinessAgentFcbgz fcbgz);
+
+	/**
+	 * 删除数据
+	 * 
+	 * @param id 数据ID
+	 */
+	void remove(Integer id);
+
+	/**
+     * 查询保管总账列表分组信息
+     * 
+     * @param map 参数
+     * @return
+     */
+    List<Map<String, Object>> selectBgzzGroupByList(Map<String, Object> map);
+
+	/**
+	 * 查询保管总账列表其它数据
+	 * 
+	 * @param map 条件
+	 * @return
+	 */
+	Map<String, Object> selectBgzzList(Map<String, Object> map);
+
+	/**
+	 * 按条件将保管明细账数据修改为已记账
+	 * 
+	 * @param fcbgz 条件
+	 */
+	void updateSfjz(BusinessAgentFcbgz fcbgz);
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/impl/BusinessAgentBgmxzServiceImpl.java

@@ -0,0 +1,107 @@
+package com.chinaitop.depot.agent.bgz.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentDepotMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepotExample;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import com.chinaitop.depot.agent.bgz.mapper.BusinessAgentBgmxzMapper;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+
+@Service
+public class BusinessAgentBgmxzServiceImpl implements BusinessAgentBgmxzService {
+
+	@Resource
+	private BusinessAgentBgmxzMapper bgmxzMapper;
+	
+	@Resource
+	private BusinessAgentDepotMapper agentDepotMapper;
+	
+	@Resource
+	private BusinessAgentWarehouseMapper agentWareHouseMapper;
+
+	@Override
+	public List<BusinessAgentBgmxz> findByConditions(Map<String, Object> parem_map) {
+		List<BusinessAgentBgmxz> list = bgmxzMapper.selectByExampleNew(parem_map);
+		return list;
+	}
+
+	@Override
+	public BusinessAgentBgmxz findByParmaryKey(Integer id) {
+		BusinessAgentBgmxz bgmxz = bgmxzMapper.selectByPrimaryKey(id);
+		return bgmxz;
+	}
+
+	@Override
+	public void insert(BusinessAgentBgmxz bgmxz) {
+		bgmxzMapper.insertSelective(bgmxz);
+	}
+
+	@Override
+	public void update(BusinessAgentBgmxz bgmxz) {
+		bgmxzMapper.updateByPrimaryKey(bgmxz);
+	}
+
+	@Override
+	public void remove(Integer id) {
+		bgmxzMapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public Map<String, Object> selectDetail(Map<String, Object> map) {
+		
+		Map<String, Object> list = bgmxzMapper.selectDetail(map);
+		return list;
+	}
+
+	@Override
+	public List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap) {
+		List<Map<String, Object>> list = bgmxzMapper.selectAgentHouseWareList(paramMap);
+		return list;
+	}
+
+	@Override
+	public BusinessAgentDepot selectAgentDepotObj(Integer orgId, Integer dckId) {
+		BusinessAgentDepotExample example = new BusinessAgentDepotExample();
+		BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(orgId);
+		criteria.andDepotIdEqualTo(dckId);
+		criteria.andDelFlagEqualTo(1);
+		List<BusinessAgentDepot> list = agentDepotMapper.selectByExample(example);
+		BusinessAgentDepot agentDepot = new BusinessAgentDepot();
+		if (null != list && list.size() > 0) {
+			agentDepot = list.get(0);
+		}
+		return agentDepot;
+	}
+
+	@Override
+	public void updateAgentDepot(Integer orgId) {
+		//要修改的值
+		BusinessAgentWarehouse record = new BusinessAgentWarehouse();
+		record.setBgmxzTbsj(new Date());
+		//修改条件
+		BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+		BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(orgId);
+		criteria.andDelFlagEqualTo(1);
+		agentWareHouseMapper.updateByExampleSelective(record, example);
+	}
+
+	@Override
+	public List<Map<String, Object>> selectFcbgzGroupBy(Map<String, Object> map) {
+		List<Map<String, Object>> list = bgmxzMapper.selectFcbgzGroupBy(map);
+		return list;
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/impl/BusinessAgentBgzzServiceImpl.java

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.agent.bgz.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agent.bgz.mapper.BusinessAgentBgzzMapper;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgzzExample;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgzzService;
+
+@Service
+public class BusinessAgentBgzzServiceImpl implements BusinessAgentBgzzService {
+
+	@Resource
+	private BusinessAgentBgzzMapper bgzzMapper;
+	
+	@Override
+	public List<BusinessAgentBgzz> findByConditions(BusinessAgentBgzzExample example) {
+		List<BusinessAgentBgzz> list = bgzzMapper.selectByExample(example);
+		return list;
+	}
+
+	@Override
+	public void update(BusinessAgentBgzz bgzz) {
+		bgzzMapper.updateByPrimaryKey(bgzz);
+	}
+
+	@Override
+	public void insert(BusinessAgentBgzz bgzz) {
+		bgzzMapper.insert(bgzz);
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/bgz/service/impl/BusinessAgentFcbgzServiceImpl.java

@@ -0,0 +1,84 @@
+package com.chinaitop.depot.agent.bgz.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agent.bgz.mapper.BusinessAgentBgmxzMapper;
+import com.chinaitop.depot.agent.bgz.mapper.BusinessAgentFcbgzMapper;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentBgmxzExample.Criteria;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgz;
+import com.chinaitop.depot.agent.bgz.model.BusinessAgentFcbgzExample;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentFcbgzService;
+import com.chinaitop.utils.ParameterUtil;
+
+@Service
+public class BusinessAgentFcbgzServiceImpl implements BusinessAgentFcbgzService {
+
+	@Resource
+	private BusinessAgentFcbgzMapper fcbgzMapper;
+
+	@Resource
+	private BusinessAgentBgmxzMapper bgmxzMapper;
+
+	@Override
+	public List<BusinessAgentFcbgz> findByConditions(BusinessAgentFcbgzExample example) {
+		return fcbgzMapper.selectByExample(example);
+	}
+
+	@Override
+	public void update(BusinessAgentFcbgz fcbgz) {
+		fcbgzMapper.updateByPrimaryKey(fcbgz);
+	}
+
+	@Override
+	public void insert(BusinessAgentFcbgz fcbgz) {
+		fcbgzMapper.insert(fcbgz);
+	}
+
+	@Override
+	public void remove(Integer id) {
+		fcbgzMapper.deleteByPrimaryKey(id);
+	}
+
+	@Override
+	public List<Map<String, Object>> selectBgzzGroupByList(Map<String, Object> map) {
+		List<Map<String, Object>> list = fcbgzMapper.selectBgzzGroupByList(map);
+		return list;
+	}
+
+	@Override
+	public Map<String, Object> selectBgzzList(Map<String, Object> map) {
+		Map<String, Object> list = fcbgzMapper.selectBgzzList(map);
+		return list;
+	}
+
+	@Override
+	public void updateSfjz(BusinessAgentFcbgz fcbgz) {
+		/* 设置要修改的数据 */
+		BusinessAgentBgmxz bgmxz = new BusinessAgentBgmxz();
+		bgmxz.setIsJz(1);
+
+		/* 设置修改条件 */
+		BusinessAgentBgmxzExample example = new BusinessAgentBgmxzExample();
+		Criteria criteria = example.createCriteria();
+		criteria.andAgentIdEqualTo(fcbgz.getAgentId());//代储点
+		criteria.andSzlkOrgIdEqualTo(fcbgz.getDckId());//代储粮库
+		criteria.andHouseIdEqualTo(fcbgz.getHouseId());//仓房
+		criteria.andWareIdEqualTo(fcbgz.getWareId());//货位
+		criteria.andLspzEqualTo(fcbgz.getLspz());//粮食品种
+		criteria.andLsxzEqualTo(fcbgz.getLsxz());//粮食性质
+		Date startTime = ParameterUtil.string2datetime(fcbgz.getFssj()+" 00:00:00");
+		Date endTime = ParameterUtil.string2datetime(fcbgz.getFssj()+" 23:59:59");
+		criteria.andFssjBetween(startTime, endTime);
+		
+		bgmxzMapper.updateByExampleSelective(bgmxz, example);
+	}
+
+}

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentHcController.java

@@ -0,0 +1,296 @@
+package com.chinaitop.depot.agent.crk.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.service.agentService;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentHc;
+import com.chinaitop.depot.agent.crk.service.agentHcService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@RestController
+@RequestMapping(value = "/agentHc")
+@Api(description = "火车出入库")
+public class AgentHcController {
+
+    @Resource
+    private agentHcService agentHcService;
+
+    @Resource
+    private agentService agentService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    @Resource
+    private BusinessAgentBgmxzService bgmxzService;
+
+    /**
+     * 查询火车出入库信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentHcList", 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 = "agentId", value = "代储点id", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotId", value = "代储库id", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
+            @ApiImplicitParam(name = "businessType", value = "业务类型", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getAgentHcList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
+                                                                Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgid);
+        if(ParameterUtil.isnotnull(agentId)){
+            map.put("agentId",agentId);
+        }
+        if(ParameterUtil.isnotnull(agentDepotId)){
+            map.put("agentDepotId",agentDepotId);
+        }
+        if(ParameterUtil.isnotnull(storehouseId)){
+            map.put("storehouseId",storehouseId);
+        }
+        if(ParameterUtil.isnotnull(warehouseId)){
+            map.put("warehouseId",warehouseId);
+        }
+        if (ParameterUtil.isnotnull(businessType)) {
+            if (businessType.equals("2")) {
+                map.put("businessType","火车入仓");
+            } else if (businessType.equals("4")) {
+                map.put("businessType","火车出仓");
+            }
+        }
+        if(ParameterUtil.isnotnull(lspz)){
+            map.put("lspz",lspz);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> list = agentHcService.getAgentHcList(map);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> page_list = ParameterUtil.slashCapitals(pageInfo.getList());
+        pageInfo.setList(page_list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存火车出入库信息
+     * @param agentHcJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgent", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存火车出入库", notes = "保存火车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentHcJson", value = "火车出入库信息", paramType = "form")
+    })
+    public Map<String, Object> saveAgent(String agentHcJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentHc agent = (BusinessAgentHc)mapper.readValue(agentHcJson, BusinessAgentHc.class);
+        if (ParameterUtil.isnull(agent.getId())) {
+            agent.setOrgId(orgId);
+            agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
+            agentHcService.add(agent);
+        } else {
+            agentHcService.update(agent);
+        }
+        modelMap.put("agentId", agent.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除火车出入库信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentHc", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除火车出入库信息", notes = "删除火车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "火车出入库主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgentHc(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentHcService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找火车出入库信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/getAgentHcEdit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id查找火车出入库信息", notes = "根据id查找火车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "火车出入库主键id", paramType = "query")
+    })
+    public BusinessAgentHc getAgentHcEdit(Integer id) {
+        BusinessAgentHc agent = new BusinessAgentHc();
+        if (id != null) {
+            agent = agentHcService.findById(id);
+        }
+        return agent;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"通知单编号", "入站单号", "火车皮号", "业务类型", "粮油品种",
+                "数量（公斤）", "仓房名称", "货位名称", "出入库日期"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false,
+                false, false, false, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            //查询代储点名称和代储库名称对应的id
+            Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+            if(ParameterUtil.isnull(agentMap)){
+                fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentHcService.importData(list, orgId, agentMap);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+
+    @RequestMapping(value="/selectAgentHouseWareList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询代储库正常使用的货位数据信息", notes = "查询代储库正常使用的货位数据信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
+	})
+	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
+
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+
+		paramMap.put("orgId", orgId);
+		List<Map<String, Object>> list = agentHcService.selectAgentHouseWareList(paramMap);
+
+		return list;
+	}
+    
+    @RequestMapping(value="/editQcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="同步功能", notes = "把出入库拿来的汽车出入库记录数据插入到代储库业务的汽车出入库记录表中")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="qcCrkRecordData", value="汽车出入库记录数据", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="form"),
+		@ApiImplicitParam(name="realName", value="当前操作人", paramType="form")
+	})
+	public Map<String, Object> editQcCrkRecordData(String hcCrkRecordData, Integer orgId, String realName) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			JSONArray json = JSONArray.fromObject(hcCrkRecordData);
+			if (json.size() > 0) {
+				BusinessAgentHc agentHc = null;
+				for (int i = 0; i < json.size(); i++) {
+					
+					JSONObject job = json.getJSONObject(i);
+					Integer unitId = Integer.parseInt(job.get("unitid")+"");
+					BusinessAgentDepot agentDepot = bgmxzService.selectAgentDepotObj(orgId, unitId);
+					Integer agentDepotId = agentDepot.getId();
+					Integer agentId = Integer.parseInt(agentDepot.getAgentId());
+					Integer houseId = Integer.parseInt(job.get("houseId")+"");
+					Integer wareId = Integer.parseInt(job.get("wareId")+"");
+
+					agentHc = new BusinessAgentHc();
+					agentHc.setOrgId(orgId);
+					agentHc.setAgentId(agentId);
+					agentHc.setAgentDepotId(agentDepotId);
+					agentHc.setNotice(job.get("tzdbh")+"");
+					agentHc.setInbound(job.get("bizNo")+"");
+					agentHc.setTrainNo(job.get("hcph")+"");
+					String businessType = job.get("ywlx")+"";
+					agentHc.setBusinessType(businessType);
+					agentHc.setLspz(Integer.parseInt(job.get("lspzid")+""));
+					agentHc.setGrainNumber(job.get("count")+"");
+					agentHc.setStorehouseId(houseId);
+					agentHc.setWarehouseId(wareId);
+					Date crk_time = ParameterUtil.string2date(job.get("rq")+"");
+					agentHc.setCrkTime(crk_time);
+					agentHc.setCreateTime(new Date());
+					agentHc.setSjly(1);
+
+					agentHcService.add(agentHc);
+				}
+
+				//修改代储点货位表的汽车出入库最后同步时间
+				agentHcService.updateAgentDepot(orgId);
+			}
+			map.put("status", "200");
+			map.put("msg", "操作成功！");
+		} catch (NumberFormatException e) {
+			map.put("msg", "操作失败！");
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/agent/crk/controller/AgentQcController.java

@@ -0,0 +1,303 @@
+package com.chinaitop.depot.agent.crk.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.service.agentService;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQc;
+import com.chinaitop.depot.agent.crk.service.agentQcService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@RestController
+@RequestMapping(value = "/agentQc")
+@Api(description = "汽车出入库")
+public class AgentQcController {
+
+    @Resource
+    private agentQcService agentQcService;
+
+    @Resource
+    private agentService agentService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    @Resource
+    private BusinessAgentBgmxzService bgmxzService;
+
+    /**
+     * 查询汽车出入库信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentQcList", 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 = "agentId", value = "代储点id", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotId", value = "代储库id", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
+            @ApiImplicitParam(name = "businessType", value = "业务类型", paramType = "query"),
+            @ApiImplicitParam(name = "lspz", value = "粮食品种", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getAgentQcList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
+                                                                Integer storehouseId, Integer warehouseId, String businessType, Integer lspz, String orgid){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgid);
+        if(ParameterUtil.isnotnull(agentId)){
+            map.put("agentId",agentId);
+        }
+        if(ParameterUtil.isnotnull(agentDepotId)){
+            map.put("agentDepotId",agentDepotId);
+        }
+        if(ParameterUtil.isnotnull(storehouseId)){
+            map.put("storehouseId",storehouseId);
+        }
+        if(ParameterUtil.isnotnull(warehouseId)){
+            map.put("warehouseId",warehouseId);
+        }
+        if (ParameterUtil.isnotnull(businessType)) {
+            if (businessType.equals("1")) {
+                map.put("businessType","汽车入库");
+            } else if (businessType.equals("3")) {
+                map.put("businessType","汽车出库");
+            }
+        }
+        if(ParameterUtil.isnotnull(lspz)){
+            map.put("lspz",lspz);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> list = agentQcService.getAgentQcList(map);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> page_list = ParameterUtil.slashCapitals(pageInfo.getList());
+        pageInfo.setList(page_list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存汽车出入库信息
+     * @param agentQcJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgent", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存汽车出入库", notes = "保存汽车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentQcJson", value = "汽车出入库信息", paramType = "form")
+    })
+    public Map<String, Object> saveAgent(String agentQcJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentQc agent = (BusinessAgentQc)mapper.readValue(agentQcJson, BusinessAgentQc.class);
+        if (ParameterUtil.isnull(agent.getId())) {
+            agent.setOrgId(orgId);
+            agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
+            agentQcService.add(agent);
+        } else {
+            agentQcService.update(agent);
+        }
+        modelMap.put("agentId", agent.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除汽车出入库信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentQc", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除汽车出入库信息", notes = "删除汽车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "汽车出入库主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgentQc(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentQcService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找汽车出入库信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/getAgentQcEdit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id查找汽车出入库信息", notes = "根据id查找汽车出入库信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "汽车出入库主键id", paramType = "query")
+    })
+    public BusinessAgentQc getAgentQcEdit(Integer id) {
+        BusinessAgentQc agent = new BusinessAgentQc();
+        if (id != null) {
+            agent = agentQcService.findById(id);
+        }
+        return agent;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"通知单编号", "业务单号", "汽车牌号", "业务类型", "粮油品种",
+                "数量（公斤）", "仓房名称", "货位名称", "出入库日期"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false,
+                false, false, false, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            //查询代储点名称和代储库名称对应的id
+            Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+            if(ParameterUtil.isnull(agentMap)){
+                fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentQcService.importData(list, orgId, agentMap);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+
+    @RequestMapping(value="/selectAgentHouseWareList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询代储库正常使用的货位数据信息", notes = "查询代储库正常使用的货位数据信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="query")
+	})
+	public List<Map<String, Object>> selectAgentHouseWareList(Integer orgId) {
+
+		Map<String, Object> paramMap = new HashMap<String, Object>();
+
+		paramMap.put("orgId", orgId);
+		List<Map<String, Object>> list = agentQcService.selectAgentHouseWareList(paramMap);
+
+		return list;
+	}
+
+    @RequestMapping(value="/editQcCrkRecordData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="同步功能", notes = "把出入库拿来的汽车出入库记录数据插入到代储库业务的汽车出入库记录表中")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="qcCrkRecordData", value="汽车出入库记录数据", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="form"),
+		@ApiImplicitParam(name="realName", value="当前操作人", paramType="form")
+	})
+	public Map<String, Object> editQcCrkRecordData(String qcCrkRecordData, Integer orgId, String realName) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			JSONArray json = JSONArray.fromObject(qcCrkRecordData);
+			if (json.size() > 0) {
+				BusinessAgentQc agentQc = null;
+				for (int i = 0; i < json.size(); i++) {
+					
+					JSONObject job = json.getJSONObject(i);
+					Integer unitId = Integer.parseInt(job.get("unitid")+"");
+					BusinessAgentDepot agentDepot = bgmxzService.selectAgentDepotObj(orgId, unitId);
+					Integer agentDepotId = agentDepot.getId();
+					Integer agentId = Integer.parseInt(agentDepot.getAgentId());
+					Integer houseId = Integer.parseInt(job.get("houseId")+"");
+					Integer wareId = Integer.parseInt(job.get("wareId")+"");
+
+					agentQc = new BusinessAgentQc();
+					agentQc.setOrgId(orgId);
+					agentQc.setAgentId(agentId);
+					agentQc.setAgentDepotId(agentDepotId);
+					agentQc.setNotice(job.get("tzdbh")+"");
+					agentQc.setBusinessNumber(job.get("bizNo")+"");
+					agentQc.setCarBrand(job.get("cphm")+"");
+					String businessType = job.get("ywlx")+"";
+					if ("入仓".equals(businessType)) {
+						businessType = "汽车入库";
+					} else {
+						businessType = "汽车出库";
+					}
+					agentQc.setBusinessType(businessType);
+					agentQc.setLspz(Integer.parseInt(job.get("lspzid")+""));
+					agentQc.setGrainNumber(job.get("count")+"");
+					agentQc.setStorehouseId(houseId);
+					agentQc.setWarehouseId(wareId);
+					Date crk_time = ParameterUtil.string2date(job.get("rq")+"");
+					agentQc.setCrkTime(crk_time);
+					agentQc.setCreateTime(new Date());
+					agentQc.setSjly(1);
+
+					//插入代储点的库存实物表
+					agentQcService.add(agentQc);
+
+				}
+
+				//修改代储点货位表的汽车出入库最后同步时间
+				agentQcService.updateAgentDepot(orgId);
+			}
+			map.put("status", "200");
+			map.put("msg", "操作成功！");
+		} catch (NumberFormatException e) {
+			map.put("msg", "操作失败！");
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentHcMapper.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.agent.crk.mapper;
+
+import com.chinaitop.depot.agent.crk.model.BusinessAgentHc;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentHcExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentHcMapper {
+    int countByExample(BusinessAgentHcExample example);
+
+    int deleteByExample(BusinessAgentHcExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentHc record);
+
+    int insertSelective(BusinessAgentHc record);
+
+    List<BusinessAgentHc> selectByExample(BusinessAgentHcExample example);
+
+    BusinessAgentHc selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentHc record, @Param("example") BusinessAgentHcExample example);
+
+    int updateByExample(@Param("record") BusinessAgentHc record, @Param("example") BusinessAgentHcExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentHc record);
+
+    int updateByPrimaryKey(BusinessAgentHc record);
+    
+    List<Map<String,Object>> getDataByExample(Map<String,Object> map);
+
+    /**
+     * 查询代储库仓房货位信息
+     */
+    List<Map<String, Object>> selectAgentHouseWareList(Map<String,Object> param_map);
+}

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentHcMapper.xml

@@ -0,0 +1,476 @@
+<?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.agent.crk.mapper.BusinessAgentHcMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.crk.model.BusinessAgentHc">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="agent_id" jdbcType="INTEGER" property="agentId" />
+    <result column="agent_depot_id" jdbcType="INTEGER" property="agentDepotId" />
+    <result column="notice" jdbcType="VARCHAR" property="notice" />
+    <result column="inbound" jdbcType="VARCHAR" property="inbound" />
+    <result column="train_no" jdbcType="VARCHAR" property="trainNo" />
+    <result column="business_type" jdbcType="VARCHAR" property="businessType" />
+    <result column="lspz" jdbcType="INTEGER" property="lspz" />
+    <result column="grain_number" jdbcType="VARCHAR" property="grainNumber" />
+    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="crk_time" jdbcType="TIMESTAMP" property="crkTime" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="sjly" jdbcType="INTEGER" property="sjly" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </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">
+    id, agent_id, agent_depot_id, notice, inbound, train_no, business_type, lspz, grain_number, 
+    storehouse_id, warehouse_id, crk_time, org_id, create_time, sjly, updatetime
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHcExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_hc
+    <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 business_agent_hc
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from business_agent_hc
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHcExample">
+    delete from business_agent_hc
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHc">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_hc.nextVal from dual
+    </selectKey>
+    insert into business_agent_hc (id, agent_id, agent_depot_id, 
+      notice, inbound, train_no, 
+      business_type, lspz, grain_number, 
+      storehouse_id, warehouse_id, crk_time, 
+      org_id, create_time, sjly, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER},
+      #{notice,jdbcType=VARCHAR}, #{inbound,jdbcType=VARCHAR}, #{trainNo,jdbcType=VARCHAR}, 
+      #{businessType,jdbcType=VARCHAR}, #{lspz,jdbcType=INTEGER}, #{grainNumber,jdbcType=VARCHAR}, 
+      #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{crkTime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{sjly,jdbcType=INTEGER}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHc">
+    insert into business_agent_hc
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="agentId != null">
+        agent_id,
+      </if>
+      <if test="agentDepotId != null">
+        agent_depot_id,
+      </if>
+      <if test="notice != null">
+        notice,
+      </if>
+      <if test="inbound != null">
+        inbound,
+      </if>
+      <if test="trainNo != null">
+        train_no,
+      </if>
+      <if test="businessType != null">
+        business_type,
+      </if>
+      <if test="lspz != null">
+        lspz,
+      </if>
+      <if test="grainNumber != null">
+        grain_number,
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="crkTime != null">
+        crk_time,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="sjly != null">
+        sjly,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null">
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null">
+        #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="notice != null">
+        #{notice,jdbcType=VARCHAR},
+      </if>
+      <if test="inbound != null">
+        #{inbound,jdbcType=VARCHAR},
+      </if>
+      <if test="trainNo != null">
+        #{trainNo,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="lspz != null">
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="grainNumber != null">
+        #{grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="crkTime != null">
+        #{crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sjly != null">
+        #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHcExample" resultType="java.lang.Integer">
+    select count(*) from business_agent_hc
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update business_agent_hc
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null">
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentDepotId != null">
+        agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.notice != null">
+        notice = #{record.notice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inbound != null">
+        inbound = #{record.inbound,jdbcType=VARCHAR},
+      </if>
+      <if test="record.trainNo != null">
+        train_no = #{record.trainNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessType != null">
+        business_type = #{record.businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lspz != null">
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainNumber != null">
+        grain_number = #{record.grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storehouseId != null">
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.crkTime != null">
+        crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sjly != null">
+        sjly = #{record.sjly,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update business_agent_hc
+    set id = #{record.id,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      notice = #{record.notice,jdbcType=VARCHAR},
+      inbound = #{record.inbound,jdbcType=VARCHAR},
+      train_no = #{record.trainNo,jdbcType=VARCHAR},
+      business_type = #{record.businessType,jdbcType=VARCHAR},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      grain_number = #{record.grainNumber,jdbcType=VARCHAR},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      sjly = #{record.sjly,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHc">
+    update business_agent_hc
+    <set>
+      <if test="agentId != null">
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null">
+        agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="notice != null">
+        notice = #{notice,jdbcType=VARCHAR},
+      </if>
+      <if test="inbound != null">
+        inbound = #{inbound,jdbcType=VARCHAR},
+      </if>
+      <if test="trainNo != null">
+        train_no = #{trainNo,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        business_type = #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="lspz != null">
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="grainNumber != null">
+        grain_number = #{grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="crkTime != null">
+        crk_time = #{crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sjly != null">
+        sjly = #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentHc">
+    update business_agent_hc
+    set agent_id = #{agentId,jdbcType=INTEGER},
+      agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      notice = #{notice,jdbcType=VARCHAR},
+      inbound = #{inbound,jdbcType=VARCHAR},
+      train_no = #{trainNo,jdbcType=VARCHAR},
+      business_type = #{businessType,jdbcType=VARCHAR},
+      lspz = #{lspz,jdbcType=INTEGER},
+      grain_number = #{grainNumber,jdbcType=VARCHAR},
+      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      crk_time = #{crkTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      sjly = #{sjly,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+    a.*
+    FROM
+    (SELECT
+          hc.id,hc.agent_id,hc.agent_depot_id,hc.notice,hc.inbound,hc.train_no,
+          hc.business_type,hc.lspz,hc.grain_number,hc.storehouse_id,
+          hc.warehouse_id,hc.crk_time,hc.org_id,hc.create_time,
+          ware.warehouse_name,store.storehouse_name,agent.agent_name,
+          depot.agent_depot_name,hc.updatetime
+      FROM
+          business_agent_hc hc
+          LEFT JOIN business_agent agent ON agent.id = hc.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
+          LEFT JOIN business_agent_depot depot ON depot.id = hc.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
+          LEFT JOIN basic_storehouse store ON store.storehouse_id = hc.storehouse_id AND store.org_id = #{orgId,jdbcType=INTEGER}
+          LEFT JOIN basic_warehouse ware ON ware.warehouse_id = hc.warehouse_id AND ware.org_id = #{orgId,jdbcType=INTEGER}
+      WHERE ware.library_type = 1 AND store.library_type = 1 AND hc.org_id = #{orgId,jdbcType=INTEGER}
+          <if test="agentId != null">
+            AND hc.agent_id = #{agentId,jdbcType=INTEGER}
+          </if>
+          <if test="agentDepotId != null">
+            AND hc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+          </if>
+          <if test="storehouseId != null">
+            AND hc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+          </if>
+          <if test="warehouseId != null">
+            AND hc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+          </if>
+          <if test="businessType != null">
+            AND hc.business_type = #{businessType,jdbcType=INTEGER}
+          </if>
+          <if test="lspz != null">
+            AND hc.lspz = #{lspz,jdbcType=INTEGER}
+          </if>
+    UNION ALL
+    SELECT
+        hc.id,hc.agent_id,hc.agent_depot_id,hc.notice,hc.inbound,hc.train_no,
+        hc.business_type,hc.lspz,hc.grain_number,hc.storehouse_id,
+        hc.warehouse_id,hc.crk_time,hc.org_id,hc.create_time,
+        ware.warehouse_name,store.storehouse_name,agent.agent_name,
+        depot.agent_depot_name,hc.updatetime
+    FROM
+    business_agent_hc hc
+        INNER JOIN business_agent_storehouse aStore ON aStore.storehouse_id = hc.storehouse_id
+        INNER JOIN business_agent_warehouse aWare ON aWare.warehouse_id = hc.warehouse_id
+        LEFT JOIN business_agent agent ON agent.id = hc.agent_id
+        LEFT JOIN business_agent_depot depot ON depot.id = hc.agent_depot_id
+        LEFT JOIN basic_storehouse store ON store.storehouse_id = aStore.storehouse_id
+        LEFT JOIN basic_warehouse ware ON ware.warehouse_id = aWare.warehouse_id
+    WHERE hc.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentId != null">
+      AND hc.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND hc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND hc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="warehouseId != null">
+      AND hc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="businessType != null">
+      AND hc.business_type = #{businessType,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND hc.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+    ) a
+    ORDER BY a.updatetime DESC
+  </select>
+  
+  <!-- 查询代储库仓房货位信息 -->
+  <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT 
+    	a.depot_id+"" unitid,
+    	c.warehouse_id hwh,
+    	c.hccrk_tbsj modifydate
+    FROM business_agent_depot a
+	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
+	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
+	<if test="orgId != null">
+	and c.org_id=#{orgId,jdbcType=INTEGER}
+	</if>
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.java

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.agent.crk.mapper;
+
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQc;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQcExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentQcMapper {
+    int countByExample(BusinessAgentQcExample example);
+
+    int deleteByExample(BusinessAgentQcExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentQc record);
+
+    int insertSelective(BusinessAgentQc record);
+
+    List<BusinessAgentQc> selectByExample(BusinessAgentQcExample example);
+
+    BusinessAgentQc selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentQc record, @Param("example") BusinessAgentQcExample example);
+
+    int updateByExample(@Param("record") BusinessAgentQc record, @Param("example") BusinessAgentQcExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentQc record);
+
+    int updateByPrimaryKey(BusinessAgentQc record);
+
+    List<Map<String,Object>> getDataByExample(Map<String,Object> map);
+
+    /**
+     * 查询代储库仓房货位信息
+     */
+    List<Map<String, Object>> selectAgentHouseWareList(Map<String,Object> param_map);
+}

src/main/java/com/chinaitop/depot/agent/crk/mapper/BusinessAgentQcMapper.xml

@@ -0,0 +1,477 @@
+<?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.agent.crk.mapper.BusinessAgentQcMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.crk.model.BusinessAgentQc">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="agent_id" jdbcType="INTEGER" property="agentId" />
+    <result column="agent_depot_id" jdbcType="INTEGER" property="agentDepotId" />
+    <result column="notice" jdbcType="VARCHAR" property="notice" />
+    <result column="business_number" jdbcType="VARCHAR" property="businessNumber" />
+    <result column="car_brand" jdbcType="VARCHAR" property="carBrand" />
+    <result column="business_type" jdbcType="VARCHAR" property="businessType" />
+    <result column="lspz" jdbcType="INTEGER" property="lspz" />
+    <result column="grain_number" jdbcType="VARCHAR" property="grainNumber" />
+    <result column="storehouse_id" jdbcType="INTEGER" property="storehouseId" />
+    <result column="warehouse_id" jdbcType="INTEGER" property="warehouseId" />
+    <result column="crk_time" jdbcType="TIMESTAMP" property="crkTime" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="sjly" jdbcType="INTEGER" property="sjly" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </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">
+    id, agent_id, agent_depot_id, notice, business_number, car_brand, business_type, 
+    lspz, grain_number, storehouse_id, warehouse_id, crk_time, org_id, create_time, sjly, 
+    updatetime
+  </sql>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQcExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_qc
+    <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 business_agent_qc
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from business_agent_qc
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQcExample">
+    delete from business_agent_qc
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQc">
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_qc.nextVal from dual
+    </selectKey>
+    insert into business_agent_qc (id, agent_id, agent_depot_id, 
+      notice, business_number, car_brand, 
+      business_type, lspz, grain_number, 
+      storehouse_id, warehouse_id, crk_time, 
+      org_id, create_time, sjly, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER},
+      #{notice,jdbcType=VARCHAR}, #{businessNumber,jdbcType=VARCHAR}, #{carBrand,jdbcType=VARCHAR}, 
+      #{businessType,jdbcType=VARCHAR}, #{lspz,jdbcType=INTEGER}, #{grainNumber,jdbcType=VARCHAR}, 
+      #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{crkTime,jdbcType=TIMESTAMP}, 
+      #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{sjly,jdbcType=INTEGER}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQc">
+    insert into business_agent_qc
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="agentId != null">
+        agent_id,
+      </if>
+      <if test="agentDepotId != null">
+        agent_depot_id,
+      </if>
+      <if test="notice != null">
+        notice,
+      </if>
+      <if test="businessNumber != null">
+        business_number,
+      </if>
+      <if test="carBrand != null">
+        car_brand,
+      </if>
+      <if test="businessType != null">
+        business_type,
+      </if>
+      <if test="lspz != null">
+        lspz,
+      </if>
+      <if test="grainNumber != null">
+        grain_number,
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id,
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id,
+      </if>
+      <if test="crkTime != null">
+        crk_time,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="sjly != null">
+        sjly,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null">
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null">
+        #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="notice != null">
+        #{notice,jdbcType=VARCHAR},
+      </if>
+      <if test="businessNumber != null">
+        #{businessNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carBrand != null">
+        #{carBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="lspz != null">
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="grainNumber != null">
+        #{grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="crkTime != null">
+        #{crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sjly != null">
+        #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQcExample" resultType="java.lang.Integer">
+    select count(*) from business_agent_qc
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update business_agent_qc
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null">
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentDepotId != null">
+        agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.notice != null">
+        notice = #{record.notice,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessNumber != null">
+        business_number = #{record.businessNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.carBrand != null">
+        car_brand = #{record.carBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessType != null">
+        business_type = #{record.businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lspz != null">
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.grainNumber != null">
+        grain_number = #{record.grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.storehouseId != null">
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null">
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.crkTime != null">
+        crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sjly != null">
+        sjly = #{record.sjly,jdbcType=INTEGER},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update business_agent_qc
+    set id = #{record.id,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      notice = #{record.notice,jdbcType=VARCHAR},
+      business_number = #{record.businessNumber,jdbcType=VARCHAR},
+      car_brand = #{record.carBrand,jdbcType=VARCHAR},
+      business_type = #{record.businessType,jdbcType=VARCHAR},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      grain_number = #{record.grainNumber,jdbcType=VARCHAR},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      crk_time = #{record.crkTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      sjly = #{record.sjly,jdbcType=INTEGER},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQc">
+    update business_agent_qc
+    <set>
+      <if test="agentId != null">
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null">
+        agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="notice != null">
+        notice = #{notice,jdbcType=VARCHAR},
+      </if>
+      <if test="businessNumber != null">
+        business_number = #{businessNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="carBrand != null">
+        car_brand = #{carBrand,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        business_type = #{businessType,jdbcType=VARCHAR},
+      </if>
+      <if test="lspz != null">
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="grainNumber != null">
+        grain_number = #{grainNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="storehouseId != null">
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null">
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="crkTime != null">
+        crk_time = #{crkTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sjly != null">
+        sjly = #{sjly,jdbcType=INTEGER},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.crk.model.BusinessAgentQc">
+    update business_agent_qc
+    set agent_id = #{agentId,jdbcType=INTEGER},
+      agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      notice = #{notice,jdbcType=VARCHAR},
+      business_number = #{businessNumber,jdbcType=VARCHAR},
+      car_brand = #{carBrand,jdbcType=VARCHAR},
+      business_type = #{businessType,jdbcType=VARCHAR},
+      lspz = #{lspz,jdbcType=INTEGER},
+      grain_number = #{grainNumber,jdbcType=VARCHAR},
+      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      crk_time = #{crkTime,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      sjly = #{sjly,jdbcType=INTEGER},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+    a.*
+    FROM
+    (SELECT
+        qc.id,qc.agent_id,qc.agent_depot_id,qc.notice,qc.business_number,qc.car_brand,
+        qc.business_type,qc.lspz,qc.grain_number,qc.storehouse_id,
+        qc.warehouse_id,qc.crk_time,qc.org_id,qc.create_time,qc.sjly,
+        ware.warehouse_name,store.storehouse_name,agent.agent_name,
+        depot.agent_depot_name,qc.updatetime
+    FROM
+        business_agent_qc qc
+        LEFT JOIN business_agent agent ON agent.id = qc.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
+        LEFT JOIN business_agent_depot depot ON depot.id = qc.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
+        LEFT JOIN basic_storehouse store ON store.storehouse_id = qc.storehouse_id AND store.org_id = #{orgId,jdbcType=INTEGER}
+        LEFT JOIN basic_warehouse ware ON ware.warehouse_id = qc.warehouse_id AND ware.org_id = #{orgId,jdbcType=INTEGER}
+    WHERE ware.library_type = 1 AND store.library_type = 1 AND qc.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentId != null">
+      AND qc.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND qc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="warehouseId != null">
+      AND qc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="businessType != null">
+      AND qc.business_type = #{businessType,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND qc.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+    UNION ALL
+    SELECT
+        qc.id,qc.agent_id,qc.agent_depot_id,qc.notice,qc.business_number,qc.car_brand,
+        qc.business_type,qc.lspz,qc.grain_number,qc.storehouse_id,
+        qc.warehouse_id,qc.crk_time,qc.org_id,qc.create_time,qc.sjly,
+        ware.warehouse_name,store.storehouse_name,agent.agent_name,
+        depot.agent_depot_name,qc.updatetime
+    FROM
+    business_agent_qc qc
+        INNER JOIN business_agent_storehouse aStore ON aStore.storehouse_id = qc.storehouse_id
+        INNER JOIN business_agent_warehouse aWare ON aWare.warehouse_id = qc.warehouse_id
+        LEFT JOIN business_agent agent ON agent.id = qc.agent_id
+        LEFT JOIN business_agent_depot depot ON depot.id = qc.agent_depot_id
+        LEFT JOIN basic_storehouse store ON store.storehouse_id = aStore.storehouse_id
+        LEFT JOIN basic_warehouse ware ON ware.warehouse_id = aWare.warehouse_id
+    WHERE qc.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentId != null">
+      AND qc.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND qc.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND qc.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="warehouseId != null">
+      AND qc.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="businessType != null">
+      AND qc.business_type = #{businessType,jdbcType=INTEGER}
+    </if>
+    <if test="lspz != null">
+      AND qc.lspz = #{lspz,jdbcType=INTEGER}
+    </if>
+    ) a
+    ORDER BY a.updatetime DESC
+  </select>
+  
+  <!-- 查询代储库仓房货位信息 -->
+  <select id="selectAgentHouseWareList" parameterType="java.util.Map" resultType="java.util.Map">
+    SELECT 
+    	a.depot_id+"" unitid,
+    	c.warehouse_id hwh,
+    	c.qccrk_tbsj modifydate
+    FROM business_agent_depot a
+	LEFT JOIN business_agent_storehouse b ON b.agent_depot_id=a.id
+	LEFT JOIN business_agent_warehouse c ON c.agent_storehouse_id=b.id 
+	WHERE a.depot_id != 0 AND b.storehouse_id IS NOT NULL AND c.warehouse_id IS NOT NULL 
+	<if test="orgId != null">
+	and c.org_id=#{orgId,jdbcType=INTEGER}
+	</if>
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentHc.java

@@ -0,0 +1,293 @@
+package com.chinaitop.depot.agent.crk.model;
+
+import java.util.Date;
+
+public class BusinessAgentHc {
+    private Integer id;
+
+    private Integer agentId;
+
+    private Integer agentDepotId;
+
+    private String notice;
+
+    private String inbound;
+
+    private String trainNo;
+
+    private String businessType;
+
+    private Integer lspz;
+
+    private String grainNumber;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+
+    private Date crkTime;
+
+    private Integer orgId;
+
+    private Date createTime;
+
+    private Integer sjly;
+
+    private Date updatetime;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 代储点id
+     * @return agent_id 代储点id
+     */
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 代储点id
+     * @param agentId 代储点id
+     */
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 代储库id
+     * @return agent_depot_id 代储库id
+     */
+    public Integer getAgentDepotId() {
+        return agentDepotId;
+    }
+
+    /**
+     * 代储库id
+     * @param agentDepotId 代储库id
+     */
+    public void setAgentDepotId(Integer agentDepotId) {
+        this.agentDepotId = agentDepotId;
+    }
+
+    /**
+     * 通知单编号
+     * @return notice 通知单编号
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * 通知单编号
+     * @param notice 通知单编号
+     */
+    public void setNotice(String notice) {
+        this.notice = notice == null ? null : notice.trim();
+    }
+
+    /**
+     * 入站单号
+     * @return inbound 入站单号
+     */
+    public String getInbound() {
+        return inbound;
+    }
+
+    /**
+     * 入站单号
+     * @param inbound 入站单号
+     */
+    public void setInbound(String inbound) {
+        this.inbound = inbound == null ? null : inbound.trim();
+    }
+
+    /**
+     * 火车皮号
+     * @return train_no 火车皮号
+     */
+    public String getTrainNo() {
+        return trainNo;
+    }
+
+    /**
+     * 火车皮号
+     * @param trainNo 火车皮号
+     */
+    public void setTrainNo(String trainNo) {
+        this.trainNo = trainNo == null ? null : trainNo.trim();
+    }
+
+    /**
+     * 业务类型
+     * @return business_type 业务类型
+     */
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    /**
+     * 业务类型
+     * @param businessType 业务类型
+     */
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType == null ? null : businessType.trim();
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食数量
+     * @return grain_number 粮食数量
+     */
+    public String getGrainNumber() {
+        return grainNumber;
+    }
+
+    /**
+     * 粮食数量
+     * @param grainNumber 粮食数量
+     */
+    public void setGrainNumber(String grainNumber) {
+        this.grainNumber = grainNumber == null ? null : grainNumber.trim();
+    }
+
+    /**
+     * 仓房id
+     * @return storehouse_id 仓房id
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 仓房id
+     * @param storehouseId 仓房id
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 货位id
+     * @return warehouse_id 货位id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位id
+     * @param warehouseId 货位id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 出入库日期
+     * @return crk_time 出入库日期
+     */
+    public Date getCrkTime() {
+        return crkTime;
+    }
+
+    /**
+     * 出入库日期
+     * @param crkTime 出入库日期
+     */
+    public void setCrkTime(Date crkTime) {
+        this.crkTime = crkTime;
+    }
+
+    /**
+     * 组织结构id
+     * @return org_id 组织结构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织结构id
+     * @param orgId 组织结构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 数据来源(0是手动添加,1是同步出入库数据)
+     * @return sjly 数据来源(0是手动添加,1是同步出入库数据)
+     */
+    public Integer getSjly() {
+        return sjly;
+    }
+
+    /**
+     * 数据来源(0是手动添加,1是同步出入库数据)
+     * @param sjly 数据来源(0是手动添加,1是同步出入库数据)
+     */
+    public void setSjly(Integer sjly) {
+        this.sjly = sjly;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/crk/model/BusinessAgentQc.java

@@ -0,0 +1,293 @@
+package com.chinaitop.depot.agent.crk.model;
+
+import java.util.Date;
+
+public class BusinessAgentQc {
+    private Integer id;
+
+    private Integer agentId;
+
+    private Integer agentDepotId;
+
+    private String notice;
+
+    private String businessNumber;
+
+    private String carBrand;
+
+    private String businessType;
+
+    private Integer lspz;
+
+    private String grainNumber;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+
+    private Date crkTime;
+
+    private Integer orgId;
+
+    private Date createTime;
+
+    private Integer sjly;
+
+    private Date updatetime;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 代储点id
+     * @return agent_id 代储点id
+     */
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    /**
+     * 代储点id
+     * @param agentId 代储点id
+     */
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    /**
+     * 代储库id
+     * @return agent_depot_id 代储库id
+     */
+    public Integer getAgentDepotId() {
+        return agentDepotId;
+    }
+
+    /**
+     * 代储库id
+     * @param agentDepotId 代储库id
+     */
+    public void setAgentDepotId(Integer agentDepotId) {
+        this.agentDepotId = agentDepotId;
+    }
+
+    /**
+     * 通知单编号
+     * @return notice 通知单编号
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * 通知单编号
+     * @param notice 通知单编号
+     */
+    public void setNotice(String notice) {
+        this.notice = notice == null ? null : notice.trim();
+    }
+
+    /**
+     * 业务单号
+     * @return business_number 业务单号
+     */
+    public String getBusinessNumber() {
+        return businessNumber;
+    }
+
+    /**
+     * 业务单号
+     * @param businessNumber 业务单号
+     */
+    public void setBusinessNumber(String businessNumber) {
+        this.businessNumber = businessNumber == null ? null : businessNumber.trim();
+    }
+
+    /**
+     * 汽车牌号
+     * @return car_brand 汽车牌号
+     */
+    public String getCarBrand() {
+        return carBrand;
+    }
+
+    /**
+     * 汽车牌号
+     * @param carBrand 汽车牌号
+     */
+    public void setCarBrand(String carBrand) {
+        this.carBrand = carBrand == null ? null : carBrand.trim();
+    }
+
+    /**
+     * 业务类型
+     * @return business_type 业务类型
+     */
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    /**
+     * 业务类型
+     * @param businessType 业务类型
+     */
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType == null ? null : businessType.trim();
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食数量
+     * @return grain_number 粮食数量
+     */
+    public String getGrainNumber() {
+        return grainNumber;
+    }
+
+    /**
+     * 粮食数量
+     * @param grainNumber 粮食数量
+     */
+    public void setGrainNumber(String grainNumber) {
+        this.grainNumber = grainNumber == null ? null : grainNumber.trim();
+    }
+
+    /**
+     * 仓房id
+     * @return storehouse_id 仓房id
+     */
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    /**
+     * 仓房id
+     * @param storehouseId 仓房id
+     */
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    /**
+     * 货位id
+     * @return warehouse_id 货位id
+     */
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    /**
+     * 货位id
+     * @param warehouseId 货位id
+     */
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    /**
+     * 出入库日期
+     * @return crk_time 出入库日期
+     */
+    public Date getCrkTime() {
+        return crkTime;
+    }
+
+    /**
+     * 出入库日期
+     * @param crkTime 出入库日期
+     */
+    public void setCrkTime(Date crkTime) {
+        this.crkTime = crkTime;
+    }
+
+    /**
+     * 组织结构id
+     * @return org_id 组织结构id
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 组织结构id
+     * @param orgId 组织结构id
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 数据来源(0是手动添加,1是同步出入库数据)
+     * @return sjly 数据来源(0是手动添加,1是同步出入库数据)
+     */
+    public Integer getSjly() {
+        return sjly;
+    }
+
+    /**
+     * 数据来源(0是手动添加,1是同步出入库数据)
+     * @param sjly 数据来源(0是手动添加,1是同步出入库数据)
+     */
+    public void setSjly(Integer sjly) {
+        this.sjly = sjly;
+    }
+
+    /**
+     * 
+     * @return updatetime 
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 
+     * @param updatetime 
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/crk/service/agentHcService.java

@@ -0,0 +1,48 @@
+package com.chinaitop.depot.agent.crk.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.agent.crk.model.BusinessAgentHc;
+
+public interface agentHcService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getAgentHcList(Map<String, Object> map);
+
+    void add(BusinessAgentHc user);
+
+    void update(BusinessAgentHc user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgentHc findById(Integer id);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap);
+
+    /**
+     * 查询代储库正常使用的货位数据信息
+     * 
+     * @param paramMap 条件
+     * @return
+     */
+	List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap);
+
+	/**
+	 * 修改代储点货位表的汽车出入库最后同步时间
+	 * 
+	 * @param orgId 单位ID
+	 */
+	void updateAgentDepot(Integer orgId);
+}

src/main/java/com/chinaitop/depot/agent/crk/service/agentQcService.java

@@ -0,0 +1,49 @@
+package com.chinaitop.depot.agent.crk.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQc;
+
+public interface agentQcService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getAgentQcList(Map<String, Object> map);
+
+    void add(BusinessAgentQc user);
+
+    void update(BusinessAgentQc user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgentQc findById(Integer id);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap);
+
+    /**
+     * 修改代储点货位表的汽车出入库最后同步时间
+     * 
+     * @param orgId 单位ID
+     */
+	void updateAgentDepot(Integer orgId);
+
+	/**
+	 * 查询代储库正常使用的货位数据信息
+	 * 
+	 * @param paramMap 条件
+	 * @return
+	 */
+	List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap);
+}

src/main/java/com/chinaitop/depot/agent/crk/service/impl/AgentHcServiceImpl.java

@@ -0,0 +1,216 @@
+package com.chinaitop.depot.agent.crk.service.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import com.chinaitop.depot.agent.crk.mapper.BusinessAgentHcMapper;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentHc;
+import com.chinaitop.depot.agent.crk.service.agentHcService;
+import com.chinaitop.utils.ParameterUtil;
+
+@Service
+public class AgentHcServiceImpl implements agentHcService {
+
+    @Resource
+    private BusinessAgentHcMapper businessAgentHcMapper;
+
+    @Resource
+    private BusinessAgentMapper BusinessAgentMapper;
+
+    @Resource
+	private BusinessAgentWarehouseMapper agentWareHouseMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAgentHcList(Map<String, Object> map) {
+        return businessAgentHcMapper.getDataByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgentHc agent) {
+        businessAgentHcMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentHc camera) {
+        businessAgentHcMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        businessAgentHcMapper.deleteByPrimaryKey(agentId);
+    }
+
+    @Override
+    public BusinessAgentHc findById(Integer id) {
+        return businessAgentHcMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap) {
+        Date date = new Date();
+        BusinessAgentHc agent = null;
+        Map<String,Object> enumData = new HashMap<>();
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //通知单编号
+                        agent = new BusinessAgentHc();
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 1 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                            agent.setNotice(revList.get(j));
+                        }
+                        agent.setCreateTime(date);//创建时间
+                        agent.setOrgId(orgId);
+                        break;
+                    case 1:
+                        //入站单号
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 2 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setInbound(revList.get(j));
+                        break;
+                    case 2:
+                        //火车皮号
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 3 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setTrainNo(revList.get(j));
+                        break;
+                    case 3:
+                        //业务类型
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 4 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setBusinessType(revList.get(j));
+                        break;
+                    case 4:
+                        //粮油品种
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("enumName", revList.get(j));
+                        enumData.put("parentId", "1061");
+                        Map<String,Object> enumId = BusinessAgentMapper.getEnumId(enumData);
+                        if(enumId.size() == 0){
+                            msg = "第 "+(i+3)+" 行第 5 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setLspz(Integer.parseInt(enumId.get("enumid").toString()));
+                        break;
+                    case 5:
+                        //数量（公斤）
+                        len = revList.get(j).length();
+                        if (len > 30) {
+                            msg = "第 "+(i+3)+" 行第 6 列的值的长度不能超过30！";
+                            return msg;
+                        }
+                        agent.setGrainNumber(revList.get(j));
+                        break;
+                    case 6:
+                        //仓房名称
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 7 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("storehouseName", revList.get(j));
+                        enumData.put("depotId", agentMap.get("depotId"));
+                        Map<String,Object> storehouseId = BusinessAgentMapper.getStorehouseId(enumData);
+                        if(ParameterUtil.isnull(storehouseId)){
+                            msg = "第 "+(i+3)+" 行第 7 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setStorehouseId(Integer.parseInt(storehouseId.get("storehouseid").toString()));
+                        break;
+                    case 7:
+                        //货位名称
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 8 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("warehouseName", revList.get(j));
+                        Map<String,Object> warehouseId = BusinessAgentMapper.getWarehouseId(enumData);
+                        if(ParameterUtil.isnull(warehouseId)){
+                            msg = "第 "+(i+3)+" 行第 8 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setWarehouseId(Integer.parseInt(warehouseId.get("warehouseid").toString()));
+                        break;
+                    case 8:
+                        //出入库日期
+                        len = revList.get(j).length();
+                        if (len > 100) {
+                            msg = "第 "+(i+3)+" 行第 5 列的值的长度不能超过100！";
+                            return msg;
+                        }
+                        agent.setCrkTime(ParameterUtil.string2date(revList.get(j)));
+                        break;
+                    default :
+                        break;
+                }
+            }
+            agent.setAgentId(Integer.parseInt(agentMap.get("agentid").toString()));
+            agent.setAgentDepotId(Integer.parseInt(agentMap.get("depotid").toString()));
+            businessAgentHcMapper.insert(agent);
+        }
+        return msg;
+    }
+
+	@Override
+	public List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap) {
+		List<Map<String, Object>> list = businessAgentHcMapper.selectAgentHouseWareList(paramMap);
+		return list;
+	}
+
+	@Override
+	public void updateAgentDepot(Integer orgId) {
+		//要修改的值
+		BusinessAgentWarehouse record = new BusinessAgentWarehouse();
+		record.setHccrkTbsj(new Date());
+		//修改条件
+		BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+		BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(orgId);
+		criteria.andDelFlagEqualTo(1);
+		agentWareHouseMapper.updateByExampleSelective(record, example);
+	}
+}

src/main/java/com/chinaitop/depot/agent/crk/service/impl/AgentQcServiceImpl.java

@@ -0,0 +1,216 @@
+package com.chinaitop.depot.agent.crk.service.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentWarehouseMapper;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouse;
+import com.chinaitop.depot.agent.basic.model.BusinessAgentWarehouseExample;
+import com.chinaitop.depot.agent.crk.mapper.BusinessAgentQcMapper;
+import com.chinaitop.depot.agent.crk.model.BusinessAgentQc;
+import com.chinaitop.depot.agent.crk.service.agentQcService;
+import com.chinaitop.utils.ParameterUtil;
+
+@Service
+public class AgentQcServiceImpl implements agentQcService {
+
+    @Resource
+    private BusinessAgentQcMapper businessAgentQcMapper;
+
+    @Resource
+    private BusinessAgentMapper BusinessAgentMapper;
+
+    @Resource
+	private BusinessAgentWarehouseMapper agentWareHouseMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAgentQcList(Map<String, Object> map) {
+        return businessAgentQcMapper.getDataByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgentQc agent) {
+        businessAgentQcMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentQc camera) {
+        businessAgentQcMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        businessAgentQcMapper.deleteByPrimaryKey(agentId);
+    }
+
+    @Override
+    public BusinessAgentQc findById(Integer id) {
+        return businessAgentQcMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap) {
+        Date date = new Date();
+        BusinessAgentQc agent = null;
+        Map<String,Object> enumData = new HashMap<>();
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //通知单编号
+                        agent = new BusinessAgentQc();
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 1 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                            agent.setNotice(revList.get(j));
+                        }
+                        agent.setCreateTime(date);//创建时间
+                        agent.setOrgId(orgId);
+                        break;
+                    case 1:
+                        //入站单号
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 2 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setBusinessNumber(revList.get(j));
+                        break;
+                    case 2:
+                        //火车皮号
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 3 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setCarBrand(revList.get(j));
+                        break;
+                    case 3:
+                        //业务类型
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 4 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        agent.setBusinessType(revList.get(j));
+                        break;
+                    case 4:
+                        //粮油品种
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("enumName", revList.get(j));
+                        enumData.put("parentId", "1061");
+                        Map<String,Object> enumId = BusinessAgentMapper.getEnumId(enumData);
+                        if(enumId.size() == 0){
+                            msg = "第 "+(i+3)+" 行第 5 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setLspz(Integer.parseInt(enumId.get("enumid").toString()));
+                        break;
+                    case 5:
+                        //数量（公斤）
+                        len = revList.get(j).length();
+                        if (len > 30) {
+                            msg = "第 "+(i+3)+" 行第 6 列的值的长度不能超过30！";
+                            return msg;
+                        }
+                        agent.setGrainNumber(revList.get(j));
+                        break;
+                    case 6:
+                        //仓房名称
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 7 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("storehouseName", revList.get(j));
+                        enumData.put("depotId", agentMap.get("depotId"));
+                        Map<String,Object> storehouseId = BusinessAgentMapper.getStorehouseId(enumData);
+                        if(ParameterUtil.isnull(storehouseId)){
+                            msg = "第 "+(i+3)+" 行第 7 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setStorehouseId(Integer.parseInt(storehouseId.get("storehouseid").toString()));
+                        break;
+                    case 7:
+                        //货位名称
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 8 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("warehouseName", revList.get(j));
+                        Map<String,Object> warehouseId = BusinessAgentMapper.getWarehouseId(enumData);
+                        if(ParameterUtil.isnull(warehouseId)){
+                            msg = "第 "+(i+3)+" 行第 8 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setWarehouseId(Integer.parseInt(warehouseId.get("warehouseid").toString()));
+                        break;
+                    case 8:
+                        //出入库日期
+                        len = revList.get(j).length();
+                        if (len > 100) {
+                            msg = "第 "+(i+3)+" 行第 5 列的值的长度不能超过100！";
+                            return msg;
+                        }
+                        agent.setCrkTime(ParameterUtil.string2date(revList.get(j)));
+                        break;
+                    default :
+                        break;
+                }
+            }
+            agent.setAgentId(Integer.parseInt(agentMap.get("agentid").toString()));
+            agent.setAgentDepotId(Integer.parseInt(agentMap.get("depotid").toString()));
+            businessAgentQcMapper.insert(agent);
+        }
+        return msg;
+    }
+
+	@Override
+	public void updateAgentDepot(Integer orgId) {
+		//要修改的值
+		BusinessAgentWarehouse record = new BusinessAgentWarehouse();
+		record.setQccrkTbsj(new Date());
+		//修改条件
+		BusinessAgentWarehouseExample example = new BusinessAgentWarehouseExample();
+		BusinessAgentWarehouseExample.Criteria criteria = example.createCriteria();
+		criteria.andOrgIdEqualTo(orgId);
+		criteria.andDelFlagEqualTo(1);
+		agentWareHouseMapper.updateByExampleSelective(record, example);
+	}
+
+	@Override
+	public List<Map<String, Object>> selectAgentHouseWareList(Map<String, Object> paramMap) {
+		List<Map<String, Object>> list = businessAgentQcMapper.selectAgentHouseWareList(paramMap);
+		return list;
+	}
+}

src/main/java/com/chinaitop/depot/agent/number/controller/AgentNumberController.java

@@ -0,0 +1,283 @@
+package com.chinaitop.depot.agent.number.controller;
+
+import java.util.ArrayList;
+import java.util.Date;
+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 org.springframework.web.multipart.MultipartFile;
+
+import com.chinaitop.depot.agent.basic.model.BusinessAgentDepot;
+import com.chinaitop.depot.agent.basic.service.agentService;
+import com.chinaitop.depot.agent.bgz.service.BusinessAgentBgmxzService;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumber;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample.Criteria;
+import com.chinaitop.depot.agent.number.service.agentNumberService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+@RestController
+@RequestMapping(value = "/agentNumber")
+@Api(description = "库存数量管理")
+public class AgentNumberController {
+
+    @Resource
+    private agentNumberService agentNumberService;
+
+    @Resource
+    private agentService agentService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    @Resource
+    private BusinessAgentBgmxzService bgmxzService;
+
+    /**
+     * 查询库存数量信息记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "/getAgentNumberList", 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 = "agentId", value = "代储点id", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotId", value = "代储库id", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位id", paramType = "query"),
+            @ApiImplicitParam(name = "orgid", value = "组织id", paramType = "query")
+    })
+    public PageInfo<Map<String, Object>> getAgentNumberList(Integer pageNum, Integer pageSize, Integer agentId, Integer agentDepotId,
+                                                                        Integer storehouseId, Integer warehouseId, String orgid){
+        Map<String,Object> map = new HashMap<>();
+        map.put("orgId",orgid);
+        if(ParameterUtil.isnotnull(agentId)){
+            map.put("agentId",agentId);
+        }
+        if(ParameterUtil.isnotnull(agentDepotId)){
+            map.put("agentDepotId",agentDepotId);
+        }
+        if(ParameterUtil.isnotnull(storehouseId)){
+            map.put("storehouseId",storehouseId);
+        }
+        if(ParameterUtil.isnotnull(warehouseId)){
+            map.put("warehouseId",warehouseId);
+        }
+
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> list = agentNumberService.getAgentNumberList(map);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(list);
+        //处理驼峰命名大写问题
+        List<Map<String, Object>> page_list = ParameterUtil.slashCapitals(pageInfo.getList());
+        pageInfo.setList(page_list);
+        return pageInfo;
+    }
+
+    /**
+     * 保存库存数量信息
+     * @param agentNumberJson 主键id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value="/saveAgent", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="保存库存数量", notes = "保存库存数量信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "agentNumberJson", value = "库存数量信息", paramType = "form")
+    })
+    public Map<String, Object> saveAgent(String agentNumberJson,Integer orgId) throws Exception {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentNumber agent = (BusinessAgentNumber)mapper.readValue(agentNumberJson, BusinessAgentNumber.class);
+        if (ParameterUtil.isnull(agent.getId())) {
+            agent.setOrgId(orgId);
+            agent.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//创建时间
+            agentNumberService.add(agent);
+        } else {
+            agentNumberService.update(agent);
+        }
+        modelMap.put("agentId", agent.getId());
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 删除库存数量信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/removeAgentNumber", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="删除库存数量信息", notes = "删除库存数量信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "库存数量主键id", paramType = "form")
+    })
+    public Map<String, Object> removeAgentNumber(Integer id){
+        Map<String, Object> modelMap = new HashMap<>();
+        if (id != null) {
+            agentNumberService.updateDeleteById(id);
+            modelMap.put("status", "success");
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id查找库存数量信息
+     * @param id 主键id
+     * @return
+     */
+    @RequestMapping(value="/getAgentNumberEdit", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id查找库存数量信息", notes = "根据id查找库存数量信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "库存数量主键id", paramType = "query")
+    })
+    public BusinessAgentNumber getAgentNumberEdit(Integer id) {
+        BusinessAgentNumber agent = new BusinessAgentNumber();
+        if (id != null) {
+            agent = agentNumberService.findById(id);
+        }
+        return agent;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId){
+
+        String[] titleArr = {"仓房名称", "货位名称", "粮油品种", "粮油性质", "等级","收获年度", "库存数量（公斤）"};//第一行的title
+        boolean[] emptyArr = {false, false, false, false, false,false, false};//指定列可为空，不可为空值为false.
+
+        List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+        try {
+        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+            if (errormsg != null && !"".equals(errormsg)) {
+                fileMap.put("errormsg",errormsg);
+                return fileMap;
+            }
+
+            //查询代储点名称和代储库名称对应的id
+            Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+            if(ParameterUtil.isnull(agentMap)){
+                fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                return fileMap;
+            }
+
+            if (list.size()>0) {
+                errormsg = agentNumberService.importData(list, orgId, agentMap);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+
+    @RequestMapping(value="/editCrkKcswData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+	@ApiOperation(value="把出入库拿来的库存实物数据插入到代储库业务的库存实物表中", notes = "把出入库拿来的库存实物数据插入到代储库业务的库存实物表中")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name="kcswData", value="出入库库存实物数据", paramType="form"),
+		@ApiImplicitParam(name="orgId", value="当前单位ID", paramType="form"),
+		@ApiImplicitParam(name="realName", value="当前操作人", paramType="form")
+	})
+	public Map<String, Object> editCrkKcswData(String kcswData, Integer orgId, String realName) {
+
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		try {
+			JSONArray json = JSONArray.fromObject(kcswData);
+			if (json.size() > 0) {
+				BusinessAgentNumber agentNumber = null;
+				for (int i = 0; i < json.size(); i++) {
+					
+					JSONObject job = json.getJSONObject(i);
+					Integer unitId = Integer.parseInt(job.get("unitid")+"");
+					BusinessAgentDepot agentDepot = bgmxzService.selectAgentDepotObj(orgId, unitId);
+					Integer agentDepotId = agentDepot.getId();
+					Integer agentId = Integer.parseInt(agentDepot.getAgentId());
+					Integer houseId = Integer.parseInt(job.get("ch")+"");
+					Integer wareId = Integer.parseInt(job.get("hwh")+"");
+
+					agentNumber = new BusinessAgentNumber();
+					agentNumber.setOrgId(orgId);
+					agentNumber.setAgentId(agentId);
+					agentNumber.setAgentDepotId(agentDepotId);
+					agentNumber.setStorehouseId(houseId);
+					agentNumber.setWarehouseId(wareId);
+					agentNumber.setLspz(Integer.parseInt(job.get("pz")+""));
+					agentNumber.setNature(job.get("hwxz")+"");
+					agentNumber.setLevel(Integer.parseInt(job.get("dj")+""));
+					agentNumber.setHarvestYear(Integer.parseInt(job.get("scnf")+""));
+                    if(ParameterUtil.isnull(job.get("scnf").toString())){
+                        agentNumber.setHarvestYear(0);
+                    }else{
+                        agentNumber.setHarvestYear(Integer.parseInt(job.get("scnf")+""));
+                    }
+					agentNumber.setInventory(job.get("kcsl")+"");
+
+					//检查这个仓房货位下的数据有没有，没有就新增，有就修改
+					BusinessAgentNumberExample example = new BusinessAgentNumberExample();
+					Criteria criteria = example.createCriteria();
+					criteria.andOrgIdEqualTo(orgId);
+					criteria.andAgentIdEqualTo(agentId);
+					criteria.andAgentDepotIdEqualTo(agentDepotId);
+					criteria.andStorehouseIdEqualTo(houseId);
+					criteria.andWarehouseIdEqualTo(wareId);
+					List<BusinessAgentNumber> list = agentNumberService.findByCondition(example);
+
+					if (null != list && list.size() > 0) {
+						agentNumber.setId(list.get(0).getId());
+						agentNumberService.update(agentNumber);
+					} else {
+						//插入代储点的库存实物表
+						agentNumber.setCreateTime(new Date());
+						agentNumberService.add(agentNumber);
+					}
+
+				}
+			}
+			map.put("status", "200");
+			map.put("msg", "操作成功！");
+		} catch (NumberFormatException e) {
+			map.put("msg", "操作失败！");
+			e.printStackTrace();
+		}
+
+		return map;
+	}
+}

src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.java

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

src/main/java/com/chinaitop/depot/agent/number/mapper/BusinessAgentNumberMapper.xml

@@ -0,0 +1,370 @@
+<?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.agent.number.mapper.BusinessAgentNumberMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="agent_id" property="agentId" jdbcType="INTEGER" />
+    <result column="agent_depot_id" property="agentDepotId" jdbcType="INTEGER" />
+    <result column="storehouse_id" property="storehouseId" jdbcType="INTEGER" />
+    <result column="warehouse_id" property="warehouseId" jdbcType="INTEGER" />
+    <result column="lspz" property="lspz" jdbcType="INTEGER" />
+    <result column="nature" property="nature" jdbcType="VARCHAR" />
+    <result column="level" property="level" jdbcType="INTEGER" />
+    <result column="harvest_year" property="harvestYear" jdbcType="INTEGER" />
+    <result column="inventory" property="inventory" jdbcType="VARCHAR" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="updatetime" property="updatetime" 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, agent_id, agent_depot_id, storehouse_id, warehouse_id, lspz, nature, level, harvest_year, 
+    inventory, org_id, create_time, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_number
+    <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_agent_number
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_number
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample" >
+    delete from business_agent_number
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_number.nextVal from dual
+    </selectKey>
+    insert into business_agent_number (id, agent_id, agent_depot_id, 
+      storehouse_id, warehouse_id, lspz, 
+      nature, level, harvest_year, 
+      inventory, org_id, create_time, 
+      updatetime)
+    values (#{id,jdbcType=INTEGER}, #{agentId,jdbcType=INTEGER}, #{agentDepotId,jdbcType=INTEGER},
+      #{storehouseId,jdbcType=INTEGER}, #{warehouseId,jdbcType=INTEGER}, #{lspz,jdbcType=INTEGER}, 
+      #{nature,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, #{harvestYear,jdbcType=INTEGER}, 
+      #{inventory,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
+    insert into business_agent_number
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="agentId != null" >
+        agent_id,
+      </if>
+      <if test="agentDepotId != null" >
+        agent_depot_id,
+      </if>
+      <if test="storehouseId != null" >
+        storehouse_id,
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id,
+      </if>
+      <if test="lspz != null" >
+        lspz,
+      </if>
+      <if test="nature != null" >
+        nature,
+      </if>
+      <if test="level != null" >
+        level,
+      </if>
+      <if test="harvestYear != null" >
+        harvest_year,
+      </if>
+      <if test="inventory != null" >
+        inventory,
+      </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="createTime != null" >
+        create_time,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="agentId != null" >
+        #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null" >
+        #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="nature != null" >
+        #{nature,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        #{level,jdbcType=INTEGER},
+      </if>
+      <if test="harvestYear != null" >
+        #{harvestYear,jdbcType=INTEGER},
+      </if>
+      <if test="inventory != null" >
+        #{inventory,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_number
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_number
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentId != null" >
+        agent_id = #{record.agentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.agentDepotId != null" >
+        agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="record.storehouseId != null" >
+        storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.warehouseId != null" >
+        warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="record.lspz != null" >
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.nature != null" >
+        nature = #{record.nature,jdbcType=VARCHAR},
+      </if>
+      <if test="record.level != null" >
+        level = #{record.level,jdbcType=INTEGER},
+      </if>
+      <if test="record.harvestYear != null" >
+        harvest_year = #{record.harvestYear,jdbcType=INTEGER},
+      </if>
+      <if test="record.inventory != null" >
+        inventory = #{record.inventory,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null" >
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_number
+    set id = #{record.id,jdbcType=INTEGER},
+      agent_id = #{record.agentId,jdbcType=INTEGER},
+      agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
+      storehouse_id = #{record.storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{record.warehouseId,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      nature = #{record.nature,jdbcType=VARCHAR},
+      level = #{record.level,jdbcType=INTEGER},
+      harvest_year = #{record.harvestYear,jdbcType=INTEGER},
+      inventory = #{record.inventory,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
+    update business_agent_number
+    <set >
+      <if test="agentId != null" >
+        agent_id = #{agentId,jdbcType=INTEGER},
+      </if>
+      <if test="agentDepotId != null" >
+        agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      </if>
+      <if test="storehouseId != null" >
+        storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="warehouseId != null" >
+        warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null" >
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="nature != null" >
+        nature = #{nature,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        level = #{level,jdbcType=INTEGER},
+      </if>
+      <if test="harvestYear != null" >
+        harvest_year = #{harvestYear,jdbcType=INTEGER},
+      </if>
+      <if test="inventory != null" >
+        inventory = #{inventory,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.number.model.BusinessAgentNumber" >
+    update business_agent_number
+    set agent_id = #{agentId,jdbcType=INTEGER},
+      agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
+      storehouse_id = #{storehouseId,jdbcType=INTEGER},
+      warehouse_id = #{warehouseId,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      nature = #{nature,jdbcType=VARCHAR},
+      level = #{level,jdbcType=INTEGER},
+      harvest_year = #{harvestYear,jdbcType=INTEGER},
+      inventory = #{inventory,jdbcType=VARCHAR},
+      org_id = #{orgId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getDataByExample" parameterType="java.util.Map" resultType="java.util.HashMap">
+    SELECT
+        num.id,num.agent_id,num.agent_depot_id,num.lspz,num.nature,num.level,
+        num.harvest_year,num.inventory,num.storehouse_id,
+        num.warehouse_id,num.create_time,num.org_id,
+        ware.warehouse_name,store.storehouse_name,agent.agent_name,
+        depot.agent_depot_name
+    FROM
+        business_agent_number num
+        LEFT JOIN business_agent agent ON agent.id = num.agent_id AND agent.org_id = #{orgId,jdbcType=INTEGER}
+        LEFT JOIN business_agent_depot depot ON depot.id = num.agent_depot_id AND depot.org_id = #{orgId,jdbcType=INTEGER}
+        LEFT JOIN basic_storehouse store ON store.storehouse_id = num.storehouse_id
+        LEFT JOIN basic_warehouse ware ON ware.warehouse_id = num.warehouse_id
+    WHERE num.org_id = #{orgId,jdbcType=INTEGER}
+    <if test="agentId != null">
+      AND num.agent_id = #{agentId,jdbcType=INTEGER}
+    </if>
+    <if test="agentDepotId != null">
+      AND num.agent_depot_id = #{agentDepotId,jdbcType=INTEGER}
+    </if>
+    <if test="storehouseId != null">
+      AND num.storehouse_id = #{storehouseId,jdbcType=INTEGER}
+    </if>
+    <if test="warehouseId != null">
+      AND num.warehouse_id = #{warehouseId,jdbcType=INTEGER}
+    </if>
+    order by num.updatetime desc
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/number/model/BusinessAgentNumber.java

@@ -0,0 +1,135 @@
+package com.chinaitop.depot.agent.number.model;
+
+import java.util.Date;
+
+public class BusinessAgentNumber {
+    private Integer id;
+
+    private Integer agentId;
+
+    private Integer agentDepotId;
+
+    private Integer storehouseId;
+
+    private Integer warehouseId;
+
+    private Integer lspz;
+
+    private String nature;
+
+    private Integer level;
+
+    private Integer harvestYear;
+
+    private String inventory;
+
+    private Integer orgId;
+
+    private Date createTime;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Integer agentId) {
+        this.agentId = agentId;
+    }
+
+    public Integer getAgentDepotId() {
+        return agentDepotId;
+    }
+
+    public void setAgentDepotId(Integer agentDepotId) {
+        this.agentDepotId = agentDepotId;
+    }
+
+    public Integer getStorehouseId() {
+        return storehouseId;
+    }
+
+    public void setStorehouseId(Integer storehouseId) {
+        this.storehouseId = storehouseId;
+    }
+
+    public Integer getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(Integer warehouseId) {
+        this.warehouseId = warehouseId;
+    }
+
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature == null ? null : nature.trim();
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public Integer getHarvestYear() {
+        return harvestYear;
+    }
+
+    public void setHarvestYear(Integer harvestYear) {
+        this.harvestYear = harvestYear;
+    }
+
+    public String getInventory() {
+        return inventory;
+    }
+
+    public void setInventory(String inventory) {
+        this.inventory = inventory == null ? null : inventory.trim();
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/number/service/agentNumberService.java

@@ -0,0 +1,42 @@
+package com.chinaitop.depot.agent.number.service;
+
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumber;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample;
+
+import java.util.List;
+import java.util.Map;
+
+public interface agentNumberService {
+
+    /**
+     * 查询代储点信息记录
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getAgentNumberList(Map<String, Object> map);
+
+    void add(BusinessAgentNumber user);
+
+    void update(BusinessAgentNumber user);
+
+    void updateDeleteById(Integer id);
+
+    BusinessAgentNumber findById(Integer id);
+
+    /**
+     * 导入
+     *
+     * @param list
+     * @param orgId
+     * @return
+     */
+    String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap);
+
+    /**
+     * 按条件查询数据
+     * 
+     * @param example 条件
+     * @return
+     */
+	List<BusinessAgentNumber> findByCondition(BusinessAgentNumberExample example);
+}

src/main/java/com/chinaitop/depot/agent/number/service/impl/AgentNumberServiceImpl.java

@@ -0,0 +1,200 @@
+package com.chinaitop.depot.agent.number.service.impl;
+
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
+import com.chinaitop.depot.agent.number.mapper.BusinessAgentNumberMapper;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumber;
+import com.chinaitop.depot.agent.number.model.BusinessAgentNumberExample;
+import com.chinaitop.depot.agent.number.service.agentNumberService;
+import com.chinaitop.utils.ParameterUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AgentNumberServiceImpl implements agentNumberService {
+
+    @Resource
+    private BusinessAgentNumberMapper businessAgentNumberMapper;
+
+    @Resource
+    private BusinessAgentMapper BusinessAgentMapper;
+
+    /**
+     * 查询仓储处作业记录
+     * * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAgentNumberList(Map<String, Object> map) {
+        return businessAgentNumberMapper.getDataByExample(map);
+    }
+
+    @Override
+    public void add(BusinessAgentNumber agent) {
+        businessAgentNumberMapper.insert(agent);
+    }
+
+    @Override
+    public void update(BusinessAgentNumber camera) {
+        businessAgentNumberMapper.updateByPrimaryKey(camera);
+    }
+
+    @Override
+    public void updateDeleteById(Integer agentId) {
+        businessAgentNumberMapper.deleteByPrimaryKey(agentId);
+    }
+
+    @Override
+    public BusinessAgentNumber findById(Integer id) {
+        return businessAgentNumberMapper.selectByPrimaryKey(id);
+    }
+
+    @Override
+    public String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap) {
+        Date date = new Date();
+        BusinessAgentNumber agent = null;
+        Map<String,Object> enumData = new HashMap<>();
+
+        String msg = "";
+        int len = 0;
+
+        for (int i = 0; i < list.size(); i++) {
+            List<String> revList = list.get(i);
+
+            for (int j = 0; j < revList.size(); j++) {
+                switch(j) {
+                    case 0:
+                        //仓房名称
+                        agent = new BusinessAgentNumber();
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 1 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("storehouseName", revList.get(j));
+                        enumData.put("depotId", agentMap.get("depotId"));
+                        Map<String,Object> storehouseId = BusinessAgentMapper.getStorehouseId(enumData);
+                        if(ParameterUtil.isnull(storehouseId)){
+                            msg = "第 "+(i+3)+" 行第 1 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setCreateTime(date);//创建时间
+                        agent.setOrgId(orgId);
+                        agent.setStorehouseId(Integer.parseInt(storehouseId.get("storehouseid").toString()));
+                        break;
+                    case 1:
+                        //货位名称
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 2 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("warehouseName", revList.get(j));
+                        Map<String,Object> warehouseId = BusinessAgentMapper.getWarehouseId(enumData);
+                        if(ParameterUtil.isnull(warehouseId)){
+                            msg = "第 "+(i+3)+" 行第 2 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setWarehouseId(Integer.parseInt(warehouseId.get("warehouseid").toString()));
+                        break;
+                    case 2:
+                        //粮油品种
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 3 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("enumName", revList.get(j));
+                        enumData.put("parentId", "1061");
+                        Map<String,Object> enumId = BusinessAgentMapper.getEnumId(enumData);
+                        if(enumId.size() == 0){
+                            msg = "第 "+(i+3)+" 行第 3 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setLspz(Integer.parseInt(enumId.get("enumid").toString()));
+                        break;
+                    case 3:
+                        //粮油性质
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 4 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        if(ParameterUtil.isequal(revList.get(j),"其他粮")){
+                            agent.setNature("3103");
+                        }else{
+                            enumData.put("enumName", revList.get(j));
+                            enumData.put("parentId", "1032");
+                            Map<String,Object> natureId = BusinessAgentMapper.getEnumChildId(enumData);
+
+                            if(natureId.size() == 0){
+                                msg = "第 "+(i+3)+" 行第 5 列的值的不正确，请查询后再添加！";
+                                return msg;
+                            }
+                            agent.setNature(natureId.get("enumId").toString());
+                        }
+                        break;
+                    case 4:
+                        //等级
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 5 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("enumName", revList.get(j));
+                        enumData.put("parentId", "1002");
+                        Map<String,Object> levelId = BusinessAgentMapper.getEnumId(enumData);
+                        if(levelId.size() == 0){
+                            msg = "第 "+(i+3)+" 行第 5 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setLevel(Integer.parseInt(levelId.get("enumid").toString()));
+                        break;
+                    case 5:
+                        //收获年度
+                        len = revList.get(j).length();
+                        if (len > 20) {
+                            msg = "第 "+(i+3)+" 行第 6 列的值的长度不能超过20！";
+                            return msg;
+                        }
+                        enumData.put("enumName", revList.get(j));
+                        enumData.put("parentId", "1004");
+                        Map<String,Object> yearId = BusinessAgentMapper.getEnumId(enumData);
+                        if(yearId.size() == 0){
+                            msg = "第 "+(i+3)+" 行第 6 列的值的不正确，请查询后再添加！";
+                            return msg;
+                        }
+                        agent.setHarvestYear(Integer.parseInt(yearId.get("enumid").toString()));
+                        break;
+                    case 6:
+                        //库存数量（公斤）
+                        if (ParameterUtil.isnotnull(revList.get(j))) {
+                            len = revList.get(j).length();
+                            if (len > 50) {
+                                msg = "第 "+(i+3)+" 行第 7 列的值的长度不能超过50！";
+                                return msg;
+                            }
+                        }
+                        agent.setInventory(revList.get(j));
+                        break;
+                    default :
+                        break;
+                }
+            }
+            agent.setAgentId(Integer.parseInt(agentMap.get("agentid").toString()));
+            agent.setAgentDepotId(Integer.parseInt(agentMap.get("depotid").toString()));
+            businessAgentNumberMapper.insert(agent);
+        }
+        return msg;
+    }
+
+	@Override
+	public List<BusinessAgentNumber> findByCondition(BusinessAgentNumberExample example) {
+		List<BusinessAgentNumber> list = businessAgentNumberMapper.selectByExample(example);
+		return list;
+	}
+}

src/main/java/com/chinaitop/depot/agent/quality/controller/AgentQualityController.java

@@ -0,0 +1,649 @@
+package com.chinaitop.depot.agent.quality.controller;
+
+
+import com.chinaitop.depot.agent.basic.service.agentService;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample;
+import com.chinaitop.depot.agent.quality.service.AgentQualityService;
+import com.chinaitop.depot.agent.quality.service.AgentQualitySonService;
+import com.chinaitop.depot.utils.ImportServiceImpl;
+import com.chinaitop.utils.ParameterUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+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.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 org.springframework.web.multipart.MultipartFile;
+
+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;
+
+/**
+ * Created by product on 2017/10/11.
+ */
+@RestController
+@RequestMapping(value = {"/agentQuality"})
+@Api(value= "AgentQualityController", description = "质量管理类")
+public class AgentQualityController {
+    @Resource
+    private AgentQualityService agentQualityService;
+
+    @Resource
+    private AgentQualitySonService agentQualitySonService;
+
+    @Resource
+    private ImportServiceImpl importService;
+
+    @Resource
+    private agentService agentService;
+
+    /**
+     * 封仓管理中查询出未封仓的质量管理信息，已经封仓的不要展示
+     * 分页获取
+     */
+    @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 = "checktype", value = "检查的类型", paramType = "query"),
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "粮库id", paramType = "query"),
+            @ApiImplicitParam(name = "agentId", value = "代储点名称", paramType = "query"),
+            @ApiImplicitParam(name = "agentDepotId", value = "粮库名称", paramType = "query"),
+            @ApiImplicitParam(name = "storehouseId", value = "仓房名称", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位名称", paramType = "query"),
+    })
+    public PageInfo<BusinessAgentQuality> listPage(Integer pageNum, Integer pageSize,String checktype, String checkResult, Integer orgId,
+    Integer agentId,Integer agentDepotId,Integer storehouseId,Integer warehouseId) {
+    	BusinessAgentQuality qualityCheck = new BusinessAgentQuality();
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checktype)){
+            qualityCheck.setType(checktype);
+        }
+        // 粮库id.
+        if (ParameterUtil.isnotnull(orgId)) {
+            qualityCheck.setOrgId(orgId);
+        }
+        // 代储点名称.
+        if (ParameterUtil.isnotnull(agentId)) {
+            qualityCheck.setAgentId(agentId);
+        }
+        // 粮库名称.
+        if (ParameterUtil.isnotnull(agentDepotId)) {
+            qualityCheck.setAgentDepotId(agentDepotId);
+        }
+        // 仓房id.
+        if (ParameterUtil.isnotnull(storehouseId)) {
+            qualityCheck.setStorehouseId(storehouseId);
+
+        }
+        // 货位id.
+        if (ParameterUtil.isnotnull(warehouseId)) {
+            qualityCheck.setWarehouseId(warehouseId);
+        }
+
+        //检验结果（0：合格 , 1 :不合格）
+
+        if (StringUtils.isNotBlank(checkResult)) {
+            qualityCheck.setCheckResult(checkResult);
+        }
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
+        qualityCheck.setSealStatus("0");
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<BusinessAgentQuality> list = agentQualityService.queryByQualitycheck(qualityCheck);
+
+        PageInfo<BusinessAgentQuality> pageInfo = new PageInfo<BusinessAgentQuality>(list);
+        return pageInfo;
+    }
+    
+    /**
+     * 获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位).
+     * @param qualitycheck
+     * @return
+     */
+    @RequestMapping(value = "/getHouseOrWareList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位)", notes = "获取仓房或者货位(通过分组查询最新的满足条件的仓房或者货位)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qualitycheck", value = "质量管理对象", paramType = "query")
+    })
+    public List<BusinessAgentQuality> getHouseIdList(BusinessAgentQuality qualitycheck) {
+        List<BusinessAgentQuality> list = agentQualityService.getHouseOrWareList(qualitycheck);
+        return list;
+    }
+    
+    /**
+     * 获取第三方检验的质量标准字符串(手动拼写)
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/getQualityStandardStr",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="获取第三方检验的质量标准字符串(手动拼写)", notes = "获取第三方检验的质量标准字符串(手动拼写)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "form"),
+    })
+    public Map<String, Object> getQualityStandardStr(Integer id) {
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        if (id == null) {
+            modelMap.put("status", "error");
+            modelMap.put("msg", "id为空，查询质量标准失败！");
+        } else {
+            String qualityStandardStr = agentQualityService.getQualityStandardStr(id);
+            modelMap.put("status", "success");
+            modelMap.put("qualityStandard", qualityStandardStr);
+        }
+
+        return modelMap;
+    }
+    
+    
+
+    /**
+     * 新增和修改的数据进行保存
+     * @param qualitycheckJson
+     * @return
+     */
+    @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="新增/修改数据", notes = "新增/修改数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qualitycheckJson", value = "质量基础信息JSON数据对象", paramType = "form"),
+            @ApiImplicitParam(name = "qualityOneJson", value = "质量检测信息JSON数据对象", paramType = "form")
+    })
+    public Map<String, Object> save(String qualitycheckJson,String qualityOneJson) {
+        Map<String, Object> modelMap = new HashMap<>();
+        // JSON字符串转对象
+        ObjectMapper mapper = new ObjectMapper();
+        BusinessAgentQuality qualitycheck = null;
+        List<BusinessAgentQualitySon> qualitycheckone = null;
+        try {
+            qualitycheck = (BusinessAgentQuality)mapper.readValue(qualitycheckJson, BusinessAgentQuality.class);
+            //默认0:未封仓   1:已封仓
+            qualitycheck.setSealStatus("0");
+            qualitycheck.setHistoryStatus(0);//0:最新数据   1:历史数据
+            Integer qualityCheckId = agentQualityService.save(qualitycheck);
+            //关联保存日常检查和第三方检测的检测信息 如果为空则是对初检 验收等操作
+            if(StringUtils.isNoneBlank(qualityOneJson)){
+                qualitycheckone = mapper.readValue(qualityOneJson,  new TypeReference<List<BusinessAgentQualitySon>>(){});
+                for (int i = 0; i < qualitycheckone.size(); i++) {
+                    qualitycheckone.get(i).setQualitycheckId(qualityCheckId);
+                    agentQualityService.saveOne(qualitycheckone.get(i));
+                }
+            }
+            modelMap.put("status", "success");
+        } catch (IOException e) {
+            modelMap.put("status", "error");
+            e.printStackTrace();
+        }
+        return modelMap;
+    }
+
+    /**
+     * 根据id加载对应数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/loadDataById" ,produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据id加载质量检查数据", notes = "根据id加载质量检查数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query"),
+    })
+    public BusinessAgentQuality loadDataById(Integer id){
+        BusinessAgentQuality qualitycheck=agentQualityService.loadDataById(id);
+        return qualitycheck;
+    }
+
+    /**
+     * 根据主键id移除数据
+     * @param id
+     * @return
+     */
+    @RequestMapping(value="/remove", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="按ID删除质量检查信息", notes = "按ID删除质量检查信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "数据ID", paramType = "form")
+    })
+    public Map<String, Object> remove(Integer id){
+        Map<String,Object> retMap = new HashMap<String,Object>();
+        agentQualityService.remove(id);
+
+        //删除管理的数据
+        BusinessAgentQualitySonExample qualitycheckSonExample = new BusinessAgentQualitySonExample();
+        BusinessAgentQualitySonExample.Criteria criteria = qualitycheckSonExample.createCriteria();
+        if(id != null){
+            criteria.andQualitycheckIdEqualTo(id);
+        }
+        agentQualitySonService.removeSon(qualitycheckSonExample);
+        retMap.put("msg","success");
+        return retMap;
+    }
+
+    /**
+     * 封仓管理中查询出所有仓已经封仓或者未封仓的质量管理信息
+     * @param houseId
+     * @param warehouseId
+     * @return
+     */
+    @RequestMapping(value="/getFoodsealList",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 = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query")
+    })
+    public PageInfo<BusinessAgentQuality> listPage(Integer pageNum, Integer pageSize ,
+                                                  String houseId, String warehouseId) {
+    	BusinessAgentQuality qualityCheck = new BusinessAgentQuality();
+        if(StringUtils.isNoneBlank(houseId)){
+            qualityCheck.setStorehouseId(Integer.valueOf(houseId));
+
+        }
+        if(StringUtils.isNoneBlank(warehouseId)){
+            qualityCheck.setWarehouseId(Integer.valueOf(warehouseId));
+        }
+        qualityCheck.setType("1");///查找验收质量管理的信息
+
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+
+        List<BusinessAgentQuality> list = agentQualityService.queryByQualitycheck(qualityCheck);
+
+        PageInfo<BusinessAgentQuality> pageInfo = new PageInfo<BusinessAgentQuality>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 根据仓号,货位号以及类型查找对应质量检查信息
+     * @param houseId warehouseId
+     * @return
+     */
+    @RequestMapping(value = "/findByStoreWarehouse", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据仓号,货位号以及类型查找对应质量检查信息", notes = "根据仓号,货位号以及类型查找对应质量检查信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "检查类型", paramType = "query"),
+            @ApiImplicitParam(name = "sealStatus", value = "封仓类型", paramType = "query")
+    })
+    public BusinessAgentQuality findByStoreWarehouse(Integer houseId, Integer warehouseId, String type,String sealStatus) {
+    	BusinessAgentQuality qualityCheckExample = new BusinessAgentQuality();
+        BusinessAgentQuality qualitycheck = null;
+        try {
+            if (houseId != null && !"".equals(houseId)) {
+                qualityCheckExample.setStorehouseId(houseId);
+
+            }
+            if(warehouseId != null && !"".equals(warehouseId)){
+                qualityCheckExample.setWarehouseId(warehouseId);
+            }
+            if(StringUtils.isNotBlank(type)){
+                qualityCheckExample.setType(type);//传入查找的质量类型
+            }
+
+            if(StringUtils.isNotBlank(sealStatus)){
+                qualityCheckExample.setSealStatus(sealStatus);//传入查找的质量类型
+            }
+            //0:最新数据  1:历史数据
+            qualityCheckExample.setHistoryStatus(0);
+            List<BusinessAgentQuality> list = agentQualityService.queryByQualitycheck(qualityCheckExample);
+            if (null != list && list.size() > 0) {
+            	qualitycheck = list.get(0);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return qualitycheck;
+    }
+
+
+    /**
+     * 查询第三方检查
+     * @param  foodbasicinfoId
+     * @return getThirdCheckList
+     */
+    @RequestMapping(value="/getThirdCheckList",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 = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+            @ApiImplicitParam(name = "foodbasicinfoId", value = "对应粮情专卡Id", paramType = "query"),
+
+    })
+    public PageInfo<BusinessAgentQuality> getThirdCheckList(Integer pageNum, Integer pageSize , Integer houseId, Integer warehouseId,
+                                                           Integer foodbasicinfoId) {
+        BusinessAgentQuality qualityCheck = new BusinessAgentQuality();
+
+        if(foodbasicinfoId != null){
+            qualityCheck.setId(foodbasicinfoId);
+        }
+        if(houseId != null){
+            qualityCheck.setStorehouseId(houseId);
+        }
+        if(warehouseId != null){
+            qualityCheck.setWarehouseId(warehouseId);
+        }
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+
+        List<BusinessAgentQuality> list = agentQualityService.getThirdCheckList(qualityCheck);
+
+        PageInfo<BusinessAgentQuality> pageInfo = new PageInfo<BusinessAgentQuality>(list);
+        return pageInfo;
+    }
+
+
+    /**
+     * 获取第三方检查的不宜存的可用数据
+     * @return
+     */
+    @RequestMapping(value = "/getStoreQualityList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET )
+    @ApiOperation(value="获取第三方检查的不宜存的可用数据", notes = "获取第三方检查的不宜存的可用数据")
+    public List<Map<String,Object>> getStoreQualityList(){
+        List<Map<String,Object>> listQuality=agentQualityService.getStoreQualityList();
+        return listQuality;
+    }
+
+    /**
+     * 获取第三方检查的不宜存的可用数据
+     * @return
+     */
+    @RequestMapping(value = "/getTrdStoreQualityList",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET )
+    @ApiOperation(value="获取第三方检查的不宜存的可用数据(集合格式)", notes = "获取第三方检查的不宜存的可用数据(集合格式)")
+    public List<BusinessAgentQuality> getTrdStoreQualityList(){
+        List<BusinessAgentQuality> listQuality=agentQualityService.getTrdStoreQualityList();
+        
+        return listQuality;
+    }
+    
+    @RequestMapping(value = "/setQualityCheckByHistoryStatus", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value = "根据仓房和货位名称更新当前质量管理为历史记录", notes = "根据仓房和货位名称更新当前质量管理为历史记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "houseId", value = "仓房id", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseId", value = "货位Id", paramType = "query"),
+    })
+    public Map<String, Object> setQualityCheckByHistoryStatus(Integer houseId, Integer warehouseId) {
+        Map<String, Object> modelMap = new HashMap<>();
+        if (ParameterUtil.isnotnull(houseId) &&ParameterUtil.isnotnull(warehouseId) ) {
+            agentQualityService.setQualityCheckByHistoryStatus(houseId,warehouseId);
+        }
+        modelMap.put("status", "success");
+        return modelMap;
+    }
+
+    /**
+     * 根据id查询质检信息
+     * @param ZZid
+     * @return
+     */
+    @RequestMapping(value="/getDataByZJId", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+    @ApiOperation(value = "根据id查询质检信息", notes = "根据id查询质检信息,计划验收模块用到。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ZZid", value = "质检id", paramType = "query")
+    })
+    public Map<String,Object> getDataByZJId(Integer ZZid) {
+        Map<String,Object> map = new HashMap<String, Object>();
+        Map<String,Object> paramMap = new HashMap<String, Object>();
+        paramMap.put("id", ZZid);
+        List<BusinessAgentQuality> list = agentQualityService.getDataByZJId(paramMap);
+        map.put("qualitycheck", list);
+        return map;
+    }
+    
+    
+    
+    /**
+     * 根据仓房和货位获取第三方检查的数据
+     * 分页获取
+     */
+    @RequestMapping(value = "/getListByhouseId",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 = "houseIds", value = "仓房id(数组)", paramType = "query"),
+            @ApiImplicitParam(name = "warehouseIds", value = "货位id(数组)", paramType = "query")
+    })
+    public PageInfo<BusinessAgentQuality> getListByhouseId(Integer pageNum, Integer pageSize,
+            Integer[] houseIds, Integer[] warehouseIds , String checktype) {
+    	BusinessAgentQuality qualityCheck = new BusinessAgentQuality();
+    	List<List<BusinessAgentQuality>> list = new ArrayList<List<BusinessAgentQuality>>();
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checktype)){
+            qualityCheck.setType(checktype);
+        }
+        
+        qualityCheck.setHistoryStatus(0);//0:最新数据  1:历史数据
+        //查询出未封仓的质量管理信息 封仓状态：0:未封仓,1:已封仓
+        qualityCheck.setSealStatus("0");
+        
+        List<BusinessAgentQuality> qualityCheckList =null;
+        for (int i = 0; i < houseIds.length; i++) {
+        	for (int j = 0; j < warehouseIds.length; j++) {
+            	if(i==j){
+            		Integer houseId = houseIds[i];
+            		Integer warehouseId = warehouseIds[j];
+            		 	//仓房id.
+            	        if (qualityCheck.getStorehouseId() == null) {
+            	            qualityCheck.setStorehouseId(houseId);
+
+            	        }
+            	        // 货位id.
+            	        if (qualityCheck.getWarehouseId() == null) {
+            	            qualityCheck.setWarehouseId(warehouseId);
+            	        }
+            	        if (pageNum!=null && pageSize!=null) {
+            	            PageHelper.startPage(pageNum, pageSize);
+            	        }
+            	        
+            	        qualityCheckList = agentQualityService.queryByQualitycheck(qualityCheck);
+            	}
+    		}
+		}
+        
+       
+       
+        PageInfo<BusinessAgentQuality> pageInfo = new PageInfo<BusinessAgentQuality>(qualityCheckList);
+        return pageInfo;
+    }
+
+    @RequestMapping(value = "/getNewList",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 = "houseId", value = "仓房ID", paramType = "query"),
+            @ApiImplicitParam(name = "wareId", value = "货位ID", paramType = "query"),
+            @ApiImplicitParam(name = "checktype", value = "检查的类型", paramType = "query"),
+            @ApiImplicitParam(name = "checkResult", value = "检查结果", paramType = "query"),
+            @ApiImplicitParam(name = "historyStatus", value = "数据状态", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+    })
+    public PageInfo<BusinessAgentQuality> newListPage(Integer pageNum, Integer pageSize, Integer houseId, Integer wareId,
+                                                  String checkType, String checkResult, Integer historyStatus, Integer orgId) {
+    	BusinessAgentQualityExample example = new BusinessAgentQualityExample();
+    	BusinessAgentQualityExample.Criteria criteria = example.createCriteria();
+
+        //根据后台传来的参数进行查找相应类型的类别0:初检 1：验收 2：质量普查 3：出库
+        if (StringUtils.isNotBlank(checkType)){
+        	criteria.andTypeEqualTo(checkType);
+        }
+        // 仓房id.
+        if (houseId != null) {
+        	criteria.andStorehouseIdEqualTo(houseId);
+        }
+        // 货位id.
+        if (wareId != null) {
+        	criteria.andWarehouseIdEqualTo(wareId);
+        }
+        // 粮库id.
+        if (orgId != null) {
+        	criteria.andOrgIdEqualTo(orgId);
+        }
+
+        //检验结果（0：合格 , 1 :不合格）
+        if (StringUtils.isNotBlank(checkResult)) {
+        	criteria.andCheckResultEqualTo(checkResult);
+        }
+        //数据状态
+        if (null != historyStatus) {
+        	//0:最新数据  1:历史数据
+        	criteria.andHistoryStatusEqualTo(historyStatus);
+        }
+
+        if (pageNum!=null && pageSize!=null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        List<BusinessAgentQuality> list = agentQualityService.findByCondition(example);
+
+        PageInfo<BusinessAgentQuality> pageInfo = new PageInfo<BusinessAgentQuality>(list);
+        return pageInfo;
+    }
+
+    /**
+     * 导入excel
+     * @param file 文件
+     * @param fileType 类型：如xlsx
+     * @param orgId 组织机构id
+     * @return
+     */
+    @RequestMapping(value="/importFile", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value="导入excel", notes = "导入excel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "文件数据", paramType = "query"),
+            @ApiImplicitParam(name = "fileType", value = "文件名", paramType = "query"),
+            @ApiImplicitParam(name = "rootPath", value = "路径", paramType = "query"),
+            @ApiImplicitParam(name = "orgId", value = "组织机构id", paramType = "query"),
+            @ApiImplicitParam(name = "checktype", value = "导入类型", paramType = "query")
+    })
+    public Map<String, Object> importFile(MultipartFile file, String fileType, HttpServletRequest request, Integer orgId,String checktype){
+        Map<String, Object> fileMap = new HashMap<>();
+        String errormsg = null;
+
+        //0:初检    4：日常检验    5：第三方检查    3：出库检验
+        if(ParameterUtil.isequal(checktype,"0") || ParameterUtil.isequal(checktype,"4") || ParameterUtil.isequal(checktype,"5") || ParameterUtil.isequal(checktype,"3")){
+            String[] titleArr = {"仓房名称","货位名称","粮油品种","明细品种","粮油性质","数量","入仓日期","收获年度","产地","保管员",
+                    "扦样日期","扦样人","检验日期","报告出具日期","检验结论","检验机构","储存品质","水分%","容量（g/L）","杂质%",
+                    "矿物质%","不完善颗粒%","生霉粒%","完整粒率%","损伤粒率%","热损伤粒%","出糙率%","整精米率%","黄粒米%","谷外糙米%",
+                    "互混率%","色泽气味","等级","是否虫粮","备注"};//第一行的title
+            boolean[] emptyArr = {false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false};//指定列可为空，不可为空值为false.
+
+            List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+            try {
+                errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+                if (errormsg != null && !"".equals(errormsg)) {
+                    fileMap.put("errormsg",errormsg);
+                    return fileMap;
+                }
+
+                //查询代储点名称和代储库名称对应的id
+                Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+                if(ParameterUtil.isnull(agentMap)){
+                    fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                    return fileMap;
+                }
+
+                if (list.size()>0) {
+                    errormsg = agentQualityService.importData(list, orgId, agentMap, checktype);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if(ParameterUtil.isequal(checktype,"1")){//1：验收
+            String[] titleArr = {"仓房名称","货位名称","粮油品种","明细品种","粮油性质","数量","入仓日期","收获年度","产地","保管员",
+                    "申请验收日期","扦样日期","扦样人","检验日期","报告出具日期","检验结论","检验机构","储存品质","水分%","容量（g/L）",
+                    "杂质%","矿物质%","不完善颗粒%","生霉粒%","完整粒率%","损伤粒率%","热损伤粒%","出糙率%","整精米率%","黄粒米%",
+                    "谷外糙米%","互混率%","色泽气味","等级","是否虫粮","备注"};//第一行的title
+            boolean[] emptyArr = {false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false};//指定列可为空，不可为空值为false.
+
+            List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+            try {
+                errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+                if (errormsg != null && !"".equals(errormsg)) {
+                    fileMap.put("errormsg",errormsg);
+                    return fileMap;
+                }
+
+                //查询代储点名称和代储库名称对应的id
+                Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+                if(ParameterUtil.isnull(agentMap)){
+                    fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                    return fileMap;
+                }
+
+                if (list.size()>0) {
+                    errormsg = agentQualityService.importDataCQ(list, orgId, agentMap, checktype);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }else if(ParameterUtil.isequal(checktype,"2")){//2：春秋普查
+            String[] titleArr = {"仓房名称","货位名称","粮油品种","明细品种","粮油性质","数量","入仓日期","收获年度","产地","保管员",
+                    "普查类型","扦样日期","扦样人","检验日期","报告出具日期","检验结论","检验机构","储存品质","水分%","容量（g/L）","杂质%",
+                    "矿物质%","不完善颗粒%","生霉粒%","完整粒率%","损伤粒率%","热损伤粒%","出糙率%","整精米率%","黄粒米%","谷外糙米%",
+                    "互混率%","色泽气味","等级","是否虫粮","备注"};//第一行的title
+            boolean[] emptyArr = {false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false, false, false, false, false,
+                    false, false, false, false, false, false};//指定列可为空，不可为空值为false.
+
+            List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
+            try {
+                errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list,1);
+
+                if (errormsg != null && !"".equals(errormsg)) {
+                    fileMap.put("errormsg",errormsg);
+                    return fileMap;
+                }
+
+                //查询代储点名称和代储库名称对应的id
+                Map<String, Object> agentMap = agentService.getNameId(importService.nameData(file, fileType, request));
+                if(ParameterUtil.isnull(agentMap)){
+                    fileMap.put("errormsg","代储点与代储库无关联，请查询后添加！");
+                    return fileMap;
+                }
+
+                if (list.size()>0) {
+                    errormsg = agentQualityService.importDataCQ(list, orgId, agentMap, checktype);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        fileMap.put("errormsg",errormsg);
+        return fileMap;
+    }
+}

src/main/java/com/chinaitop/depot/agent/quality/controller/AgentQualitySonController.java

@@ -0,0 +1,80 @@
+package com.chinaitop.depot.agent.quality.controller;
+
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample;
+import com.chinaitop.depot.agent.quality.service.AgentQualitySonService;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author sunhongbing
+ * @Date 2017/12/23
+ */
+@RestController
+@RequestMapping(value = {"/agentQualitySon"})
+@Api(value= "AgentQualitySonController", description = "质量管理中检测信息控制类")
+public class AgentQualitySonController {
+    @Resource
+    private AgentQualitySonService agentQualitySonService;
+
+    /**
+     * 接收主表的id关联着子表的ktId
+     * @param qcSonId
+     * @return
+     */
+    @RequestMapping(value = "/findQualitycheckSonBySonId",produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value="根据质量检查id查询出关联的子表信息(包含检测信息)", notes = "根据质量检查id查询出关联的子表信息(包含检测信息)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qcSonId", value = "qcSonId", paramType = "query"),
+    })
+    public List<BusinessAgentQualitySon> findKtDetailsByKtId(Integer qcSonId){
+        BusinessAgentQualitySonExample storageQualitycheckSonExample = new BusinessAgentQualitySonExample();
+        BusinessAgentQualitySonExample.Criteria criteria = storageQualitycheckSonExample.createCriteria();
+        if(qcSonId != null){
+            criteria.andQualitycheckIdEqualTo(qcSonId);
+        }
+        return  agentQualitySonService.findQualitycheckSonExample(storageQualitycheckSonExample);
+    }
+
+    /**
+     * 删除一条检测信息
+     * @param sonId 数据ID
+     * @return
+     */
+    @RequestMapping(value = "/removeSon", produces = MediaType.APPLICATION_JSON_VALUE,method = RequestMethod.POST)
+    @ApiOperation(value="根据子表id质量检查的子表信息", notes = "根据子表id质量检查的子表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "sonId", value = "sonId", paramType = "form"),
+    })
+    public Map<String, Object> removeSon(Integer sonId) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        //删除管理的数据
+        BusinessAgentQualitySonExample qualitycheckSonExample = new BusinessAgentQualitySonExample();
+        BusinessAgentQualitySonExample.Criteria criteria = qualitycheckSonExample.createCriteria();
+        if(sonId != null){
+            criteria.andIdEqualTo(sonId);
+        }
+        try {
+            agentQualitySonService.removeSon(qualitycheckSonExample);
+            map.put("status", "success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "error");
+            map.put("msg", "删除失败！");
+        }
+        return map;
+    }
+
+}

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualityMapper.java

@@ -0,0 +1,57 @@
+package com.chinaitop.depot.agent.quality.mapper;
+
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQuality;
+import com.chinaitop.depot.agent.quality.model.BusinessAgentQualityExample;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface BusinessAgentQualityMapper {
+    int countByExample(BusinessAgentQualityExample example);
+
+    int deleteByExample(BusinessAgentQualityExample example);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BusinessAgentQuality record);
+
+    int insertSelective(BusinessAgentQuality record);
+
+    List<BusinessAgentQuality> selectByExample(BusinessAgentQualityExample example);
+
+    BusinessAgentQuality selectByPrimaryKey(Integer id);
+
+    int updateByExampleSelective(@Param("record") BusinessAgentQuality record, @Param("example") BusinessAgentQualityExample example);
+
+    int updateByExample(@Param("record") BusinessAgentQuality record, @Param("example") BusinessAgentQualityExample example);
+
+    int updateByPrimaryKeySelective(BusinessAgentQuality record);
+
+    int updateByPrimaryKey(BusinessAgentQuality record);
+
+    /**
+     * @param qualitycheck
+     * @return
+     */
+    List<BusinessAgentQuality> getHouseIdList(BusinessAgentQuality qualitycheck);
+
+    /**
+     * @param qualitycheck
+     * @return
+     */
+    List<BusinessAgentQuality> getWareHouseIdList(
+            BusinessAgentQuality qualitycheck);
+    List<BusinessAgentQuality> getThirdCheckList(BusinessAgentQuality qualitycheck);
+    List<BusinessAgentQuality> getQualitycheckListByFoodbasicinfoCheck(BusinessAgentQuality qualitycheck);
+    BusinessAgentQuality queryPrimaryKey(Integer id);
+    List<BusinessAgentQuality> queryByExample(BusinessAgentQuality example);
+    List<Map<String,Object>> getStoreQualityList();
+
+    List<BusinessAgentQuality> getTrdStoreQualityList();
+    List<BusinessAgentQuality> getDataByZJId(Map<String, Object> paramMap);
+
+    List<BusinessAgentQuality> queryByExampleData(BusinessAgentQuality example);
+
+    List<BusinessAgentQuality> queryByQualitycheckusiness(BusinessAgentQuality qualityCheckExample);
+}

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualitySonMapper.java

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

src/main/java/com/chinaitop/depot/agent/quality/mapper/BusinessAgentQualitySonMapper.xml

@@ -0,0 +1,225 @@
+<?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.agent.quality.mapper.BusinessAgentQualitySonMapper" >
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="qualitycheck_id" property="qualitycheckId" jdbcType="INTEGER" />
+    <result column="numbering" property="numbering" jdbcType="INTEGER" />
+    <result column="set_value" property="setValue" jdbcType="VARCHAR" />
+    <result column="updatetime" property="updatetime" 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, qualitycheck_id, numbering, set_value, updatetime
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample" >
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from business_agent_quality_son
+    <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_agent_quality_son
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from business_agent_quality_son
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample" >
+    delete from business_agent_quality_son
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon" >
+    <selectKey keyProperty="id" resultType="java.lang.Integer" order="BEFORE">
+      select seq_business_agent_quality_son.nextVal from dual
+    </selectKey>
+    insert into business_agent_quality_son (id, qualitycheck_id, numbering, 
+      set_value, updatetime)
+    values (#{id,jdbcType=INTEGER}, #{qualitycheckId,jdbcType=INTEGER}, #{numbering,jdbcType=INTEGER},
+      #{setValue,jdbcType=VARCHAR}, #{updatetime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon" >
+    insert into business_agent_quality_son
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="qualitycheckId != null" >
+        qualitycheck_id,
+      </if>
+      <if test="numbering != null" >
+        numbering,
+      </if>
+      <if test="setValue != null" >
+        set_value,
+      </if>
+      <if test="updatetime != null" >
+        updatetime,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="qualitycheckId != null" >
+        #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="numbering != null" >
+        #{numbering,jdbcType=INTEGER},
+      </if>
+      <if test="setValue != null" >
+        #{setValue,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample" resultType="java.lang.Integer" >
+    select count(*) from business_agent_quality_son
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    update business_agent_quality_son
+    <set >
+      <if test="record.id != null" >
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.qualitycheckId != null" >
+        qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="record.numbering != null" >
+        numbering = #{record.numbering,jdbcType=INTEGER},
+      </if>
+      <if test="record.setValue != null" >
+        set_value = #{record.setValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updatetime != null" >
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    update business_agent_quality_son
+    set id = #{record.id,jdbcType=INTEGER},
+      qualitycheck_id = #{record.qualitycheckId,jdbcType=INTEGER},
+      numbering = #{record.numbering,jdbcType=INTEGER},
+      set_value = #{record.setValue,jdbcType=VARCHAR},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon" >
+    update business_agent_quality_son
+    <set >
+      <if test="qualitycheckId != null" >
+        qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      </if>
+      <if test="numbering != null" >
+        numbering = #{numbering,jdbcType=INTEGER},
+      </if>
+      <if test="setValue != null" >
+        set_value = #{setValue,jdbcType=VARCHAR},
+      </if>
+      <if test="updatetime != null" >
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon" >
+    update business_agent_quality_son
+    set qualitycheck_id = #{qualitycheckId,jdbcType=INTEGER},
+      numbering = #{numbering,jdbcType=INTEGER},
+      set_value = #{setValue,jdbcType=VARCHAR},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+  <select id="getQualitycheckSonByFoodbasicinfoCheck" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM storage_qualitycheck_son sqk
+    WHERE sqk.qualitycheck_id in (
+    SELECT qualitycheck_id
+    FROM storage_foodbasicinfochecks fcs
+    WHERE fcs.foodbasicinfo_id =#{id}
+    )
+  </select>
+</mapper>

src/main/java/com/chinaitop/depot/agent/quality/model/BusinessAgentQualitySon.java

@@ -0,0 +1,55 @@
+package com.chinaitop.depot.agent.quality.model;
+
+import java.util.Date;
+
+public class BusinessAgentQualitySon {
+    private Integer id;
+
+    private Integer qualitycheckId;
+
+    private Integer numbering;
+
+    private String setValue;
+
+    private Date updatetime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getQualitycheckId() {
+        return qualitycheckId;
+    }
+
+    public void setQualitycheckId(Integer qualitycheckId) {
+        this.qualitycheckId = qualitycheckId;
+    }
+
+    public Integer getNumbering() {
+        return numbering;
+    }
+
+    public void setNumbering(Integer numbering) {
+        this.numbering = numbering;
+    }
+
+    public String getSetValue() {
+        return setValue;
+    }
+
+    public void setSetValue(String setValue) {
+        this.setValue = setValue == null ? null : setValue.trim();
+    }
+
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+}

src/main/java/com/chinaitop/depot/agent/quality/model/BusinessAgentQualitySonExample.java

@@ -0,0 +1,511 @@
+package com.chinaitop.depot.agent.quality.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BusinessAgentQualitySonExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public BusinessAgentQualitySonExample() {
+        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;
+    }
+
+    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 andQualitycheckIdIsNull() {
+            addCriterion("qualitycheck_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIsNotNull() {
+            addCriterion("qualitycheck_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdEqualTo(Integer value) {
+            addCriterion("qualitycheck_id =", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <>", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThan(Integer value) {
+            addCriterion("qualitycheck_id >", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id >=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThan(Integer value) {
+            addCriterion("qualitycheck_id <", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdLessThanOrEqualTo(Integer value) {
+            addCriterion("qualitycheck_id <=", value, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdIn(List<Integer> values) {
+            addCriterion("qualitycheck_id in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotIn(List<Integer> values) {
+            addCriterion("qualitycheck_id not in", values, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andQualitycheckIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("qualitycheck_id not between", value1, value2, "qualitycheckId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIsNull() {
+            addCriterion("numbering is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIsNotNull() {
+            addCriterion("numbering is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingEqualTo(Integer value) {
+            addCriterion("numbering =", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotEqualTo(Integer value) {
+            addCriterion("numbering <>", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingGreaterThan(Integer value) {
+            addCriterion("numbering >", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingGreaterThanOrEqualTo(Integer value) {
+            addCriterion("numbering >=", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingLessThan(Integer value) {
+            addCriterion("numbering <", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingLessThanOrEqualTo(Integer value) {
+            addCriterion("numbering <=", value, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingIn(List<Integer> values) {
+            addCriterion("numbering in", values, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotIn(List<Integer> values) {
+            addCriterion("numbering not in", values, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingBetween(Integer value1, Integer value2) {
+            addCriterion("numbering between", value1, value2, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumberingNotBetween(Integer value1, Integer value2) {
+            addCriterion("numbering not between", value1, value2, "numbering");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIsNull() {
+            addCriterion("set_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIsNotNull() {
+            addCriterion("set_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueEqualTo(String value) {
+            addCriterion("set_value =", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotEqualTo(String value) {
+            addCriterion("set_value <>", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueGreaterThan(String value) {
+            addCriterion("set_value >", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueGreaterThanOrEqualTo(String value) {
+            addCriterion("set_value >=", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLessThan(String value) {
+            addCriterion("set_value <", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLessThanOrEqualTo(String value) {
+            addCriterion("set_value <=", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueLike(String value) {
+            addCriterion("set_value like", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotLike(String value) {
+            addCriterion("set_value not like", value, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueIn(List<String> values) {
+            addCriterion("set_value in", values, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotIn(List<String> values) {
+            addCriterion("set_value not in", values, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueBetween(String value1, String value2) {
+            addCriterion("set_value between", value1, value2, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andSetValueNotBetween(String value1, String value2) {
+            addCriterion("set_value not between", value1, value2, "setValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNull() {
+            addCriterion("updatetime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIsNotNull() {
+            addCriterion("updatetime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeEqualTo(Date value) {
+            addCriterion("updatetime =", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotEqualTo(Date value) {
+            addCriterion("updatetime <>", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThan(Date value) {
+            addCriterion("updatetime >", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("updatetime >=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThan(Date value) {
+            addCriterion("updatetime <", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeLessThanOrEqualTo(Date value) {
+            addCriterion("updatetime <=", value, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeIn(List<Date> values) {
+            addCriterion("updatetime in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotIn(List<Date> values) {
+            addCriterion("updatetime not in", values, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeBetween(Date value1, Date value2) {
+            addCriterion("updatetime between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatetimeNotBetween(Date value1, Date value2) {
+            addCriterion("updatetime not between", value1, value2, "updatetime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    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);
+        }
+    }
+}