bug

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/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/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/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/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>