优化预约开单

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/DetailsListVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/11 17:06
+ */
+@Data
+public class DetailsListVo {
+
+    @ApiModelProperty("主产品首期月还")
+    private String mainFirstRepay;
+    @ApiModelProperty("主产品期间月还")
+    private String mainMidRepay;
+    @ApiModelProperty("主产品期末月还")
+    private String mainLastRepay;
+    @ApiModelProperty("其他融首期月还")
+    private String otherFirstRepay;
+    @ApiModelProperty("其他融期间月还")
+    private String otherMidRepay;
+    @ApiModelProperty("其他融期末月还")
+    private String otherLastRepay;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    private String busVinSid;
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentDetailsVo.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentschedule;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/11 16:38
+ */
+@Data
+public class LoanRepaymentDetailsVo {
+
+    private String sid;
+    @ApiModelProperty("消贷合同编号")
+    private String loanContractNo;
+    @ApiModelProperty("借款人名称")
+    private String borrowerName;
+    @ApiModelProperty("贷款总金额")
+    private String amountAll;
+    @ApiModelProperty("车辆台数")
+    private String vehCount;
+    @ApiModelProperty("金融产品名称")
+    private String policyName;
+    @ApiModelProperty("主产品贷款金额")
+    private String loanAmount;
+    @ApiModelProperty("主产品期数")
+    private String mainPeriod;
+    @ApiModelProperty("主产品首期还款日")
+    private String mainRepayDate;
+    @ApiModelProperty("其他融资方")
+    private String otherPolicyName;
+    @ApiModelProperty("其他融贷款金额")
+    private String otherAmount;
+    @ApiModelProperty("其他融期数")
+    private String otherPeriod;
+    @ApiModelProperty("其他融首期还款日")
+    private String otherRepayDate;
+    private List<DetailsListVo> vinList = new ArrayList<>();
+
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java

@@ -38,6 +38,11 @@ public interface LoanRepaymentScheduleFeign {
     @ResponseBody
     public ResultBean<LoanRepaymentSchedule> fetchBySid(@RequestParam("sid") String sid);
 
+    @ApiOperation("查看详情页")
+    @GetMapping("/scheduleDetails")
+    @ResponseBody
+    public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(@RequestParam("salesOrderSid") String salesOrderSid);
+
 
     @PostMapping("/exportExcel")
     @ApiOperation(value = "还款计划表导出")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java

@@ -28,6 +28,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule
         return null;
     }
 
+    @Override
+    public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean exportExcel(List<String> sids) {
         return null;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java

@@ -44,6 +44,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign {
         return rb.success().setData(repaymentSchedule);
     }
 
+    @Override
+    public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
+        return loanRepaymentScheduleService.scheduleDetails(salesOrderSid);
+    }
+
     @Override
     public ResultBean<List<LoanRepaymentPlanDetailsExportVo>> exportExcel(List<String> sids) {
         return loanRepaymentScheduleService.exportExcel(sids);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@@ -4592,4 +4592,15 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         List<LoanRepaymentPlanDetailsExportVo> vos = baseMapper.selPlansExcel(sids);
         return rb.success().setData(vos);
     }
+
+    public ResultBean<LoanRepaymentDetailsVo> scheduleDetails(String salesOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanRepaymentDetailsVo vo = new LoanRepaymentDetailsVo();
+        LoanRepaymentSchedule schedule = baseMapper.selectByContractSid(salesOrderSid);
+        if (null != schedule) {
+
+
+        }
+        return rb.success().setData(vo);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDetailsVo.java

@@ -56,6 +56,7 @@ import lombok.Data;
 public class AsBusreserveBillDetailsVo implements Vo {
 
     private String sid; // sid
+    private String userSid;
     private String createBySid; // sid
     private String orgPath;
     private String remarks; // 备注
@@ -98,7 +99,7 @@ public class AsBusreserveBillDetailsVo implements Vo {
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();
     @ApiModelProperty("跟踪记录")
-    private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
+    private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
     @ApiModelProperty("跟踪记录")
     private String trackLog;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillDto.java

@@ -56,6 +56,7 @@ import lombok.Data;
 public class AsBusreserveBillDto implements Dto {
 
     private String sid; // sid
+    private String userSid;
     private String createBySid; // sid
     private String orgPath;
     private String remarks; // 备注
@@ -98,7 +99,7 @@ public class AsBusreserveBillDto implements Dto {
     private String customerOrg; // 客户单位
     private List<AsbillSitemVo> sitemVos = new ArrayList<>();
     @ApiModelProperty("跟踪记录")
-    private List<String> trackLogs = new ArrayList<>(); // 跟踪记录
+    private List<TrackLogsVo> trackLogs = new ArrayList<>(); // 跟踪记录
     @ApiModelProperty("跟踪记录")
     private String trackLog;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/AsBusreserveBillVo.java

@@ -73,10 +73,10 @@ public class AsBusreserveBillVo implements Vo {
     @ApiModelProperty("联系电话")
     private String mobile; // 联系电话
     @ApiModelProperty("预约时间开始")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date reserveStart; // 预约时间开始
     @ApiModelProperty("预约时间截止")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date reserveEnd; // 预约时间截止
 	@ApiModelProperty("预约服务顾问")
     private String waitorName; // 预约服务顾问

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusreservebill/TrackLogsVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.api.asbusreservebill;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/5/11 17:28
+ */
+@Data
+public class TrackLogsVo {
+    private String remarks;
+    private String createTime;
+}

yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceitem/AsServiceItemQuery.java

@@ -57,4 +57,6 @@ public class AsServiceItemQuery implements Query {
 
     @ApiModelProperty("全路径")
     private String orgPath;
+
+    private String type; //0查预约项目 1查所有
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.java

@@ -55,13 +55,15 @@ public interface AsBusreserveBillMapper extends BaseMapper<AsBusreserveBill> {
 
 	//@Update("update as_busreserve_bill set name=#{msg} where id=#{id}")
 	//IPage<AsBusreserveBillVo> voPage(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) QueryWrapper<AsBusreserveBill> qw);
-	
+
 	IPage<AsBusreserveBillVo> selectPageVo(IPage<AsBusreserveBill> page, @Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
-	
+
 	List<AsBusreserveBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsBusreserveBill> qw);
-	
+
 	@Select("select * from as_busreserve_bill")
 	List<AsBusreserveBillVo> selectListVo();
 
 	int selectNum(String bill);
-}
+
+    int selectBySid(String join);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml

@@ -6,7 +6,7 @@
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
 		SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
 	</select>
-	
+
 	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
 		SELECT * FROM as_busreserve_bill <where> ${ew.sqlSegment} </where>
 	</select>
@@ -15,4 +15,10 @@
 		from as_busreserve_bill
 		where billNo LIKE concat(#{bill}, '%')
 	</select>
-</mapper>
+    <select id="selectBySid" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM as_busreserve_bill
+		WHERE `state` != 1
+		  and find_in_set(sid, #{list})
+	</select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillRest.java

@@ -35,6 +35,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -85,6 +86,11 @@ public class AsBusreserveBillRest {
     @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有不是未完成的
+        int count = asBusreserveBillService.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("请选择未完成的数据进行删除！");
+        }
         asBusreserveBillService.delBySids(sids);
         for (String sid : sids) {
             asBusreserveBillSitemService.delByMainSid(sid);

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@@ -312,13 +312,16 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             }
             List<AsBusreserveBillTrack> asBusreserveBillTracks = asBusreserveBillTrackService.fetchByMainSid(sid);
             if (!asBusreserveBillTracks.isEmpty()) {
-                List<String> remarks = new ArrayList<>();
+                List<TrackLogsVo> list = new ArrayList<>();
                 for (AsBusreserveBillTrack asBusreserveBillTrack : asBusreserveBillTracks) {
+                    TrackLogsVo logsVo = new TrackLogsVo();
                     if (StringUtils.isNotBlank(asBusreserveBillTrack.getRemarks())) {
-                        remarks.add(asBusreserveBillTrack.getRemarks());
+                        logsVo.setRemarks(asBusreserveBillTrack.getRemarks());
                     }
+                    logsVo.setCreateTime(sdf.format(asBusreserveBillTrack.getCreateTime()));
+                    list.add(logsVo);
                 }
-                vo.setTrackLogs(remarks);
+                vo.setTrackLogs(list);
             }
         }
         return vo;
@@ -340,6 +343,8 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
                     AsBusreserveBillTrack billTrack = new AsBusreserveBillTrack();
                     billTrack.setRemarks(dto.getTrackLog());
                     billTrack.setBillSid(dto.getSid());
+                    billTrack.setCreateBySid(dto.getUserSid());
+                    billTrack.setUpdateBySid(dto.getUserSid());
                     asBusreserveBillTrackService.insert(billTrack);
                 }
             }
@@ -413,4 +418,8 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             baseMapper.updateById(bill);
         }
     }
+
+    public int selectBySid(String join) {
+        return baseMapper.selectBySid(join);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@@ -49,6 +49,12 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
         if (StringUtils.isNotBlank(query.getManufacturer())) {
             qw.like("manufacturer", query.getManufacturer());
         }
+        if (StringUtils.isNotBlank(query.getType())) {
+            if (query.getType().equals("0")) {
+                //查询预约项目
+                qw.eq("isReserve",1);
+            }
+        }
         ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath());
         if (orgSidByPath.getSuccess()) {
             qw.eq("useOrgSid", orgSidByPath.getData());