Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/CostExternalPageParam.java

@@ -38,4 +38,7 @@ public class CostExternalPageParam extends PageRequest {
     @Schema(description = "失效时间")
     private List<String> failureTime;
 
+    @Schema(description = "创建时间")
+    private List<String> createTimeArr;
+
 }

commons/src/main/java/com/jzg/commons/entity/dto/CostManagementVo.java

@@ -56,6 +56,12 @@ public class CostManagementVo {
     @Schema(description = "费用主键ID")
     private String costId;
 
+    @Schema(description = "创建时间")
+    private String createTime;
+
+    @Schema(description = "创建人")
+    private String createBy;
+
     @Schema(description = "规则条件集合")
     private List<PtlAgreementCostRuleVo> ruleConditions;
 

commons/src/main/java/com/jzg/commons/entity/dto/CostReviewParam.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.entity.dto;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Schema(description = "费用审核参数")
+public class CostReviewParam {
+
+    @NotEmpty(message = "id不能为空")
+    @Schema(description = "费用ID集合")
+    private List<String> ids;
+
+
+    @Schema(description = "自动跳审核下一条费用")
+    private boolean automatic;
+
+
+    @Schema(description = "审核意见")
+    private String reason;
+
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/PtlAgreementCostParam.java

@@ -39,6 +39,9 @@ public class PtlAgreementCostParam extends PageRequest {
     @Schema(description = "失效时间")
     private List<String> failureTime;
 
+    @Schema(description = "创建时间")
+    private List<String> createTimeArr;
+
 
 
 }

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreementCost.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
+
+import java.time.LocalDateTime;
 import java.util.Date;
 
 
@@ -46,4 +48,8 @@ public class PtlAgreementCost extends BaseModel {
 
     private String costRules;
 
+    private LocalDateTime auditTime;
+
+    private String auditPerson;
+
 }

commons/src/main/java/com/jzg/commons/entity/po/PtlAgreementCostExternal.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -42,6 +43,9 @@ public class PtlAgreementCostExternal extends BaseModel {
 
     private String contactMobile;
 
+    private LocalDateTime auditTime;
+
+    private String auditPerson;
 
 
 }

commons/src/main/java/com/jzg/commons/entity/vo/CostExternalListVo.java

@@ -58,6 +58,22 @@ public class CostExternalListVo {
     @Schema(description = "对接人手机号")
     private String contactMobile;
 
+    @Schema(description = "创建时间")
+    private String createTime;
+
+    @Schema(description = "创建人")
+    private String createBy;
+
+    @Schema(description = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String auditTime;
+
+    @Schema(description = "审核人")
+    private String auditPerson;
+
+    @Schema(description = "审核描述")
+    private String reviewDescription;
+
     @Schema(description = "费用类型")
     private List<CostExternalTypeVo>  costExternalTypeAdds;
 

commons/src/main/java/com/jzg/commons/entity/vo/PtlAgreementCostVo.java

@@ -50,6 +50,16 @@ public class PtlAgreementCostVo {
     @Schema(description = "费用描述")
     private String costDescribe;
 
+    @Schema(description = "审核人")
+    private String auditPerson;
+
+    @Schema(description = "审核时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String auditTime;
+
+    @Schema(description = "审核不通过原因")
+    private String reviewDescription;
+
     @Schema(description = "费用类型集合")
     private List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList;
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/quote/CarInfoVo.java

@@ -137,6 +137,10 @@ public class CarInfoVo implements Serializable {
      * 商业险过户
      */
     private boolean ciTransfer;
+    /**
+     * 是否贷款车 true 贷款车
+     */
+    private boolean loanStatus;
     /**
      * 新能源标志 true 新能源
      */

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/entity/request/InsurancePolicyPrintRequest.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 
 /**
- * @description: 电子保单下载
+ * @description: 中煤财险 电子保单下载 请求
  * @author: shenwd
  * @date:2025/2/24 17:08
  **/
@@ -21,18 +21,37 @@ public class InsurancePolicyPrintRequest extends BaseRequest {
 
     @Serial
     private static final long serialVersionUID = -5981502952732639737L;
+    /**
+     * 保单号
+     * 车险保单送车险保单号，非车险保单送非车险保单号
+     */
     @JsonProperty("policyNo")
     private String policyNo;
 
+    /**
+     * 险种代码
+     * 0330:交强  0361:燃油商业  0365：新能源商业
+     * 非车险不传
+     */
     @JsonProperty("riskCode")
     private String riskCode;
 
+    /**
+     * 业务类型
+     * 车险保单下载传P
+     * 非车险保单下载传EP
+     */
     @JsonProperty("businessType")
     private String businessType = "P";
 
     @JsonProperty("endorSeqNo")
     private String endorSeqNo = "000";
 
+    /**
+     * 单证类型
+     * DZ_AJ : 标志
+     * DZ_AE : 保单
+     */
     @JsonProperty("documentType")
     private String documentType;
 

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/entity/response/InsurancePolicyPrintResponse.java

@@ -9,7 +9,7 @@ import java.io.Serial;
 import java.util.List;
 
 /**
- * @description: todo
+ * @description: 中煤财险 下载保单 返回数据
  * @author: shenwd
  * @date:2025/2/24 17:06
  **/
@@ -20,9 +20,15 @@ public class InsurancePolicyPrintResponse extends BaseResponse {
 
     @Serial
     private static final long serialVersionUID = 4370219849517321256L;
+    /**
+     * 电子保单下载链接
+     */
     @JsonProperty("downloadUrl")
     private List<String> downloadUrl;
 
+    /**
+     * 电子保单下载返回状态码
+     */
     @JsonProperty("statusCode")
     private String statusCode;
 

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/repository/ZmApiOrderRepository.java

@@ -11,8 +11,9 @@ import org.springframework.data.mongodb.repository.Query;
  **/
 public interface ZmApiOrderRepository extends MongoRepository<ZmApiOrder, String> {
 
-    ZmApiOrder getByOrdersNo(String ordersNo);
+    @Query("{'ordersNo' : ?0}")
+    ZmApiOrder findByOrdersNo(String ordersNo);
 
-    @Query(value = "{'fieldname': ?0 }", delete = true)
+    @Query(value = "{'ordersNo': ?0 }", delete = true)
     void deleteByOrdersNo(String ordersNo);
 }

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/service/ZhongmeiApiOrderService.java

@@ -0,0 +1,19 @@
+package com.jzg.quote.zhongmei.api.service;
+
+import com.jzg.quote.zhongmei.api.entity.po.ZmApiOrder;
+
+/**
+ * @description: 中煤财险 mongodb中操作数据
+ * @author: shenwd
+ * @date: 2025/3/6 11:16
+ **/
+public interface ZhongmeiApiOrderService {
+
+    ZmApiOrder findByOrdersNo(String ordersNo);
+
+    void deleteByOrdersNo(String ordersNo);
+
+    ZmApiOrder save(ZmApiOrder zmApiOrder);
+
+    ZmApiOrder update(ZmApiOrder zmApiOrder);
+}

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java

@@ -8,7 +8,6 @@ import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.UnderwritingVo;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.commons.entity.vo.quote.AccidentalDrivingVo;
 import com.jzg.quotation.commons.entity.vo.quote.AttributionInformationVo;
 import com.jzg.quotation.commons.entity.vo.quote.CarInfoVo;
@@ -22,15 +21,12 @@ import com.jzg.quote.zhongmei.api.entity.ZmApiConfigureParameters;
 import com.jzg.quote.zhongmei.api.entity.po.ZmApiOrder;
 import com.jzg.quote.zhongmei.api.entity.request.*;
 import com.jzg.quote.zhongmei.api.entity.response.*;
-import com.jzg.quote.zhongmei.api.repository.ZmApiOrderRepository;
 import com.jzg.quote.zhongmei.api.service.ZhongMeiApiRequest;
+import com.jzg.quote.zhongmei.api.service.ZhongmeiApiOrderService;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service(value = InsuranceCode.INSURANCE_ZMBX)
@@ -39,7 +35,8 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
 
     private final ZmApiRequestComponent zmApiRequestComponent;
 
-    private final ZmApiOrderRepository zmApiOrderRepository;
+    private final ZhongmeiApiOrderService zhongmeiApiOrderService;
+
     @Override
     public QuoteResultsVo quote(QuoteVo quoteVo) {
         OrderBase order = quoteVo.getOrder();
@@ -67,7 +64,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
         zmApiOrder.setOrdersNo(order.getOrdersNo());
         zmApiOrder.setBussinessNo(quotedPriceResponse.getBusinessNo());
         zmApiOrder.setPolicyHolderInfo(quoteVo.getPolicyHolderInfo());
-        zmApiOrderRepository.save(zmApiOrder);
+        zhongmeiApiOrderService.save(zmApiOrder);
         return ZmApiQuoteResultsVoBuild.buildQuoteResultsVo(order.getOrdersNo(), quoteVo, quotedPriceResponse);
     }
 
@@ -78,7 +75,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
         //获取配置信息
         ZmApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmApiConfigureParameters.class, orderBase.getAttributionInformationVo().getConfigInfo());
 
-        ZmApiOrder zmApiOrder = zmApiOrderRepository.getByOrdersNo(orderBase.getOrdersNo());
+        ZmApiOrder zmApiOrder = zhongmeiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         BaseRequestHead baseRequestHead = new BaseRequestHead(parameters);
         SubmitRequest submitRequest = new SubmitRequest();
         submitRequest.setHead(baseRequestHead);
@@ -95,15 +92,14 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
                 parameters.getDistrict(), policyHolderInfo.getAddr());
         SubmitResponse submitResponse = zmApiRequestComponent.submit(submitRequest, SubmitResponse.class);
         if (submitResponse != null && !StringUtils.isEmpty(submitResponse.getPayUrl())) {
-            zmApiOrderRepository.deleteByOrdersNo(zmApiOrder.getOrdersNo());
             zmApiOrder.setPayUrl(submitResponse.getPayUrl());
-            zmApiOrderRepository.save(zmApiOrder);
+            zhongmeiApiOrderService.update(zmApiOrder);
         }
     }
 
     @Override
     public String getPaymentLink(OrderBase orderBase) {
-        ZmApiOrder zmApiOrder = zmApiOrderRepository.getByOrdersNo(orderBase.getOrdersNo());
+        ZmApiOrder zmApiOrder = zhongmeiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         String payUrl = zmApiOrder.getPayUrl();
         //如果mongodb中没有支付链接，说明是人工审核，需要调用核保状态查询接口
         if (StringUtils.isEmpty(payUrl)) {
@@ -128,7 +124,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
         ZmApiConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmApiConfigureParameters.class, attributionInformationVo.getConfigInfo());
 
         // 获取主投保单号
-        ZmApiOrder zmApiOrder = zmApiOrderRepository.getByOrdersNo(orderBase.getOrdersNo());
+        ZmApiOrder zmApiOrder = zhongmeiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         String bussinessNo = zmApiOrder.getBussinessNo();
 
         // 上传影像
@@ -148,12 +144,19 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
 
         //先调用缴费查询接口获取保单号
         OrderStatusRequest orderStatusRequest = new OrderStatusRequest();
-        orderStatusRequest.setHead(new BaseRequestHead(parameters));
-        ZmApiOrder zmApiOrder = zmApiOrderRepository.getByOrdersNo(orderBase.getOrdersNo());
+        BaseRequestHead baseRequestHead = new BaseRequestHead(parameters);
+        orderStatusRequest.setHead(baseRequestHead);
+        ZmApiOrder zmApiOrder = zhongmeiApiOrderService.findByOrdersNo(orderBase.getOrdersNo());
         orderStatusRequest.setBusinessNo(zmApiOrder.getBussinessNo());
         OrderStatusResponse orderStatusResponse = zmApiRequestComponent.orderStatus(orderStatusRequest, OrderStatusResponse.class);
 
-        //调用下载保单接口
+        //获取保单号，然后调用下载保单接口
+        InsurancePolicyPrintRequest insurancePolicyPrintRequest = new InsurancePolicyPrintRequest();
+        insurancePolicyPrintRequest.setHead(baseRequestHead);
+        // 需设置参数 保单号，险种编码，业务类型，单证类型
+
+        InsurancePolicyPrintResponse printResponse = zmApiRequestComponent.insurancePolicyPrint(insurancePolicyPrintRequest, InsurancePolicyPrintResponse.class);
+
 
     }
 

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quote/zhongmei/api/service/impl/ZhongmeiApiOrderServiceImpl.java

@@ -0,0 +1,55 @@
+package com.jzg.quote.zhongmei.api.service.impl;
+
+import com.jzg.quote.zhongmei.api.entity.po.ZmApiOrder;
+import com.jzg.quote.zhongmei.api.repository.ZmApiOrderRepository;
+import com.jzg.quote.zhongmei.api.service.ZhongmeiApiOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @description: 中煤财险 mongodb 操作数据
+ * @author: shenwd
+ * @date: 2025/3/6 11:18
+ **/
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class ZhongmeiApiOrderServiceImpl implements ZhongmeiApiOrderService {
+
+    private final ZmApiOrderRepository zmApiOrderRepository;
+    /**
+     * @param ordersNo
+     * @return
+     */
+    @Override
+    public ZmApiOrder findByOrdersNo(String ordersNo) {
+        return zmApiOrderRepository.findByOrdersNo(ordersNo);
+    }
+
+    /**
+     * @param ordersNo
+     */
+    @Override
+    public void deleteByOrdersNo(String ordersNo) {
+        zmApiOrderRepository.deleteByOrdersNo(ordersNo);
+    }
+
+    /**
+     * @param zmApiOrder
+     */
+    @Override
+    public ZmApiOrder save(ZmApiOrder zmApiOrder) {
+        return zmApiOrderRepository.save(zmApiOrder);
+    }
+
+    /**
+     * @param zmApiOrder
+     * @return
+     */
+    @Override
+    public ZmApiOrder update(ZmApiOrder zmApiOrder) {
+        zmApiOrderRepository.deleteByOrdersNo(zmApiOrder.getOrdersNo());
+        return zmApiOrderRepository.save(zmApiOrder);
+    }
+}

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

@@ -66,14 +66,14 @@ public class PtlAgreementCostController {
 
     @Operation(summary = "协议费用管理审核成功")
     @PostMapping("auditSuccess")
-    public HttpResult auditSuccess(@RequestSingleParam(value = "ids") @NotEmpty(message = "id不能为空") List<String> ids){
-        return ptlAgreementCostService.auditSuccess(ids) ? HttpResult.ok("审核通过") : HttpResult.error("审核失败");
+    public HttpResult auditSuccess(@Valid @RequestBody CostReviewParam costReviewParam){
+        return ptlAgreementCostService.auditSuccess(costReviewParam);
     }
 
     @Operation(summary = "协议费用管理审核失败")
     @PostMapping("auditFailed")
-    public HttpResult auditFailed(@RequestParam(value = "ids") @NotEmpty(message = "id不能为空") List<String> ids, @RequestParam(value = "reason") String reason){
-        return ptlAgreementCostService.auditFailed(ids,reason) ? HttpResult.ok("审核不通过") : HttpResult.error("审核失败");
+    public HttpResult auditFailed(@Valid @RequestBody CostReviewParam costReviewParam){
+        return ptlAgreementCostService.auditFailed(costReviewParam);
     }
 
 

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

@@ -105,14 +105,14 @@ public class PtlAgreementCostExternalController {
 
     @Operation(summary = "补录协议费用管理审核成功")
     @PostMapping("auditSuccess")
-    public HttpResult auditSuccess(@RequestSingleParam(value = "ids") @NotEmpty(message = "id不能为空") List<String> ids){
-        return ptlAgreementCostExternalService.auditSuccess(ids) ? HttpResult.ok("审核通过") : HttpResult.error("审核失败");
+    public HttpResult auditSuccess(@Valid @RequestBody CostReviewParam costReviewParam){
+        return ptlAgreementCostExternalService.auditSuccess(costReviewParam);
     }
 
     @Operation(summary = "补录协议费用管理审核失败")
     @PostMapping("auditFailed")
-    public HttpResult auditFailed(@RequestParam(value = "ids") @NotEmpty(message = "id不能为空") List<String> ids, @RequestParam(value = "reason") String reason){
-        return ptlAgreementCostExternalService.auditFailed(ids,reason) ? HttpResult.ok("审核不通过") : HttpResult.error("审核失败");
+    public HttpResult auditFailed(@Valid @RequestBody CostReviewParam costReviewParam){
+        return ptlAgreementCostExternalService.auditFailed(costReviewParam);
     }
 
 

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementCostMapper.java

@@ -23,7 +23,6 @@ public interface PtlAgreementCostMapper extends BaseMapper<PtlAgreementCost> {
 
     List<CostListVo> queryByAgreementIdAndCoverRuleId(CostAgreementParam costAgreementParam);
 
-
     Page<CostManagementVo> pageList(Page page,@Param("costParam") PtlAgreementCostParam costParam);
 
 

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

@@ -29,8 +29,8 @@ public interface PtlAgreementCostExternalService extends IService<PtlAgreementCo
 
     HttpResult approvalMethodAll(List<String> ids, int auditMethod);
 
-    boolean auditSuccess(List<String> ids);
+    HttpResult auditSuccess(CostReviewParam costReviewParam);
 
-    boolean auditFailed(List<String> ids,String reason);
+    HttpResult auditFailed(CostReviewParam costReviewParam);
 
 }

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

@@ -2,10 +2,7 @@ package com.jzg.organization.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.CostAdd;
-import com.jzg.commons.entity.dto.CostAgreementParam;
-import com.jzg.commons.entity.dto.PtlAgreementCostEnd;
-import com.jzg.commons.entity.dto.PtlAgreementCostParam;
+import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.PtlAgreementCost;
 import com.jzg.commons.entity.vo.CostListVo;
 import jakarta.validation.constraints.NotNull;
@@ -27,9 +24,9 @@ public interface PtlAgreementCostService extends IService<PtlAgreementCost> {
 
     void updateAuditMethod(List<Long> ids);
 
-    boolean auditSuccess(List<String> ids);
+    HttpResult auditSuccess(CostReviewParam costReviewParam);
 
-    boolean auditFailed(List<String> ids,String reason);
+    HttpResult auditFailed(CostReviewParam costReviewParam);
 
     HttpResult pageList(PtlAgreementCostParam costParam);
 

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

@@ -2,18 +2,19 @@ package com.jzg.organization.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.Constants;
 import com.jzg.commons.constants.ReturnInformation;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
-import com.jzg.commons.entity.po.PtlAgreementCost;
 import com.jzg.commons.entity.po.PtlAgreementCostExternal;
 import com.jzg.commons.entity.po.PtlAgreementCostExternalType;
+import com.jzg.commons.entity.vo.CostExternalListVo;
 import com.jzg.commons.entity.vo.CostExternalVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.DateTimeUtils;
@@ -26,7 +27,7 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -41,6 +42,8 @@ public class PtlAgreementCostExternalServiceImpl extends ServiceImpl<PtlAgreemen
     @Resource
     private CostStateListener costStateListener;
 
+    @Resource
+    private BaseController baseController;
 
     @Override
     @Transactional
@@ -213,56 +216,62 @@ public class PtlAgreementCostExternalServiceImpl extends ServiceImpl<PtlAgreemen
                 HttpResult.ok(ReturnInformation.UPDATE_SUCCESS) : HttpResult.error(ReturnInformation.UPDATE_FAILED);
     }
 
+
     @Override
     @Transactional
-    public boolean auditSuccess(List<String> ids) {
-        for (String id : ids) {
-            PtlAgreementCostExternal ptlAgreementCostExternal = baseMapper.selectById(id);
-            if (ObjectUtil.isNull(ptlAgreementCostExternal)) {
-                throw new SystemException("该条补录费用不存在，请检查");
-            }
-            if (ptlAgreementCostExternal.getAuditStatus() == 1) {
-                throw new SystemException("该条补录费用已审核通过，请勿重复操作");
-            }
-            if (ptlAgreementCostExternal.getAuditStatus() == 2) {
-                throw new SystemException("该条补录费用已审核不通过，请勿重复操作");
-            }
-            if (ptlAgreementCostExternal.getAuditStatus() == 0) {
-                StateResult stateResult = costStateListener.auditSuccess(ptlAgreementCostExternal);
-                if (stateResult.isResult()) {
-                    ptlAgreementCostExternal.setAuditStatus(stateResult.getCurrentState());
-                    baseMapper.updateById(ptlAgreementCostExternal);
-                }
-            }
-        }
-        return true;
+    public HttpResult auditSuccess(CostReviewParam costReviewParam) {
+        return audit(costReviewParam, true);
     }
 
     @Override
     @Transactional
-    public boolean auditFailed(List<String> ids, String reason) {
-        for (String id : ids) {
-            PtlAgreementCostExternal ptlAgreementCostExternal = baseMapper.selectById(id);
-            if (ObjectUtil.isNull(ptlAgreementCostExternal)) {
-                throw new SystemException("该条补录费用不存在，请检查");
-            }
-            if (ptlAgreementCostExternal.getAuditStatus() == 1) {
-                throw new SystemException("该条补录费用已审核通过，请勿重复操作");
+    public HttpResult auditFailed(CostReviewParam costReviewParam) {
+        return audit(costReviewParam, false);
+    }
+
+    private HttpResult audit(CostReviewParam costReviewParam, boolean isSuccess) {
+        // 批量查询所有记录
+        List<PtlAgreementCostExternal> records = baseMapper.selectBatchIds(costReviewParam.getIds());
+        String userName = baseController.getUserName();
+        // 检查审核状态并执行相应操作
+        for (PtlAgreementCostExternal record : records) {
+            int auditStatus = record.getAuditStatus();
+            if (auditStatus == 1) {
+                throw new SystemException("补录费用 " + record.getId() + " 已审核通过，请勿重复操作");
             }
-            if (ptlAgreementCostExternal.getAuditStatus() == 2) {
-                throw new SystemException("该条补录费用已审核不通过，请勿重复操作");
+            if (auditStatus == 2) {
+                throw new SystemException("补录费用 " + record.getId() + " 已审核不通过，请勿重复操作");
             }
-            if (ptlAgreementCostExternal.getAuditStatus() == 0) {
-                StateResult stateResult = costStateListener.auditFailed(ptlAgreementCostExternal);
+            if (auditStatus == 0) {
+                StateResult stateResult = isSuccess
+                        ? costStateListener.auditSuccess(record)
+                        : costStateListener.auditFailed(record);
                 if (stateResult.isResult()) {
-                    ptlAgreementCostExternal.setAuditStatus(stateResult.getCurrentState());
-                    ptlAgreementCostExternal.setReviewDescription(reason);
-                    baseMapper.updateById(ptlAgreementCostExternal);
+                    record.setAuditStatus(stateResult.getCurrentState());
+                    if (!isSuccess) {
+                        record.setReviewDescription(costReviewParam.getReason());
+                    }
+                    record.setAuditPerson(userName);
+                    record.setAuditTime(LocalDateTime.now());
+                    baseMapper.updateById(record);
                 }
             }
         }
-        return true;
+        return HttpResult.ok("审核成功",costReviewParam.isAutomatic() ? nextDataID() : null);
     }
 
 
+    public String nextDataID() {
+        CostExternalPageParam costParam = new CostExternalPageParam();
+        costParam.getPage().setSize(1);
+        costParam.setAuditStatus("0");
+        Page<CostExternalListVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
+        return costManagementVoPage.getRecords().size() > 0 ?
+                String.valueOf(costManagementVoPage.getRecords().get(0).getId()) : "";
+    }
+
+
+
+
+
 }

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

@@ -3,9 +3,11 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.Constants;
 import com.jzg.commons.constants.ReturnInformation;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.*;
@@ -36,6 +38,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +70,9 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
     @Resource
     private CostStateListener costStateListener;
+    @Qualifier("baseController")
+    @Autowired
+    private BaseController baseController;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -208,55 +214,64 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
 
     @Override
     @Transactional
-    public boolean auditSuccess(List<String> ids) {
-        for (String id : ids) {
-            PtlAgreementCost ptlAgreementCost = baseMapper.selectById(id);
-            if (ObjectUtil.isNull(ptlAgreementCost)) {
-                throw new SystemException("该条费用不存在，请检查");
-            }
-            if (ptlAgreementCost.getApproved() == 1) {
-                throw new SystemException("该条费用已审核通过，请勿重复操作");
-            }
-            if (ptlAgreementCost.getApproved() == 2) {
-                throw new SystemException("该条费用已审核不通过，请勿重复操作");
-            }
-            if (ptlAgreementCost.getApproved() == 0) {
-                StateResult stateResult = costStateListener.auditSuccess(ptlAgreementCost);
-                if (stateResult.isResult()) {
-                    ptlAgreementCost.setApproved(stateResult.getCurrentState());
-                    baseMapper.updateById(ptlAgreementCost);
-                }
-            }
-        }
-        return true;
+    public HttpResult auditSuccess(CostReviewParam costReviewParam) {
+        return audit(costReviewParam, true);
     }
 
     @Override
     @Transactional
-    public boolean auditFailed(List<String> ids, String reason) {
-        for (String id : ids) {
-            PtlAgreementCost ptlAgreementCost = baseMapper.selectById(id);
-            if (ObjectUtil.isNull(ptlAgreementCost)) {
-                throw new SystemException("该条费用不存在，请检查");
-            }
-            if (ptlAgreementCost.getApproved() == 1) {
-                throw new SystemException("该条费用已审核通过，请勿重复操作");
-            }
-            if (ptlAgreementCost.getApproved() == 2) {
-                throw new SystemException("该条费用已审核不通过，请勿重复操作");
-            }
-            if (ptlAgreementCost.getApproved() == 0) {
-                StateResult stateResult = costStateListener.auditFailed(ptlAgreementCost);
-                if (stateResult.isResult()) {
-                    ptlAgreementCost.setApproved(stateResult.getCurrentState());
-                    ptlAgreementCost.setReviewDescription(reason);
-                    baseMapper.updateById(ptlAgreementCost);
+    public HttpResult auditFailed(CostReviewParam costReviewParam) {
+        return audit(costReviewParam, false);
+    }
+
+    private HttpResult audit(CostReviewParam costReviewParam, boolean isSuccessful) {
+        try {
+            String userName = baseController.getUserName();
+            for (String id : costReviewParam.getIds()) {
+                PtlAgreementCost ptlAgreementCost = baseMapper.selectById(id);
+                if (ObjectUtil.isNull(ptlAgreementCost)) {
+                    throw new SystemException("该条费用不存在，请检查");
+                }
+                if (ptlAgreementCost.getApproved() == 1 || ptlAgreementCost.getApproved() == 2) {
+                    throw new SystemException("该条费用已审核，请勿重复操作");
+                }
+                if (ptlAgreementCost.getApproved() == 0) {
+                    StateResult stateResult = isSuccessful ?
+                            costStateListener.auditSuccess(ptlAgreementCost) :
+                            costStateListener.auditFailed(ptlAgreementCost);
+                    if (stateResult.isResult()) {
+                        ptlAgreementCost.setApproved(stateResult.getCurrentState());
+                        ptlAgreementCost.setAuditPerson(userName);
+                        ptlAgreementCost.setAuditTime(LocalDateTime.now());
+                        if (!isSuccessful) {
+                            ptlAgreementCost.setReviewDescription(costReviewParam.getReason());
+                        }
+                        baseMapper.updateById(ptlAgreementCost);
+                    }
                 }
             }
+            return HttpResult.ok("审核成功", costReviewParam.isAutomatic() ? nextDataID() : null);
+        } catch (SystemException e) {
+            log.error("审核失败: {}", e.getMessage(), e);
+            return HttpResult.error("审核失败: " + e.getMessage());
+        } catch (Exception e) {
+            log.error("未知错误: ", e);
+            return HttpResult.error("审核失败: 未知错误");
         }
-        return true;
     }
 
+
+    public String nextDataID() {
+        PtlAgreementCostParam costParam = new PtlAgreementCostParam();
+        costParam.getPage().setSize(1);
+        costParam.setAuditStatus("0");
+        Page<CostManagementVo> costManagementVoPage = baseMapper.pageList(costParam.getPage(), costParam);
+        return costManagementVoPage.getRecords().size() > 0 ?
+                String.valueOf(costManagementVoPage.getRecords().get(0).getCostId()) : "";
+    }
+
+
+
     @Override
     public HttpResult pageList(PtlAgreementCostParam costParam) {
         return HttpResult.ok(baseMapper.pageList(costParam.getPage(),costParam));

tenant/organization/src/main/java/com/jzg/organization/state/listener/CostStateListener.java

@@ -100,7 +100,7 @@ public class CostStateListener {
     private StateResult callExternalEvent(PtlAgreementCostExternal ptlAgreementCostExternal,CostState.CostStateEvent event) {
         StateResult stateResult = new StateResult();
         Mono<Message<CostState.CostStateEvent>> message = Mono.just(MessageBuilder.withPayload(event).setHeader("entity",ptlAgreementCostExternal).build());
-        stateResult.setResult(sendEvent(message));
+        stateResult.setResult(sendCostExternalEvent(message));
         stateResult.setCurrentState(costStateMachine.getState().getId().getValue());
         return stateResult;
     }

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

@@ -21,6 +21,9 @@
         <result column="effective" property="effective" />
         <result column="audit_status" property="auditStatus" />
         <result column="is_enabled" property="isEnabled" />
+        <result column="audit_person" property="auditPerson" />
+        <result column="audit_time" property="auditTime" />
+        <result column="review_description" property="reviewDescription" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
     </resultMap>
 
@@ -41,13 +44,15 @@
         <result column="contact_person" property="contactPerson" />
         <result column="contact_mobile" property="contactMobile" />
         <result column="audit_method" property="auditMethod" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
         <collection property="costExternalTypeAdds" column="id" ofType="com.jzg.commons.entity.vo.CostExternalTypeVo" select="selectCostExternalTypeVo" />
     </resultMap>
 
 
     <sql id="Base_Column">
         SELECT
-            id,ptl_agreement_id,product_name,product_id,effective_time,failure_time,audit_method,audit_status,is_enabled,review_description,is_inquiry,cost_describe,contact_person,contact_mobile,is_delete
+            id,ptl_agreement_id,product_name,product_id,effective_time,failure_time,audit_method,audit_status,is_enabled,review_description,audit_person,audit_time,is_inquiry,cost_describe,contact_person,contact_mobile,is_delete
         FROM
             ptl_agreement_cost_external
     </sql>
@@ -110,6 +115,8 @@
             ce.contact_person,
             ce.contact_mobile,
             ce.audit_method,
+            ce.create_time,
+            ce.create_by,
             pa.agreement_code,
             pa.agreement_abbreviation
         FROM
@@ -136,7 +143,7 @@
                 AND ce.is_enabled = #{costParam.agreementStatus}
             </if>
             <if test="costParam.auditStatus != null and costParam.auditStatus != ''">
-                AND ce.approved = #{costParam.auditStatus}
+                AND ce.audit_status = #{costParam.auditStatus}
             </if>
             <if test="costParam.validState != null and costParam.validState != ''">
                 AND ce.is_valid = #{costParam.validState}
@@ -147,7 +154,11 @@
             <if test="costParam.failureTime != null and costParam.failureTime.size() > 0">
                 AND ce.failure_time BETWEEN #{costParam.failureTime[0]} AND #{costParam.failureTime[1]}
             </if>
+            <if test="costParam.createTimeArr != null and costParam.createTimeArr.size() > 0">
+                AND ce.create_time BETWEEN #{costParam.createTimeArr[0]} AND #{costParam.createTimeArr[1]}
+            </if>
         </where>
+        order by ce.create_time desc
     </select>
 
 

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

@@ -16,6 +16,9 @@
         <result column="approved" property="approved" jdbcType="VARCHAR"/>
         <result column="is_valid" property="isValid" jdbcType="VARCHAR"/>
         <result column="is_enabled" property="isEnabled" jdbcType="VARCHAR"/>
+        <result column="audit_person" property="auditPerson" jdbcType="VARCHAR"/>
+        <result column="audit_time" property="auditTime" jdbcType="VARCHAR"/>
+        <result column="review_description" property="reviewDescription" jdbcType="VARCHAR"/>
         <collection property="ptlAgreementCostTypeList" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
         <collection property="ruleConditions" column="{costId=id}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostRuleVo" select="selectCostRule" />
     </resultMap>
@@ -98,6 +101,8 @@
         <result column="effective_time" property="effectiveTime" jdbcType="VARCHAR"/>
         <result column="failure_time" property="failureTime" jdbcType="VARCHAR"/>
         <result column="costId" property="costId" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
+        <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
         <collection property="ruleConditions" column="{costId=costId}" ofType="com.jzg.commons.entity.vo.PtlAgreementCostTypeVo" select="selectCostType" />
      </resultMap>
 
@@ -155,7 +160,10 @@
             t.create_by,
             t.create_time,
             t.update_by,
-            t.update_time
+            t.update_time,
+            t.audit_person,
+            t.review_description,
+            t.audit_time
         FROM
             ptl_agreement_cost t
            <where>
@@ -258,6 +266,8 @@
             pc.approved,
             pc.is_enabled,
             pc.is_valid,
+            pc.create_time,
+            pc.create_by,
             pa.agreement_code,
             pa.agreement_title,
             pa.agreement_abbreviation,
@@ -299,7 +309,11 @@
             <if test="costParam.failureTime != null and costParam.failureTime.size() > 0">
                 AND pc.failure_time BETWEEN #{costParam.failureTime[0]} AND #{costParam.failureTime[1]}
             </if>
+            <if test="costParam.createTimeArr != null and costParam.createTimeArr.size() > 0">
+                AND pc.create_time BETWEEN #{costParam.createTimeArr[0]} AND #{costParam.createTimeArr[1]}
+            </if>
         </where>
+        order by pc.create_time desc
     </select>