Explorar el Código

设为代储油罐问题修改

lvzhikai hace 5 años
padre
commit
a6466f1d29

+ 122 - 60
src/main/java/com/chinaitop/depot/agent/basic/controller/AgentDepotController.java

@@ -5,6 +5,7 @@ import com.chinaitop.depot.agent.basic.model.*;
5 5
 import com.chinaitop.depot.agent.basic.service.agentDepotService;
6 6
 import com.chinaitop.depot.agent.basic.service.agentStoreWareService;
7 7
 import com.chinaitop.depot.agent.basic.service.agentStorehouseService;
8
+import com.chinaitop.depot.agent.basic.service.agentTankExistService;
8 9
 import com.chinaitop.depot.utils.ImportServiceImpl;
9 10
 import com.chinaitop.utils.ParameterUtil;
10 11
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -36,6 +37,9 @@ public class AgentDepotController {
36 37
     private agentStorehouseService agentStorehouseService;
37 38
 
38 39
     @Resource
40
+    private agentTankExistService agentTankExistService;
41
+
42
+    @Resource
39 43
     private agentStoreWareService agentStoreWareService;
40 44
 
41 45
     @Resource
@@ -196,18 +200,18 @@ public class AgentDepotController {
196 200
     }
197 201
 
198 202
     /**
199
-     * 查找所有粮库
203
+     * 查找仓房所有粮库
200 204
      * @param orgName 组织机构名称
201 205
      * @return
202 206
      */
203
-    @RequestMapping(value="/getDepotList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
204
-    @ApiOperation(value="查找所有粮库", notes = "查找所有粮库信息")
207
+    @RequestMapping(value="/getHouseDepotList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
208
+    @ApiOperation(value="查找仓房所有粮库", notes = "查找仓房所有粮库信息")
205 209
     @ApiImplicitParams({
206 210
             @ApiImplicitParam(name="orgId", value="组织机构id", paramType="query"),
207 211
             @ApiImplicitParam(name="storehouseId", value="仓房id", paramType="query"),
208 212
             @ApiImplicitParam(name="orgName", value="组织机构名称", paramType="query")
209 213
     })
210
-    public List<List<Map<String, Object>>> getDepotList(String orgId,String storehouseId,String orgName) {
214
+    public List<List<Map<String, Object>>> getHouseDepotList(String orgId,String storehouseId,String orgName) {
211 215
         //查询所有粮库
212 216
         Map<String,Object> map = new HashMap<>();
213 217
         map.put("orgId",orgId);
@@ -217,7 +221,7 @@ public class AgentDepotController {
217 221
             map.put("orgName","%" + orgName + "%");
218 222
         }
219 223
         //查出来的数据
220
-        List<Map<String, Object>> list = agentDepotService.getDepotList(map);
224
+        List<Map<String, Object>> list = agentDepotService.getHouseDepotList(map);
221 225
         //准备处理,每六条数据一个list
222 226
         List<List<Map<String, Object>>> dataList = new ArrayList<List<Map<String, Object>>>();
223 227
         List<Map<String, Object>> six = new ArrayList<Map<String, Object>>();
@@ -235,58 +239,45 @@ public class AgentDepotController {
235 239
         return dataList;
236 240
     }
237 241
 
238
-//    /**
239
-//     * 保存已有粮库代储库信息----老--2019/20/23号,3个月后无改动可删除
240
-//     * @param depotList 已有粮库
241
-//     * @return
242
-//     * @throws Exception
243
-//     */
244
-//    @RequestMapping(value="/saveLaoDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
245
-//    @ApiOperation(value="保存已有粮库代储库信息", notes = "保存已有粮库代储库信息")
246
-//    @ApiImplicitParams({
247
-//            @ApiImplicitParam(name = "depotList", value = "已有粮库", paramType = "form"),
248
-//            @ApiImplicitParam(name = "agentId", value = "代储点Id", paramType = "form"),
249
-//            @ApiImplicitParam(name = "orgId", value = "组织结构id", paramType = "form")
250
-//    })
251
-//    public Map<String, Object> saveLaoDepot(String depotList,String agentId,Integer orgId) throws Exception {
252
-//        Map<String, Object> modelMap = new HashMap<String, Object>();
253
-//        // JSON字符串转对象s
254
-//        List<String> depotLists= JSONArray.parseArray(depotList,String.class);
255
-//        for (String data:depotLists) {
256
-//            List<String> six= JSONArray.parseArray(data,String.class);
257
-//            for (String sixdata:six) {
258
-//                Map<String, String> map = ParameterUtil.stringToMap(sixdata.substring(1,sixdata.length()-1),":",",");
259
-//                if(ParameterUtil.isnotnull(map.get("stateLao")) && ParameterUtil.isequal(map.get("stateLao"),"1")){//判断库是否已经是代储库
260
-//                    //如果是代储库判断是否有改动
261
-//                    if(ParameterUtil.isequal(map.get("stateValue"),"0") || ParameterUtil.isequal(map.get("stateValue"),"false")){
262
-//                        this.removeStoreList(Integer.parseInt(map.get("id")));
263
-//                        //有改动直接修改状态为删除---1正常,2删除
264
-//                        agentDepotService.updateDeleteById(Integer.parseInt(map.get("id")),2);
265
-//                    }
266
-//                }else if(ParameterUtil.isequal(map.get("stateValue"),"true")){
267
-//                    //去数据库中查询,看看是否已经添加,但是删除的数据
268
-//                    Map<String,Object> getDepot = new HashMap<>();
269
-//                    getDepot.put("depotId",Integer.parseInt(map.get("orgId")));
270
-//                    List<Map<String,Object>> dataList = agentDepotService.getDepot(getDepot);
271
-//                    if(!ParameterUtil.isequal(dataList.size(),0)){//如果有已经添加但是删除的数据则回复成正常数据
272
-//                        agentDepotService.updateDeleteById(Integer.parseInt(dataList.get(0).get("id").toString()),1);
273
-//                    }else{//如果没有则新增
274
-//                        BusinessAgentDepot agentDepot = new BusinessAgentDepot();
275
-//                        agentDepot.setOrgId(orgId);
276
-//                        agentDepot.setDelFlag(1);
277
-//                        agentDepot.setAgentId(agentId);
278
-//                        agentDepot.setAgentDepotName(map.get("orgName").substring(1,map.get("orgName").length()-1));
279
-//                        agentDepot.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
280
-//                        agentDepot.setDepotId(Integer.parseInt(map.get("orgId")));
281
-//                        agentDepotService.add(agentDepot);
282
-//                    }
283
-//                }
284
-//            }
285
-//        }
286
-//
287
-//        modelMap.put("status", "success");
288
-//        return modelMap;
289
-//    }
242
+    /**
243
+     * 查找油罐所有粮库
244
+     * @param orgName 组织机构名称
245
+     * @return
246
+     */
247
+    @RequestMapping(value="/getTankDepotList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
248
+    @ApiOperation(value="查找油罐所有粮库", notes = "查找油罐所有粮库信息")
249
+    @ApiImplicitParams({
250
+            @ApiImplicitParam(name="orgId", value="组织机构id", paramType="query"),
251
+            @ApiImplicitParam(name="TankId", value="油罐id", paramType="query"),
252
+            @ApiImplicitParam(name="orgName", value="组织机构名称", paramType="query")
253
+    })
254
+    public List<List<Map<String, Object>>> getTankDepotList(String orgId,String TankId,String orgName) {
255
+        //查询所有粮库
256
+        Map<String,Object> map = new HashMap<>();
257
+        map.put("orgId",orgId);
258
+        map.put("TankId",TankId);
259
+
260
+        if(ParameterUtil.isnotnull(orgName)){
261
+            map.put("orgName","%" + orgName + "%");
262
+        }
263
+        //查出来的数据
264
+        List<Map<String, Object>> list = agentDepotService.getTankDepotList(map);
265
+        //准备处理,每六条数据一个list
266
+        List<List<Map<String, Object>>> dataList = new ArrayList<List<Map<String, Object>>>();
267
+        List<Map<String, Object>> six = new ArrayList<Map<String, Object>>();
268
+        for (int i = 0;i<list.size();i++){
269
+            six.add(list.get(i));
270
+            //如果查出来的数据小于六条则直接加入总数据返回
271
+            if(ParameterUtil.isequal(six.size(),list.size())){
272
+                dataList.add(six);
273
+            }
274
+            if(ParameterUtil.isequal((i+1)%6,0)){
275
+                dataList.add(six);
276
+                six = new ArrayList<Map<String, Object>>();;
277
+            }
278
+        }
279
+        return dataList;
280
+    }
290 281
 
291 282
     /**
292 283
      * 保存已有粮库代储库信息
@@ -294,8 +285,8 @@ public class AgentDepotController {
294 285
      * @return
295 286
      * @throws Exception
296 287
      */
297
-    @RequestMapping(value="/saveLaoDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
298
-    @ApiOperation(value="保存已有粮库代储库信息", notes = "保存已有粮库代储库信息")
288
+    @RequestMapping(value="/saveLaoHouseDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
289
+    @ApiOperation(value="保存已有粮库代储库信息-仓房", notes = "保存已有粮库代储库信息-仓房")
299 290
     @ApiImplicitParams({
300 291
             @ApiImplicitParam(name = "agentDepotId", value = "已有粮库", paramType = "form"),
301 292
             @ApiImplicitParam(name = "storehouseId", value = "仓房id", paramType = "form"),
@@ -303,7 +294,7 @@ public class AgentDepotController {
303 294
             @ApiImplicitParam(name = "orgName", value = "组织结构名称", paramType = "form"),
304 295
             @ApiImplicitParam(name = "orgId", value = "组织结构id", paramType = "form")
305 296
     })
306
-    public Map<String, Object> saveLaoDepot(Integer agentDepotId,Integer storehouseId,String warehouIds,String orgName,Integer orgId) throws Exception {
297
+    public Map<String, Object> saveLaoHouseDepot(Integer agentDepotId,Integer storehouseId,String warehouIds,String orgName,Integer orgId) throws Exception {
307 298
         //添加代储库
308 299
         Map<String, Object> modelMap = new HashMap<String, Object>();
309 300
         //查询是否已经添加过此粮库,如果添加过则过滤,不再添加
@@ -356,6 +347,62 @@ public class AgentDepotController {
356 347
     }
357 348
 
358 349
     /**
350
+     * 保存已有粮库代储库信息-油罐
351
+     * @param agentDepotId 选中粮库
352
+     * @return
353
+     * @throws Exception
354
+     */
355
+    @RequestMapping(value="/saveLaoTankDepot", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
356
+    @ApiOperation(value="保存已有粮库代储库信息-油罐", notes = "保存已有粮库代储库信息-油罐")
357
+    @ApiImplicitParams({
358
+            @ApiImplicitParam(name = "agentDepotId", value = "已有粮库", paramType = "form"),
359
+            @ApiImplicitParam(name = "tankId", value = "油罐id", paramType = "form"),
360
+            @ApiImplicitParam(name = "orgName", value = "组织结构名称", paramType = "form"),
361
+            @ApiImplicitParam(name = "orgId", value = "组织结构id", paramType = "form")
362
+    })
363
+    public Map<String, Object> saveLaoTankDepot(Integer agentDepotId,String tankId,String orgName,Integer orgId) throws Exception {
364
+        //添加代储库
365
+        Map<String, Object> modelMap = new HashMap<String, Object>();
366
+        //查询是否已经添加过此粮库,如果添加过则过滤,不再添加
367
+        BusinessAgentDepotExample example = new BusinessAgentDepotExample();
368
+        BusinessAgentDepotExample.Criteria criteria = example.createCriteria();
369
+        criteria.andOrgIdEqualTo(agentDepotId);
370
+        criteria.andDepotIdEqualTo(orgId);
371
+        List<BusinessAgentDepot> depotNum = agentDepotService.selectIdNum(example);
372
+        //添加仓房
373
+        BusinessAgentTankExist agentTankExist = new BusinessAgentTankExist();
374
+        agentTankExist.setOrgId(agentDepotId);
375
+        agentTankExist.setDelFlag(1);
376
+        agentTankExist.setBgmxzTbsj(new Date());
377
+        agentTankExist.setHccrkTbsj(new Date());
378
+        agentTankExist.setQccrkTbsj(new Date());
379
+
380
+
381
+        if(depotNum.size() == 0){
382
+            BusinessAgentDepot agentDepot = new BusinessAgentDepot();
383
+            agentDepot.setOrgId(agentDepotId);
384
+            agentDepot.setDelFlag(1);
385
+            agentDepot.setAgentDepotName(orgName);
386
+            agentDepot.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
387
+            agentDepot.setDepotId(orgId);
388
+            agentDepotService.add(agentDepot);
389
+            agentTankExist.setAgentDepotId(agentDepot.getId());
390
+        }else if(depotNum.get(0).getDelFlag() == 2){
391
+            agentDepotService.updateDeleteById(depotNum.get(0).getId(),1);
392
+            agentTankExist.setAgentDepotId(depotNum.get(0).getId());
393
+        }else{
394
+            agentTankExist.setAgentDepotId(depotNum.get(0).getId());
395
+        }
396
+
397
+        agentTankExist.setCreateTime(ParameterUtil.string2date(ParameterUtil.getSysDateTime()));//修改时间
398
+        agentTankExist.setTankId(tankId);
399
+        agentTankExist.setId(ParameterUtil.getCode());
400
+        agentTankExistService.add(agentTankExist);
401
+        modelMap.put("status", "success");
402
+        return modelMap;
403
+    }
404
+
405
+    /**
359 406
      * 保存粮库代储企业信息
360 407
      * @param agentId 选中粮库
361 408
      * @return
@@ -378,6 +425,21 @@ public class AgentDepotController {
378 425
         return modelMap;
379 426
     }
380 427
 
428
+    //根据油罐id删除油罐
429
+    @RequestMapping(value="/removeTank", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
430
+    @ApiOperation(value="删除油罐", notes = "根据油罐id删除油罐")
431
+    @ApiImplicitParams({
432
+            @ApiImplicitParam(name = "depotId", value = "代储粮库id", paramType = "form"),
433
+            @ApiImplicitParam(name = "tankId", value = "油罐id", paramType = "form")
434
+    })
435
+    public void removeTank(Integer depotId,String tankId){
436
+        Integer houseNum = agentDepotService.getIdHouse(depotId);
437
+        if(houseNum == 1){
438
+            agentDepotService.updateDeleteById(depotId,2);
439
+        }
440
+        agentTankExistService.updateTankDeleteById(tankId,2);
441
+    }
442
+
381 443
     /**
382 444
      * 导入excel
383 445
      * @param file 文件

+ 4 - 1
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.java

@@ -30,11 +30,14 @@ public interface BusinessAgentDepotMapper {
30 30
 
31 31
     int updateByPrimaryKey(BusinessAgentDepot record);
32 32
 
33
-    List<Map<String,Object>> getDepotList(Map<String,Object> map);
33
+    List<Map<String,Object>> getHouseDepotList(Map<String,Object> map);
34
+    List<Map<String,Object>> getTankDepotList(Map<String,Object> map);
34 35
 
35 36
     List<Map<String,Object>> getDepot(Map<String,Object> map);
36 37
 
37 38
     List<BusinessAgentDepot> getByExample(Map<String,Object> map);
38 39
 
39 40
     List<Map<String,Object>> getDepotLaoList(Map<String,Object> map);
41
+
42
+    int getIdHouse(Integer depotId);
40 43
 }

+ 54 - 10
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentDepotMapper.xml

@@ -370,25 +370,44 @@
370 370
       updatetime = #{updatetime,jdbcType=TIMESTAMP}
371 371
     where id = #{id,jdbcType=INTEGER}
372 372
   </update>
373
-  <select id="getDepotList" resultType="java.util.Map" parameterType="java.util.Map">
373
+  <select id="getHouseDepotList" resultType="java.util.Map" parameterType="java.util.Map">
374 374
     SELECT
375
-        store.id,
376
-        store.agent_depot_id depot_id,
377
-        org.org_id,
378
-        org.org_name,
379
-        NVL2(store.id,'1','0') state_value,
380
-        NVL2(store.id,org.org_code,null) org_code,
381
-        NVL2(store.id,org.area_name,null) area_name
375
+    store.id,
376
+    store.agent_depot_id depot_id,
377
+    org.org_id,
378
+    org.org_name,
379
+    NVL2(store.id,'1','0') state_value,
380
+    NVL2(store.id,org.org_code,null) org_code,
381
+    NVL2(store.id,org.area_name,null) area_name
382 382
     FROM
383
-        org_info org
383
+    org_info org
384 384
     LEFT JOIN business_agent_storehouse store ON store.org_id = org.org_id
385
-        AND store.del_flag = 1 AND store.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
385
+    AND store.del_flag = 1 AND store.storehouse_id = #{storehouseId,jdbcType=VARCHAR}
386 386
     WHERE org.org_class_id = 5318 AND org.org_id != #{orgId,jdbcType=VARCHAR}
387 387
     <if test="orgName != null">
388 388
       AND org.org_name LIKE #{orgName,jdbcType=VARCHAR}
389 389
     </if>
390 390
     order by store.id desc
391 391
   </select>
392
+  <select id="getTankDepotList" resultType="java.util.Map" parameterType="java.util.Map">
393
+    SELECT
394
+    tank.id,
395
+    tank.agent_depot_id depot_id,
396
+    org.org_id,
397
+    org.org_name,
398
+    NVL2(tank.id,'1','0') state_value,
399
+    NVL2(tank.id,org.org_code,null) org_code,
400
+    NVL2(tank.id,org.area_name,null) area_name
401
+    FROM
402
+    org_info org
403
+    LEFT JOIN business_agent_tank_exist tank ON tank.org_id = org.org_id
404
+    AND tank.del_flag = 1 AND tank.tank_id = #{TankId,jdbcType=VARCHAR}
405
+    WHERE org.org_class_id = 5318 AND org.org_id != #{orgId,jdbcType=VARCHAR}
406
+    <if test="orgName != null">
407
+      AND org.org_name LIKE #{orgName,jdbcType=VARCHAR}
408
+    </if>
409
+    order by tank.id desc
410
+  </select>
392 411
   <select id="getByExample" resultMap="BaseResultMap" parameterType="java.util.Map">
393 412
     SELECT
394 413
     *
@@ -466,4 +485,29 @@
466 485
     WHERE
467 486
         depot_id != 0 AND depot_id = #{depotId,jdbcType=VARCHAR}
468 487
   </select>
488
+
489
+  <select id="getIdHouse" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
490
+    SELECT
491
+	COUNT(t.id) houseNum
492
+    FROM
493
+        (
494
+            SELECT
495
+                TO_CHAR(store.id,9999) as id
496
+            FROM
497
+                business_agent_depot depot
498
+            LEFT JOIN business_agent_storehouse store ON store.agent_depot_id = depot.id
499
+            WHERE
500
+                store.del_flag = 1
501
+            AND depot.id = #{depotId,jdbcType=INTEGER}
502
+            UNION ALL
503
+            SELECT
504
+                tank.id
505
+            FROM
506
+                business_agent_depot depot
507
+            LEFT JOIN business_agent_tank_exist tank ON tank.agent_depot_id = depot.id
508
+            WHERE
509
+                tank.del_flag = 1
510
+            AND depot.id = #{depotId,jdbcType=INTEGER}
511
+        ) t
512
+  </select>
469 513
 </mapper>

+ 30 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankExistMapper.java

@@ -0,0 +1,30 @@
1
+package com.chinaitop.depot.agent.basic.mapper;
2
+
3
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist;
4
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExistExample;
5
+import java.util.List;
6
+import org.apache.ibatis.annotations.Param;
7
+
8
+public interface BusinessAgentTankExistMapper {
9
+    int countByExample(BusinessAgentTankExistExample example);
10
+
11
+    int deleteByExample(BusinessAgentTankExistExample example);
12
+
13
+    int deleteByPrimaryKey(String id);
14
+
15
+    int insert(BusinessAgentTankExist record);
16
+
17
+    int insertSelective(BusinessAgentTankExist record);
18
+
19
+    List<BusinessAgentTankExist> selectByExample(BusinessAgentTankExistExample example);
20
+
21
+    BusinessAgentTankExist selectByPrimaryKey(String id);
22
+
23
+    int updateByExampleSelective(@Param("record") BusinessAgentTankExist record, @Param("example") BusinessAgentTankExistExample example);
24
+
25
+    int updateByExample(@Param("record") BusinessAgentTankExist record, @Param("example") BusinessAgentTankExistExample example);
26
+
27
+    int updateByPrimaryKeySelective(BusinessAgentTankExist record);
28
+
29
+    int updateByPrimaryKey(BusinessAgentTankExist record);
30
+}

+ 276 - 0
src/main/java/com/chinaitop/depot/agent/basic/mapper/BusinessAgentTankExistMapper.xml

@@ -0,0 +1,276 @@
1
+<?xml version="1.0" encoding="UTF-8" ?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3
+<mapper namespace="com.chinaitop.depot.agent.basic.mapper.BusinessAgentTankExistMapper" >
4
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist" >
5
+    <id column="id" property="id" jdbcType="VARCHAR" />
6
+    <result column="tank_id" property="tankId" jdbcType="VARCHAR" />
7
+    <result column="agent_depot_id" property="agentDepotId" jdbcType="INTEGER" />
8
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
9
+    <result column="del_flag" property="delFlag" jdbcType="INTEGER" />
10
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
11
+    <result column="bgmxz_tbsj" property="bgmxzTbsj" jdbcType="TIMESTAMP" />
12
+    <result column="qccrk_tbsj" property="qccrkTbsj" jdbcType="TIMESTAMP" />
13
+    <result column="hccrk_tbsj" property="hccrkTbsj" jdbcType="TIMESTAMP" />
14
+  </resultMap>
15
+  <sql id="Example_Where_Clause" >
16
+    <where >
17
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
18
+        <if test="criteria.valid" >
19
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
20
+            <foreach collection="criteria.criteria" item="criterion" >
21
+              <choose >
22
+                <when test="criterion.noValue" >
23
+                  and ${criterion.condition}
24
+                </when>
25
+                <when test="criterion.singleValue" >
26
+                  and ${criterion.condition} #{criterion.value}
27
+                </when>
28
+                <when test="criterion.betweenValue" >
29
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
30
+                </when>
31
+                <when test="criterion.listValue" >
32
+                  and ${criterion.condition}
33
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
34
+                    #{listItem}
35
+                  </foreach>
36
+                </when>
37
+              </choose>
38
+            </foreach>
39
+          </trim>
40
+        </if>
41
+      </foreach>
42
+    </where>
43
+  </sql>
44
+  <sql id="Update_By_Example_Where_Clause" >
45
+    <where >
46
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
47
+        <if test="criteria.valid" >
48
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
49
+            <foreach collection="criteria.criteria" item="criterion" >
50
+              <choose >
51
+                <when test="criterion.noValue" >
52
+                  and ${criterion.condition}
53
+                </when>
54
+                <when test="criterion.singleValue" >
55
+                  and ${criterion.condition} #{criterion.value}
56
+                </when>
57
+                <when test="criterion.betweenValue" >
58
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
59
+                </when>
60
+                <when test="criterion.listValue" >
61
+                  and ${criterion.condition}
62
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
63
+                    #{listItem}
64
+                  </foreach>
65
+                </when>
66
+              </choose>
67
+            </foreach>
68
+          </trim>
69
+        </if>
70
+      </foreach>
71
+    </where>
72
+  </sql>
73
+  <sql id="Base_Column_List" >
74
+    id, tank_id, agent_depot_id, org_id, del_flag, create_time, bgmxz_tbsj, qccrk_tbsj, 
75
+    hccrk_tbsj
76
+  </sql>
77
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExistExample" >
78
+    select
79
+    <if test="distinct" >
80
+      distinct
81
+    </if>
82
+    <include refid="Base_Column_List" />
83
+    from business_agent_tank_exist
84
+    <if test="_parameter != null" >
85
+      <include refid="Example_Where_Clause" />
86
+    </if>
87
+    <if test="orderByClause != null" >
88
+      order by ${orderByClause}
89
+    </if>
90
+  </select>
91
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
92
+    select 
93
+    <include refid="Base_Column_List" />
94
+    from business_agent_tank_exist
95
+    where id = #{id,jdbcType=VARCHAR}
96
+  </select>
97
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
98
+    delete from business_agent_tank_exist
99
+    where id = #{id,jdbcType=VARCHAR}
100
+  </delete>
101
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExistExample" >
102
+    delete from business_agent_tank_exist
103
+    <if test="_parameter != null" >
104
+      <include refid="Example_Where_Clause" />
105
+    </if>
106
+  </delete>
107
+  <insert id="insert" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist" >
108
+    insert into business_agent_tank_exist (id, tank_id, agent_depot_id, 
109
+      org_id, del_flag, create_time, 
110
+      bgmxz_tbsj, qccrk_tbsj, hccrk_tbsj
111
+      )
112
+    values (#{id,jdbcType=VARCHAR}, #{tankId,jdbcType=VARCHAR}, #{agentDepotId,jdbcType=INTEGER}, 
113
+      #{orgId,jdbcType=INTEGER}, #{delFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
114
+      #{bgmxzTbsj,jdbcType=TIMESTAMP}, #{qccrkTbsj,jdbcType=TIMESTAMP}, #{hccrkTbsj,jdbcType=TIMESTAMP}
115
+      )
116
+  </insert>
117
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist" >
118
+    insert into business_agent_tank_exist
119
+    <trim prefix="(" suffix=")" suffixOverrides="," >
120
+      <if test="id != null" >
121
+        id,
122
+      </if>
123
+      <if test="tankId != null" >
124
+        tank_id,
125
+      </if>
126
+      <if test="agentDepotId != null" >
127
+        agent_depot_id,
128
+      </if>
129
+      <if test="orgId != null" >
130
+        org_id,
131
+      </if>
132
+      <if test="delFlag != null" >
133
+        del_flag,
134
+      </if>
135
+      <if test="createTime != null" >
136
+        create_time,
137
+      </if>
138
+      <if test="bgmxzTbsj != null" >
139
+        bgmxz_tbsj,
140
+      </if>
141
+      <if test="qccrkTbsj != null" >
142
+        qccrk_tbsj,
143
+      </if>
144
+      <if test="hccrkTbsj != null" >
145
+        hccrk_tbsj,
146
+      </if>
147
+    </trim>
148
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
149
+      <if test="id != null" >
150
+        #{id,jdbcType=VARCHAR},
151
+      </if>
152
+      <if test="tankId != null" >
153
+        #{tankId,jdbcType=VARCHAR},
154
+      </if>
155
+      <if test="agentDepotId != null" >
156
+        #{agentDepotId,jdbcType=INTEGER},
157
+      </if>
158
+      <if test="orgId != null" >
159
+        #{orgId,jdbcType=INTEGER},
160
+      </if>
161
+      <if test="delFlag != null" >
162
+        #{delFlag,jdbcType=INTEGER},
163
+      </if>
164
+      <if test="createTime != null" >
165
+        #{createTime,jdbcType=TIMESTAMP},
166
+      </if>
167
+      <if test="bgmxzTbsj != null" >
168
+        #{bgmxzTbsj,jdbcType=TIMESTAMP},
169
+      </if>
170
+      <if test="qccrkTbsj != null" >
171
+        #{qccrkTbsj,jdbcType=TIMESTAMP},
172
+      </if>
173
+      <if test="hccrkTbsj != null" >
174
+        #{hccrkTbsj,jdbcType=TIMESTAMP},
175
+      </if>
176
+    </trim>
177
+  </insert>
178
+  <select id="countByExample" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExistExample" resultType="java.lang.Integer" >
179
+    select count(*) from business_agent_tank_exist
180
+    <if test="_parameter != null" >
181
+      <include refid="Example_Where_Clause" />
182
+    </if>
183
+  </select>
184
+  <update id="updateByExampleSelective" parameterType="map" >
185
+    update business_agent_tank_exist
186
+    <set >
187
+      <if test="record.id != null" >
188
+        id = #{record.id,jdbcType=VARCHAR},
189
+      </if>
190
+      <if test="record.tankId != null" >
191
+        tank_id = #{record.tankId,jdbcType=VARCHAR},
192
+      </if>
193
+      <if test="record.agentDepotId != null" >
194
+        agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
195
+      </if>
196
+      <if test="record.orgId != null" >
197
+        org_id = #{record.orgId,jdbcType=INTEGER},
198
+      </if>
199
+      <if test="record.delFlag != null" >
200
+        del_flag = #{record.delFlag,jdbcType=INTEGER},
201
+      </if>
202
+      <if test="record.createTime != null" >
203
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
204
+      </if>
205
+      <if test="record.bgmxzTbsj != null" >
206
+        bgmxz_tbsj = #{record.bgmxzTbsj,jdbcType=TIMESTAMP},
207
+      </if>
208
+      <if test="record.qccrkTbsj != null" >
209
+        qccrk_tbsj = #{record.qccrkTbsj,jdbcType=TIMESTAMP},
210
+      </if>
211
+      <if test="record.hccrkTbsj != null" >
212
+        hccrk_tbsj = #{record.hccrkTbsj,jdbcType=TIMESTAMP},
213
+      </if>
214
+    </set>
215
+    <if test="_parameter != null" >
216
+      <include refid="Update_By_Example_Where_Clause" />
217
+    </if>
218
+  </update>
219
+  <update id="updateByExample" parameterType="map" >
220
+    update business_agent_tank_exist
221
+    set id = #{record.id,jdbcType=VARCHAR},
222
+      tank_id = #{record.tankId,jdbcType=VARCHAR},
223
+      agent_depot_id = #{record.agentDepotId,jdbcType=INTEGER},
224
+      org_id = #{record.orgId,jdbcType=INTEGER},
225
+      del_flag = #{record.delFlag,jdbcType=INTEGER},
226
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
227
+      bgmxz_tbsj = #{record.bgmxzTbsj,jdbcType=TIMESTAMP},
228
+      qccrk_tbsj = #{record.qccrkTbsj,jdbcType=TIMESTAMP},
229
+      hccrk_tbsj = #{record.hccrkTbsj,jdbcType=TIMESTAMP}
230
+    <if test="_parameter != null" >
231
+      <include refid="Update_By_Example_Where_Clause" />
232
+    </if>
233
+  </update>
234
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist" >
235
+    update business_agent_tank_exist
236
+    <set >
237
+      <if test="tankId != null" >
238
+        tank_id = #{tankId,jdbcType=VARCHAR},
239
+      </if>
240
+      <if test="agentDepotId != null" >
241
+        agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
242
+      </if>
243
+      <if test="orgId != null" >
244
+        org_id = #{orgId,jdbcType=INTEGER},
245
+      </if>
246
+      <if test="delFlag != null" >
247
+        del_flag = #{delFlag,jdbcType=INTEGER},
248
+      </if>
249
+      <if test="createTime != null" >
250
+        create_time = #{createTime,jdbcType=TIMESTAMP},
251
+      </if>
252
+      <if test="bgmxzTbsj != null" >
253
+        bgmxz_tbsj = #{bgmxzTbsj,jdbcType=TIMESTAMP},
254
+      </if>
255
+      <if test="qccrkTbsj != null" >
256
+        qccrk_tbsj = #{qccrkTbsj,jdbcType=TIMESTAMP},
257
+      </if>
258
+      <if test="hccrkTbsj != null" >
259
+        hccrk_tbsj = #{hccrkTbsj,jdbcType=TIMESTAMP},
260
+      </if>
261
+    </set>
262
+    where id = #{id,jdbcType=VARCHAR}
263
+  </update>
264
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist" >
265
+    update business_agent_tank_exist
266
+    set tank_id = #{tankId,jdbcType=VARCHAR},
267
+      agent_depot_id = #{agentDepotId,jdbcType=INTEGER},
268
+      org_id = #{orgId,jdbcType=INTEGER},
269
+      del_flag = #{delFlag,jdbcType=INTEGER},
270
+      create_time = #{createTime,jdbcType=TIMESTAMP},
271
+      bgmxz_tbsj = #{bgmxzTbsj,jdbcType=TIMESTAMP},
272
+      qccrk_tbsj = #{qccrkTbsj,jdbcType=TIMESTAMP},
273
+      hccrk_tbsj = #{hccrkTbsj,jdbcType=TIMESTAMP}
274
+    where id = #{id,jdbcType=VARCHAR}
275
+  </update>
276
+</mapper>

+ 167 - 0
src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentTankExist.java

@@ -0,0 +1,167 @@
1
+package com.chinaitop.depot.agent.basic.model;
2
+
3
+import java.util.Date;
4
+
5
+public class BusinessAgentTankExist {
6
+    private String id;
7
+
8
+    private String tankId;
9
+
10
+    private Integer agentDepotId;
11
+
12
+    private Integer orgId;
13
+
14
+    private Integer delFlag;
15
+
16
+    private Date createTime;
17
+
18
+    private Date bgmxzTbsj;
19
+
20
+    private Date qccrkTbsj;
21
+
22
+    private Date hccrkTbsj;
23
+
24
+    /**
25
+     * 
26
+     * @return id 
27
+     */
28
+    public String getId() {
29
+        return id;
30
+    }
31
+
32
+    /**
33
+     * 
34
+     * @param id 
35
+     */
36
+    public void setId(String id) {
37
+        this.id = id == null ? null : id.trim();
38
+    }
39
+
40
+    /**
41
+     * 油罐id
42
+     * @return tank_id 油罐id
43
+     */
44
+    public String getTankId() {
45
+        return tankId;
46
+    }
47
+
48
+    /**
49
+     * 油罐id
50
+     * @param tankId 油罐id
51
+     */
52
+    public void setTankId(String tankId) {
53
+        this.tankId = tankId == null ? null : tankId.trim();
54
+    }
55
+
56
+    /**
57
+     * 代储库id
58
+     * @return agent_depot_id 代储库id
59
+     */
60
+    public Integer getAgentDepotId() {
61
+        return agentDepotId;
62
+    }
63
+
64
+    /**
65
+     * 代储库id
66
+     * @param agentDepotId 代储库id
67
+     */
68
+    public void setAgentDepotId(Integer agentDepotId) {
69
+        this.agentDepotId = agentDepotId;
70
+    }
71
+
72
+    /**
73
+     * 组织机构id
74
+     * @return org_id 组织机构id
75
+     */
76
+    public Integer getOrgId() {
77
+        return orgId;
78
+    }
79
+
80
+    /**
81
+     * 组织机构id
82
+     * @param orgId 组织机构id
83
+     */
84
+    public void setOrgId(Integer orgId) {
85
+        this.orgId = orgId;
86
+    }
87
+
88
+    /**
89
+     * 删除状态(1.正常,2.删除)
90
+     * @return del_flag 删除状态(1.正常,2.删除)
91
+     */
92
+    public Integer getDelFlag() {
93
+        return delFlag;
94
+    }
95
+
96
+    /**
97
+     * 删除状态(1.正常,2.删除)
98
+     * @param delFlag 删除状态(1.正常,2.删除)
99
+     */
100
+    public void setDelFlag(Integer delFlag) {
101
+        this.delFlag = delFlag;
102
+    }
103
+
104
+    /**
105
+     * 创建时间
106
+     * @return create_time 创建时间
107
+     */
108
+    public Date getCreateTime() {
109
+        return createTime;
110
+    }
111
+
112
+    /**
113
+     * 创建时间
114
+     * @param createTime 创建时间
115
+     */
116
+    public void setCreateTime(Date createTime) {
117
+        this.createTime = createTime;
118
+    }
119
+
120
+    /**
121
+     * 保管明细账最后同步时间
122
+     * @return bgmxz_tbsj 保管明细账最后同步时间
123
+     */
124
+    public Date getBgmxzTbsj() {
125
+        return bgmxzTbsj;
126
+    }
127
+
128
+    /**
129
+     * 保管明细账最后同步时间
130
+     * @param bgmxzTbsj 保管明细账最后同步时间
131
+     */
132
+    public void setBgmxzTbsj(Date bgmxzTbsj) {
133
+        this.bgmxzTbsj = bgmxzTbsj;
134
+    }
135
+
136
+    /**
137
+     * 汽车出入库最后同步时间
138
+     * @return qccrk_tbsj 汽车出入库最后同步时间
139
+     */
140
+    public Date getQccrkTbsj() {
141
+        return qccrkTbsj;
142
+    }
143
+
144
+    /**
145
+     * 汽车出入库最后同步时间
146
+     * @param qccrkTbsj 汽车出入库最后同步时间
147
+     */
148
+    public void setQccrkTbsj(Date qccrkTbsj) {
149
+        this.qccrkTbsj = qccrkTbsj;
150
+    }
151
+
152
+    /**
153
+     * 火车出入库最后同步时间
154
+     * @return hccrk_tbsj 火车出入库最后同步时间
155
+     */
156
+    public Date getHccrkTbsj() {
157
+        return hccrkTbsj;
158
+    }
159
+
160
+    /**
161
+     * 火车出入库最后同步时间
162
+     * @param hccrkTbsj 火车出入库最后同步时间
163
+     */
164
+    public void setHccrkTbsj(Date hccrkTbsj) {
165
+        this.hccrkTbsj = hccrkTbsj;
166
+    }
167
+}

+ 779 - 0
src/main/java/com/chinaitop/depot/agent/basic/model/BusinessAgentTankExistExample.java

@@ -0,0 +1,779 @@
1
+package com.chinaitop.depot.agent.basic.model;
2
+
3
+import java.util.ArrayList;
4
+import java.util.Date;
5
+import java.util.List;
6
+
7
+public class BusinessAgentTankExistExample {
8
+    /**
9
+     * business_agent_tank_exist
10
+     */
11
+    protected String orderByClause;
12
+
13
+    /**
14
+     * business_agent_tank_exist
15
+     */
16
+    protected boolean distinct;
17
+
18
+    /**
19
+     * business_agent_tank_exist
20
+     */
21
+    protected List<Criteria> oredCriteria;
22
+
23
+    public BusinessAgentTankExistExample() {
24
+        oredCriteria = new ArrayList<Criteria>();
25
+    }
26
+
27
+    public void setOrderByClause(String orderByClause) {
28
+        this.orderByClause = orderByClause;
29
+    }
30
+
31
+    public String getOrderByClause() {
32
+        return orderByClause;
33
+    }
34
+
35
+    public void setDistinct(boolean distinct) {
36
+        this.distinct = distinct;
37
+    }
38
+
39
+    public boolean isDistinct() {
40
+        return distinct;
41
+    }
42
+
43
+    public List<Criteria> getOredCriteria() {
44
+        return oredCriteria;
45
+    }
46
+
47
+    public void or(Criteria criteria) {
48
+        oredCriteria.add(criteria);
49
+    }
50
+
51
+    public Criteria or() {
52
+        Criteria criteria = createCriteriaInternal();
53
+        oredCriteria.add(criteria);
54
+        return criteria;
55
+    }
56
+
57
+    public Criteria createCriteria() {
58
+        Criteria criteria = createCriteriaInternal();
59
+        if (oredCriteria.size() == 0) {
60
+            oredCriteria.add(criteria);
61
+        }
62
+        return criteria;
63
+    }
64
+
65
+    protected Criteria createCriteriaInternal() {
66
+        Criteria criteria = new Criteria();
67
+        return criteria;
68
+    }
69
+
70
+    public void clear() {
71
+        oredCriteria.clear();
72
+        orderByClause = null;
73
+        distinct = false;
74
+    }
75
+
76
+    /**
77
+     * business_agent_tank_exist 2020-08-17
78
+     */
79
+    protected abstract static class GeneratedCriteria {
80
+        protected List<Criterion> criteria;
81
+
82
+        protected GeneratedCriteria() {
83
+            super();
84
+            criteria = new ArrayList<Criterion>();
85
+        }
86
+
87
+        public boolean isValid() {
88
+            return criteria.size() > 0;
89
+        }
90
+
91
+        public List<Criterion> getAllCriteria() {
92
+            return criteria;
93
+        }
94
+
95
+        public List<Criterion> getCriteria() {
96
+            return criteria;
97
+        }
98
+
99
+        protected void addCriterion(String condition) {
100
+            if (condition == null) {
101
+                throw new RuntimeException("Value for condition cannot be null");
102
+            }
103
+            criteria.add(new Criterion(condition));
104
+        }
105
+
106
+        protected void addCriterion(String condition, Object value, String property) {
107
+            if (value == null) {
108
+                throw new RuntimeException("Value for " + property + " cannot be null");
109
+            }
110
+            criteria.add(new Criterion(condition, value));
111
+        }
112
+
113
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
114
+            if (value1 == null || value2 == null) {
115
+                throw new RuntimeException("Between values for " + property + " cannot be null");
116
+            }
117
+            criteria.add(new Criterion(condition, value1, value2));
118
+        }
119
+
120
+        public Criteria andIdIsNull() {
121
+            addCriterion("id is null");
122
+            return (Criteria) this;
123
+        }
124
+
125
+        public Criteria andIdIsNotNull() {
126
+            addCriterion("id is not null");
127
+            return (Criteria) this;
128
+        }
129
+
130
+        public Criteria andIdEqualTo(String value) {
131
+            addCriterion("id =", value, "id");
132
+            return (Criteria) this;
133
+        }
134
+
135
+        public Criteria andIdNotEqualTo(String value) {
136
+            addCriterion("id <>", value, "id");
137
+            return (Criteria) this;
138
+        }
139
+
140
+        public Criteria andIdGreaterThan(String value) {
141
+            addCriterion("id >", value, "id");
142
+            return (Criteria) this;
143
+        }
144
+
145
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
146
+            addCriterion("id >=", value, "id");
147
+            return (Criteria) this;
148
+        }
149
+
150
+        public Criteria andIdLessThan(String value) {
151
+            addCriterion("id <", value, "id");
152
+            return (Criteria) this;
153
+        }
154
+
155
+        public Criteria andIdLessThanOrEqualTo(String value) {
156
+            addCriterion("id <=", value, "id");
157
+            return (Criteria) this;
158
+        }
159
+
160
+        public Criteria andIdLike(String value) {
161
+            addCriterion("id like", value, "id");
162
+            return (Criteria) this;
163
+        }
164
+
165
+        public Criteria andIdNotLike(String value) {
166
+            addCriterion("id not like", value, "id");
167
+            return (Criteria) this;
168
+        }
169
+
170
+        public Criteria andIdIn(List<String> values) {
171
+            addCriterion("id in", values, "id");
172
+            return (Criteria) this;
173
+        }
174
+
175
+        public Criteria andIdNotIn(List<String> values) {
176
+            addCriterion("id not in", values, "id");
177
+            return (Criteria) this;
178
+        }
179
+
180
+        public Criteria andIdBetween(String value1, String value2) {
181
+            addCriterion("id between", value1, value2, "id");
182
+            return (Criteria) this;
183
+        }
184
+
185
+        public Criteria andIdNotBetween(String value1, String value2) {
186
+            addCriterion("id not between", value1, value2, "id");
187
+            return (Criteria) this;
188
+        }
189
+
190
+        public Criteria andTankIdIsNull() {
191
+            addCriterion("tank_id is null");
192
+            return (Criteria) this;
193
+        }
194
+
195
+        public Criteria andTankIdIsNotNull() {
196
+            addCriterion("tank_id is not null");
197
+            return (Criteria) this;
198
+        }
199
+
200
+        public Criteria andTankIdEqualTo(String value) {
201
+            addCriterion("tank_id =", value, "tankId");
202
+            return (Criteria) this;
203
+        }
204
+
205
+        public Criteria andTankIdNotEqualTo(String value) {
206
+            addCriterion("tank_id <>", value, "tankId");
207
+            return (Criteria) this;
208
+        }
209
+
210
+        public Criteria andTankIdGreaterThan(String value) {
211
+            addCriterion("tank_id >", value, "tankId");
212
+            return (Criteria) this;
213
+        }
214
+
215
+        public Criteria andTankIdGreaterThanOrEqualTo(String value) {
216
+            addCriterion("tank_id >=", value, "tankId");
217
+            return (Criteria) this;
218
+        }
219
+
220
+        public Criteria andTankIdLessThan(String value) {
221
+            addCriterion("tank_id <", value, "tankId");
222
+            return (Criteria) this;
223
+        }
224
+
225
+        public Criteria andTankIdLessThanOrEqualTo(String value) {
226
+            addCriterion("tank_id <=", value, "tankId");
227
+            return (Criteria) this;
228
+        }
229
+
230
+        public Criteria andTankIdLike(String value) {
231
+            addCriterion("tank_id like", value, "tankId");
232
+            return (Criteria) this;
233
+        }
234
+
235
+        public Criteria andTankIdNotLike(String value) {
236
+            addCriterion("tank_id not like", value, "tankId");
237
+            return (Criteria) this;
238
+        }
239
+
240
+        public Criteria andTankIdIn(List<String> values) {
241
+            addCriterion("tank_id in", values, "tankId");
242
+            return (Criteria) this;
243
+        }
244
+
245
+        public Criteria andTankIdNotIn(List<String> values) {
246
+            addCriterion("tank_id not in", values, "tankId");
247
+            return (Criteria) this;
248
+        }
249
+
250
+        public Criteria andTankIdBetween(String value1, String value2) {
251
+            addCriterion("tank_id between", value1, value2, "tankId");
252
+            return (Criteria) this;
253
+        }
254
+
255
+        public Criteria andTankIdNotBetween(String value1, String value2) {
256
+            addCriterion("tank_id not between", value1, value2, "tankId");
257
+            return (Criteria) this;
258
+        }
259
+
260
+        public Criteria andAgentDepotIdIsNull() {
261
+            addCriterion("agent_depot_id is null");
262
+            return (Criteria) this;
263
+        }
264
+
265
+        public Criteria andAgentDepotIdIsNotNull() {
266
+            addCriterion("agent_depot_id is not null");
267
+            return (Criteria) this;
268
+        }
269
+
270
+        public Criteria andAgentDepotIdEqualTo(Integer value) {
271
+            addCriterion("agent_depot_id =", value, "agentDepotId");
272
+            return (Criteria) this;
273
+        }
274
+
275
+        public Criteria andAgentDepotIdNotEqualTo(Integer value) {
276
+            addCriterion("agent_depot_id <>", value, "agentDepotId");
277
+            return (Criteria) this;
278
+        }
279
+
280
+        public Criteria andAgentDepotIdGreaterThan(Integer value) {
281
+            addCriterion("agent_depot_id >", value, "agentDepotId");
282
+            return (Criteria) this;
283
+        }
284
+
285
+        public Criteria andAgentDepotIdGreaterThanOrEqualTo(Integer value) {
286
+            addCriterion("agent_depot_id >=", value, "agentDepotId");
287
+            return (Criteria) this;
288
+        }
289
+
290
+        public Criteria andAgentDepotIdLessThan(Integer value) {
291
+            addCriterion("agent_depot_id <", value, "agentDepotId");
292
+            return (Criteria) this;
293
+        }
294
+
295
+        public Criteria andAgentDepotIdLessThanOrEqualTo(Integer value) {
296
+            addCriterion("agent_depot_id <=", value, "agentDepotId");
297
+            return (Criteria) this;
298
+        }
299
+
300
+        public Criteria andAgentDepotIdIn(List<Integer> values) {
301
+            addCriterion("agent_depot_id in", values, "agentDepotId");
302
+            return (Criteria) this;
303
+        }
304
+
305
+        public Criteria andAgentDepotIdNotIn(List<Integer> values) {
306
+            addCriterion("agent_depot_id not in", values, "agentDepotId");
307
+            return (Criteria) this;
308
+        }
309
+
310
+        public Criteria andAgentDepotIdBetween(Integer value1, Integer value2) {
311
+            addCriterion("agent_depot_id between", value1, value2, "agentDepotId");
312
+            return (Criteria) this;
313
+        }
314
+
315
+        public Criteria andAgentDepotIdNotBetween(Integer value1, Integer value2) {
316
+            addCriterion("agent_depot_id not between", value1, value2, "agentDepotId");
317
+            return (Criteria) this;
318
+        }
319
+
320
+        public Criteria andOrgIdIsNull() {
321
+            addCriterion("org_id is null");
322
+            return (Criteria) this;
323
+        }
324
+
325
+        public Criteria andOrgIdIsNotNull() {
326
+            addCriterion("org_id is not null");
327
+            return (Criteria) this;
328
+        }
329
+
330
+        public Criteria andOrgIdEqualTo(Integer value) {
331
+            addCriterion("org_id =", value, "orgId");
332
+            return (Criteria) this;
333
+        }
334
+
335
+        public Criteria andOrgIdNotEqualTo(Integer value) {
336
+            addCriterion("org_id <>", value, "orgId");
337
+            return (Criteria) this;
338
+        }
339
+
340
+        public Criteria andOrgIdGreaterThan(Integer value) {
341
+            addCriterion("org_id >", value, "orgId");
342
+            return (Criteria) this;
343
+        }
344
+
345
+        public Criteria andOrgIdGreaterThanOrEqualTo(Integer value) {
346
+            addCriterion("org_id >=", value, "orgId");
347
+            return (Criteria) this;
348
+        }
349
+
350
+        public Criteria andOrgIdLessThan(Integer value) {
351
+            addCriterion("org_id <", value, "orgId");
352
+            return (Criteria) this;
353
+        }
354
+
355
+        public Criteria andOrgIdLessThanOrEqualTo(Integer value) {
356
+            addCriterion("org_id <=", value, "orgId");
357
+            return (Criteria) this;
358
+        }
359
+
360
+        public Criteria andOrgIdIn(List<Integer> values) {
361
+            addCriterion("org_id in", values, "orgId");
362
+            return (Criteria) this;
363
+        }
364
+
365
+        public Criteria andOrgIdNotIn(List<Integer> values) {
366
+            addCriterion("org_id not in", values, "orgId");
367
+            return (Criteria) this;
368
+        }
369
+
370
+        public Criteria andOrgIdBetween(Integer value1, Integer value2) {
371
+            addCriterion("org_id between", value1, value2, "orgId");
372
+            return (Criteria) this;
373
+        }
374
+
375
+        public Criteria andOrgIdNotBetween(Integer value1, Integer value2) {
376
+            addCriterion("org_id not between", value1, value2, "orgId");
377
+            return (Criteria) this;
378
+        }
379
+
380
+        public Criteria andDelFlagIsNull() {
381
+            addCriterion("del_flag is null");
382
+            return (Criteria) this;
383
+        }
384
+
385
+        public Criteria andDelFlagIsNotNull() {
386
+            addCriterion("del_flag is not null");
387
+            return (Criteria) this;
388
+        }
389
+
390
+        public Criteria andDelFlagEqualTo(Integer value) {
391
+            addCriterion("del_flag =", value, "delFlag");
392
+            return (Criteria) this;
393
+        }
394
+
395
+        public Criteria andDelFlagNotEqualTo(Integer value) {
396
+            addCriterion("del_flag <>", value, "delFlag");
397
+            return (Criteria) this;
398
+        }
399
+
400
+        public Criteria andDelFlagGreaterThan(Integer value) {
401
+            addCriterion("del_flag >", value, "delFlag");
402
+            return (Criteria) this;
403
+        }
404
+
405
+        public Criteria andDelFlagGreaterThanOrEqualTo(Integer value) {
406
+            addCriterion("del_flag >=", value, "delFlag");
407
+            return (Criteria) this;
408
+        }
409
+
410
+        public Criteria andDelFlagLessThan(Integer value) {
411
+            addCriterion("del_flag <", value, "delFlag");
412
+            return (Criteria) this;
413
+        }
414
+
415
+        public Criteria andDelFlagLessThanOrEqualTo(Integer value) {
416
+            addCriterion("del_flag <=", value, "delFlag");
417
+            return (Criteria) this;
418
+        }
419
+
420
+        public Criteria andDelFlagIn(List<Integer> values) {
421
+            addCriterion("del_flag in", values, "delFlag");
422
+            return (Criteria) this;
423
+        }
424
+
425
+        public Criteria andDelFlagNotIn(List<Integer> values) {
426
+            addCriterion("del_flag not in", values, "delFlag");
427
+            return (Criteria) this;
428
+        }
429
+
430
+        public Criteria andDelFlagBetween(Integer value1, Integer value2) {
431
+            addCriterion("del_flag between", value1, value2, "delFlag");
432
+            return (Criteria) this;
433
+        }
434
+
435
+        public Criteria andDelFlagNotBetween(Integer value1, Integer value2) {
436
+            addCriterion("del_flag not between", value1, value2, "delFlag");
437
+            return (Criteria) this;
438
+        }
439
+
440
+        public Criteria andCreateTimeIsNull() {
441
+            addCriterion("create_time is null");
442
+            return (Criteria) this;
443
+        }
444
+
445
+        public Criteria andCreateTimeIsNotNull() {
446
+            addCriterion("create_time is not null");
447
+            return (Criteria) this;
448
+        }
449
+
450
+        public Criteria andCreateTimeEqualTo(Date value) {
451
+            addCriterion("create_time =", value, "createTime");
452
+            return (Criteria) this;
453
+        }
454
+
455
+        public Criteria andCreateTimeNotEqualTo(Date value) {
456
+            addCriterion("create_time <>", value, "createTime");
457
+            return (Criteria) this;
458
+        }
459
+
460
+        public Criteria andCreateTimeGreaterThan(Date value) {
461
+            addCriterion("create_time >", value, "createTime");
462
+            return (Criteria) this;
463
+        }
464
+
465
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
466
+            addCriterion("create_time >=", value, "createTime");
467
+            return (Criteria) this;
468
+        }
469
+
470
+        public Criteria andCreateTimeLessThan(Date value) {
471
+            addCriterion("create_time <", value, "createTime");
472
+            return (Criteria) this;
473
+        }
474
+
475
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
476
+            addCriterion("create_time <=", value, "createTime");
477
+            return (Criteria) this;
478
+        }
479
+
480
+        public Criteria andCreateTimeIn(List<Date> values) {
481
+            addCriterion("create_time in", values, "createTime");
482
+            return (Criteria) this;
483
+        }
484
+
485
+        public Criteria andCreateTimeNotIn(List<Date> values) {
486
+            addCriterion("create_time not in", values, "createTime");
487
+            return (Criteria) this;
488
+        }
489
+
490
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
491
+            addCriterion("create_time between", value1, value2, "createTime");
492
+            return (Criteria) this;
493
+        }
494
+
495
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
496
+            addCriterion("create_time not between", value1, value2, "createTime");
497
+            return (Criteria) this;
498
+        }
499
+
500
+        public Criteria andBgmxzTbsjIsNull() {
501
+            addCriterion("bgmxz_tbsj is null");
502
+            return (Criteria) this;
503
+        }
504
+
505
+        public Criteria andBgmxzTbsjIsNotNull() {
506
+            addCriterion("bgmxz_tbsj is not null");
507
+            return (Criteria) this;
508
+        }
509
+
510
+        public Criteria andBgmxzTbsjEqualTo(Date value) {
511
+            addCriterion("bgmxz_tbsj =", value, "bgmxzTbsj");
512
+            return (Criteria) this;
513
+        }
514
+
515
+        public Criteria andBgmxzTbsjNotEqualTo(Date value) {
516
+            addCriterion("bgmxz_tbsj <>", value, "bgmxzTbsj");
517
+            return (Criteria) this;
518
+        }
519
+
520
+        public Criteria andBgmxzTbsjGreaterThan(Date value) {
521
+            addCriterion("bgmxz_tbsj >", value, "bgmxzTbsj");
522
+            return (Criteria) this;
523
+        }
524
+
525
+        public Criteria andBgmxzTbsjGreaterThanOrEqualTo(Date value) {
526
+            addCriterion("bgmxz_tbsj >=", value, "bgmxzTbsj");
527
+            return (Criteria) this;
528
+        }
529
+
530
+        public Criteria andBgmxzTbsjLessThan(Date value) {
531
+            addCriterion("bgmxz_tbsj <", value, "bgmxzTbsj");
532
+            return (Criteria) this;
533
+        }
534
+
535
+        public Criteria andBgmxzTbsjLessThanOrEqualTo(Date value) {
536
+            addCriterion("bgmxz_tbsj <=", value, "bgmxzTbsj");
537
+            return (Criteria) this;
538
+        }
539
+
540
+        public Criteria andBgmxzTbsjIn(List<Date> values) {
541
+            addCriterion("bgmxz_tbsj in", values, "bgmxzTbsj");
542
+            return (Criteria) this;
543
+        }
544
+
545
+        public Criteria andBgmxzTbsjNotIn(List<Date> values) {
546
+            addCriterion("bgmxz_tbsj not in", values, "bgmxzTbsj");
547
+            return (Criteria) this;
548
+        }
549
+
550
+        public Criteria andBgmxzTbsjBetween(Date value1, Date value2) {
551
+            addCriterion("bgmxz_tbsj between", value1, value2, "bgmxzTbsj");
552
+            return (Criteria) this;
553
+        }
554
+
555
+        public Criteria andBgmxzTbsjNotBetween(Date value1, Date value2) {
556
+            addCriterion("bgmxz_tbsj not between", value1, value2, "bgmxzTbsj");
557
+            return (Criteria) this;
558
+        }
559
+
560
+        public Criteria andQccrkTbsjIsNull() {
561
+            addCriterion("qccrk_tbsj is null");
562
+            return (Criteria) this;
563
+        }
564
+
565
+        public Criteria andQccrkTbsjIsNotNull() {
566
+            addCriterion("qccrk_tbsj is not null");
567
+            return (Criteria) this;
568
+        }
569
+
570
+        public Criteria andQccrkTbsjEqualTo(Date value) {
571
+            addCriterion("qccrk_tbsj =", value, "qccrkTbsj");
572
+            return (Criteria) this;
573
+        }
574
+
575
+        public Criteria andQccrkTbsjNotEqualTo(Date value) {
576
+            addCriterion("qccrk_tbsj <>", value, "qccrkTbsj");
577
+            return (Criteria) this;
578
+        }
579
+
580
+        public Criteria andQccrkTbsjGreaterThan(Date value) {
581
+            addCriterion("qccrk_tbsj >", value, "qccrkTbsj");
582
+            return (Criteria) this;
583
+        }
584
+
585
+        public Criteria andQccrkTbsjGreaterThanOrEqualTo(Date value) {
586
+            addCriterion("qccrk_tbsj >=", value, "qccrkTbsj");
587
+            return (Criteria) this;
588
+        }
589
+
590
+        public Criteria andQccrkTbsjLessThan(Date value) {
591
+            addCriterion("qccrk_tbsj <", value, "qccrkTbsj");
592
+            return (Criteria) this;
593
+        }
594
+
595
+        public Criteria andQccrkTbsjLessThanOrEqualTo(Date value) {
596
+            addCriterion("qccrk_tbsj <=", value, "qccrkTbsj");
597
+            return (Criteria) this;
598
+        }
599
+
600
+        public Criteria andQccrkTbsjIn(List<Date> values) {
601
+            addCriterion("qccrk_tbsj in", values, "qccrkTbsj");
602
+            return (Criteria) this;
603
+        }
604
+
605
+        public Criteria andQccrkTbsjNotIn(List<Date> values) {
606
+            addCriterion("qccrk_tbsj not in", values, "qccrkTbsj");
607
+            return (Criteria) this;
608
+        }
609
+
610
+        public Criteria andQccrkTbsjBetween(Date value1, Date value2) {
611
+            addCriterion("qccrk_tbsj between", value1, value2, "qccrkTbsj");
612
+            return (Criteria) this;
613
+        }
614
+
615
+        public Criteria andQccrkTbsjNotBetween(Date value1, Date value2) {
616
+            addCriterion("qccrk_tbsj not between", value1, value2, "qccrkTbsj");
617
+            return (Criteria) this;
618
+        }
619
+
620
+        public Criteria andHccrkTbsjIsNull() {
621
+            addCriterion("hccrk_tbsj is null");
622
+            return (Criteria) this;
623
+        }
624
+
625
+        public Criteria andHccrkTbsjIsNotNull() {
626
+            addCriterion("hccrk_tbsj is not null");
627
+            return (Criteria) this;
628
+        }
629
+
630
+        public Criteria andHccrkTbsjEqualTo(Date value) {
631
+            addCriterion("hccrk_tbsj =", value, "hccrkTbsj");
632
+            return (Criteria) this;
633
+        }
634
+
635
+        public Criteria andHccrkTbsjNotEqualTo(Date value) {
636
+            addCriterion("hccrk_tbsj <>", value, "hccrkTbsj");
637
+            return (Criteria) this;
638
+        }
639
+
640
+        public Criteria andHccrkTbsjGreaterThan(Date value) {
641
+            addCriterion("hccrk_tbsj >", value, "hccrkTbsj");
642
+            return (Criteria) this;
643
+        }
644
+
645
+        public Criteria andHccrkTbsjGreaterThanOrEqualTo(Date value) {
646
+            addCriterion("hccrk_tbsj >=", value, "hccrkTbsj");
647
+            return (Criteria) this;
648
+        }
649
+
650
+        public Criteria andHccrkTbsjLessThan(Date value) {
651
+            addCriterion("hccrk_tbsj <", value, "hccrkTbsj");
652
+            return (Criteria) this;
653
+        }
654
+
655
+        public Criteria andHccrkTbsjLessThanOrEqualTo(Date value) {
656
+            addCriterion("hccrk_tbsj <=", value, "hccrkTbsj");
657
+            return (Criteria) this;
658
+        }
659
+
660
+        public Criteria andHccrkTbsjIn(List<Date> values) {
661
+            addCriterion("hccrk_tbsj in", values, "hccrkTbsj");
662
+            return (Criteria) this;
663
+        }
664
+
665
+        public Criteria andHccrkTbsjNotIn(List<Date> values) {
666
+            addCriterion("hccrk_tbsj not in", values, "hccrkTbsj");
667
+            return (Criteria) this;
668
+        }
669
+
670
+        public Criteria andHccrkTbsjBetween(Date value1, Date value2) {
671
+            addCriterion("hccrk_tbsj between", value1, value2, "hccrkTbsj");
672
+            return (Criteria) this;
673
+        }
674
+
675
+        public Criteria andHccrkTbsjNotBetween(Date value1, Date value2) {
676
+            addCriterion("hccrk_tbsj not between", value1, value2, "hccrkTbsj");
677
+            return (Criteria) this;
678
+        }
679
+    }
680
+
681
+    /**
682
+     * business_agent_tank_exist
683
+     */
684
+    public static class Criteria extends GeneratedCriteria {
685
+
686
+        protected Criteria() {
687
+            super();
688
+        }
689
+    }
690
+
691
+    /**
692
+     * business_agent_tank_exist 2020-08-17
693
+     */
694
+    public static class Criterion {
695
+        private String condition;
696
+
697
+        private Object value;
698
+
699
+        private Object secondValue;
700
+
701
+        private boolean noValue;
702
+
703
+        private boolean singleValue;
704
+
705
+        private boolean betweenValue;
706
+
707
+        private boolean listValue;
708
+
709
+        private String typeHandler;
710
+
711
+        public String getCondition() {
712
+            return condition;
713
+        }
714
+
715
+        public Object getValue() {
716
+            return value;
717
+        }
718
+
719
+        public Object getSecondValue() {
720
+            return secondValue;
721
+        }
722
+
723
+        public boolean isNoValue() {
724
+            return noValue;
725
+        }
726
+
727
+        public boolean isSingleValue() {
728
+            return singleValue;
729
+        }
730
+
731
+        public boolean isBetweenValue() {
732
+            return betweenValue;
733
+        }
734
+
735
+        public boolean isListValue() {
736
+            return listValue;
737
+        }
738
+
739
+        public String getTypeHandler() {
740
+            return typeHandler;
741
+        }
742
+
743
+        protected Criterion(String condition) {
744
+            super();
745
+            this.condition = condition;
746
+            this.typeHandler = null;
747
+            this.noValue = true;
748
+        }
749
+
750
+        protected Criterion(String condition, Object value, String typeHandler) {
751
+            super();
752
+            this.condition = condition;
753
+            this.value = value;
754
+            this.typeHandler = typeHandler;
755
+            if (value instanceof List<?>) {
756
+                this.listValue = true;
757
+            } else {
758
+                this.singleValue = true;
759
+            }
760
+        }
761
+
762
+        protected Criterion(String condition, Object value) {
763
+            this(condition, value, null);
764
+        }
765
+
766
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
767
+            super();
768
+            this.condition = condition;
769
+            this.value = value;
770
+            this.secondValue = secondValue;
771
+            this.typeHandler = typeHandler;
772
+            this.betweenValue = true;
773
+        }
774
+
775
+        protected Criterion(String condition, Object value, Object secondValue) {
776
+            this(condition, value, secondValue, null);
777
+        }
778
+    }
779
+}

+ 4 - 1
src/main/java/com/chinaitop/depot/agent/basic/service/agentDepotService.java

@@ -30,6 +30,8 @@ public interface agentDepotService {
30 30
 
31 31
     void updateDeleteById(Integer id,Integer delFlag);
32 32
 
33
+    Integer getIdHouse(Integer depotId);
34
+
33 35
     BusinessAgentDepot findById(Integer id);
34 36
 
35 37
     /**
@@ -37,7 +39,8 @@ public interface agentDepotService {
37 39
      * @param map
38 40
      * @return
39 41
      */
40
-    List<Map<String, Object>> getDepotList(Map<String, Object> map);
42
+    List<Map<String, Object>> getHouseDepotList(Map<String, Object> map);
43
+    List<Map<String, Object>> getTankDepotList(Map<String, Object> map);
41 44
 
42 45
     /**
43 46
      * 导入

+ 9 - 0
src/main/java/com/chinaitop/depot/agent/basic/service/agentTankExistService.java

@@ -0,0 +1,9 @@
1
+package com.chinaitop.depot.agent.basic.service;
2
+
3
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist;
4
+
5
+public interface agentTankExistService {
6
+	void add(BusinessAgentTankExist user);
7
+
8
+	void updateTankDeleteById(String tankId,Integer delFlag);
9
+}

+ 12 - 4
src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentDepotServiceImpl.java

@@ -5,8 +5,6 @@ import com.chinaitop.depot.agent.basic.mapper.BusinessAgentMapper;
5 5
 import com.chinaitop.depot.agent.basic.mapper.BusinessAgentStorehouseMapper;
6 6
 import com.chinaitop.depot.agent.basic.model.*;
7 7
 import com.chinaitop.depot.agent.basic.service.agentDepotService;
8
-import com.chinaitop.utils.ParameterUtil;
9
-import com.github.pagehelper.PageHelper;
10 8
 import org.springframework.stereotype.Service;
11 9
 
12 10
 import javax.annotation.Resource;
@@ -47,8 +45,13 @@ public class AgentDepotServiceImpl implements agentDepotService {
47 45
     }
48 46
 
49 47
     @Override
50
-    public List<Map<String, Object>> getDepotList(Map<String, Object> map) {
51
-        return BusinessAgentDepotMapper.getDepotList(map);
48
+    public List<Map<String, Object>> getHouseDepotList(Map<String, Object> map) {
49
+        return BusinessAgentDepotMapper.getHouseDepotList(map);
50
+    }
51
+
52
+    @Override
53
+    public List<Map<String, Object>> getTankDepotList(Map<String, Object> map) {
54
+        return BusinessAgentDepotMapper.getTankDepotList(map);
52 55
     }
53 56
 
54 57
     @Override
@@ -67,6 +70,11 @@ public class AgentDepotServiceImpl implements agentDepotService {
67 70
     }
68 71
 
69 72
     @Override
73
+    public Integer getIdHouse(Integer depotId) {
74
+        return BusinessAgentDepotMapper.getIdHouse(depotId);
75
+    }
76
+
77
+    @Override
70 78
     public void updateDeleteById(Integer depotId,Integer delFlag) {
71 79
         BusinessAgentDepot businessAgentDepot = new BusinessAgentDepot();
72 80
         businessAgentDepot.setId(depotId);

+ 28 - 0
src/main/java/com/chinaitop/depot/agent/basic/service/impl/AgentTankExistServiceImpl.java

@@ -0,0 +1,28 @@
1
+package com.chinaitop.depot.agent.basic.service.impl;
2
+
3
+import com.chinaitop.depot.agent.basic.mapper.BusinessAgentTankExistMapper;
4
+import com.chinaitop.depot.agent.basic.model.BusinessAgentStorehouse;
5
+import com.chinaitop.depot.agent.basic.model.BusinessAgentTankExist;
6
+import com.chinaitop.depot.agent.basic.service.agentTankExistService;
7
+import org.springframework.stereotype.Service;
8
+
9
+import javax.annotation.Resource;
10
+
11
+@Service
12
+public class AgentTankExistServiceImpl implements agentTankExistService {
13
+
14
+    @Resource
15
+    private BusinessAgentTankExistMapper businessAgentTankExistMapper;
16
+
17
+	@Override
18
+	public void add(BusinessAgentTankExist tank) {
19
+		businessAgentTankExistMapper.insert(tank);
20
+	}
21
+
22
+	public void updateTankDeleteById(String tankId,Integer delFlag) {
23
+		BusinessAgentTankExist businessAgentTankExist = new BusinessAgentTankExist();
24
+		businessAgentTankExist.setId(tankId);
25
+		businessAgentTankExist.setDelFlag(delFlag);
26
+		businessAgentTankExistMapper.updateByPrimaryKeySelective(businessAgentTankExist);
27
+	}
28
+}

+ 10 - 0
src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -291,4 +291,14 @@ public class ParameterUtil {
291 291
         // 返回
292 292
         return sbf.toString();
293 293
     }
294
+
295
+    /**
296
+     * 生成32位随机数
297
+     *
298
+     * @return 返回32位随机数
299
+     */
300
+    public static String getCode() {
301
+        UUID uuid = UUID.randomUUID();
302
+        return uuid.toString().replace("-", "");
303
+    }
294 304
 }