Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-common/zd-common-core/src/main/java/com/zd/common/core/domain/per/PerPrefix.java

@@ -702,6 +702,17 @@ public class PerPrefix {
     /**   ================================================气瓶申请流程的权限=====================================     */
     public static final String QP_USEGASAPPLY = "bottle:usegasapply:";
 
+
+    /***
+     * 气瓶入库-2版
+     */
+    public static final String BOTTLE_BOTTLESTORAGE= "bottle:bottleStorage:";
+
+    /***
+     * 气瓶出库-2版
+     */
+    public static final String BOTTLE_BOTTLESTORAGEOUT= "bottle:bottleStorageOut:";
+
     /*****************************智能门锁******************************/
     public static final String SMARTLOCK_OPENDOORAPPLY = "smartlock:openDoorApply:";
 }

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/domain/BottleStorageOut.java

@@ -33,6 +33,12 @@ public class BottleStorageOut extends BaseBean{
     @ApiModelProperty("操作人Id")
     private Long applyUserid;
 
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
     @ApiModelProperty("联系方式")
     private String phone;
 

zd-modules/zd-bottle-parent/zd-bottle-api/src/main/java/com/zd/bottle/vo/AirAmount.java

@@ -17,6 +17,8 @@ public class AirAmount {
     private String date;
     @ApiModelProperty("楼栋名称/实验室名称")
     private String name;
+    @ApiModelProperty("用气申请数")
+    private Integer count;
     @ApiModelProperty("入库数量/气瓶库存数/楼栋库存数")
     private Integer inNum;
     @ApiModelProperty("出库数量")

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageController.java

@@ -1,28 +1,22 @@
 package com.zd.bottle.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.zd.bottle.domain.AlarmRecord;
+
 import com.zd.bottle.domain.BottleStorage;
-import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.service.BottleStorageService;
 import com.zd.bottle.service.UseRecordService;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.bottle.vo.UseRecordVo;
+import com.zd.common.core.domain.per.PerFun;
 import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.domain.AjaxResult;
 import com.zd.bottle.vo.BottleStorageUseVo;
-import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.utils.SecurityUtils;
-import com.zd.bottle.vo.BottleStorageVo;
-import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
 import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.ApiOperation;
-import org.apache.hadoop.security.SecurityUtil;
 import org.springframework.web.bind.annotation.*;
 import com.zd.common.core.web.controller.BaseController;
 
@@ -52,7 +46,8 @@ public class BottleStorageController extends BaseController {
     /**
      * 查询入库记录列表
      */
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:list")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:list")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
     public TableDataInfo<BottleStorageVo> list(BottleStorageVo vo) {
@@ -68,7 +63,8 @@ public class BottleStorageController extends BaseController {
      * @return Boolean
      */
     @ApiOperation(value = "新增入库信息")
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:add")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:add")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.ADD)
     @Log(title = "新增入库信息", businessType = BusinessType.INSERT)
     @PostMapping
     public ResultData<Boolean> add(@RequestBody BottleStorage bottleStorage) {
@@ -82,7 +78,8 @@ public class BottleStorageController extends BaseController {
      * @return
      */
     @ApiOperation(value = "入库详情")
-    @PreAuthorize(hasPermi = "bottle:bottleStorage:query")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorage:query")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGE + PerFun.QUERY)
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         Map<String,Object> map = new HashMap<String,Object>();

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/BottleStorageOutController.java

@@ -1,10 +1,10 @@
 package com.zd.bottle.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageOut;
-import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.service.BottleStorageService;
+import com.zd.bottle.service.BottleStorageOutService;
+import com.zd.common.core.domain.per.PerFun;
+import com.zd.common.core.domain.per.PerPrefix;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
@@ -27,20 +27,21 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/bottleStorageOut")
-public class BottleStorageOutController extends BaseController<BottleStorage> {
+public class BottleStorageOutController extends BaseController<BottleStorageOut> {
 
     @Resource
-    private BottleStorageService bottleStorageService;
+    private BottleStorageOutService outService;
 
 
     /**
      * 查询出库记录列表
      */
-    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:list")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorageOut:list")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.LIST)
     @GetMapping("/list")
     @ApiOperation(value = "查询出库记录列表")
-    public TableDataInfo<BottleStorage> list(BottleStorage bottleStorage) {
-        List<BottleStorage> list = bottleStorageService.list(new LambdaQueryWrapper<>(bottleStorage));
+    public TableDataInfo<BottleStorageOut> list(BottleStorageOut bottleStorage) {
+        List<BottleStorageOut> list = outService.list(new LambdaQueryWrapper<>(bottleStorage));
         return getDataTable(list);
     }
 
@@ -50,10 +51,26 @@ public class BottleStorageOutController extends BaseController<BottleStorage> {
      * @return Boolean
      */
     @ApiOperation(value = "出库修改")
-    @PreAuthorize(hasPermi = "bottle:bottleStorageOut:edit")
+    //@PreAuthorize(hasPermi = "bottle:bottleStorageOut:edit")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.EDIT)
     @Log(title = "出库修改", businessType = BusinessType.UPDATE)
     @PutMapping
-    public ResultData<Boolean> edit(@RequestBody BottleStorage bottleStorage) {
-        return ResultData.result(bottleStorageService.updateById(bottleStorage));
+    public ResultData<Boolean> edit(@RequestBody BottleStorageOut bottleStorage) {
+        return ResultData.result(outService.updateById(bottleStorage));
+    }
+
+    /**
+     * 新增出库
+     * @param bottleStorageOut 参数实体
+     * @return Boolean
+     */
+    @ApiOperation(value = "新增出库")
+    @PreAuthorize(hasPermi = PerPrefix.BOTTLE_BOTTLESTORAGEOUT+ PerFun.ADD)
+    @Log(title = "新增出库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public ResultData<Boolean> add(@RequestBody BottleStorageOut bottleStorageOut) {
+        // storageId  入库表id
+        // pressure 出库气压
+        return ResultData.result(outService.add(bottleStorageOut));
     }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/UseRecordController.java

@@ -136,6 +136,15 @@ public class UseRecordController extends BaseController<UseRecord> {
     }
 
     /**
+     * 用气申请统计
+     */
+    @ApiOperation(value = "用气申请统计")
+    @GetMapping(value = "/calcApply")
+    public ResultData<List<AirAmount>> calcApply(String airName) {
+        return ResultData.success(useRecordService.calcApply(airName));
+    }
+
+    /**
      * 新增使用登记
      * value 说明：
      * 1：正常状态

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/mapper/UsegasApplyMapper.java

@@ -2,6 +2,7 @@ package com.zd.bottle.mapper;
 
 import com.zd.bottle.domain.UsegasApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
 
@@ -22,4 +23,10 @@ public interface UsegasApplyMapper extends BaseMapper<UsegasApply> {
 
     UsegasApplyTabVo selectApplyTabCount(UsegasApply usegasApply);
 
+    /**
+     * 用气申请统计
+     * @param airName 气体名称
+     * @return List<AirAmount>
+     */
+    List<AirAmount> calcApply(String airName);
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/BottleStorageOutService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BottleStorageOutService extends IService<BottleStorageOut> {
 
+    boolean add(BottleStorageOut bottleStorageOut);
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UseRecordService.java

@@ -98,8 +98,15 @@ public interface UseRecordService extends IService<UseRecord> {
 
     /***
      * 查询气瓶的使用记录
-     * @param storageId
-     * @return
+     * @param storageId 入库ID
+     * @return List<UseRecordVo>
      */
     List<UseRecordVo> getListUseRecord(Long storageId);
+
+    /**
+     * 用气量信息统计
+     * @param airName 气体名称
+     * @return 数据集合
+     */
+    List<AirAmount> calcApply(String airName);
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/UsegasApplyService.java

@@ -2,6 +2,7 @@ package com.zd.bottle.service;
 
 import com.zd.bottle.domain.UsegasApply;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
 
@@ -21,4 +22,10 @@ public interface UsegasApplyService extends IService<UsegasApply> {
 
     UsegasApplyTabVo selectApplyTabCount(UsegasApply usegasApply);
 
+    /**
+     * 用气申请统计
+     * @param airName 气体名称
+     * @return List<AirAmount>
+     */
+    List<AirAmount> calcApply(String airName);
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zd.bottle.domain.AlarmRecord;
 import com.zd.bottle.domain.BottleStorage;
+import com.zd.bottle.domain.RfidTag;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.service.AlarmRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.service.BottleStorageService;
+import com.zd.bottle.service.RfidTagService;
 import com.zd.bottle.vo.AlarmRecordVo;
 import com.zd.bottle.vo.BottleStorageVo;
 import com.zd.common.core.constant.HttpStatus;
@@ -69,6 +71,11 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     @Resource
     private RemoteSubQueryService remoteSubQueryService;
 
+    @Resource
+    private RfidTagService tagService;
+
+    private static final String MSG_MATCH="==================>{},{}";
+
     @Override
     public void getRecordInfo(List<AlarmRecordVo> recordVos) {
         List<Long> masterIds = recordVos.stream().filter(alarmRecordVo -> alarmRecordVo.getProductType() == 1).map(AlarmRecordVo::getMasterId).collect(Collectors.toList());
@@ -105,15 +112,21 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
     public boolean remoteAdd(InventoryTag tag) {
         String electronicTag = tag.getEpc();
         RemoteLabHardware hardware = tag.getRemoteLabHardware();
-        LambdaQueryWrapper<BottleStorage> queryWrapper = Wrappers.lambdaQuery(BottleStorage.class);
-        queryWrapper.eq(BottleStorage::getElectronicTag,electronicTag);
-
-        BottleStorage bottleStorage = storageService.getOne(queryWrapper);
+        LambdaQueryWrapper<RfidTag> queryWrapper = Wrappers.lambdaQuery(RfidTag.class);
+        queryWrapper.eq(RfidTag::getTagCode,electronicTag);
+        RfidTag rfidTag = tagService.getOne(queryWrapper);
+        if (rfidTag==null){
+            log.info(MSG_MATCH,electronicTag,"标签未录入");
+            return false;
+        }
+        LambdaQueryWrapper<BottleStorage> wrapper = Wrappers.lambdaQuery(BottleStorage.class);
+        wrapper.eq(BottleStorage::getElectronicTag,rfidTag.getId());
+        BottleStorage bottleStorage = storageService.getOne(wrapper);
         if (bottleStorage != null) {
             if (hardware!=null){
                 //RFID设备报警
                 R<Boolean> alarm = remoteNettyService.alarm(hardware);
-                log.info("==================>{},{}",alarm.getCode(),alarm.getMsg());
+                log.info(MSG_MATCH,alarm.getCode(),alarm.getMsg());
             }
             Long id = bottleStorage.getId();
             String key = FRID_CODE + electronicTag + id;
@@ -133,7 +146,7 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
             return save(alarmRecord);
         }else {
             if (hardware!=null){
-                log.info("==================>{},{}",electronicTag,"标签无数据");
+                log.info(MSG_MATCH,electronicTag,"标签未绑定气瓶");
             }
             return false;
         }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageOutServiceImpl.java

@@ -1,11 +1,21 @@
 package com.zd.bottle.service.impl;
 
+import com.zd.bottle.domain.BottleStorage;
 import com.zd.bottle.domain.BottleStorageOut;
 import com.zd.bottle.mapper.BottleStorageOutMapper;
 import com.zd.bottle.service.BottleStorageOutService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.bottle.service.BottleStorageService;
+import com.zd.common.core.exception.ServiceException;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.security.service.TokenService;
+import com.zd.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Date;
+
 /**
  * <p>
  * 气瓶出库表 服务实现类
@@ -17,4 +27,34 @@ import org.springframework.stereotype.Service;
 @Service
 public class BottleStorageOutServiceImpl extends ServiceImpl<BottleStorageOutMapper, BottleStorageOut> implements BottleStorageOutService {
 
+    @Resource
+    private BottleStorageService bottleStorageService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Override
+    public boolean add(BottleStorageOut bottleStorageOut) {
+        if(StringUtils.isNull(bottleStorageOut.getStorageId())){
+            throw new ServiceException("入库ID不能为空。");
+        }
+        SysUser sysUser = tokenService.getLoginUser().getSysUser();
+        //查询入库信息
+        BottleStorage bottleStorage =  bottleStorageService.getById(bottleStorageOut.getStorageId());
+        if(bottleStorage.getStorageStatus()==3){
+            throw new ServiceException("该条记录已出库。");
+        }
+        //出库状态
+        bottleStorage.setStorageStatus(3);
+        //刷新入库状态
+        bottleStorageService.updateById(bottleStorage);
+
+        bottleStorageOut.setDeptId(sysUser.getDept().getDeptId());
+        bottleStorageOut.setDeptName(sysUser.getDept().getDeptName());
+        bottleStorageOut.setApplyUserid(sysUser.getUserId());
+        bottleStorageOut.setApplyUserName(sysUser.getUserName());
+        bottleStorageOut.setPhone(sysUser.getPhonenumber());
+        bottleStorageOut.setCreateTime(new Date());
+        return save(bottleStorageOut);
+    }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/BottleStorageServiceImpl.java

@@ -36,7 +36,7 @@ public class BottleStorageServiceImpl extends ServiceImpl<BottleStorageMapper, B
     @Autowired
     private BottleStorageMapper bottleStorageMapper;
 
-    @Resource
+    @Autowired
     private TokenService tokenService;
 
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -71,7 +71,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
             Long storageId = u.getStorageId();
             if (storageMap.containsKey(storageId)) {
                 BottleStorage bottleStorage = storageMap.get(storageId);
-                //u.setAirName(bottleStorage.getAirBottleName()).setStorage(bottleStorage);
+                u.setAirName(bottleStorage.getAirName()).setStorage(bottleStorage);
             }
         });
         return recordVos;
@@ -124,17 +124,17 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         return list(queryWrapper);
     }
 
-    /***
-     * 查询气瓶的使用记录
-     * @param storageId
-     * @return
-     */
     @Override
     public List<UseRecordVo> getListUseRecord(Long storageId) {
         return useRecordMapper.getListUseRecord(storageId);
     }
 
     @Override
+    public List<AirAmount> calcApply(String airName) {
+        return usegasApplyService.calcApply(airName);
+    }
+
+    @Override
     public List<AirAmount> calcRepertory(String airName) {
         return baseMapper.calcRepertory(airName);
     }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UsegasApplyServiceImpl.java

@@ -1,25 +1,17 @@
 package com.zd.bottle.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sun.org.apache.xpath.internal.operations.Bool;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zd.bottle.domain.UsegasApply;
 import com.zd.bottle.mapper.UsegasApplyMapper;
 import com.zd.bottle.service.UsegasApplyService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zd.bottle.vo.AirAmount;
 import com.zd.bottle.vo.UsegasApplyTabVo;
 import com.zd.bottle.vo.UsegasApplyVo;
-import com.zd.common.core.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -32,17 +24,19 @@ import java.util.stream.Collectors;
 @Service
 public class UsegasApplyServiceImpl extends ServiceImpl<UsegasApplyMapper, UsegasApply> implements UsegasApplyService {
 
-    @Autowired
-    private UsegasApplyMapper usegasApplyMapper;
-
     @Override
     public List <UsegasApplyVo> selectUseagsApplyList(UsegasApply usegasApply) {
-        return usegasApplyMapper.selectUseagsApplyList(usegasApply);
+        return baseMapper.selectUseagsApplyList(usegasApply);
     }
 
     @Override
     public UsegasApplyTabVo selectApplyTabCount(UsegasApply usegasApply) {
-        return usegasApplyMapper.selectApplyTabCount(usegasApply);
+        return baseMapper.selectApplyTabCount(usegasApply);
+    }
+
+    @Override
+    public List<AirAmount> calcApply(String airName) {
+        return baseMapper.calcApply(airName);
     }
 
 

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageOutMapper.xml

@@ -8,6 +8,8 @@
         <result column="create_time" property="createTime" />
         <result column="apply_user_name" property="applyUserName" />
         <result column="apply_userid" property="applyUserid" />
+        <result column="dept_id" property="deptId" />
+        <result column="apply_userid" property="applyUserid" />
         <result column="phone" property="phone" />
         <result column="storage_id" property="storageId" />
         <result column="pressure" property="pressure" />

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/UsegasApplyMapper.xml

@@ -4,27 +4,27 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.zd.bottle.domain.UsegasApply">
-        <result column="id" property="id" />
-        <result column="create_time" property="createTime" />
-        <result column="location" property="location" />
-        <result column="subject_id" property="subjectId" />
-        <result column="apply_user" property="applyUser" />
-        <result column="user_id" property="userId" />
-        <result column="dept_id" property="deptId" />
-        <result column="dept_name" property="deptName" />
-        <result column="phone" property="phone" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="gas_use" property="gasUse" />
-        <result column="apply_certificate" property="applyCertificate" />
-        <result column="safety_precautions" property="safetyPrecautions" />
-        <result column="use_gas_id" property="useGasId" />
-        <result column="use_gas_name" property="useGasName" />
-        <result column="lead_audit_staus" property="leadAuditStaus" />
-        <result column="lead_audit_userid" property="leadAuditUserid" />
-        <result column="lead_audit_username" property="leadAuditUsername" />
-        <result column="lead_audit_time" property="leadAuditTime" />
-        <result column="lead_audit_cause" property="leadAuditCause" />
+        <result column="id" property="id"/>
+        <result column="create_time" property="createTime"/>
+        <result column="location" property="location"/>
+        <result column="subject_id" property="subjectId"/>
+        <result column="apply_user" property="applyUser"/>
+        <result column="user_id" property="userId"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="phone" property="phone"/>
+        <result column="start_time" property="startTime"/>
+        <result column="end_time" property="endTime"/>
+        <result column="gas_use" property="gasUse"/>
+        <result column="apply_certificate" property="applyCertificate"/>
+        <result column="safety_precautions" property="safetyPrecautions"/>
+        <result column="use_gas_id" property="useGasId"/>
+        <result column="use_gas_name" property="useGasName"/>
+        <result column="lead_audit_staus" property="leadAuditStaus"/>
+        <result column="lead_audit_userid" property="leadAuditUserid"/>
+        <result column="lead_audit_username" property="leadAuditUsername"/>
+        <result column="lead_audit_time" property="leadAuditTime"/>
+        <result column="lead_audit_cause" property="leadAuditCause"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -35,8 +35,10 @@
     </sql>
 
 
-    <select id="selectUseagsApplyList" parameterType="com.zd.bottle.domain.UsegasApply" resultType="com.zd.bottle.vo.UsegasApplyVo">
-        select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time applyTime,
+    <select id="selectUseagsApplyList" parameterType="com.zd.bottle.domain.UsegasApply"
+            resultType="com.zd.bottle.vo.UsegasApplyVo">
+        select ua.id,ua.apply_user applyUserName,ua.phone applyUserPhone,ua.use_gas_name useGasName,ua.create_time
+        applyTime,
         ua.start_time startTime,ua.end_time endTime,ua.gas_use gasUse,ua.safety_precautions safetyPrecautions,
         ua.use_gas_file useGasFile
         from ab_usegas_apply ua
@@ -53,11 +55,27 @@
         </where>
     </select>
 
-    <select id="selectApplyTabCount" parameterType="com.zd.bottle.domain.UsegasApply" resultType="com.zd.bottle.vo.UsegasApplyTabVo">
-        SELECT
-         (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 0) waitApplyCount,
-         (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 1) passApplyCount,
-         (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 2) refuseApplyCount
+    <select id="selectApplyTabCount" parameterType="com.zd.bottle.domain.UsegasApply"
+            resultType="com.zd.bottle.vo.UsegasApplyTabVo">
+        SELECT (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 0) waitApplyCount,
+               (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 1) passApplyCount,
+               (SELECT COUNT(ua.id) FROM ab_usegas_apply ua WHERE ua.lead_audit_staus = 2) refuseApplyCount
         FROM DUAL
     </select>
+    <select id="calcApply" resultType="com.zd.bottle.vo.AirAmount" parameterType="java.lang.String">
+        SELECT
+        DATE_FORMAT( r.create_time, '%Y年-%m月' ) date,
+        count(1) as count
+        FROM
+        ab_usegas_apply r
+        WHERE
+        DATE_FORMAT( r.create_time, '%Y-%m' )> DATE_FORMAT( date_sub( curdate(), INTERVAL 12 MONTH ), '%Y-%m' )
+        and r.lead_audit_staus=1
+        <if test="airName != null and airName!=''">
+            and r.use_gas_name LIKE concat( '%', #{airName}, '%' ) )
+        </if>
+        GROUP BY
+        MONTH (r.create_time
+        )
+    </select>
 </mapper>