大屏气瓶检验检测统计接口

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationEquipMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplicationEquip;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +24,6 @@ public interface JyjcInspectionApplicationEquipMapper extends BaseMapper<JyjcIns
      * @return 统计列表
      */
     List<InspectTimeCountDto> countInspectTimeCountByTypeAndEquList(DPFilterParamDto dpFilterParamDto);
+
+    Integer inspectTimeCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationEquipMapper.xml

@@ -47,4 +47,27 @@
         c.equ_category,
         c.equ_define
     </select>
+    <select id="inspectTimeCount" resultType="java.lang.Integer">
+        SELECT COUNT(1) AS num
+        FROM
+            (
+                SELECT
+                    ae.equ_category,
+                    concat ( u.PROVINCE, '#', u.CITY, '#', u.COUNTY ) AS areaCode
+                FROM
+                    "tz_jyjc_inspection_application_equip" ae,
+                    tz_jyjc_inspection_application A,
+                    "idx_biz_jg_use_info" u
+                WHERE
+                    ae.equip_unicode = u."RECORD"
+                  AND A.sequence_nbr = ae.application_seq
+                  AND ( A.application_date BETWEEN #{ dpFilterParamDto.beginDate } AND #{ dpFilterParamDto.endDate } )
+                  AND A.status = '6616'
+                  AND ae.equ_category = '2300'
+            ) C
+        WHERE
+            C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )
+        GROUP BY
+            C.equ_category
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/DPStatisticsController.java

@@ -47,4 +47,16 @@ public class DPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.inspectTimeCountByTypeAndEquList(dpFilterParamDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "气瓶检验检测次数统计", notes = "气瓶检验检测次数统计")
+    @PostMapping(value = "/inspectTimeCount")
+    public ResponseModel<Map<String, Object>> inspectTimeCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if(!fieldErrors.isEmpty()){
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.inspectTimeCount(dpFilterParamDto));
+    }
+
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java

@@ -10,6 +10,10 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -113,4 +117,24 @@ public class DPStatisticsServiceImpl {
             dpFilterParamDto.setEndDate(DateUtil.today());
         }
     }
+
+    public Map<String, Object> inspectTimeCount(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> returnMap = new HashMap<>();
+        LocalDate today = LocalDate.now();
+        List xDataList = new ArrayList();
+        List<Integer> yDataList = new ArrayList();
+        DateTimeFormatter sdf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        for (int i = 2; i >= 0; i--) {
+            LocalDate firstDayOfPrevMonth = today.minusMonths(i).with(TemporalAdjusters.firstDayOfMonth());
+            LocalDate lastDayOfPrevMonth = today.minusMonths(i).with(TemporalAdjusters.lastDayOfMonth());
+            dpFilterParamDto.setBeginDate(LocalDateTime.of(firstDayOfPrevMonth, java.time.LocalTime.MIN).format(sdf));
+            dpFilterParamDto.setEndDate(LocalDateTime.of(lastDayOfPrevMonth, java.time.LocalTime.MAX).format(sdf));
+            Integer inspectTimeCount = inspectionApplicationEquipMapper.inspectTimeCount(dpFilterParamDto);
+            xDataList.add(firstDayOfPrevMonth.getMonthValue()+"月");
+            yDataList.add(null == inspectTimeCount ? 0 : inspectTimeCount);
+        }
+        returnMap.put("xData",xDataList);
+        returnMap.put("yData",yDataList);
+        return returnMap;
+    }
 }