已审核列表

njzscloud-svr/src/main/java/com/njzscloud/supervisory/hsoa/service/HsoaService.java

@@ -1,26 +1,15 @@
 package com.njzscloud.supervisory.hsoa.service;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import com.njzscloud.common.core.jackson.Jackson;
-import com.njzscloud.common.core.tuple.Tuple2;
-import com.njzscloud.common.core.utils.ImgUtil;
-import com.njzscloud.common.oss.util.AliOSS;
 import com.njzscloud.supervisory.hsoa.Hsoa;
 import com.njzscloud.supervisory.hsoa.pojo.param.PushProvincialSaveParam;
-import com.njzscloud.supervisory.hsoa.pojo.param.PushProvincialUploadParam;
 import com.njzscloud.supervisory.hsoa.pojo.result.HsoaResult;
-import com.njzscloud.supervisory.hsoa.pojo.result.UploadResult;
 import com.njzscloud.supervisory.order.pojo.result.OrderPagingResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.format.DateTimeFormatter;
@@ -145,12 +134,12 @@ public class HsoaService {
     public HsoaResult<?> pushProvincialSave(OrderPagingResult detail) {
         log.info("上传数据：{}", Jackson.toJsonStr(detail));
 
-        return Hsoa.pushProvincial(new PushProvincialSaveParam()
+        PushProvincialSaveParam param = new PushProvincialSaveParam()
                 .setHandleInfo(new PushProvincialSaveParam.HandleInfo()
                         .setApproveDate(detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                         .setApproveUserName(detail.getCheckerName())
-                        .setCreateTime(detail.getCreateTime())
-                        .setCreaterName(detail.getContacts())
+                        // .setCreateTime(detail.getCreateTime())
+                        // .setCreaterName(detail.getContacts())
                         // .setDisposalSiteCode("")
                         .setDisposalSiteName(detail.getStationName())
                         // .setHandleCraft("")
@@ -176,9 +165,10 @@ public class HsoaService {
                                 // .setCgUnitCode("")
                                 .setCgUnitName(detail.getAreaName() + "城管")
                                 .setCgUserId(detail.getQuAuditUserId() == null ? (detail.getShiAuditUserId() == null ? null : detail.getShiAuditUserId().toString()) : detail.getQuAuditUserId().toString())
-                                .setCgUserName(detail.getQuAuditUserName() == null ? (detail.getShiAuditUserName() == null ? null : detail.getShiAuditUserName()) : detail.getQuAuditUserName())
-                                .setCreateTime(detail.getCreateTime())
-                                .setCreaterName(detail.getContacts())
+                                // .setCgUserName(detail.getQuAuditUserName() == null ? (detail.getShiAuditUserName() == null ? null : detail.getShiAuditUserName()) : detail.getQuAuditUserName())
+                                .setCgUserName(detail.getAreaName().contains("琅琊") ? "陶明莉" : (detail.getAreaName().contains("南谯") ? "刘浩" : (detail.getQuAuditUserName() == null ? (detail.getShiAuditUserName() == null ? null : detail.getShiAuditUserName()) : detail.getQuAuditUserName())))
+                        // .setCreateTime(detail.getCreateTime())
+                        // .setCreaterName(detail.getContacts())
                         // .setCG_REVIEW_FILE("")
                 )
                 .setTransportOrder(new PushProvincialSaveParam.TransportOrder()
@@ -211,7 +201,10 @@ public class HsoaService {
                         .setStreetName(detail.getTownName())
                         .setTransportationEnterpriseId(detail.getTransCompanyId() == null ? null : detail.getTransCompanyId().toString())
                         .setTransportationEnterpriseName(detail.getTransCompanyName())
-                        .setWasteTypeCode(detail.getGoodsName().contains("拆除") ? "4" : (detail.getGoodsName().contains("装修") ? "5" : (detail.getGoodsName().contains("建筑") ? "3" : null)))
+                        .setWasteTypeCode(detail.getGoodsName().contains("拆除") ? "4" :
+                                (detail.getGoodsName().contains("装修") ? "5" :
+                                        (detail.getGoodsName().contains("建筑") ? "3" : (detail.getGoodsName().contains("园林") ? "3" : (detail.getGoodsName().contains("拆迁") ? "4" : null)))
+                                ))
                         .setWasteTypeName(detail.getGoodsName())
                         .setWorkUnitCreditCode(detail.getUscc())
                         .setWorkUnitDirector(detail.getContacts())
@@ -245,11 +238,15 @@ public class HsoaService {
                         .setTransportEndDate(detail.getOutTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                         .setTransportationEnterpriseId(detail.getTransCompanyId() == null ? null : detail.getTransCompanyId().toString())
                         .setTransportationEnterpriseName(detail.getTransCompanyName())
-                ));
+                );
+        log.info(Jackson.toJsonStr(param));
+        return Hsoa.pushProvincial(param);
+        // return null;
     }
 
     private String upload(List<String> urls, String uploadPath) {
-        if (CollUtil.isEmpty(urls)) return null;
+        return null;
+        /* if (CollUtil.isEmpty(urls)) return null;
         String url = urls.get(0);
         if (StrUtil.isBlank(url)) return null;
         url = url.substring(1);
@@ -274,6 +271,6 @@ public class HsoaService {
             throw new RuntimeException(e);
         } finally {
             IoUtil.close(in);
-        }
+        } */
     }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java

@@ -294,8 +294,8 @@ public class OrderInfoController {
     }
 
     @PostMapping("/hsoa/push_provincial")
-    public R<?> pushProvincial(@RequestParam("orderId") Long orderId) {
-        return R.success(orderInfoService.pushProvincial(orderId));
+    public R<?> pushProvincial(@RequestBody List<String> orderSns) {
+        return R.success(orderInfoService.pushProvincial(orderSns));
     }
 
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -554,7 +554,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
                 ew
                         .in("a.order_status", OrderStatus.YiJieDan, OrderStatus.QingYunZhong, OrderStatus.YiJinChang, OrderStatus.YiChuChang, OrderStatus.YiWanCheng)
                         .and(it ->
-                                it.or(CollUtil.isNotEmpty(areaList), it0 -> it0.in("b.area", areaList).eq("a.audit_status", AuditStatus.ShiDaiShenHe))
+                                it.or(CollUtil.isNotEmpty(areaList), it0 -> it0.in("b.area", areaList).in("a.audit_status", AuditStatus.ShiDaiShenHe, AuditStatus.TongGuo))
                                         .or(CollUtil.isNotEmpty(cityList), it1 -> it1.in("b.area", cityList).in("a.audit_status", AuditStatus.TongGuo, AuditStatus.BoHui))
                                         .or(CollUtil.isNotEmpty(cityAreaList), it2 -> it2.in("b.area", cityAreaList).in("a.audit_status", AuditStatus.TongGuo, AuditStatus.BoHui))
                         );
@@ -2135,8 +2135,27 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
     }
 
-    public HsoaResult<?> pushProvincial(Long orderId) {
-        OrderPagingResult detail = this.detail(orderId);
-        return hsoaService.pushProvincialSave(detail);
+    public List<Map<String, Object>> pushProvincial(List<String> orderSns) {
+        List<Map<String, Object>> list = new ArrayList<>(orderSns.size());
+        for (String orderSn : orderSns) {
+            try {
+                OrderInfoEntity orderInfo = this.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, orderSn));
+                Long orderId = orderInfo.getId();
+                OrderPagingResult detail = this.detail(orderId);
+                HsoaResult<?> hsoaResult = hsoaService.pushProvincialSave(detail);
+                list.add(MapUtil.<String, Object>builder()
+                        .put("result", hsoaResult)
+                        .put("id", orderId)
+                        .put("sn", orderSn)
+                        .build());
+            } catch (Exception e) {
+                list.add(MapUtil.<String, Object>builder()
+                        .put("result", "失败")
+                        .put("sn", orderSn)
+                        .build());
+                log.error("单号：{}", orderSn, e);
+            }
+        }
+        return list;
     }
 }