Merge remote-tracking branch 'origin/master'

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

@@ -91,6 +91,8 @@ public class LoanSecondarySalesApply extends BaseEntity {
     private String orgSidPath;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty("有效期")
+    private String validityDate;
 
 
 }

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

@@ -94,5 +94,8 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
 
+    @ApiModelProperty("有效期")
+    private String validityDate;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesbidding/SalesBiddingVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loansecondarysalesbidding;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -16,4 +17,6 @@ public class SalesBiddingVo {
     private String vinNo;
 
     private List<BiddingVo> biddingList = new ArrayList<>();
+    @ApiModelProperty("是否显示竞价按钮")
+    private boolean validate;
 }

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

@@ -4,30 +4,32 @@
     <select id="selectPageVo"
             resultType="com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyVo">
         select la.sid,
-               if(length(la.nodeState) > 0, la.nodeState, '待提交')                                            as nodeState,
+               if(length(la.nodeState) > 0, la.nodeState, '待提交') as nodeState,
                la.useOrgName,
                la.createDept,
                la.createByName,
-               DATE_FORMAT(la.createTime, '%Y-%m-%d')                                                       as createDate,
+               DATE_FORMAT(la.createTime, '%Y-%m-%d')            as createDate,
                la.closeDate,
                la.loanContractNo,
-        ss.vinNo,
-        ss.vehmark,
-             <!--  (select group_concat(lv.vinNo) from loan_secondary_sales_veh lv where lv.mainSid = la.sid)   as vinNo,
-               (select group_concat(lv.vehMark) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vehMark,-->
-               la.bankName,
-               la.bankContractNo,
-               la.customerName,
-               la.loanName,
-               lc.arrearsAll,
-               lc.vehPrice,
-               lc.lossPrice,
-               la.createBySid,
-               la.procDefId,
-               la.procInstId
+               ss.vinNo,
+               ss.vehmark,
+        <!--  (select group_concat(lv.vinNo) from loan_secondary_sales_veh lv where lv.mainSid = la.sid)   as vinNo,
+          (select group_concat(lv.vehMark) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vehMark,-->
+        la.bankName,
+        la.bankContractNo,
+        la.customerName,
+        la.loanName,
+        lc.arrearsAll,
+        lc.vehPrice,
+        lc.lossPrice,
+        la.createBySid,
+        la.procDefId,
+        la.procInstId
         from loan_secondary_sales_apply la
                  left join loan_secondary_sales_cost lc on lc.mainSid = la.sid
-        left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv group by lv.mainSid) ss on ss.mainSid = la.sid
+                 left join (select group_concat(lv.vinNo) as vinNo, group_concat(lv.vehMark) as vehmark, lv.mainSid
+                            from loan_secondary_sales_veh lv
+                            group by lv.mainSid) ss on ss.mainSid = la.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -97,7 +99,8 @@
                la.beOverdueMoneyAndPeriod,
                la.loanSid,
                la.customerSid,
-               la.salesOrderSid
+               la.salesOrderSid,
+               la.validityDate
         from loan_secondary_sales_apply la
         where sid = #{sid}
     </select>

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

@@ -480,16 +480,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 loanSecondarySalesApply = fetchBySid(businessSid);
                 loanSecondarySalesApply.setCloseDate(DateUtil.today());
-                baseMapper.updateById(loanSecondarySalesApply);
-                //推公告
-                PushNoticeQuery pushNoticeQuery = new PushNoticeQuery();
-                pushNoticeQuery.setApp_type("2");
-                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleBiddingActivity");
-                pushNoticeQuery.setUserSid(bv.getUserSid());
-                pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
-                pushNoticeQuery.setSid(businessSid);
-                pushNoticeQuery.setCreateTime(DateUtil.today());
-                pushNoticeQuery.setPcUrl("#/notificationannouncement/relation/secondarysaleannouncement");
+
                 DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
                 String closeDates = "";
                 try {
@@ -502,11 +493,24 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
+                loanSecondarySalesApply.setValidityDate(closeDates);
+                baseMapper.updateById(loanSecondarySalesApply);
+                //推公告
+                PushNoticeQuery pushNoticeQuery = new PushNoticeQuery();
+                pushNoticeQuery.setApp_type("2");
+                pushNoticeQuery.setModuleAction("com.anrui.android.plugin.riskcontrol.activity.DetailCarSecondSaleBiddingActivity");
+                pushNoticeQuery.setUserSid(bv.getUserSid());
+                pushNoticeQuery.setModuleSid("fec4e243-491a-11ec-94cd-fa163e0cb33c");
+                pushNoticeQuery.setSid(businessSid);
+                pushNoticeQuery.setCreateTime(DateUtil.today());
+                pushNoticeQuery.setPcUrl("#/notificationannouncement/relation/secondarysaleannouncement");
+
                 pushNoticeQuery.setTitle(loanSecondarySalesApply.getUseOrgName() + "二手车销售公示（竞价截止日期：" + closeDates + "）");
                 pushNoticeQuery.setValidityDate(closeDates);
                 Map<String, Object> maps = new HashMap<>();
                 maps.put("sid", businessSid);
                 pushNoticeQuery.setArgs_json(JSONObject.toJSONString(maps));
+
                 ResultBean resultBeans = sysNoticeFeign.savePushNotice(pushNoticeQuery);
                 LoanSecondarySalesBiddingDto loanSecondarySalesBiddingDto = new LoanSecondarySalesBiddingDto();
                 loanSecondarySalesBiddingDto.setMainSid(businessSid);

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

@@ -7,10 +7,12 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.BiddingVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBidding;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.LoanSecondarySalesBiddingDto;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesbidding.SalesBiddingVo;
+import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
@@ -21,7 +23,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,6 +44,8 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
 
     public ResultBean saveBidding(LoanSecondarySalesBiddingDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -102,6 +110,20 @@ public class LoanSecondarySalesBiddingService extends MybatisBaseService<LoanSec
         salesBiddingVo.setBiddingList(list);
         String vinNo = baseMapper.getVinNo(sid);
         salesBiddingVo.setVinNo(vinNo);
+        DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        String nowtime = sdf.format(date);//当前时间
+        LoanSecondarySalesApply loanSecondarySalesApply = loanSecondarySalesApplyService.fetchBySid(sid);
+        String endtime = loanSecondarySalesApply.getValidityDate();   //到期时间
+        try {
+            if (sdf.parse(nowtime).getTime() > sdf.parse(endtime).getTime()) {//转成long类型比较
+                salesBiddingVo.setValidate(false);
+            } else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) {
+                salesBiddingVo.setValidate(true);
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         return rb.success().setData(salesBiddingVo);
     }
 }