根据天津最新bug修改

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

@@ -1,649 +0,0 @@
-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

@@ -1,80 +0,0 @@
-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

@@ -1,57 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,225 +0,0 @@
-<?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

@@ -1,55 +0,0 @@
-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

@@ -1,511 +0,0 @@
-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);
-        }
-    }
-}

src/main/java/com/chinaitop/depot/agent/quality/service/AgentQualityService.java

@@ -1,121 +0,0 @@
-package com.chinaitop.depot.agent.quality.service;
-
-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 java.util.List;
-import java.util.Map;
-
-public interface AgentQualityService {
-
-	/**
-	 * 按条件查询qualitycheck列表
-	 *
-	 * @param example
-	 * @return
-	 */
-	List<BusinessAgentQuality> findByCondition(BusinessAgentQualityExample example);
-
-	/**
-	 * 条件查询qualitycheck列表
-	 *
-	 * @param example
-	 * @return
-	 */
-	List<BusinessAgentQuality> queryByQualitycheck(BusinessAgentQuality example);
-
-	/**
-	 * 新增qualitycheck信息
-	 *
-	 * @param qualitycheck
-	 */
-	Integer save(BusinessAgentQuality qualitycheck);
-
-	/**
-	 * 新增qualitycheck字表信息
-	 *
-	 * @param qualitycheckone
-	 */
-	void saveOne(BusinessAgentQualitySon qualitycheckone);
-
-	/**
-	 * 根据id查询数据
-	 *
-	 * @param id
-	 * @return
-	 */
-	BusinessAgentQuality loadDataById(Integer id);
-
-	/**
-	 * 根据主键id删除数据
-	 *
-	 * @param id
-	 */
-	void remove(int id);
-
-    /**
-     * @param qualitycheck
-     * @return
-     */
-    List<BusinessAgentQuality> getHouseOrWareList(
-            BusinessAgentQuality qualitycheck);
-
-    /**
-     * @param id
-     * @return
-     */
-    String getQualityStandardStr(Integer id);
-
-	/**
-	 * 查询第三方检查列表
-	 * @param qualitycheck
-	 * @return
-	 */
-	List<BusinessAgentQuality> getThirdCheckList(BusinessAgentQuality qualitycheck);
-	/**
-	 * 查询粮情专卡中粮食质量检测记录
-	 * @param qualitycheck
-	 * @return
-	 */
-	List<BusinessAgentQuality> getQualitycheckListByFoodbasicinfoCheck(BusinessAgentQuality qualitycheck);
-
-	void setQualityCheckByHistoryStatus (Integer houseId, Integer warehouseId);
-	List<Map<String,Object>> getStoreQualityList();
-	List<BusinessAgentQuality> getTrdStoreQualityList();
-
-	List<BusinessAgentQuality> getDataByZJId(Map<String, Object> paramMap);
-
-
-	/**
-	 * 取出封仓需要的数据
-	 * @param qualityCheckExample
-	 * @return
-	 */
-	List<BusinessAgentQuality> queryByQualitycheckData(BusinessAgentQuality qualityCheckExample);
-
-	/**
-	 * 查看business_store_ware_detail中是否有数据
-	 * @param qualityCheckExample
-	 * @return
-	 */
-	List<BusinessAgentQuality> queryByQualitycheckusiness(BusinessAgentQuality qualityCheckExample);
-
-	/**
-	 * 导入
-	 *
-	 * @param list
-	 * @param orgId
-	 * @return
-	 */
-	String importData(List<List<String>> list, Integer orgId, Map<String, Object> agentMap, String checktype);
-
-	/**
-	 * 春秋导入
-	 *
-	 * @param list
-	 * @param orgId
-	 * @return
-	 */
-	String importDataCQ(List<List<String>> list, Integer orgId, Map<String, Object> agentMap, String checktype);
-}

src/main/java/com/chinaitop/depot/agent/quality/service/AgentQualitySonService.java

@@ -1,26 +0,0 @@
-package com.chinaitop.depot.agent.quality.service;
-
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySon;
-import com.chinaitop.depot.agent.quality.model.BusinessAgentQualitySonExample;
-
-import java.util.List;
-
-/**
- * @author sunhongbing
- * @Date 2017/12/23
- */
-public interface AgentQualitySonService {
-    List<BusinessAgentQualitySon> findQualitycheckSonExample(BusinessAgentQualitySonExample storageQualitycheckSonExample);
-    /**
-     * 根据qualitycheckId删除数据
-     * @param
-     */
-    public void removeSon(BusinessAgentQualitySonExample storageQualitycheckSonExample);
-
-    /**
-     * 获取qualitycheck 对应的数据
-     * @param foodbasicinfoId
-     * @return
-     */
-    List<BusinessAgentQualitySon> getQualitycheckSonByFoodbasicinfoCheck(Integer foodbasicinfoId);
-}

src/main/java/com/chinaitop/depot/agent/quality/service/impl/AgentQualitySonServiceImpl.java

@@ -1,34 +0,0 @@
-package com.chinaitop.depot.agent.quality.service.impl;
-
-import com.chinaitop.depot.agent.quality.mapper.BusinessAgentQualitySonMapper;
-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 org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author sunhongbing
- * @Date 2017/12/23
- */
-@Service
-public class AgentQualitySonServiceImpl implements AgentQualitySonService {
-    @Resource
-    private BusinessAgentQualitySonMapper QualitySonMapper;
-    @Override
-    public List<BusinessAgentQualitySon> findQualitycheckSonExample(BusinessAgentQualitySonExample storageQualitycheckSonExample) {
-        return QualitySonMapper.selectByExample(storageQualitycheckSonExample);
-    }
-
-    @Override
-    public void removeSon(BusinessAgentQualitySonExample storageQualitycheckSonExample) {
-        QualitySonMapper.deleteByExample(storageQualitycheckSonExample);
-    }
-
-    @Override
-    public List<BusinessAgentQualitySon> getQualitycheckSonByFoodbasicinfoCheck(Integer foodbasicinfoId) {
-        return QualitySonMapper.getQualitycheckSonByFoodbasicinfoCheck(foodbasicinfoId);
-    }
-}