Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518' into dev_jzg_lipf_v20260518

commons/src/main/java/com/jzg/commons/entity/finance/vo/AddReceivableVo.java

@@ -0,0 +1,25 @@
+package com.jzg.commons.entity.finance.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author tz
+ * @description 应收查询VO
+ * @createDate 2024-06-26 10:49:31
+ */
+@Data
+public class AddReceivableVo {
+
+    @Schema(description = "订单编码")
+    private List<String> orderNo;
+
+    @Schema(description = "查询")
+    private String queryType;
+
+}

tenant/organization/src/main/java/com/jzg/organization/controller/ReceivableController.java

@@ -59,7 +59,7 @@ public class ReceivableController {
     @PostMapping("getUnauditedOrder")
     @Operation(summary = "获取未审核的订单")
     public HttpResult getUnauditedOrder(@RequestBody ReceivableQueryVo receivableQueryVo){
-        if (Objects.isNull(receivableQueryVo.getAgreementType()) || receivableQueryVo.getAgreementType().isEmpty()) {
+        if (Objects.isNull(receivableQueryVo.getAgreementType()) || StrUtil.isBlank(receivableQueryVo.getAgreementType())) {
             receivableQueryVo.setAgreementType("1");
         }
         InsPlyIncome auditedOrder  = receivableService.getUnauditedOrder(receivableQueryVo);
@@ -72,8 +72,8 @@ public class ReceivableController {
 
     @PostMapping("addReceivable")
     @Operation(summary = "添加应收记录")
-    public HttpResult addReceivable(@RequestSingleParam("orderNos") List<String> orderNos){
-        boolean result = receivableService.saveAuditedOrder(orderNos);
+    public HttpResult addReceivable(@RequestBody AddReceivableVo addReceivableVo){
+        boolean result = receivableService.saveAuditedOrder(addReceivableVo);
         return result ? HttpResult.ok("添加成功") : HttpResult.error("添加失败");
     }
 

tenant/organization/src/main/java/com/jzg/organization/service/ReceivableService.java

@@ -30,7 +30,7 @@ public interface ReceivableService extends IService<InsPlyIncome> {
     /**
      * 添加已审核订单的数据 应收表插入
      */
-    boolean saveAuditedOrder(List<String> orderNos);
+    boolean saveAuditedOrder(AddReceivableVo addReceivableVo);
 
     /**
      * 获取应收订单的保司

tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -147,19 +147,19 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
 
     @Override
     public InsPlyIncome getUnauditedOrder(ReceivableQueryVo receivableQueryVo) {
-        InsPlyIncome auditedOrder = baseMapper.getAuditedOrder(receivableQueryVo.getOrderNo(), receivableQueryVo.getQueryType(), InsOrderStatusEnum.UNDERWRITED.getCode(), receivableQueryVo.getAgreementType());
-        if (receivableQueryVo.getQueryType().equals("3") || receivableQueryVo.getQueryType().equals("4")) {
-            if (Objects.isNull(auditedOrder.getJyPolicyNo()) && auditedOrder.getJyPolicyNo().isEmpty()) {
+        InsPlyIncome auditedOrder = baseMapper.getAuditedOrder(receivableQueryVo.getOrderNo(), InsOrderStatusEnum.UNDERWRITED.getCode(), "0", receivableQueryVo.getAgreementType());
+        if ("3".equals(receivableQueryVo.getQueryType()) || "4".equals(receivableQueryVo.getQueryType())) {
+            if (StrUtil.isBlank(auditedOrder.getJyPolicyNo())) {
                 return null;
             }
         }
-        return baseMapper.getAuditedOrder(receivableQueryVo.getOrderNo(), InsOrderStatusEnum.UNDERWRITED.getCode(), "0", receivableQueryVo.getAgreementType());
+        return auditedOrder;
     }
 
     @Override
-    public boolean saveAuditedOrder(List<String> orderNos) {
+    public boolean saveAuditedOrder(AddReceivableVo addReceivableVo) {
 
-        List<InsPlyIncome> auditedOrder = this.getUnauditOrderList(orderNos, InsOrderStatusEnum.UNDERWRITED.getCode(), "0");
+        List<InsPlyIncome> auditedOrder = this.getUnauditOrderList(addReceivableVo.getOrderNo(), InsOrderStatusEnum.UNDERWRITED.getCode(), "0");
         AssertionUtils.isEmpty(auditedOrder, "订单不存在");
         // 查看当前表是否已经存在了已审核订单数据
 //        Long count = baseMapper.selectCount(new LambdaQueryWrapper<InsPlyIncome>().eq(InsPlyIncome::getOrderNo, order.getOrderNo()));

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -61,15 +61,14 @@
                 LEFT JOIN ins_fee_audit ifa on ifa.order_no = io.id
         WHERE
             io.id = #{orderNo}
-        AND
-            io.order_status = #{orderStatus}
+        <if test="orderStatus != null and orderStatus != ''">
+            AND io.order_status = #{orderStatus}
+        </if>
         <if test="auditStatus != null and auditStatus != ''">
-            AND
-                ifa.audit_status = #{auditStatus}
+            AND ifa.audit_status = #{auditStatus}
         </if>
         <if test="agreementType != null and agreementType != ''">
-            AND
-                pa.agreement_type = #{agreementType}
+            AND pa.agreement_type = #{agreementType}
         </if>
     </select>
 
@@ -181,15 +180,16 @@
         LEFT JOIN ptl_agreement pa ON io.agreement_id = pa.id
         LEFT JOIN ins_fee_audit ifa on ifa.order_no = io.id
         WHERE
-        io.id in
-        <foreach collection="orderNo" item="id" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-        AND
+        <if test="orderNo != null and orderNo.size > 0">
+            io.id in
+            <foreach collection="orderNo" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            AND
+        </if>
         io.order_status = #{orderStatus}
         <if test="auditStatus != null and auditStatus != ''">
-            AND
-            ifa.audit_status = #{auditStatus}
+            AND ifa.audit_status = #{auditStatus}
         </if>
     </select>