自定义sql添加删除过滤条件

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java

@@ -690,7 +690,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
     @Override
     public List<PurchaseOrderDO> getOrderByNos(List<String> orderNos) {
-        return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos);
+        return purchaseOrderMapper.selectList(PurchaseOrderDO::getSystemOrderNumber, orderNos,PurchaseOrderDO::getDeleted,0);
     }
 
     @Override

zt-module-contract-order/zt-module-contract-order-server/src/main/resources/mapper/purchaseorder/PurchaseOrderMapper.xml

@@ -230,6 +230,7 @@
             #{orderNumber}
         </foreach>
         AND po.deleted=0
+        AND pod.deleted=0
         ORDER BY po.SYS_ORD_NUM, pod.LINE_NUM
     </select>
 

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApi.java

@@ -0,0 +1,19 @@
+package com.zt.plat.module.erp.api;
+
+import com.zt.plat.module.erp.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.HashMap;
+import java.util.Map;
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - ERP")
+public interface ErpInvoiceRecheckApi {
+    String PREFIX = ApiConstants.PREFIX + "/erp-invoice-recheck";
+    @PostMapping(PREFIX + "/submit082")
+    HashMap<String, String> submit082(@RequestBody Map<String, Object> param);
+    @PostMapping(PREFIX + "/submit085")
+    HashMap<String, String> submit085(@RequestBody Map<String, Object> param);
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpInvoiceRecheckApiImpl.java

@@ -0,0 +1,28 @@
+package com.zt.plat.module.erp.api;
+
+import com.zt.plat.module.erp.service.erp.ErpInvoiceRecheckService;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@Validated
+@Slf4j
+public class ErpInvoiceRecheckApiImpl implements ErpInvoiceRecheckApi{
+    @Resource
+    private ErpInvoiceRecheckService erpInvoiceRecheckService;
+
+    @Override
+    public HashMap<String, String> submit082(Map<String, Object> param) {
+        return erpInvoiceRecheckService.submit082(param);
+    }
+
+    @Override
+    public HashMap<String, String> submit085(Map<String, Object> param) {
+        return erpInvoiceRecheckService.submit085(param);
+    }
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckService.java

@@ -0,0 +1,9 @@
+package com.zt.plat.module.erp.service.erp;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public interface ErpInvoiceRecheckService {
+   HashMap<String, String> submit082(Map<String, Object>  param);
+    HashMap<String, String> submit085(Map<String, Object>  param);
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpInvoiceRecheckServiceImpl.java

@@ -0,0 +1,41 @@
+package com.zt.plat.module.erp.service.erp;
+
+import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils;
+import com.zt.plat.module.erp.api.ErpExternalApi;
+import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+@Validated
+public class ErpInvoiceRecheckServiceImpl implements ErpInvoiceRecheckService {
+    @Resource
+    public ErpExternalApi erpExternalApi;
+    @Override
+    public HashMap<String, String> submit082(Map<String, Object> param) {
+        ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
+        reqDTO.setFuncnr("082");
+        reqDTO.setBskey(param.get("id").toString());
+        reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
+        param.remove("id");//移除id字段
+        reqDTO.setReq(param);
+        return erpExternalApi.submitDataToErp(reqDTO);
+    }
+
+    @Override
+    public HashMap<String, String> submit085(Map<String, Object> param) {
+        ErpSubmitReqDTO reqDTO = new ErpSubmitReqDTO();
+        reqDTO.setFuncnr("085");
+        reqDTO.setBskey(param.get("id").toString());
+        reqDTO.setUsrid(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
+        reqDTO.setUsrnm((SecurityFrameworkUtils.getLoginUserNickname()));
+        param.remove("id");
+        reqDTO.setReq(param);
+        return erpExternalApi.submitDataToErp(reqDTO);
+    }
+}