Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1189,7 +1189,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     Future future10 = pool.submit(() -> {
                         pushOtherDocument(busDeliveredApply, detailsList);
                     });
-                    /*Future future13 = pool.submit(() -> {
+                   /* Future future13 = pool.submit(() -> {
+                        //推送车辆利润报表
                         pushCarSoldProfit(busDeliveredApply, detailsList);
                     });*/
                     //推送单车返利管理

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -301,7 +301,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @param procInsId 流程实例Id
      * @return
      */
-    public ResultBean<FlowRecordVo> businessFlowRecord(String procInsId) {
+    public ResultBean<FlowRecordVo> businessFlowRecordOld(String procInsId) {
         long startTimes = System.currentTimeMillis(); // 记录开始时间
         ResultBean<FlowRecordVo> rb = ResultBean.fireFail();
         FlowRecordVo flowRecordVo = new FlowRecordVo();
@@ -437,7 +437,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
      * @param procInsId 流程实例Id
      * @return
      */
-    public ResultBean<FlowRecordVo> businessFlowRecordOld(String procInsId) {
+    public ResultBean<FlowRecordVo> businessFlowRecord(String procInsId) {
         ResultBean<FlowRecordVo> rb = ResultBean.fireFail();
         FlowRecordVo flowRecordVo = new FlowRecordVo();
         if (StringUtils.isNotBlank(procInsId)) {

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysnotice/SysNoticeVo.java

@@ -21,4 +21,6 @@ public class SysNoticeVo {
     private String stateValue;
     @ApiModelProperty("是否置顶")
     private String topping;
+    @ApiModelProperty("PC端页面地址")
+    private String pcUrl;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -165,9 +165,7 @@ public class FlowableRest implements FlowableFeign {
         resultBean.setData(flowRecordVo1);
         return resultBean;
     }
-
-    @Override
-    public ResultBean<List<PCHistTaskListAndCommentList>> flowRecordAndComment(String procInsId, String deployId) {
+    public ResultBean<List<PCHistTaskListAndCommentList>> flowRecordAndCommentOld(String procInsId, String deployId) {
         long startTimes = System.currentTimeMillis(); // 记录开始时间
         // 并行调用外部服务
         CompletableFuture<ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowRecordVo>> flowRecordFuture =
@@ -273,8 +271,8 @@ public class FlowableRest implements FlowableFeign {
         log.info("流程记录接口耗时 {} ms", endTime - startTimes);
         return resultBean;
     }
-
-    public ResultBean<List<PCHistTaskListAndCommentList>> flowRecordAndCommentOld(String procInsId, String deployId) {
+    @Override
+    public ResultBean<List<PCHistTaskListAndCommentList>> flowRecordAndComment(String procInsId, String deployId) {
         ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
         com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData();
         List<PCHistTaskListAndCommentList> flowList = new ArrayList<>();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java

@@ -100,5 +100,7 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("是否显示竞价按钮")
     private boolean validate;
 
+    private String result;
+
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -24,8 +24,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.portal.api.sysnotice.PushNoticeQuery;
-import com.yxt.anrui.portal.api.sysnotice.SysNoticeFeign;
+import com.yxt.anrui.portal.api.sysnotice.*;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -46,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundtrailer.LoanReturnInboundTr
 import com.yxt.anrui.riskcenter.api.loanreturnvehledger.LoanReturnVehLedger;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCostVo;
@@ -86,6 +86,9 @@ import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -500,6 +503,28 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             if (loanSecondarySalesCost != null) {
                 if ((loanSecondarySalesCost.getVehicleEvaluation() == null ? BigDecimal.ZERO : loanSecondarySalesCost.getVehicleEvaluation()).compareTo(loanSecondarySalesCost.getVehPrice()) > 0) {
                     variables.put("isTrue", true);
+                    LoanSecondarySalesBidding loanSecondarySalesBidding = new LoanSecondarySalesBidding();
+                    loanSecondarySalesBidding.setCreateBySid(bv.getUserSid());
+                    loanSecondarySalesBidding.setMainSid(bv.getBusinessSid());
+                    loanSecondarySalesBidding.setOrgSidPath(loanSecondarySalesApply.getOrgSidPath());
+                    String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(loanSecondarySalesApply.getOrgSidPath()).getData();
+                    loanSecondarySalesBidding.setUseOrgSid(useOrgSid);
+                    //创建组织使用组织
+                    ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(useOrgSid);
+                    if (organizationResultBean.getData() != null) {
+                        loanSecondarySalesBidding.setUseOrgName(organizationResultBean.getData().getName());
+                    }
+                    //根据用户sid查询人员姓名
+                    ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(bv.getUserSid());
+                    if (!userVoResultBean.getSuccess()) {
+                        return rb.setMsg(userVoResultBean.getMsg());
+                    }
+                    loanSecondarySalesBidding.setCreateByName(userVoResultBean.getData().getName());
+                    loanSecondarySalesBidding.setPrice(new BigDecimal(price));
+                    loanSecondarySalesBiddingService.insert(loanSecondarySalesBidding);
+
+
+
                 } else {
                     variables.put("isTrue", false);
                 }
@@ -1194,6 +1219,28 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 }
             }
 
+            //查询竞价结果
+            SysNoticeDetailsVo sysNotice = sysNoticeFeign.getDetails(sid).getData();
+            if(sysNotice != null){
+                //查询截止日期，是否小于或等于当前日期
+                String validityDate = sysNotice.getValidityDate();
+                // 解析截止日期（假设格式为 yyyy-MM-dd）
+                LocalDate noticeExpiryDate = LocalDate.parse(validityDate);
+                LocalDate currentDate = LocalDate.now();
+
+                // 判断是否已过期（截止日期 <= 当前日期）
+                if (noticeExpiryDate.isBefore(currentDate) || noticeExpiryDate.isEqual(currentDate)) {
+                    LoanSecondarySalesBidding loanSecondarySalesBidding = loanSecondarySalesBiddingService.selectByMainSid(sid);
+                    Date createTime = loanSecondarySalesBidding.getCreateTime();
+                    LocalDate localDate = createTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                    String formattedDate = localDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                    String result = loanSecondarySalesBidding.getCreateByName()+formattedDate+loanSecondarySalesBidding.getPrice();
+                    loanSecondarySalesApplyDetailsVo.setResult(result);
+                }
+
+
+            }
+
         }
         return rb.success().setData(loanSecondarySalesApplyDetailsVo);
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.java

@@ -23,4 +23,6 @@ public interface LoanSecondarySalesBiddingMapper extends BaseMapper<LoanSecondar
     String getPrice(String sid);
 
     String getVinNo(String sid);
+
+    LoanSecondarySalesBidding selectBySidSort(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingMapper.xml

@@ -33,4 +33,9 @@
                             group by lv.mainSid) ss on ss.mainSid = la.sid
         where la.sid = #{sid}
     </select>
+
+    <select id="selectBySidSort"
+            resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding">
+        select * from loan_secondary_sales_bidding where mainSid = #{sid} order by id desc limit 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesbidding/LoanSecondarySalesBiddingService.java

@@ -50,7 +50,7 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
     public ResultBean saveBidding(LoanSecondarySalesBiddingDto dto) {
         ResultBean rb = ResultBean.fireFail();
         LoanSecondarySalesBidding loanSecondarySalesBidding = new LoanSecondarySalesBidding();
-        loanSecondarySalesBidding.setCreateBySid(dto.getMainSid());
+        loanSecondarySalesBidding.setCreateBySid(dto.getUserSid());
         loanSecondarySalesBidding.setMainSid(dto.getMainSid());
         loanSecondarySalesBidding.setOrgSidPath(dto.getOrgPath());
         String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
@@ -128,4 +128,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         }
         return rb.success().setData(salesBiddingVo);
     }
+
+    public LoanSecondarySalesBidding selectByMainSid(String sid) {
+        return baseMapper.selectBySidSort(sid);
+    }
 }