Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@@ -67,7 +67,7 @@ public interface BaseDiscountpackageFeign {
 
     @ApiOperation("查询本公司下优惠政策列表")
     @GetMapping("/getAppPackageByUseOrg")
-    ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg);
+    ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(@RequestParam("userOrg") String userOrg);
 
     @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构")
     @GetMapping("/getAppPackage")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java

@@ -90,6 +90,8 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String taskId; // taskId
 	@ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 //    @ApiModelProperty("合同sid")
 //    private String contractSid;
 //    @ApiModelProperty("车型sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(优惠包申请) <br/>
  * File: BaseDiscountpackageApply.java <br/>
@@ -57,7 +59,7 @@ public class BaseDiscountpackageApply extends BaseEntity {
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
 	@ApiModelProperty("申请日期")
-    private String applyDate; // 申请日期
+    private Date applyDate; // 申请日期
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 	@ApiModelProperty("创建组织名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java

@@ -54,6 +54,8 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("userSid")
+    private String userSid; // userSid
 	@ApiModelProperty("合同编号")
     private String contractId; // 合同编号
 	@ApiModelProperty("申请人")
@@ -88,6 +90,8 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo {
     private String taskId; // taskId
 	@ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 //    @ApiModelProperty("合同sid")
 //    private String contractSid;
 //    @ApiModelProperty("车型sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.base.api.basediscountpackageapply;
 
 import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
@@ -129,10 +130,10 @@ public interface BaseDiscountpackageApplyFeign {
 
     @ApiOperation(value = "获取下一个环节")
     @GetMapping(value = "/getNextNodesForSubmit")
-    ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
-    ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java

@@ -59,6 +59,16 @@ public class BaseDiscountpackageApplyQuery implements Query {
     private String createStartTime; // 申请开始时间
     @ApiModelProperty("申请结束时间")
     private String createEndTime; // 申请结束时间
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+    @ApiModelProperty("合同编号 客户名称")
+    private String names;
+    @ApiModelProperty("申请日期")
+    private String date;
+    @ApiModelProperty("1待办 2已办")
+    private String type;
+
+
 //	@ApiModelProperty("申请日期")
 //    private String applyDate; // 申请日期
 //	@ApiModelProperty("创建组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.base.api.basediscountpackageapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
+
 /**
  * Project: anrui-base(优惠包申请) <br/>
  * File: BaseDiscountpackageApplyVo.java <br/>
@@ -58,8 +61,9 @@ public class BaseDiscountpackageApplyVo implements Vo {
     private String applyName; // 申请人
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-    @ApiModelProperty("申请日期")
-    private String applyDate; // 申请日期
+    @ApiModelProperty("发起日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyDate; // 申请日期
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("创建组织名称")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java

@@ -21,7 +21,6 @@ public class BaseDiscountpackageApplyCompleteDto implements Dto {
     @NotBlank(message = "参数错误：userSid")
     private String userSid;
     @ApiModelProperty(value = "用户全路径sid")
-    @NotBlank(message = "参数错误：orgSidPath")
     private String orgSidPath;
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java

@@ -81,4 +81,9 @@ public interface BaseDiscountpackagelistFeign {
     @ResponseBody
     public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid);
 
+    @ApiOperation("根据主表SID获取记录")
+    @GetMapping("/getlistByDiscountSid}")
+    @ResponseBody
+    public ResultBean<List<BaseDiscountpackagelist>> getlistByDiscountSid(String discountSid);
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java

@@ -74,4 +74,9 @@ public class BaseDiscountpackagelistFeignFallback implements BaseDiscountpackage
 	public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<BaseDiscountpackagelist>> getlistByDiscountSid(String discountSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -12,14 +12,16 @@ import lombok.Data;
 public class BaseDistributorListVo implements Vo {
     private static final long serialVersionUID = 7567158573644935938L;
 
-    private String name;
-    private String sid;
+    private String name;//名称
+    private String sid;//sid
 
-    private String registNum;//税号
+    private String registNum;//税号或身份证号
     private String registDetailAddress;//地址
     private String invoPhone;//开票联系电话
     private String invoBank;//开票开户行
     private String invoBankNum;//开票银行账号
 
-    private String openTickRemarks;
+    private String openTickRemarks;//拼接的开票信息
+
+    private String nameAndPhone;//个人名字手机号拼接
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyRest.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageA
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.utils.PagerUtil;
@@ -66,103 +67,121 @@ import java.util.List;
 @RequestMapping("v1/basediscountpackageapply")
 public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFeign {
 
-	@Autowired
-	private BaseDiscountpackageApplyService baseDiscountpackageApplyService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseDiscountpackageApplyVo> pv = baseDiscountpackageApplyService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseDiscountpackageApplyService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private BaseDiscountpackageApplyService baseDiscountpackageApplyService;
+
+    @Autowired
+    private BaseDiscountpackagelistService baseDiscountpackagelistService;
+
+    @Override
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseDiscountpackageApplyVo> pv = baseDiscountpackageApplyService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        baseDiscountpackageApplyService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @Override
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		baseDiscountpackageApplyService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        if (sids.length > 0) {
+            for (String sid : sids) {
+                BaseDiscountpackageApply apply = baseDiscountpackageApplyService.fetchBySid(sid);
+                if (null != apply) {
+                    if (!apply.getNodeState().equals("待提交")) {
+                        return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+                    }
+                }
+            }
+        }
+        baseDiscountpackageApplyService.delBySids(sids);
+        if (sids.length > 0) {
+            for (String sid : sids) {
+                baseDiscountpackagelistService.delByDiscountSid(sid);
+            }
+        }
+        return rb.success().setMsg("删除成功");
+    }
+
+    @Override
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@Override
-	public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
-		PagerVo<AppDiscountpackageVo> page = new PagerVo<>();
-		IPage<AppDiscountpackageVo> iPage = baseDiscountpackageApplyService.getDiscountManageApplyList(pq);
-		PagerVo<AppDiscountpackageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-		return new ResultBean<PagerVo<AppDiscountpackageVo>>().success().setData(pagerVo);
-	}
-
-	@Override
-	public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
-		return baseDiscountpackageApplyService.saveDiscountPackageApplyInfo(dto);
-	}
-
-	@Override
-	public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
-		return baseDiscountpackageApplyService.getDiscountPackageApplyInfo(sid);
-	}
-
-	@Override
-	public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
-		return baseDiscountpackageApplyService.submitRecordApplication(dto);
-	}
-
-	@Override
-	public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(dto, bv);
-		bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
-		return baseDiscountpackageApplyService.complete(bv);
-	}
-
-	@Override
-	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
-		return baseDiscountpackageApplyService.revokeProcess(flowTaskVo);
-	}
-
-	@Override
-	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
-		return baseDiscountpackageApplyService.taskReject(flowTaskVo);
-	}
-
-	@Override
-	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
-		return baseDiscountpackageApplyService.breakProcess(flowTaskVo);
-	}
-
-	@Override
-	public ResultBean flowRecord(String procInsId) {
-		return baseDiscountpackageApplyService.flowRecord(procInsId);
-	}
-
-	@Override
-	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
-		return baseDiscountpackageApplyService.getNextNodesForSubmit(query);
-	}
-
-	@Override
-	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
-		return baseDiscountpackageApplyService.getPreviousNodesForReject(query);
-	}
+    public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+        PagerVo<AppDiscountpackageVo> page = new PagerVo<>();
+        IPage<AppDiscountpackageVo> iPage = baseDiscountpackageApplyService.getDiscountManageApplyList(pq);
+        PagerVo<AppDiscountpackageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+        return new ResultBean<PagerVo<AppDiscountpackageVo>>().success().setData(pagerVo);
+    }
+
+    @Override
+    public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+        return baseDiscountpackageApplyService.saveDiscountPackageApplyInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+        return baseDiscountpackageApplyService.getDiscountPackageApplyInfo(sid);
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+        return baseDiscountpackageApplyService.submitRecordApplication(dto);
+    }
+
+    @Override
+    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(dto, bv);
+        bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
+        return baseDiscountpackageApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+        return baseDiscountpackageApplyService.revokeProcess(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+        return baseDiscountpackageApplyService.taskReject(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+        return baseDiscountpackageApplyService.breakProcess(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean flowRecord(String procInsId) {
+        return baseDiscountpackageApplyService.flowRecord(procInsId);
+    }
+
+    @Override
+    public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+        return baseDiscountpackageApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+        return baseDiscountpackageApplyService.getPreviousNodesForReject(query);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@@ -114,7 +114,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
         qw.eq("createOrgSid", orgSid);
-        qw.eq("createBySid",query.getUserSid());
+        qw.eq("createBySid", query.getUserSid());
         if (StringUtils.isNotBlank(query.getContractId())) {
             qw.like("contractId", query.getContractId());
         }
@@ -126,6 +126,19 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(createEndTime), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
                 );
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("contractId", query.getNames()).or().like("customerName", query.getNames()));
+        }
+        if (StringUtils.isNotBlank(query.getType())) {
+            if ("2".equals(query.getType())) {
+                qw.and(wrapper -> wrapper.ne("nodeState", "待提交").ne("nodeState", "销售专员申请"));
+            }
+            if ("1".equals(query.getType())) {
+                qw.and(wrapper -> wrapper.eq("nodeState", "待提交").or().eq("nodeState", "销售专员申请"));
+            }
+        }
+        qw.apply(StringUtils.isNotEmpty(query.getDate()), "date_format (applyDate,'%Y-%m-%d') = date_format('" + query.getDate() + "','%Y-%m-%d')");
+        qw.orderByDesc("applyDate");
         return qw;
     }
 
@@ -166,11 +179,10 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
 
     public String insertByDto(BaseDiscountpackageApplyDto dto) {
         BaseDiscountpackageApply entity = new BaseDiscountpackageApply();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         entity.setNodeState("待提交");
         entity.setShowHandleBtn(true);
-        entity.setApplyDate(sdf.format(new Date()));
+        entity.setApplyDate(new Date());
         int i = baseMapper.insert(entity);
         return entity.getSid();
     }
@@ -189,6 +201,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         BaseDiscountpackageApply entity = fetchBySid(sid);
         BaseDiscountpackageApplyDetailsVo vo = new BaseDiscountpackageApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        if (StringUtils.isNotBlank(entity.getCreateBySid())) {
+            vo.setUserSid(entity.getCreateBySid());
+        }
         //根据优惠包申请sid查询对应优惠包列表
         List<BaseDiscountpackagelistDto> dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid);
         vo.setDiscountPackageList(dtoList);
@@ -200,7 +215,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         QueryWrapper<AppDiscountpackageVo> qw = new QueryWrapper<>();
         AppDiscountpackageQuery params = pq.getParams();
         String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
-        qw.eq("createBySid",params.getUserSid());
+        qw.eq("createBySid", params.getUserSid());
         qw.eq("createOrgSid", orgSid);
 //        qw.eq("state", params.getType());
         qw.eq("isDelete", 0);
@@ -217,46 +232,52 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
     public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        //  ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+//        if (!userVoResultBean.getSuccess()) {
+//            return rb.setMsg(userVoResultBean.getMsg());
+//        }
+//        //根据staffSid获取用户的组织全路径
+//        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+//        if (!staffOrgResultBean.getSuccess()) {
+//            return rb.setMsg(staffOrgResultBean.getMsg());
+//        }
+//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         String dtoSid = dto.getSid();
         List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
         if (StringUtils.isBlank(dtoSid)) {
             BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
             BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
-            baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
+            baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath());
             baseDiscountpackageApplyDto.setCreateBySid(dto.getUserSid());
             String sid = this.insertByDto(baseDiscountpackageApplyDto);
-            for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
-                BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
-                BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
-                baseDiscountpackagelist.setDiscountSid(sid);
-                baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
+            if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) {
+                for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
+                    BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
+                    BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
+                    baseDiscountpackagelist.setDiscountSid(sid);
+                    baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
+                }
             }
+
             return rb.success().setMsg("添加成功").setData(sid);
         }
         BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid);
         if (baseDiscountpackageApply == null) {
             return rb.setMsg("该优惠包申请不存在");
         }
-        baseDiscountpackagelistService.delByDiscountSid(dtoSid);
+        // baseDiscountpackagelistService.delByDiscountSid(dtoSid);
         BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
         BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
-        baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
+        baseDiscountpackageApplyDto.setOrgSidPath(dto.getOrgSidPath());
         this.updateByDto(baseDiscountpackageApplyDto);
-        for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
-            BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
-            BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
-            baseDiscountpackagelist.setDiscountSid(dtoSid);
-            baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
+        if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) {
+            for (AppDiscountpackagelistDto packageList : appDiscountpackagelists) {
+                BaseDiscountpackagelist baseDiscountpackagelist = baseDiscountpackagelistService.fetchBySid(packageList.getSid());
+                if (null != baseDiscountpackagelist) {
+                    BeanUtil.copyProperties(packageList, baseDiscountpackagelist, "id", "sid");
+                    baseDiscountpackagelistService.updateById(baseDiscountpackagelist);
+                }
+            }
         }
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java

@@ -73,4 +73,6 @@ public interface BaseDiscountpackagelistMapper extends BaseMapper<BaseDiscountpa
     List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid);
 
     List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(@Param("discountSid") String discountSid);
+
+    List<BaseDiscountpackagelist> getlistByDiscountSid(@Param("discountSid")String discountSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.xml

@@ -19,4 +19,10 @@
         FROM base_discountpackagelist
         WHERE discountSid = #{discountSid}
     </select>
+    <select id="getlistByDiscountSid"
+            resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist">
+        SELECT*
+        FROM base_discountpackagelist
+        WHERE discountSid = #{discountSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java

@@ -105,4 +105,11 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign
         List<BaseDiscountpackagelistDto> dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(discountSid);
         return rb.success().setData(dtos);
     }
+
+    @Override
+    public ResultBean<List<BaseDiscountpackagelist>> getlistByDiscountSid(String discountSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseDiscountpackagelist> dtos = baseDiscountpackagelistService.getlistByDiscountSid(discountSid);
+        return rb.success().setData(dtos);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java

@@ -114,4 +114,8 @@ public class BaseDiscountpackagelistService extends MybatisBaseService<BaseDisco
 	public List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(String discountSid) {
 		return baseMapper.fetchDetailsByDiscountSid(discountSid);
 	}
+
+	public List<BaseDiscountpackagelist> getlistByDiscountSid(String discountSid) {
+		return baseMapper.getlistByDiscountSid(discountSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -903,6 +903,9 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             baseDistributorListVo.setName(crmCustomerTempListVo.getName());
             baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
             baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile());
+            baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile());
             baseDistributorListVos.add(baseDistributorListVo);
         }
         return rb.success().setData(baseDistributorListVos);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2375,7 +2375,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
         for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {
-            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
+            /*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
                 BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
@@ -2390,7 +2390,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                         break;
                     }
                 }
-            }
+            }*/
+            existingCarListVo.setSaleOrderNo("");
+            existingCarListVo.setSaleOrderDate("");
+            existingCarListVo.setCustomerSid("");
+            existingCarListVo.setCustomerName("");
+            existingCarListVo.setStaffSid("");
+            existingCarListVo.setStaffName("");
         }
         return rb.success().setData(baseExistingCarListVo);
     }
@@ -3836,7 +3842,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0002"));
         List<BaseExistingCarListVo> baseExistingCarListVo = baseMapper.selExistingCar(qw);
         for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) {
-            List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
+            /*List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData();
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid();
                 BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData();
@@ -3851,7 +3857,13 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                         break;
                     }
                 }
-            }
+            }*/
+            existingCarListVo.setSaleOrderNo("");
+            existingCarListVo.setSaleOrderDate("");
+            existingCarListVo.setCustomerSid("");
+            existingCarListVo.setCustomerName("");
+            existingCarListVo.setStaffSid("");
+            existingCarListVo.setStaffName("");
         }
         return rb.success().setData(baseExistingCarListVo);
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java

@@ -149,5 +149,7 @@ public class AppArrearsCarryInfoVo implements Vo {
 
     @ApiModelProperty("销售订单sid")
     private String busSalesOrderSid;
+    @ApiModelProperty("是否是自营非担保")
+    private boolean finType;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverQuery.java

@@ -15,9 +15,11 @@ public class AppBusDiscountpackageHandoverQuery implements Query {
     private String orgPath; // 分公司sid
     @ApiModelProperty("当前登录用户sid")
     private String userSid; //
-    @ApiModelProperty("待接收销售专员用户sid")
-    private String recUserSid; // 待接收销售专员用户sid
+//    @ApiModelProperty("待接收销售专员用户sid")
+//    private String recUserSid; // 待接收销售专员用户sid
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
+    @ApiModelProperty("1待准备 2待交接 3已交接")
+    private String names; // 1待准备 2待交接 3已交接
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/app/AppBusDiscountpackageHandoverVo.java

@@ -32,7 +32,7 @@ public class AppBusDiscountpackageHandoverVo implements Vo {
     @ApiModelProperty("车型名称")
     private String model; // 车型名称
     @ApiModelProperty("车辆台数")
-    private String carNun; // 车辆台数
+    private String carNum; // 车辆台数
     @ApiModelProperty("接收人姓名")
     private String recName; // 接收人姓名
     @ApiModelProperty("接收人电话")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java

@@ -11,6 +11,8 @@ import java.util.List;
 public class BusHandoverPrepareAddDto implements Dto {
     private static final long serialVersionUID = -5503119838818185683L;
 
+    private String createBySid;
+
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户Sid")
@@ -42,4 +44,6 @@ public class BusHandoverPrepareAddDto implements Dto {
     @ApiModelProperty("车辆信息")
     private List<AppBusHandoverPrepareVehicleDto> appBusHandoverPrepareVehicleDtos;
 
+    private String model;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageQuery.java

@@ -25,5 +25,9 @@ public class AppHandoverPreparePageQuery implements Query {
     private String payTypeKey;
     @ApiModelProperty("组织机构全路径")
     private String orgPath;
+    @ApiModelProperty("移动端菜单应用sid")
+    private String menuSid;
+    @ApiModelProperty("PC端菜单url")
+    private String menuUrl;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppHandoverPreparePageVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,6 +32,7 @@ public class AppHandoverPreparePageVo implements Vo {
     @ApiModelProperty("交车准备状态key")
     private String handoverPrepareStateKey;
     @ApiModelProperty("是否显示办理")
+    @JsonProperty("isShowUpData")
     private boolean isShowUpData;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java

@@ -10,7 +10,7 @@ public class AppInvoicingInfoQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
-
+    @ApiModelProperty("sid")
     private String sid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -12,7 +13,7 @@ public class AppInvoicingInfoVo implements Vo {
 
     private String sid;
 
-    @ApiModelProperty("车架号")
+   /* @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("发票代码")
     private String invoice;
@@ -21,6 +22,16 @@ public class AppInvoicingInfoVo implements Vo {
     @ApiModelProperty("开票人")
     private String name;
     @ApiModelProperty("开票附件")
-    private List<String> invoiceImages;
+    private List<String> invoiceImages;*/
 
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("开票人")
+    private String drawer;
+    @ApiModelProperty("开票日期")
+    private String invoiceDate;
+    @ApiModelProperty("发票号")
+    private String invoiceNo;
+    @ApiModelProperty("发票图片")
+    private List<String> invoiceImages = new ArrayList<>();
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -16,6 +17,6 @@ public class AppOtherDataDto implements Dto {
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")
-    private List<String> otherInfo;
+    private List<String> otherInfo = new ArrayList<>();
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformation.java

@@ -48,4 +48,7 @@ public class BusVehicleInformation extends BaseEntity {
     private Date recTime; // 接收时间
     @ApiModelProperty("移交人")
     private String transferName; // 移交人
+    @ApiModelProperty("剩余随车资料")
+    private String vehicleHandoverData; //剩余随车资料
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationDto.java

@@ -39,4 +39,8 @@ public class BusVehicleInformationDto implements Dto {
     private Date recTime; // 接收时间
     @ApiModelProperty("移交人")
     private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationFeignFallback.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.buscenter.api.busvehicleinformation;
 
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -9,6 +10,7 @@ import java.util.List;
  * @description
  * @date 2023/5/16 14:15
  */
+@Component
 public class BusVehicleInformationFeignFallback implements BusVehicleInformationFeign{
     @Override
     public ResultBean<List<BusVehicleInformation>> getByHandoverSid(String handoverSid) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformation/BusVehicleInformationVo.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.buscenter.api.busvehicleinformation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -12,9 +15,10 @@ import lombok.Data;
 @Data
 public class BusVehicleInformationVo implements Vo {
 
+    private String informationSid;
     @ApiModelProperty("车钥匙个数")
     private String vehicleKeyNum; // 车钥匙个数
-//    @ApiModelProperty("发票0无1有")
+    //    @ApiModelProperty("发票0无1有")
 //    private Integer invoice; // 发票
     @ApiModelProperty("一致性证书0无1有")
     private String certificate; // 一致性证书0无1有
@@ -28,5 +32,16 @@ public class BusVehicleInformationVo implements Vo {
     private String dirverCard; // 驾驶员卡0无1有
     @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有")
     private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
+    @ApiModelProperty("接收人")
+    private String recName; // 接收人
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("移交人")
+    private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("剩余随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsListVo.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.busvehicleinformationhandover;
+
+import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/25 14:34
+ */
+@Data
+public class BusVehicleInformationHandoverDetailsListVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("合同号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("随车资料")
+    private List<BusVehicleInformationVo> informations;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDetailsVo.java

@@ -32,11 +32,7 @@ public class BusVehicleInformationHandoverDetailsVo implements Vo {
     private String customerName;
     @ApiModelProperty("接收人")
     private String recName; // 接收人
-    @ApiModelProperty("接收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date recTime;
     @ApiModelProperty("随车资料")
     private BusVehicleInformationVo busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverDto.java

@@ -48,8 +48,6 @@ public class BusVehicleInformationHandoverDto implements Dto {
     private String busSid;
     @ApiModelProperty("随车资料")
     private BusVehicleInformationDto busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
     @ApiModelProperty("是否是燃气车 0不是1是")
     private Integer isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("是否完成")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeign.java

@@ -44,14 +44,19 @@ public interface BusVehicleInformationHandoverFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ApiOperation("编辑回显")
+    @GetMapping("/fetchDetailsBySid/{sid}/{times}")
     @ResponseBody
-    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid, @PathVariable("times") String times);
 
     @ApiOperation("根据车辆sid获取一条记录")
     @PostMapping("/selectByVehicleSid")
     @ResponseBody
     public ResultBean<BusVehicleInformationHandover> selectByVehicleSid(@RequestParam("vehicleSid") String vehicleSid);
 
+    @ApiOperation("随车资料交接详情")
+    @GetMapping("/details/{sid}")
+    @ResponseBody
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(@PathVariable("sid") String sid);
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverFeignFallback.java

@@ -34,7 +34,7 @@ public class BusVehicleInformationHandoverFeignFallback implements BusVehicleInf
     }
 
     @Override
-    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid,String times) {
         return null;
     }
 
@@ -42,4 +42,9 @@ public class BusVehicleInformationHandoverFeignFallback implements BusVehicleInf
     public ResultBean<BusVehicleInformationHandover> selectByVehicleSid(String vehicleSid) {
         return null;
     }
+
+    @Override
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(String sid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busvehicleinformationhandover/BusVehicleInformationHandoverVo.java

@@ -30,9 +30,6 @@ public class BusVehicleInformationHandoverVo implements Vo {
     private String model;
     @ApiModelProperty("合同号")
     private String contractNo;
-    @ApiModelProperty("接收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date recTime;
     @ApiModelProperty("客户名称")
     private String customerName;
     @ApiModelProperty("接收人")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -633,6 +633,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             if (!resultBean.getSuccess()) {
                 log.error("获取销售订单详情出错啦！！！");
             }
+            if(resultBean.getData().isFinState()){
+                appArrearsCarryInfoVo.setFinType(false);
+            }else{
+                appArrearsCarryInfoVo.setFinType(true);
+            }
             appArrearsCarryInfoVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid());
             appArrearsCarryInfoVo.setUserSid(busArrearsCarryVehicleApply.getCreateBySid());
             appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo());
@@ -2246,6 +2251,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             log.error("获取销售订单详情出错啦！！！");
         }
         appArrearsCarryInfoVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid());
+        if(resultBean.getData().isFinState()){
+            appArrearsCarryInfoVo.setFinType(false);
+        }else{
+            appArrearsCarryInfoVo.setFinType(true);
+        }
         appArrearsCarryInfoVo.setContractId(busArrearsCarryVehicleApply.getContractNo());
         appArrearsCarryInfoVo.setPublishInfo(busArrearsCarryVehicleApply.getApplyDept() + "-" + busArrearsCarryVehicleApply.getApplyName());
         appArrearsCarryInfoVo.setCreateDate(DateUtil.format(busArrearsCarryVehicleApply.getCreateTime(), "yyyy-MM-dd"));

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

@@ -741,16 +741,20 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if ("1".equals(busDeliveredApply.getPaymentMethodKey())) {
             dto.setCustomerName(busDeliveredApply.getName());
             dto.setCustomerSid(busDeliveredApply.getCustomerSid());
+            dto.setMobile(busDeliveredApply.getMobile());
         } else {
             dto.setCustomerName(busDeliveredApply.getLoanName());
             dto.setCustomerSid(busDeliveredApply.getLoanSid());
+            dto.setMobile(busDeliveredApply.getLoanMobile());
         }
+        dto.setCreateBySid(busDeliveredApply.getCreateBySid());
         //付款方式
         dto.setPayType(busDeliveredApply.getPaymentMethod());
         dto.setPayTypeKey(busDeliveredApply.getPaymentMethodKey());
+        dto.setModel(busDeliveredApply.getModelName());
         //交车准备状态
-        dto.setHandoverPrepareState("1");
-        dto.setHandoverPrepareStateKey("待准备");
+        dto.setHandoverPrepareState("待准备");
+        dto.setHandoverPrepareStateKey("1");
         //创建组织sid、使用组织sid
         dto.setCreateOrgSid(busDeliveredApply.getUseOrgSid());
         dto.setUseOrgSid(busDeliveredApply.getUseOrgSid());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverMapper.xml

@@ -30,7 +30,7 @@
         contractNo as contractId,
         customerName,
         vehModel as model,
-        vehCount as carNun,
+        vehCount as carNum,
         recName,
         recPhone,
         recTime

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdiscountpackagehandover/BusDiscountpackageHandoverService.java

@@ -495,8 +495,8 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
         QueryWrapper<BusDiscountpackageHandover> qw = new QueryWrapper<>();
         qw.eq("useOrgSid", query.getOrgPath());
         qw.eq("isDelete", 0);
-        if (StringUtils.isNotBlank(query.getRecUserSid())) {
-            qw.eq("recUserSid", query.getRecUserSid());
+        if (StringUtils.isNotBlank(query.getUserSid())) {
+            qw.eq("recUserSid", query.getUserSid());
         }
         if (StringUtils.isNotBlank(query.getType())) {
             if (query.getType().equals("3")) {
@@ -505,6 +505,10 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
                 qw.ne("state", 3);
             }
         }
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("contractNo", query.getNames()).or().like("customerName", query.getNames())
+            .or().like("recName",query.getNames()));
+        }
         return qw;
     }
 
@@ -517,9 +521,6 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
     public PagerVo<AppBusDiscountpackageHandoverVo> getDiscountHandoverList(PagerQuery<AppBusDiscountpackageHandoverQuery> pq) {
         //从传入参数中取查询条件
         AppBusDiscountpackageHandoverQuery query = pq.getParams();
-        //取到当前登录用户的sid
-        String userSid = query.getUserSid();
-        query.setRecUserSid(userSid);
         QueryWrapper<BusDiscountpackageHandover> qw = appCreateQueryWrapper(query);
         IPage<BusDiscountpackageHandover> page = PagerUtil.queryToPage(pq);
         IPage<AppBusDiscountpackageHandoverVo> pagging = baseMapper.selectAppPageVo(page, qw);
@@ -528,8 +529,13 @@ public class BusDiscountpackageHandoverService extends MybatisBaseService<BusDis
             for (AppBusDiscountpackageHandoverVo record : records) {
                 if (null != record) {
                     if (StringUtils.isNotBlank(record.getContractId())) {
-                        String busSid = commonContractFeign.selectByNo(record.getContractId()).getData().getBusSid();
-                        record.setSalesOrderSid(busSid);
+
+                        CommonContract data = commonContractFeign.selectByNo(record.getContractId()).getData();
+                        if (null != data) {
+                            if (StringUtils.isNotBlank(data.getBusSid())) {
+                                record.setSalesOrderSid(data.getBusSid());
+                            }
+                        }
                     }
                     if (null != record.getType()) {
                         if (record.getType() == 1 || record.getType() == 2) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -25,10 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareFeign;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
-import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -105,10 +103,9 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
 
     @Override
     public ResultBean<PagerVo<AppHandoverPreparePageVo>> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
-        PagerVo<AppHandoverPreparePageVo> page = new PagerVo<>();
-        IPage<AppHandoverPreparePageVo> iPage = busHandoverPrepareService.getDeliveryPlanList(pagerQuery);
-        PagerVo<AppHandoverPreparePageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppHandoverPreparePageVo>>().success().setData(pagerVo);
+        ResultBean<PagerVo<AppHandoverPreparePageVo>> rb = ResultBean.fireFail();
+        PagerVo<AppHandoverPreparePageVo> pv = busHandoverPrepareService.getDeliveryPlanList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -44,14 +44,18 @@ import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
 import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
 import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
-import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -91,6 +95,10 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private BusHandoverWaitService busHandoverWaitService;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
    /* private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -165,23 +173,62 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      * @param pagerQuery
      * @return
      */
-    public IPage<AppHandoverPreparePageVo> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
+    public PagerVo<AppHandoverPreparePageVo> getDeliveryPlanList(PagerQuery<AppHandoverPreparePageQuery> pagerQuery) {
         IPage<AppHandoverPreparePageQuery> page = PagerUtil.queryToPage(pagerQuery);
         AppHandoverPreparePageQuery params = pagerQuery.getParams();
         String userSid = params.getUserSid();
-        String useOrgSid = "";
+       /* String useOrgSid = "";
         if(StringUtils.isNotBlank(params.getOrgPath())){
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
         }else{
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }
+        }*/
         QueryWrapper<AppHandoverPreparePageVo> qw = new QueryWrapper<>();
+        //=======================
+        params.setMenuSid("ace04aa4-c970-4960-b211-984052f204c3");
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(params.getOrgPath());
+        privilegeQuery.setMenuSid(params.getMenuSid());
+        privilegeQuery.setMenuUrl(params.getMenuUrl());
+        privilegeQuery.setUserSid(params.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = params.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("orgSidPath", orgSidPath);
+            } else if("5".equals(orgLevelKey)){
+                qw.eq("createBySid",params.getUserSid());
+            }else{
+                PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
+            return p;
+        }
         if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备
             qw.eq("handoverPrepareStateKey", params.getType());
         }
-        if (StringUtils.isNotBlank(useOrgSid)) {
+       /* if (StringUtils.isNotBlank(useOrgSid)) {
             qw.eq("useOrgSid", useOrgSid);
-        }
+        }*/
         if(StringUtils.isNotBlank(params.getContractNo())){
             qw.like("contractNo",params.getContractNo());
         }
@@ -203,7 +250,8 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 record.setShowUpData(false);
             }
         }
-        return iPage;
+        PagerVo<AppHandoverPreparePageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
     /**
@@ -241,12 +289,12 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      */
     public ResultBean<AppInvoicingInfoVo> getInvoiceInfo(AppInvoicingInfoQuery query) {
         ResultBean<AppInvoicingInfoVo> rb = new ResultBean();
-        String vin = query.getVin();
+        BusHandoverPrepareVehicle busHandoverPrepareVehicle = busHandoverPrepareVehicleService.fetchBySid(query.getSid());
         AppInvoicingInfoVo vo = new AppInvoicingInfoVo();
-        ResultBean<AppInvoicingInfoVinNoVo> resultBean = finBillVehicleFeign.selDetailsByVinNo(vin);
-        AppInvoicingInfoVinNoVo data = resultBean.getData();
+        ResultBean<VehicleInvoiceVo> resultBean = finVehicleInvoiceFeign.selectByVinSid(busHandoverPrepareVehicle.getVinSid());
+        VehicleInvoiceVo data = resultBean.getData();
         BeanUtil.copyProperties(data, vo);
-        vo.setVin(vin);
+        vo.setSid(busHandoverPrepareVehicle.getVinSid());
         return rb.success().setData(vo);
     }
 
@@ -332,6 +380,9 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
      */
     public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
         ResultBean rb = new ResultBean<>();
+        if(dto.getOtherInfo().isEmpty()){
+            return rb.setMsg("其他资料图片为必填项");
+        }
         buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
         buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
         return rb.success();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.java

@@ -15,4 +15,6 @@ import java.util.List;
 @Mapper
 public interface BusVehicleInformationMapper extends BaseMapper<BusVehicleInformation> {
     List<BusVehicleInformation> getByHandoverSid(@Param("handoverSid") String handoverSid);
+
+    BusVehicleInformation selectByHandoverNumAndHandoverSid(@Param("handoverNum")String handoverNum, @Param("sid")String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationMapper.xml

@@ -11,4 +11,12 @@
         where handoverSid = #{handoverSid}
           and isDelete = '0'
     </select>
+    <select id="selectByHandoverNumAndHandoverSid"
+            resultType="com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation">
+        select *
+        from bus_vehicle_information
+        where handoverNum = #{handoverNum}
+          and handoverSid = #{sid}
+
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformation/BusVehicleInformationService.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.busvehicleinformation;
 
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.common.base.service.MybatisBaseService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,4 +18,8 @@ public class BusVehicleInformationService extends MybatisBaseService<BusVehicleI
     public List<BusVehicleInformation> getByHandoverSid(String handoverSid) {
         return baseMapper.getByHandoverSid(handoverSid);
     }
+
+    public BusVehicleInformation selectByHandoverNumAndHandoverSid(String handoverNum, String sid) {
+        return baseMapper.selectByHandoverNumAndHandoverSid(handoverNum,sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -13,7 +13,6 @@
         vehicleSid,
         model,
         contractNo,
-        recTime,
         customerName,
         recName,
         recPhone,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverRest.java

@@ -29,6 +29,7 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH
 
     /**
      * 新增或修改
+     *
      * @param dto
      * @return
      */
@@ -51,8 +52,8 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH
     }
 
     @Override
-    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
-        return busVehicleInformationHandoverService.fetchDetailsBySid(sid);
+    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid, String times) {
+        return busVehicleInformationHandoverService.fetchDetailsBySid(sid, times);
     }
 
     @Override
@@ -60,4 +61,9 @@ public class BusVehicleInformationHandoverRest implements BusVehicleInformationH
         return busVehicleInformationHandoverService.selectByVehicleSid(vehicleSid);
     }
 
+    @Override
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(String sid) {
+        return busVehicleInformationHandoverService.details(sid);
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -5,14 +5,8 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
-import com.yxt.anrui.buscenter.api.bussealapply.BusSealApply;
-import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyQuery;
-import com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyVo;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationDto;
 import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformationVo;
@@ -28,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -42,8 +37,6 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
     @Autowired
     private BusVehicleInformationService busVehicleInformationService;
     @Autowired
-    private BaseVehicleFeign baseVehicleFeign;
-    @Autowired
     private BaseVehicleModelFeign baseVehicleModelFeign;
 
 
@@ -67,7 +60,7 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                 for (BusVehicleInformation information : informations) {
                     BusVehicleInformation twiceInformation = new BusVehicleInformation();
                     if ("001".equals(information.getHandoverNum())) {
-                        BeanUtil.copyProperties(information, twiceInformation, "id", "sid");
+                        BeanUtil.copyProperties(information, twiceInformation, "id", "sid", "recTime", "transferName", "remarks", "vehicleHandoverData");
                         if (null != informationDto.getRecTime()) {
                             twiceInformation.setRecTime(informationDto.getRecTime());
                         }
@@ -85,6 +78,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                         twiceInformation.setEnvironmentalList(1);
                         twiceInformation.setDirverCard(1);
                         twiceInformation.setHandoverNum("002");
+                        twiceInformation.setRemarks(informationDto.getRemarks());
+                        twiceInformation.setVehicleHandoverData(informationDto.getVehicleHandoverData());
                         busVehicleInformationService.insert(twiceInformation);
                     }
                 }
@@ -99,10 +94,72 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                     newInformation.setIsFuelVehicle(fetchBySid(sid).getIsFuelVehicle());
                 }
                 busVehicleInformationService.insert(newInformation);
+                BusVehicleInformation busVehicleInformation = busVehicleInformationService.fetchBySid(newInformation.getSid());
+                StringBuffer str = new StringBuffer();
+                //车钥匙
+                if (busVehicleInformation.getVehicleKeyNum() > 0) {
+                    Integer num = busVehicleInformation.getVehicleKeyNum();
+                    int value = num.intValue();
+                    str.append("车钥匙" + value + "把、");
+                }
+                //一致性证书
+                if (busVehicleInformation.getCertificate() > 0) {
+                    str.append("一致性证书、");
+                }
+                //申请表
+                if (busVehicleInformation.getApplyForm() > 0) {
+                    str.append("申请表、");
+                }
+                //保修手册、说明书
+                if (busVehicleInformation.getManual() > 0) {
+                    str.append("保修手册、说明书、");
+                }
+                //环保清单
+
+                if (busVehicleInformation.getEnvironmentalList() > 0) {
+                    str.append("环保清单、");
+                }
+                //驾驶员卡
+                if (busVehicleInformation.getDirverCard() > 0) {
+                    str.append("驾驶员卡、");
+                }
+                if (busVehicleInformation.getGasCertificate() > 0) {
+                    if (busVehicleInformation.getIsFuelVehicle() != 0) {
+                        str.append("气瓶检测合格证、");
+                    }
+                }
+                str.delete(str.length() - 1, str.length());
+                busVehicleInformation.setVehicleHandoverData(str.toString());
+                busVehicleInformationService.updateById(busVehicleInformation);
             }
-            List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(sid);
-            if (null != informationList) {
-                entity.setHandoverState(1);
+            List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid());
+            if (null != informationList && informationList.size() > 0) {
+                for (BusVehicleInformation busVehicleInformation : informationList) {
+                    if ("001".equals(busVehicleInformation.getHandoverNum())) {
+                        if (busVehicleInformation.getVehicleKeyNum() < 1
+                                || busVehicleInformation.getCertificate() < 1
+                                || busVehicleInformation.getApplyForm() < 1
+                                || busVehicleInformation.getManual() < 1
+                                || busVehicleInformation.getEnvironmentalList() < 1
+                                || busVehicleInformation.getDirverCard() < 1
+                        ) {
+                            entity.setHandoverState(1);
+                        } else {
+                            if (busVehicleInformation.getGasCertificate() < 1) {
+                                if (busVehicleInformation.getIsFuelVehicle() == 0) {
+                                    entity.setHandoverState(2);
+                                } else {
+                                    entity.setHandoverState(1);
+                                }
+                            } else {
+                                entity.setHandoverState(2);
+                            }
+                        }
+                    }
+                    if ("002".equals(busVehicleInformation.getHandoverNum())) {
+                        entity.setHandoverState(2);
+                    }
+                }
             }
             baseMapper.updateById(entity);
             return rb.success().setData(sid);
@@ -177,40 +234,111 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
      * @param sid
      * @return
      */
-    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid, String times) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleInformationHandover informationHandover = fetchBySid(sid);
         BusVehicleInformationHandoverDetailsVo vo = new BusVehicleInformationHandoverDetailsVo();
         BeanUtil.copyProperties(informationHandover, vo, "id", "sid");
         vo.setSid(sid);
+        String recName = "";
+        if (StringUtils.isNotBlank(vo.getRecName())) {
+            recName = vo.getRecName();
+        }
         List<BusVehicleInformation> busVehicleInformations = busVehicleInformationService.getByHandoverSid(sid);
-
-        if (null != busVehicleInformations) {
+        if (null != busVehicleInformations && busVehicleInformations.size() > 0) {
             for (BusVehicleInformation informationServiceByHandoverSid : busVehicleInformations) {
-                BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
-                BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid");
-                if (null == informationServiceByHandoverSid.getApplyForm()) {
-                    informationVo.setApplyForm("");
-                }
-                if (null == informationServiceByHandoverSid.getCertificate()) {
-                    informationVo.setCertificate("");
-                }
-                if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
-                    informationVo.setVehicleKeyNum("");
-                }
-                if (null == informationServiceByHandoverSid.getManual()) {
-                    informationVo.setManual("");
-                }
-                if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
-                    informationVo.setEnvironmentalList("");
-                }
-                if (null == informationServiceByHandoverSid.getDirverCard()) {
-                    informationVo.setDirverCard("");
+                //第一次的记录编辑回显
+                if (times.equals("1") && informationServiceByHandoverSid.getHandoverNum().equals("001")) {
+                    BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
+                    BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid");
+                    if (null == informationServiceByHandoverSid.getApplyForm()) {
+                        informationVo.setApplyForm("");
+                    }
+                    if (null == informationServiceByHandoverSid.getCertificate()) {
+                        informationVo.setCertificate("");
+                    }
+                    if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
+                        informationVo.setVehicleKeyNum("");
+                    }
+                    if (null == informationServiceByHandoverSid.getManual()) {
+                        informationVo.setManual("");
+                    }
+                    if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
+                        informationVo.setEnvironmentalList("");
+                    }
+                    if (null == informationServiceByHandoverSid.getDirverCard()) {
+                        informationVo.setDirverCard("");
+                    }
+                    if (null == informationServiceByHandoverSid.getGasCertificate()) {
+                        informationVo.setGasCertificate("");
+                    }
+                    informationVo.setVehicleHandoverData(informationServiceByHandoverSid.getVehicleHandoverData());
+                    informationVo.setInformationSid(informationServiceByHandoverSid.getSid());
+                    informationVo.setRecName(recName);
+                    vo.setBusVehicleInformation(informationVo);
                 }
-                if (null == informationServiceByHandoverSid.getGasCertificate()) {
-                    informationVo.setGasCertificate("");
+                if (times.equals("2")) {
+                    BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
+                    BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid");
+                    if (null == informationServiceByHandoverSid.getApplyForm()) {
+                        informationVo.setApplyForm("");
+                    }
+                    if (null == informationServiceByHandoverSid.getCertificate()) {
+                        informationVo.setCertificate("");
+                    }
+                    if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
+                        informationVo.setVehicleKeyNum("");
+                    }
+                    if (null == informationServiceByHandoverSid.getManual()) {
+                        informationVo.setManual("");
+                    }
+                    if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
+                        informationVo.setEnvironmentalList("");
+                    }
+                    if (null == informationServiceByHandoverSid.getDirverCard()) {
+                        informationVo.setDirverCard("");
+                    }
+                    if (null == informationServiceByHandoverSid.getGasCertificate()) {
+                        informationVo.setGasCertificate("");
+                    }
+                    String handoverNum = "001";
+                    StringBuffer str = new StringBuffer();
+                    BusVehicleInformation infor = busVehicleInformationService.selectByHandoverNumAndHandoverSid(handoverNum, sid);
+                    //车钥匙
+                    if (infor.getVehicleKeyNum() < 1) {
+                        str.append("车钥匙、");
+                    }
+                    //一致性证书
+                    if (infor.getCertificate() < 1) {
+                        str.append("一致性证书、");
+                    }
+                    //申请表
+                    if (infor.getApplyForm() < 1) {
+                        str.append("申请表、");
+                    }
+                    //保修手册、说明书
+                    if (infor.getManual() < 1) {
+                        str.append("保修手册、说明书、");
+                    }
+                    //环保清单
+                    if (infor.getEnvironmentalList() < 1) {
+                        str.append("环保清单、");
+                    }
+                    //驾驶员卡
+                    if (infor.getDirverCard() < 1) {
+                        str.append("驾驶员卡、");
+                    }
+                    if (infor.getGasCertificate() < 1) {
+                        if (infor.getIsFuelVehicle() != 0) {
+                            str.append("气瓶检测合格证、");
+                        }
+                    }
+                    str.delete(str.length() - 1, str.length());
+                    informationVo.setVehicleHandoverData(str.toString());
+                    informationVo.setInformationSid(informationServiceByHandoverSid.getSid());
+                    informationVo.setRecName(recName);
+                    vo.setBusVehicleInformation(informationVo);
                 }
-                vo.setBusVehicleInformation(informationVo);
             }
         } else {
             BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
@@ -221,22 +349,24 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
             informationVo.setEnvironmentalList("");
             informationVo.setDirverCard("");
             informationVo.setGasCertificate("");
+            informationVo.setRecName(recName);
             vo.setBusVehicleInformation(informationVo);
         }
         return rb.success().setData(vo);
     }
 
     public void delAllBySids(String[] sids) {
-//        for (String sid : sids) {
-//            deleteBySid(sid);
-//            BusVehicleInformation vehicleInformation = busVehicleInformationService.getByHandoverSid(sid);
-//            if (null != vehicleInformation) {
-//                busVehicleInformationService.deleteBySid(vehicleInformation.getSid());
-//            }
-//        }
+        for (String sid : sids) {
+            deleteBySid(sid);
+            List<BusVehicleInformation> vehicleInformation = busVehicleInformationService.getByHandoverSid(sid);
+            if (null != vehicleInformation && vehicleInformation.size() > 0) {
+                for (BusVehicleInformation busVehicleInformation : vehicleInformation) {
+                    busVehicleInformationService.deleteBySid(busVehicleInformation.getSid());
+                }
+            }
+        }
     }
 
-
     public ResultBean<BusVehicleInformationHandover> selectByVehicleSid(String vehicleSid) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleInformationHandover busVehicleInformationHandover = baseMapper.selectByVehicleSid(vehicleSid);
@@ -253,9 +383,21 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         ResultBean rb = ResultBean.fireFail();
         BusVehicleInformationHandover entity = fetchBySid(dto.getSid());
         List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(dto.getSid());
+        BusVehicleInformationDto informationDto = dto.getBusVehicleInformation();
         if (null != informationList) {
             for (BusVehicleInformation busVehicleInformation : informationList) {
                 if ("001".equals(busVehicleInformation.getHandoverNum())) {
+                    if (informationList.size() < 2) {
+                        if (null != informationDto) {
+                            if (null != informationDto.getRecTime()) {
+                                busVehicleInformation.setRecTime(informationDto.getRecTime());
+                            }
+                            if (StringUtils.isNotBlank(informationDto.getTransferName())) {
+                                busVehicleInformation.setTransferName(informationDto.getTransferName());
+                            }
+                            busVehicleInformationService.updateById(busVehicleInformation);
+                        }
+                    }
                     if (busVehicleInformation.getVehicleKeyNum() < 1
                             || busVehicleInformation.getCertificate() < 1
                             || busVehicleInformation.getApplyForm() < 1
@@ -277,6 +419,15 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                     }
                 }
                 if ("002".equals(busVehicleInformation.getHandoverNum())) {
+                    if (null != informationDto) {
+                        if (null != informationDto.getRecTime()) {
+                            busVehicleInformation.setRecTime(informationDto.getRecTime());
+                        }
+                        if (StringUtils.isNotBlank(informationDto.getTransferName())) {
+                            busVehicleInformation.setTransferName(informationDto.getTransferName());
+                        }
+                        busVehicleInformationService.updateById(busVehicleInformation);
+                    }
                     entity.setHandoverState(2);
                 }
             }
@@ -284,4 +435,31 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         baseMapper.updateById(entity);
         return rb.success().setData(dto.getSid());
     }
+
+    /**
+     * 随车资料交接详情
+     *
+     * @param sid
+     * @return
+     */
+    public ResultBean<BusVehicleInformationHandoverDetailsListVo> details(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusVehicleInformationHandoverDetailsListVo vo = new BusVehicleInformationHandoverDetailsListVo();
+        BusVehicleInformationHandover entity = fetchBySid(sid);
+        if (null != entity) {
+            BeanUtil.copyProperties(entity, vo);
+        }
+        List<BusVehicleInformationVo> voList = new ArrayList<>();
+        List<BusVehicleInformation> informations = busVehicleInformationService.getByHandoverSid(sid);
+        if (null != informations && informations.size() > 0) {
+            for (BusVehicleInformation information : informations) {
+                BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
+                BeanUtil.copyProperties(information, informationVo);
+                informationVo.setInformationSid(information.getSid());
+                voList.add(informationVo);
+            }
+        }
+        vo.setInformations(voList);
+        return rb.success().setData(vo);
+    }
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerBillApplicationDto.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+
+import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
+import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户管理) <br/>
+ * File: CrmCustomerTempDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto <br/>
+ * Description: 潜在客户信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-12 11:21:16 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "潜在客户信息 数据传输对象", description = "潜在客户信息 数据传输对象")
+@Data
+public class CrmCustomerBillApplicationDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String taxpayerNo;
+    @ApiModelProperty("电话")
+    private String phone;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+    @ApiModelProperty("用户sid")
+    private String createBySid;
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -132,10 +133,10 @@ public class CrmCustomerTempDto implements Dto {
 
     //运营信息
     @ApiModelProperty(value = "运营信息")
-    private CrmBusinessDto crmBusinessDto;
+    private CrmBusinessDto crmBusinessDto = new CrmBusinessDto();
     //见证材料集合
     @ApiModelProperty(value = "见证材料的集合，编辑保存时无此字段")
-    private List<PcCrmVisitAppendixDto> crmVisitAppendixDtoList;
+    private List<PcCrmVisitAppendixDto> crmVisitAppendixDtoList = new ArrayList<>();
 
 
     private String orgPath;

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -86,6 +86,16 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/save")
     public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto);
 
+    /**
+     * 开票信息维护客户新增修改
+     *
+     * @return
+     */
+    @ApiOperation("开票信息维护客户新增修改")
+    @PostMapping("/billApplicatSaveCust")
+    public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
+
+
     /**
      * pc端潜在客户编辑保存
      *

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -67,8 +67,13 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 	public ResultBean save(CrmCustomerTempDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/save无法访问");
 	}
-      
-    @Override
+
+	@Override
+	public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+		return null;
+	}
+
+	@Override
 	public ResultBean update(CrmCustomerTempUpdateDto dto,String sid){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/update无法访问");
 	}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -114,6 +114,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.saveCrmCustomer(dto);
     }
 
+    @Override
+    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+        return crmCustomerTempService.billApplicatSaveCust(dto);
+    }
+
     /**
      * 潜在客户修改保存
      *

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -995,11 +995,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             qw.eq("ct.createOrgSid", orgSid);
         }
-        if (StringUtils.isNotBlank(query.getCertificateTypeKey())){
+        if (StringUtils.isNotBlank(query.getCertificateTypeKey())) {
             qw.eq("ct.certificateTypeKey", query.getCertificateTypeKey());
         }
-        if (StringUtils.isNotBlank(query.getSearch())){
-            qw.like("ct.name",query.getSearch());
+        if (StringUtils.isNotBlank(query.getSearch())) {
+            qw.like("ct.name", query.getSearch());
         }
         qw.eq("ct.staffSid", staffSid);
         List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
@@ -1100,4 +1100,51 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         }
         return rb.success().setData(customerQuery.getCustomerNo());
     }
+
+    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)){//新增
+
+        }
+        //手机号
+        String phone = dto.getPhone();
+        if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
+            return rb.setMsg("手机号格式不正确");
+        }
+        if (!dto.getTaxpayerNo().matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
+            return rb.setMsg("证件号码格式不正确");
+        }
+        //客户姓名
+        String name = dto.getName();
+        //业务员sid
+        String staffSid = dto.getStaffSid();
+        //生成客户编码：分公司简称+部门编码+手机号+姓名首字母大写拼写
+        String customerNo = getPrefix(staffSid, name, phone);
+        //查询该客户编码是否存在
+        CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerNo(customerNo);
+        if (crmCustomerTemp != null) {//存在
+            //查询该客户属于哪个业务员
+            String staffName = "";
+            SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
+            if (sysCrmVo != null) {
+                staffName = sysCrmVo.getName();
+                return rb.setMsg("该客户已存在，为" + staffName + "销售专员客户");
+            }
+        } else {//不存在
+            // 新增
+            SysUserVo sysUserVo = new SysUserVo();
+            sysUserVo.setStaffSid(staffSid);
+            CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
+            crmCustomerTempDto.setName(name);
+            crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo());
+            crmCustomerTempDto.setMobile(phone);
+            crmCustomerTempDto.setUserSid(dto.getCreateBySid());
+            crmCustomerTempDto.setOrgPath(dto.getOrgSidPath());
+            crmCustomerTempDto.setCertificateTypeKey("01");
+            crmCustomerTempDto.setCertificateType("身份证");
+            saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
+        }
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -102,7 +102,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据名称模糊检索")
     @PostMapping("/qyFetchListByName")
     @ResponseBody
-    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name);
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name,@RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("企业开票信息管理新增或保存")
     @PostMapping("/qySaveOrUpdate")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -48,65 +48,65 @@ import java.util.List;
 @Component
 public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeign {
 
-	@Override
-	public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(PagerQuery<FinCompanyInvoicingQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问");
+    }
 
-	@Override
-	public ResultBean save(FinCompanyInvoicingDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
-	}
+    @Override
+    public ResultBean save(FinCompanyInvoicingDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
+    }
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");
-	}
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问");
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问");
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name) {
-		return null;
-	}
+    @Override
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name, String useOrgSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
-		return null;
-	}
+    @Override
+    public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+        return null;
+    }
 
-	@Override
-	public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(String orgSid) {
-		return null;
-	}
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(String orgSid) {
+        return null;
+    }
 
-	@Override
-	public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
-		return null;
-	}
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java

@@ -66,4 +66,6 @@ public class FinCompanyInvoicingQuery implements Query {
     private String name;
     @ApiModelProperty("纳税人识别号")
     private String taxpayerNo;
+
+    private String appName;//移动端查询条件
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@@ -4,11 +4,9 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -83,4 +81,8 @@ public interface FinVehicleInvoiceFeign {
     @PostMapping("/updateBybillingSid")
     public ResultBean updateBybillingSid(@RequestParam("billingSid") String billingSid);
 
+    @ApiOperation("根据车辆sid获取发票信息")
+    @GetMapping("/selectByVinSid")
+    ResultBean<VehicleInvoiceVo> selectByVinSid(@RequestParam("vinSid") String vinSid);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@@ -89,4 +89,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<VehicleInvoiceVo> selectByVinSid(String vinSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/VehicleInvoiceVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.fin.api.finvehicleinvoice;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 车辆发票信息
+ * @author: dimengzhe
+ * @date: 2023/5/29
+ **/
+@Data
+public class VehicleInvoiceVo {
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("开票人")
+    private String drawer;
+    @ApiModelProperty("开票日期")
+    private String invoiceDate;
+    @ApiModelProperty("发票号")
+    private String invoiceNo;
+    @ApiModelProperty("发票图片")
+    private List<String> invoiceImages = new ArrayList<>();
+
+    private String filePath;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1092,6 +1092,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //将collList根据sid去重
         collList = collList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(()
                 -> new TreeSet<>(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getSid))), ArrayList::new));
+        //根据合同编号倒序排序
+        collList = collList.stream().sorted(Comparator.comparing(AppFinUncollectedReceivablesDetailedVo::getContractId).reversed()).collect(Collectors.toList());
         //分页
         IPage<AppFinUncollectedReceivablesDetailedVo> page1 = new Page<>();
         page1.setRecords(collList);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -56,8 +56,10 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 	//@Update("update fin_company_invoicing set name=#{msg} where id=#{id}")
 	//IPage<FinCompanyInvoicingVo> voPage(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) QueryWrapper<FinCompanyInvoicing> qw);
 	
+	IPage<FinCompanyInvoicingVo> selectPageVoGS(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
+
 	IPage<FinCompanyInvoicingVo> selectPageVo(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
-	
+
 	List<FinCompanyInvoicingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
 	
 	@Select("select * from fin_company_invoicing")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -3,6 +3,13 @@
 <mapper namespace="com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVoGS" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
+        SELECT fci.* FROM fin_company_invoicing fci
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
         SELECT fci.* FROM fin_company_invoicing fci
         <where>
@@ -37,6 +44,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
 
     <select id="selByUseOrgSidAndNameOrTaxNo"
@@ -45,6 +53,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
 
     <select id="qySelByUseOrgSid" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingBillListVo">
@@ -61,5 +70,8 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
+
+
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -118,9 +118,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	}
 
 	@Override
-	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name) {
+	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name,String useOrgSid) {
 		ResultBean rb = ResultBean.fireFail();
-		List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name);
+		List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid);
 		return rb.success().setData(finCompanyInvoicingDetailsVos);
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -130,7 +130,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             qw.eq("fci.purchaseSystemSid", query.getPurchaseSystemSid());
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
-        IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVoGS(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -239,12 +239,15 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             return p;
         }
         //=======================
+        //PC查询条件
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("fci.name", query.getName());
         }
         if (StringUtils.isNotBlank(query.getTaxpayerNo())) {
             qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
+        //移动端查询条件
+
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
@@ -261,12 +264,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             QueryWrapper qw1 = new QueryWrapper<>();
             qw1.eq("useOrgSid", useOrgSid);
             qw1.eq("name", name);
-            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
             QueryWrapper qw2 = new QueryWrapper<>();
             qw2.eq("useOrgSid", useOrgSid);
             qw2.eq("taxpayerNo", taxpayerNo);
-            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
             if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
                 return rb.setMsg("该企业开票信息已存在");
@@ -276,15 +277,13 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         }
         QueryWrapper qw1 = new QueryWrapper<>();
         qw1.eq("useOrgSid", useOrgSid);
-        qw1.notIn("sid", dtoSid);
+        qw1.ne("sid", dtoSid);
         qw1.eq("name", name);
-        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
         QueryWrapper qw2 = new QueryWrapper<>();
         qw2.eq("useOrgSid", useOrgSid);
-        qw1.notIn("sid", dtoSid);
+        qw2.ne("sid", dtoSid);
         qw2.eq("taxpayerNo", taxpayerNo);
-        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
         if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
             return rb.setMsg("该企业开票信息已存在");
@@ -293,8 +292,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return rb.success();
     }
 
-    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name) {
+    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name,String useOrgSid) {
         QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", useOrgSid);
+        qw.eq("isDelete", 0);
         qw.like("name", name);
         List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = baseMapper.qyFetchListByName(qw);
         return finCompanyInvoicingDetailsVos;
@@ -304,7 +305,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", orgSid);
         qw.eq("isDelete", 0);
-        qw.isNull("purchaseSystemSid");
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -313,7 +313,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.isNull("purchaseSystemSid");
         qw.like("name",search);
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -51,6 +51,7 @@
             ${ew.sqlSegment}
             and length(busVinSid) > 0
         </where>
+        order by id asc
     </select>
 
     <select id="getCustomerBillList"

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -220,6 +220,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         if (StringUtils.isNotBlank(query.getVinNo())) {
             list = list.stream().filter(v -> v.getVIN().contains(query.getVinNo())).collect(Collectors.toList());
         }
+        list = list.stream().sorted(Comparator.comparing(DetailsOfReceivablesAndUncollectedItemsVo::getContractNo).reversed()).collect(Collectors.toList());
         return list;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@@ -52,4 +52,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
 
     @Select("SELECT COUNT(*) FROM fin_vehicle_invoice WHERE vehicleSid = #{vinSid}")
     int selectCountByVinSid(String vehSid);
+
+    VehicleInvoiceVo selectByVinSids(String vinSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -213,4 +213,8 @@
         from fin_vehicle_invoice
         where billingSid = #{billingSid}
     </select>
+
+    <select id="selectByVinSids" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.VehicleInvoiceVo">
+        select VIN as vinNo,drawer,DATE_FORMAT(invoiceDate, '%Y-%m-%d')  as invoiceDate,invoiceNo,filePath from fin_vehicle_invoice where vehicleSid = #{vinSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@@ -207,4 +207,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
         return finVehicleInvoiceService.updateBybillingSid(billingSid);
     }
 
+    @Override
+    public ResultBean<VehicleInvoiceVo> selectByVinSid(String vinSid) {
+        return finVehicleInvoiceService.selectByVinSids(vinSid);
+    }
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -375,4 +376,14 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
     public int selectCountByVinSid(String vehSid) {
         return baseMapper.selectCountByVinSid(vehSid);
     }
+
+    public ResultBean<VehicleInvoiceVo> selectByVinSids(String vinSid) {
+        ResultBean<VehicleInvoiceVo> rb = ResultBean.fireFail();
+        VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid);
+        if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){
+            List<String> filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(","));
+            vehicleInvoiceVo.setInvoiceImages(filePathList);
+        }
+        return rb.success().setData(vehicleInvoiceVo);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsInfoVo.java

@@ -159,6 +159,8 @@ public class AdvanceArrearsInfoVo implements Vo {
 
     @ApiModelProperty("销售订单sid")
     private String busSalesOrderSid;
+    @ApiModelProperty("是否是自营非担保")
+    private boolean finType;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPreparePageQuery.java

@@ -11,9 +11,14 @@ public class HandoverPreparePageQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("合同编号/客户名称/联系电话")
     private String name;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("1待准备，2已准备")
     private String type;
+
+    @ApiModelProperty("菜单应用sid")
+    private String menuSid;
+    @ApiModelProperty("组织机构全路径")
+    private String orgPath;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPreparePageVo.java

@@ -38,7 +38,8 @@ public class HandoverPreparePageVo implements Vo {
     private String handoverPrepareState;
 
     @ApiModelProperty("是否显示i办理")
-    private Boolean isShowUpData;
+    @JsonProperty("isShowUpData")
+    private boolean isShowUpData;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java

@@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -15,12 +16,18 @@ public class InvoicingInfoVo implements Vo {
     @JsonProperty("vinSid")
     private String sid;
     @ApiModelProperty("车架号")
-    private String vin;
-    @ApiModelProperty("发票代码")
-    private String invoice;
+    @JsonProperty("vin")
+    private String vinNo;
+    @ApiModelProperty("开票人")
+    @JsonProperty("name")
+    private String drawer;
     @ApiModelProperty("开票日期")
-    private String date;
-    @ApiModelProperty("开票附件")
-    private List<String> invoiceImages;
+    @JsonProperty("date")
+    private String invoiceDate;
+    @ApiModelProperty("发票号")
+    @JsonProperty("invoice")
+    private String invoiceNo;
+    @ApiModelProperty("发票图片")
+    private List<String> invoiceImages = new ArrayList<>();
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackageByApplyDto.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 11:04
+ */
+@Data
+public class AppBaseDiscountpackageByApplyDto implements Dto {
+
+    @ApiModelProperty("优惠项目名称")
+    private String discountName;
+    @ApiModelProperty("价值")
+    private BigDecimal price;
+    @ApiModelProperty("优惠项目说明")
+    private String packageExplain;
+    @ApiModelProperty("数量")
+    private Integer number;
+    @ApiModelProperty("总价值")
+    private BigDecimal totalPrice;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppBaseDiscountpackagelistDto.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 10:43
+ */
+@Data
+public class AppBaseDiscountpackagelistDto implements Dto {
+
+    private String sid; // sid
+    @ApiModelProperty("价值")
+    private String price; // 价值
+    @ApiModelProperty("数量")
+    private String number; // 数量
+    @ApiModelProperty("说明")
+    private String packageExplain; // 说明
+    @ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+    @ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+    @ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppCommonContractPackageVo.java

@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 10:55
+ */
+@Data
+public class AppCommonContractPackageVo implements Vo {
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("订单台数")
+    private String number;
+    @ApiModelProperty("业务订单sid")
+    private String busSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java

@@ -51,51 +51,44 @@ import java.util.List;
 public class AppDiscountpackageApplyDetailsVo implements Vo {
 
     private String sid; // sid
-
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("userSid")
+    private String userSid; // userSid
+    @ApiModelProperty("合同编号")
     private String contractId; // 合同编号
-	@ApiModelProperty("申请人")
+    @ApiModelProperty("申请人")
     private String applyName; // 申请人
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    @ApiModelProperty("是否显示办理按钮 提交后不显示")
     private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
-	@ApiModelProperty("车型名称")
+    @ApiModelProperty("车型名称")
     private String model; // 车型名称
-	@ApiModelProperty("台数")
+    @ApiModelProperty("台数")
     private String number; // 台数
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
-	@ApiModelProperty("申请人组织路径")
+    @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
-    private String contractSid;
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
-    @ApiModelProperty("成交价")
-    private String price;
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
     @ApiModelProperty("优惠包列表")
-    private List<AppDiscountpackagelistDetailsVo> appDiscountpackagelists; // 优惠包列表
+    private List<AppBaseDiscountpackagelistDto> discountPackageList;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java

@@ -54,50 +54,42 @@ public class AppDiscountpackageApplyDto implements Dto {
 
     @ApiModelProperty("用户sid")
     private String userSid;
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractId; // 合同编号
-	@ApiModelProperty("申请人")
+    @ApiModelProperty("申请人")
     private String applyName; // 申请人
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    @ApiModelProperty("是否显示办理按钮 提交后不显示")
     private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
-	@ApiModelProperty("车型名称")
+    @ApiModelProperty("车型名称")
     private String model; // 车型名称
-	@ApiModelProperty("台数")
+    @ApiModelProperty("台数")
     private String number; // 台数
-	@ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程定义的id")
     private String procDefId; // 流程定义的id
-	@ApiModelProperty("环节定义的sid")
+    @ApiModelProperty("环节定义的sid")
     private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("流程实例的sid")
+    @ApiModelProperty("流程实例的sid")
     private String procInstId; // 流程实例的sid
-	@ApiModelProperty("流程状态")
+    @ApiModelProperty("流程状态")
     private String nodeState; // 流程状态
-	@ApiModelProperty("taskId")
+    @ApiModelProperty("taskId")
     private String taskId; // taskId
-	@ApiModelProperty("申请人组织路径")
+    @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
-    private String contractSid;
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
-    @ApiModelProperty("成交价")
-    private String price;
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
     @ApiModelProperty("优惠包列表")
     private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

@@ -12,6 +12,7 @@ import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Api(tags = "优惠包申请列表")
 @FeignClient(
@@ -36,6 +37,22 @@ public interface AppDiscountpackageFegin {
     @ResponseBody
     public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(@RequestParam("sid") String sid);
 
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据创建人sid查询合同")
+    @ResponseBody
+    @GetMapping("/selectContractBycreateBySid")
+    public ResultBean<List<AppCommonContractPackageVo>> selectByCreateUserSid(@RequestParam("createBySid") String createBySid);
+
+    @ApiOperation("查询本公司下优惠政策列表")
+    @GetMapping("/getAppPackageByUseOrg")
+    @ResponseBody
+    ResultBean<List<AppBaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(@RequestParam("userOrg") String userOrg);
+
+
     @ApiOperation("提交入账申请")
     @PostMapping("/submitDiscountPackageApplyInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java

@@ -4,8 +4,11 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
+import java.util.List;
+
 public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{
 
+
     @Override
     public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
         return null;
@@ -21,6 +24,21 @@ public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{
         return null;
     }
 
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AppCommonContractPackageVo>> selectByCreateUserSid(String createBySid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        return null;
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
         return null;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 @ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象")
 @Data
 public class AppDiscountpackageVo implements Vo {
@@ -20,19 +23,27 @@ public class AppDiscountpackageVo implements Vo {
 
     @ApiModelProperty("客户名称")
     private String customerName;
-
     @ApiModelProperty("流程状态")
     private String nodeState;
-
-    @ApiModelProperty("申请日期")
-    private String applyDate;
-
     @ApiModelProperty("是否显示办理按钮 提交后不显示")
     private Boolean showHandleBtn;
-
     @ApiModelProperty("车型名称")
     private String model;
-
     @ApiModelProperty("台数")
     private String number;
+    @ApiModelProperty("发起日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date applyDate; // 申请日期
+    @ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+    @ApiModelProperty("taskId")
+    private String taskId; // taskId
+    @ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplysCompleteDto.java

@@ -39,6 +39,6 @@ public class BaseDiscountpackageApplysCompleteDto implements Dto {
     private String businessSid;
     @ApiModelProperty(value = "分支字段及业务字段")
     private Map<String, Object> formVariables;
-    @ApiModelProperty("调账车辆列表")
-    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+//    @ApiModelProperty("调账车辆列表")
+//    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversQuery.java

@@ -16,9 +16,10 @@ public class AppBusDiscountpackageHandoversQuery implements Query {
     private String orgPath; // 分公司sid
     @ApiModelProperty("当前登录用户sid")
     private String userSid; //
-    @ApiModelProperty("待接收销售专员用户sid")
-    private String recUserSid; // 待接收销售专员用户sid
     @ApiModelProperty("1待准备 2待交接 3已交接")
     private String type; // 1待准备 2待交接 3已交接
+    @ApiModelProperty("合同编号/客户名称/待接收人")
+    private String names;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBusDiscountpackageHandoversVo.java

@@ -32,7 +32,7 @@ public class AppBusDiscountpackageHandoversVo implements Vo {
     @ApiModelProperty("车型名称")
     private String model; // 车型名称
     @ApiModelProperty("车辆台数")
-    private String carNun; // 车辆台数
+    private String carNum; // 车辆台数
     @ApiModelProperty("接收人姓名")
     private String recName; // 接收人姓名
     @ApiModelProperty("接收人电话")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppBuscenterFile.java

@@ -1,12 +1,8 @@
 package com.yxt.anrui.terminal.api.autoservice.discountPackageHandover;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * @author Administrator
  * @description

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageHandover/AppDiscountPackageHandoverFegin.java

@@ -46,4 +46,5 @@ public interface AppDiscountPackageHandoverFegin {
     @ResponseBody
     public ResultBean uploadPicture(@RequestBody AppBusDiscountpackageHandoversDto dto) throws InvocationTargetException, IllegalAccessException;
 
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationDto.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -12,27 +14,33 @@ import lombok.Data;
 @Data
 public class AppVehicleInformationDto implements Dto {
     @ApiModelProperty("车钥匙个数")
-    private Integer vehicleKeyNum; // 车钥匙个数
-//    @ApiModelProperty("发票0无1有")
-//    private Integer invoice; // 发票
-//    @ApiModelProperty("合格证0无1有")
-//    private Integer credential; // 合格证0无1有
+    private String vehicleKeyNum; // 车钥匙个数
     @ApiModelProperty("一致性证书0无1有")
-    private Integer certificate; // 一致性证书0无1有
+    private String certificate; // 一致性证书0无1有
     @ApiModelProperty("申请表0无1有")
-    private Integer applyForm; // 申请表0无1有
+    private String applyForm; // 申请表0无1有
     @ApiModelProperty("保修手册、说明书0无1有")
-    private Integer manual; // 保修手册、说明书0无1有
+    private String manual; // 保修手册、说明书0无1有
     @ApiModelProperty("环保清单0无1有")
-    private Integer environmentalList; // 环保清单0无1有
+    private String environmentalList; // 环保清单0无1有
     @ApiModelProperty("驾驶员卡0无1有")
-    private Integer dirverCard; // 驾驶员卡0无1有
+    private String dirverCard; // 驾驶员卡0无1有
     @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有")
-    private Integer gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
+    private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
     @ApiModelProperty("随车资料交接表sid")
     private String handoverSid; // 随车资料交接表sid
     @ApiModelProperty("交接次数")
-    private Integer handoverNum; // 交接次数
+    private String handoverNum; // 交接次数
     @ApiModelProperty("是否是燃气车 0不是1是")
-    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+    @ApiModelProperty("接收人")
+    private String recName; // 接收人
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("移交人")
+    private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsListVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/29 15:17
+ */
+@Data
+public class AppVehicleInformationHandoverDetailsListVo implements Vo {
+    private String sid;
+    @ApiModelProperty("车辆sid")
+    private String vehicleSid; // 车辆sid
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("合同号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("随车资料")
+    private List<AppVehicleInformationVo> informations;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDetailsVo.java

@@ -15,10 +15,11 @@ import java.util.Date;
  */
 @Data
 public class AppVehicleInformationHandoverDetailsVo implements Vo {
-
     private String sid;
     @ApiModelProperty("车辆sid")
     private String vehicleSid; // 车辆sid
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private String isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("车型")
@@ -29,11 +30,6 @@ public class AppVehicleInformationHandoverDetailsVo implements Vo {
     private String customerName;
     @ApiModelProperty("接收人")
     private String recName; // 接收人
-    @ApiModelProperty("接收日期")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date recTime;
     @ApiModelProperty("随车资料")
     private AppVehicleInformationVo busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationHandoverDto.java

@@ -16,16 +16,18 @@ public class AppVehicleInformationHandoverDto implements Dto {
     private String sid;
     @ApiModelProperty("交接状态")
     private Integer handoverState; // 交接状态
+    @ApiModelProperty("创建人sid")
+    private String createBySid; // 创建人sid
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("车辆sid")
     private String vehicleSid; // 车辆sid
-    @ApiModelProperty("创建人sid")
-    private String createBySid; // 创建人sid
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
     @ApiModelProperty("车型名")
     private String model; // 车型名
+    @ApiModelProperty("车型sid")
+    private String modelSid;
     @ApiModelProperty("合同号")
     private String contractNo; // 合同号
     @ApiModelProperty("接收人")
@@ -38,10 +40,9 @@ public class AppVehicleInformationHandoverDto implements Dto {
     private String useOrgName;
     @ApiModelProperty("关联业务sid")
     private String busSid;
-    @ApiModelProperty("接收日期")
-    private Date recTime;
+    @ApiModelProperty("是否是燃气车 0不是1是")
+    private Integer isFuelVehicle; // 是否是燃气车 0不是1是
     @ApiModelProperty("随车资料")
     private AppVehicleInformationDto busVehicleInformation;
-    @ApiModelProperty("备注信息")
-    private String remarks;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/AppVehicleInformationVo.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.terminal.api.autoservice.vehicleinformationhandover;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author Administrator
  * @description
@@ -11,12 +14,11 @@ import lombok.Data;
  */
 @Data
 public class AppVehicleInformationVo implements Vo {
+    private String informationSid;
     @ApiModelProperty("车钥匙个数")
     private String vehicleKeyNum; // 车钥匙个数
-    //    @ApiModelProperty("发票0无1有")
-//    private Integer invoice; // 发票
     @ApiModelProperty("一致性证书0无1有")
-    private Integer certificate; // 一致性证书0无1有
+    private String certificate; // 一致性证书0无1有
     @ApiModelProperty("申请表0无1有")
     private String applyForm; // 申请表0无1有
     @ApiModelProperty("保修手册、说明书0无1有")
@@ -27,4 +29,15 @@ public class AppVehicleInformationVo implements Vo {
     private String dirverCard; // 驾驶员卡0无1有
     @ApiModelProperty("气瓶产品质量证明书（燃气车）0无1有")
     private String gasCertificate; // 气瓶产品质量证明书（燃气车）0无1有
+    @ApiModelProperty("接收人")
+    private String recName; // 接收人
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("接收时间")
+    private Date recTime; // 接收时间
+    @ApiModelProperty("移交人")
+    private String transferName; // 移交人
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("剩余随车资料")
+    private String vehicleHandoverData; //剩余随车资料
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeign.java

@@ -34,10 +34,17 @@ public interface VehicleInformationHandoverFeign {
     @ResponseBody
     public ResultBean appSaveOrUpdate(@RequestBody AppVehicleInformationHandoverDto dto);
 
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ApiOperation("编辑回显")
+    @GetMapping("/fetchDetailsBySid/{sid}/{times}")
     @ResponseBody
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid,@PathVariable("times") String times);
+
+
+    @ApiOperation("随车资料交接详情")
+    @GetMapping("details/{sid}")
+    @ResponseBody
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(@PathVariable("sid") String sid);
+
 
     @ApiOperation("根据创建人sid查询合同用于交车资料查询")
     @ResponseBody
@@ -45,16 +52,13 @@ public interface VehicleInformationHandoverFeign {
     public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(@RequestBody PagerQuery<AppContractBusVechileDataHandoverQuery> pq);
 
 
+
     @ApiOperation("对外二次交付新增或修改交车资料管理")
     @PostMapping("/saveVehicleData")
     @ResponseBody
     public ResultBean<String> saveVehicleData(@RequestBody AppVehicleDataHandoverDto dto);
 
 
-    @ApiOperation("对外二次交付查看交车资料确认单详情")
-    @GetMapping("/fetchVehicleDataBySid/{sid}")
-    @ResponseBody
-    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(@PathVariable("sid") String sid);
 
     @ApiOperation(("打印交车资料确认单"))
     @PostMapping("/createPdf")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/vehicleinformationhandover/VehicleInformationHandoverFeignFallback.java

@@ -25,25 +25,30 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati
     }
 
     @Override
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid,String times) {
         return null;
     }
 
     @Override
-    public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(PagerQuery<AppContractBusVechileDataHandoverQuery> pq) {
+    public ResultBean<AppVehicleInformationHandoverDetailsListVo> details(String sid) {
         return null;
     }
 
     @Override
-    public ResultBean<String> saveVehicleData(AppVehicleDataHandoverDto dto) {
+    public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(PagerQuery<AppContractBusVechileDataHandoverQuery> pq) {
         return null;
     }
 
     @Override
-    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
+    public ResultBean<String> saveVehicleData(AppVehicleDataHandoverDto dto) {
         return null;
     }
 
+//    @Override
+//    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
+//        return null;
+//    }
+
     @Override
     public ResultBean<String> createPdf(AppVehicleDataHandoverDto dto) throws Exception {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -316,6 +316,11 @@ public class AppBusArrearsCarryVehicleApplyService {
                 arrearVo.setType(1);
                 arrearVo.setKey("guaranteeLetter");
                 arrearVo.setNullAble(false);
+                if(advanceArrearsInfoVo.isFinType()){//自营非担保
+                    arrearVo.setNullAble(true);
+                }else{//可不填
+                    arrearVo.setNullAble(false);
+                }
                 List<String> guaranteeLetter = advanceArrearsInfoVo.getGuaranteeLetter();
                 arrearVo.setFilesPath(guaranteeLetter);
                 list.add(arrearVo);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java

@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.List;
+
 @Api(tags = "优惠包申请列表")
 @Controller
 @RequestMapping("/autoservice/v1/discountPackageApply")
@@ -32,6 +34,21 @@ public class AppDiscountPackageApplyRest implements AppDiscountpackageFegin {
         return appDiscountPackageApplyService.getDiscountPackageApplyInfo(sid);
     }
 
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return appDiscountPackageApplyService.delBySids(sids);
+    }
+
+    @Override
+    public ResultBean<List<AppCommonContractPackageVo>> selectByCreateUserSid(String createBySid) {
+        return appDiscountPackageApplyService.selectByCreateUserSid(createBySid);
+    }
+
+    @Override
+    public ResultBean<List<AppBaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        return appDiscountPackageApplyService.getAppPackageByUseOrg(userOrg);
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
         return appDiscountPackageApplyService.submitRecordApplication(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

@@ -1,19 +1,27 @@
 package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDetailsVo;
 import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyQuery;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*;
-import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -23,20 +31,32 @@ public class AppDiscountPackageApplyService {
     @Autowired
     private BaseDiscountpackageApplyFeign baseDiscountpackageApplyFeign;
 
+    @Autowired
+    private CommonContractFeign commonContractFeign;
+
+    @Autowired
+    private BaseDiscountpackageFeign baseDiscountpackageFeign;
+
+
     public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> query) {
         ResultBean<PagerVo<AppDiscountpackageVo>> rb = ResultBean.fireFail();
-        PagerQuery<com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery> pq = CoverUtils.getPagerQuery(query);
-        ResultBean<PagerVo<com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo>> discountManageApplyList = baseDiscountpackageApplyFeign.getDiscountManageApplyList(pq);
-        PagerVo<AppDiscountpackageVo> pagerVo = CoverUtils.selectPagerVo(discountManageApplyList.getData());
+        PagerQuery<BaseDiscountpackageApplyQuery> pagerQuery = new PagerQuery<>();
+        BeanUtil.copyProperties(query, pagerQuery);
+        ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage = baseDiscountpackageApplyFeign.listPage(pagerQuery);
+        PagerVo<AppDiscountpackageVo> pagerVo = new PagerVo<>();
+        if (listPage.getSuccess()) {
+            PagerVo<BaseDiscountpackageApplyVo> data = listPage.getData();
+            BeanUtil.copyProperties(data, pagerVo);
+        }
         return rb.success().setData(pagerVo);
     }
 
     public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto appDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto();
-        BeanUtil.copyProperties(dto,appDiscountpackageApplyDto);
+        BeanUtil.copyProperties(dto, appDiscountpackageApplyDto);
         ResultBean resultBean = baseDiscountpackageApplyFeign.saveDiscountPackageApplyInfo(appDiscountpackageApplyDto);
-        if (resultBean.getSuccess() != true){
+        if (resultBean.getSuccess() != true) {
             return rb.setMsg(resultBean.getMsg());
         }
         return rb.success().setMsg(resultBean.getMsg());
@@ -44,32 +64,35 @@ public class AppDiscountPackageApplyService {
 
     public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        ResultBean<com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDetailsVo> discountPackageApplyInfo = baseDiscountpackageApplyFeign.getDiscountPackageApplyInfo(sid);
-        AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
-        BeanUtil.copyProperties(discountPackageApplyInfo,appDiscountpackageApplyDetailsVo);
-        return rb.success().setData(appDiscountpackageApplyDetailsVo);
+        ResultBean<BaseDiscountpackageApplyDetailsVo> voResultBean = baseDiscountpackageApplyFeign.fetchDetailsBySid(sid);
+        AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo();
+        if (voResultBean.getSuccess()) {
+            BaseDiscountpackageApplyDetailsVo data = voResultBean.getData();
+            BeanUtil.copyProperties(data, vo);
+        }
+        return rb.success().setData(vo);
     }
 
     public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto submitBaseDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto();
-        BeanUtil.copyProperties(dto,submitBaseDiscountpackageApplyDto);
-        baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
-        return rb.success();
+        BeanUtil.copyProperties(dto, submitBaseDiscountpackageApplyDto);
+        ResultBean resultBean = baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
+        return rb.success().setData(resultBean.getData());
     }
 
     public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new BaseDiscountpackageApplyCompleteDto();
-        BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto);
-        baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
-        return rb.success();
+        BeanUtil.copyProperties(dto, baseDiscountpackageApplyCompleteDto);
+        ResultBean complete = baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
+        return rb.success().setData(complete.getData());
     }
 
     public ResultBean revokeProcess(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
         FlowTaskVo flowTaskVo1 = new FlowTaskVo();
-        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        BeanUtil.copyProperties(flowTaskVo, flowTaskVo1);
         baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo1);
         return rb.success();
     }
@@ -77,7 +100,7 @@ public class AppDiscountPackageApplyService {
     public ResultBean taskReject(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
         FlowTaskVo flowTaskVo1 = new FlowTaskVo();
-        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        BeanUtil.copyProperties(flowTaskVo, flowTaskVo1);
         baseDiscountpackageApplyFeign.taskReject(flowTaskVo1);
         return rb.success();
     }
@@ -85,7 +108,7 @@ public class AppDiscountPackageApplyService {
     public ResultBean breakProcess(FlowTasksVo flowTaskVo) {
         ResultBean rb = ResultBean.fireFail();
         FlowTaskVo flowTaskVo1 = new FlowTaskVo();
-        BeanUtil.copyProperties(flowTaskVo,flowTaskVo1);
+        BeanUtil.copyProperties(flowTaskVo, flowTaskVo1);
         baseDiscountpackageApplyFeign.breakProcess(flowTaskVo1);
         return rb.success();
     }
@@ -96,9 +119,12 @@ public class AppDiscountPackageApplyService {
         int next = discountpackageQuery.getNext();
         GetNodeQuery getNodeQuery = new GetNodeQuery();
         BeanUtil.copyProperties(discountpackageQuery, getNodeQuery);
+        if (StringUtils.isNotBlank(discountpackageQuery.getBusinessSid())) {
+            getNodeQuery.setSid(discountpackageQuery.getBusinessSid());
+        }
         String data = "";
         if (next == 0) {
-            ResultBean<List<GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery);
             if (getPreviousNodesForReject.getSuccess()) {
                 getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
                 data = getPreviousNodesForReject.getData().get(0).getName();
@@ -106,7 +132,7 @@ public class AppDiscountPackageApplyService {
                 return rb.setMsg(getPreviousNodesForReject.getMsg());
             }
         } else if (next == 1) {
-            ResultBean<List<GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            ResultBean<List<com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery);
             if (getNextNodesForSubmit.getSuccess()) {
                 getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
                 data = getNextNodesForSubmit.getData().get(0).getName();
@@ -118,4 +144,45 @@ public class AppDiscountPackageApplyService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean delBySids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        String msg = baseDiscountpackageApplyFeign.delBySids(sids).getMsg();
+        return rb.success().setMsg(msg);
+    }
+
+
+    public ResultBean<List<AppCommonContractPackageVo>> selectByCreateUserSid(String createBySid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<List<CommonContractPackageVo>> listResultBean = commonContractFeign.selectByCreateUserSid(createBySid);
+        List<AppCommonContractPackageVo> voList = new ArrayList<>();
+        if (listResultBean.getSuccess()) {
+            List<CommonContractPackageVo> data = listResultBean.getData();
+            if (null != data && data.size() > 0) {
+                for (CommonContractPackageVo datum : data) {
+                    AppCommonContractPackageVo vo = new AppCommonContractPackageVo();
+                    BeanUtil.copyProperties(datum, vo);
+                    voList.add(vo);
+                }
+            }
+        }
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<AppBaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<List<BaseDiscountpackageByApplyDto>> packageByUseOrg = baseDiscountpackageFeign.getAppPackageByUseOrg(userOrg);
+        List<AppBaseDiscountpackageByApplyDto> voList = new ArrayList<>();
+        if (packageByUseOrg.getSuccess()) {
+            List<BaseDiscountpackageByApplyDto> data = packageByUseOrg.getData();
+            if (null != data && data.size() > 0) {
+                for (BaseDiscountpackageByApplyDto datum : data) {
+                    AppBaseDiscountpackageByApplyDto vo = new AppBaseDiscountpackageByApplyDto();
+                    BeanUtil.copyProperties(datum, vo);
+                    voList.add(vo);
+                }
+            }
+        }
+        return rb.success().setData(voList);
+    }
 }