business-common/src/main/java/com/rongwei/bscommon/sys/feign/BsPlatformService.java

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.feign;
 import com.rongwei.bsentity.dto.OutsideInspactionSyncDto;
 import com.rongwei.rwcommon.base.R;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -18,5 +19,9 @@ public interface BsPlatformService {
      * @return
      */
     @PostMapping("rw-business-server/sync/exterior-inspection")
-    R syncOutsideInpection(@RequestBody List<OutsideInspactionSyncDto> list);
+    R syncOutsideInpection(
+            @RequestBody List<OutsideInspactionSyncDto> list
+            , @PathVariable("companyName") String companyName  //路径参数
+    );
+
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxInsideInspectionService.java

@@ -1,12 +1,12 @@
 package com.rongwei.bscommon.sys.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZhcxInsideInspectionDo;
 import com.rongwei.bsentity.dto.InsideInspectionOperRequest;
 import com.rongwei.bsentity.dto.inside.*;
 import com.rongwei.bsentity.vo.ZhcxInsideInspectionVo;
-import org.apache.ibatis.annotations.Param;
+import com.rongwei.rwcommon.base.R;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -166,4 +166,6 @@ public interface ZhcxInsideInspectionService extends IService<ZhcxInsideInspecti
      *
      */
     void doDeletedPointByPrjCode(String prjCode);
+
+    R getSeqReportResult(String projectCode, String inspectionPoint);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxOutsideInspectionItpService.java

@@ -67,7 +67,7 @@ public interface ZhcxOutsideInspectionItpService extends IService<ZhcxOutsideIns
      *
      * @param req
      */
-    void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req);
+    void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req,String companyName);
 
     /**
      * 获取初始化报验点状态报验单

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -33,6 +33,7 @@ import com.rongwei.rwadmincommon.system.service.PagePartService;
 import com.rongwei.rwadmincommon.system.service.SysGeneralCRUDService;
 import com.rongwei.rwadmincommon.system.service.SysUserService;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
@@ -1134,6 +1135,42 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         doDeletedPoint(project.getId());
     }
 
+    @Override
+    public R getSeqReportResult(String projectCode, String inspectionPoint) {
+        //根据INSPECTIONCOMPLATETIM 取最新的一条数据
+        LambdaQueryWrapper<ZhcxInsideInspectionDo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ZhcxInsideInspectionDo::getProjectcode, projectCode)
+                .eq(ZhcxInsideInspectionDo::getInspectioncontent, inspectionPoint)
+                .eq(ZhcxInsideInspectionDo::getInspectionstatus, "30")
+                .orderByDesc(ZhcxInsideInspectionDo::getInspectioncomplatetime)
+                .last("limit 1");
+
+        ZhcxInsideInspectionDo inside = this.getOne(queryWrapper);
+
+        //如果不是空去获取报验结论
+        if (ObjectUtil.isNotEmpty(inside)){
+            //根据inside ID 获取报验结论
+            LambdaQueryWrapper<ZhcxInsideInspectionDispatchDo> disQueryWrapper = Wrappers.lambdaQuery();
+            disQueryWrapper.eq(ZhcxInsideInspectionDispatchDo::getInsideid, inside.getId());
+            ZhcxInsideInspectionDispatchDo dispatchDo = dispatchService.getOne(disQueryWrapper);
+
+            if (ObjectUtil.isNotEmpty(dispatchDo)) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("projectcode", inside.getProjectcode());
+                data.put("inspectionpoint", inside.getInspectioncontent());
+                data.put("inspectioncode", inside.getInspectioncode());
+                data.put("result", dispatchDo.getInspectionconclusion());
+                return R.ok(data);
+            }else {
+                //如果没有查到完工报验结果 返回-2
+                return R.ok("-2","未查到完工报验结果");
+            }
+        }else {
+            //如果没有查到inside 返回 -1
+            return R.ok("-1","未查到报验内容");
+        }
+    }
+
     /**
      * 通过报验点拆单
      *

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -9,13 +9,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.ZhcxInsideInspectionDao;
+import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
 import com.rongwei.bscommon.sys.feign.BsPlatformService;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.ZhcxCommon;
 import com.rongwei.bsentity.domain.*;
-import com.rongwei.bscommon.sys.dao.ZhcxOutsideInspectionItpDao;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bsentity.dto.*;
 import com.rongwei.bsentity.dto.indicators.ComlpateIndicatorsRequest;
 import com.rongwei.bsentity.dto.outside.OutsideInspectionInsertRequest;
@@ -23,7 +23,9 @@ import com.rongwei.bsentity.dto.outside.OutsideInspectionUpdateRequest;
 import com.rongwei.bsentity.dto.project.indicator.DelPhysicalParam;
 import com.rongwei.bsentity.dto.project.node.ProjectNodeStateBo;
 import com.rongwei.bsentity.dto.project.node.UnItpNodeStateBo;
-import com.rongwei.bsentity.vo.*;
+import com.rongwei.bsentity.vo.OperOutsideInspectionVo;
+import com.rongwei.bsentity.vo.SupervisionVo;
+import com.rongwei.bsentity.vo.ZhcxOutsideExportVo;
 import com.rongwei.bsentity.vo.outside.OutsideInspectionVo;
 import com.rongwei.bsentity.vo.project.ShipOffStoreNodeTotal;
 import com.rongwei.commonservice.serial.service.SysSerialNumberService;
@@ -52,8 +54,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -1308,7 +1308,8 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
      * @param req
      */
     @Override
-    public void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req) {
+    public void sync2SubmissionPlatform(OutsideInspactionSyncReqquest req,String companyName) {
+        System.out.println(companyName+"公司名称===========");
         List<OutsideInspactionSyncDto> syncDtoList = dao.getInspection(req);
 
         if(ObjectUtil.isEmpty(syncDtoList)) {
@@ -1345,8 +1346,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             record.setDeleted("0");
             recordList.add(record);
         }
-
-        R result = bsPlatformService.syncOutsideInpection(syncDtoList);
+        R result = bsPlatformService.syncOutsideInpection(syncDtoList,companyName);
 
         if(ObjectUtil.isNull(result) || !"200".equals(result.getCode())) {
             log.error("请求结果：{}", result);

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxInsideInspectionController.java

@@ -258,5 +258,22 @@ public class ZhcxInsideInspectionController {
         service.doDeletedPointByPrjCode(json.getString("projectCode"));
         return R.ok();
     }
+
+    /**
+     * 生产订单末工序报工检验
+     * @param projectCode 项目工号
+     * @param inspectionPoint 报验内容（大构建号+小构建号+完工检验）
+     */
+    @PostMapping("/getSeqReportResult")
+    public R getSeqReportResult(
+            @RequestParam("projectcode") String projectCode,
+            @RequestParam("inspectionpoint") String inspectionPoint
+    ) {
+        return service.getSeqReportResult(projectCode, inspectionPoint);
+    }
+
+
+
+
 }
 

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxOutsideInspectionItpController.java

@@ -114,8 +114,8 @@ public class ZhcxOutsideInspectionItpController {
      */
     @ApiOperation("推送到报送平台")
     @PostMapping("/syncBsPlatform")
-    public R syncBsPlatform(@RequestBody OutsideInspactionSyncReqquest req){
-        service.sync2SubmissionPlatform(req);
+    public R syncBsPlatform(@RequestBody OutsideInspactionSyncReqquest req,@RequestParam String companyName){
+        service.sync2SubmissionPlatform(req,companyName);
         return R.ok();
     }