特设大屏-检验检测-报检数量-下钻后筛选修改及筛选办理状态下拉调整

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JYJCStatisticsMapper.xml

@@ -55,6 +55,7 @@
 			tz_base_enterprise_info b
 		<where>
 			tzjia.inspection_unit_code= b.use_unit_code
+			and tzjia.status != '6610'  and tzjia.status != '6615'
 			and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
 			<if test="dto.applicationNo != null and dto.applicationNo != ''">
 				and tzjia.application_no like concat('%',#{dto.applicationNo},'%')

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JYJCDPStatisticsController.java

@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.biz.common.dto.JyjcInspectionApplicationDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JYJCDPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -209,6 +207,13 @@ public class JYJCDPStatisticsController {
     public ResponseModel<JSONObject> queryDetailsMatui(@PathVariable Long sequenceNbr, @RequestBody JSONObject jsonObject) {
         return ResponseHelper.buildResponse(statisticsService.queryDetailsMatui(sequenceNbr, JSONObject.parseObject(JSON.toJSONString(jsonObject))));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handle/status")
+    @ApiOperation(httpMethod = "POST", value = "检验检测办理状态", notes = "检验检测办理状态")
+    public ResponseModel<List<Map<String,Object>>> handleStatus() {
+        return ResponseHelper.buildResponse(statisticsService.handleStatus());
+    }
 }
 
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JYJCDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.jna.StringArray;
-import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.dto.JyjcInspectionApplicationDto;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 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.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
-import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
@@ -24,8 +19,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionResultMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.JYJCStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
-import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
@@ -43,13 +37,10 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
-import javax.validation.constraints.NotBlank;
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.time.LocalDate;
@@ -712,4 +703,19 @@ public class JYJCDPStatisticsServiceImpl {
         result.put("completionRate",formattedCompletionRate);
         return result;
     }
+
+    public List<Map<String, Object>> handleStatus() {
+        FlowStatusEnum[] values = FlowStatusEnum.values();
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (FlowStatusEnum value : values) {
+            Map<String, Object> map = new HashMap<>();
+            if (value.getCode() != 6610 && value.getCode() != 6615 && value.getCode() != 6612) {
+                map.put("name", value.getName());
+                map.put("code", value.getCode());
+                result.add(map);
+            }
+        }
+        result =  result.stream().sorted(Comparator.comparing(map -> (Integer) map.get("code"))).collect(Collectors.toList());
+        return result;
+    }
 }