优惠包申请和内部随车资料交接

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/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("申请日期")
+    @ApiModelProperty("发起日期")
-    private String applyDate; // 申请日期
+    @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-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;
@@ -69,10 +70,13 @@ public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFei
     @Autowired
     private BaseDiscountpackageApplyService baseDiscountpackageApplyService;
 
+    @Autowired
+    private BaseDiscountpackagelistService baseDiscountpackagelistService;
+
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq){
+    public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BaseDiscountpackageApplyVo> pv = baseDiscountpackageApplyService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -81,7 +85,7 @@ public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFei
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto){
+    public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         baseDiscountpackageApplyService.saveOrUpdateDto(dto);
         return rb.success();
@@ -90,16 +94,31 @@ public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFei
     @Override
     @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    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);
-		return rb.success();
+        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){
+    public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);

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());
+        //  ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
+//        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
+//            return rb.setMsg(userVoResultBean.getMsg());
-        }
+//        }
-        //根据staffSid获取用户的组织全路径
+//        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+//        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
+//        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
+//            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
+//        }
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+//        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);
+            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) {
+        if (null != appDiscountpackagelists && appDiscountpackagelists.size() > 0) {
-            BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
+            for (AppDiscountpackagelistDto packageList : appDiscountpackagelists) {
-            BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
+                BaseDiscountpackagelist baseDiscountpackagelist = baseDiscountpackagelistService.fetchBySid(packageList.getSid());
-            baseDiscountpackagelist.setDiscountSid(dtoSid);
+                if (null != baseDiscountpackagelist) {
-            baseDiscountpackagelistService.saveOrUpdateDto(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-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获取一条记录")
+    @ApiOperation("编辑回显")
-    @GetMapping("/fetchDetailsBySid/{sid}")
+    @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/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) {
+    public ResultBean<BusVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid, String times) {
-        return busVehicleInformationHandoverService.fetchDetailsBySid(sid);
+        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,11 +94,73 @@ 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("环保清单、");
                 }
-            List<BusVehicleInformation> informationList = busVehicleInformationService.getByHandoverSid(sid);
+                //驾驶员卡
-            if (null != informationList) {
+                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(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);
         } else {
@@ -177,16 +234,21 @@ 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 && busVehicleInformations.size() > 0) {
-        if (null != busVehicleInformations) {
             for (BusVehicleInformation informationServiceByHandoverSid : busVehicleInformations) {
+                //第一次的记录编辑回显
+                if (times.equals("1") && informationServiceByHandoverSid.getHandoverNum().equals("001")) {
                     BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
                     BeanUtil.copyProperties(informationServiceByHandoverSid, informationVo, "id", "sid");
                     if (null == informationServiceByHandoverSid.getApplyForm()) {
@@ -210,8 +272,74 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
                     if (null == informationServiceByHandoverSid.getGasCertificate()) {
                         informationVo.setGasCertificate("");
                     }
+                    informationVo.setVehicleHandoverData(informationServiceByHandoverSid.getVehicleHandoverData());
+                    informationVo.setInformationSid(informationServiceByHandoverSid.getSid());
+                    informationVo.setRecName(recName);
                     vo.setBusVehicleInformation(informationVo);
                 }
+                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);
+                }
+            }
         } else {
             BusVehicleInformationVo informationVo = new BusVehicleInformationVo();
             informationVo.setApplyForm("");
@@ -221,21 +349,23 @@ 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) {
+        for (String sid : sids) {
-//            deleteBySid(sid);
+            deleteBySid(sid);
-//            BusVehicleInformation vehicleInformation = busVehicleInformationService.getByHandoverSid(sid);
+            List<BusVehicleInformation> vehicleInformation = busVehicleInformationService.getByHandoverSid(sid);
-//            if (null != vehicleInformation) {
+            if (null != vehicleInformation && vehicleInformation.size() > 0) {
-//                busVehicleInformationService.deleteBySid(vehicleInformation.getSid());
+                for (BusVehicleInformation busVehicleInformation : vehicleInformation) {
-//            }
+                    busVehicleInformationService.deleteBySid(busVehicleInformation.getSid());
-//        }
+                }
+            }
+        }
     }
-
 
     public ResultBean<BusVehicleInformationHandover> selectByVehicleSid(String vehicleSid) {
         ResultBean rb = ResultBean.fireFail();
@@ -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,30 @@ 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);
+                voList.add(informationVo);
+            }
+        }
+        vo.setInformations(voList);
+        return rb.success().setData(vo);
+    }
 }

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,7 +51,8 @@ import java.util.List;
 public class AppDiscountpackageApplyDetailsVo implements Vo {
 
     private String sid; // sid
-
+    @ApiModelProperty("userSid")
+    private String userSid; // userSid
     @ApiModelProperty("合同编号")
     private String contractId; // 合同编号
     @ApiModelProperty("申请人")
@@ -86,16 +87,8 @@ public class AppDiscountpackageApplyDetailsVo implements Vo {
     private String taskId; // taskId
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+    @ApiModelProperty("备注")
-    private String contractSid;
+    private String remarks; // 备注
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
-    @ApiModelProperty("成交价")
-    private String price;
     @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

@@ -88,16 +88,8 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String taskId; // taskId
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+    @ApiModelProperty("备注")
-    private String contractSid;
+    private String remarks; // 备注
-    @ApiModelProperty("车型sid")
-    private String modelSid;
-    @ApiModelProperty("配置sid")
-    private String configSid;
-    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
-    @ApiModelProperty("成交价")
-    private String price;
     @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("调账车辆列表")
+//    @ApiModelProperty("调账车辆列表")
-    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+//    private List<BaseInternalPurchasesVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

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/vehicleinformationhandover/VehicleInformationHandoverFeign.java

@@ -51,10 +51,10 @@ public interface VehicleInformationHandoverFeign {
     public ResultBean<String> saveVehicleData(@RequestBody AppVehicleDataHandoverDto dto);
 
 
-    @ApiOperation("对外二次交付查看交车资料确认单详情")
+//    @ApiOperation("对外二次交付查看交车资料确认单详情")
-    @GetMapping("/fetchVehicleDataBySid/{sid}")
+//    @GetMapping("/fetchVehicleDataBySid/{sid}")
-    @ResponseBody
+//    @ResponseBody
-    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(@PathVariable("sid") String sid);
+//    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

@@ -39,10 +39,10 @@ public class VehicleInformationHandoverFeignFallback implements VehicleInformati
         return null;
     }
 
-    @Override
+//    @Override
-    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
+//    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
-        return null;
+//        return null;
-    }
+//    }
 
     @Override
     public ResultBean<String> createPdf(AppVehicleDataHandoverDto dto) throws Exception {

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,28 @@
 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 +32,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);
+        PagerQuery<BaseDiscountpackageApplyQuery> pagerQuery = new PagerQuery<>();
-        ResultBean<PagerVo<com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo>> discountManageApplyList = baseDiscountpackageApplyFeign.getDiscountManageApplyList(pq);
+        BeanUtil.copyProperties(query, pagerQuery);
-        PagerVo<AppDiscountpackageVo> pagerVo = CoverUtils.selectPagerVo(discountManageApplyList.getData());
+        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 +65,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);
+        ResultBean<BaseDiscountpackageApplyDetailsVo> voResultBean = baseDiscountpackageApplyFeign.fetchDetailsBySid(sid);
-        AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
+        AppDiscountpackageApplyDetailsVo vo = new AppDiscountpackageApplyDetailsVo();
-        BeanUtil.copyProperties(discountPackageApplyInfo,appDiscountpackageApplyDetailsVo);
+        if (voResultBean.getSuccess()) {
-        return rb.success().setData(appDiscountpackageApplyDetailsVo);
+            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);
+        BeanUtil.copyProperties(dto, submitBaseDiscountpackageApplyDto);
-        baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
+        ResultBean resultBean = baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
-        return rb.success();
+        return rb.success().setData(resultBean.getData());
     }
 
     public ResultBean complete(BaseDiscountpackageApplysCompleteDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new BaseDiscountpackageApplyCompleteDto();
-        BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto);
+        BeanUtil.copyProperties(dto, baseDiscountpackageApplyCompleteDto);
-        baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
+        ResultBean complete = baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
-        return rb.success();
+        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 +101,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 +109,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,6 +120,9 @@ 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);
@@ -118,4 +145,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);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverRest.java

@@ -37,9 +37,14 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove
 
     @Override
     public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
-        return vehicleInformationHandoverService.fetchDetailsBySid(sid);
+        return null;
     }
 
+//    @Override
+//    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+//        return vehicleInformationHandoverService.fetchDetailsBySid(sid);
+//    }
+
     @Override
     public ResultBean<List<AppContractBusVechileDataHandoverVo>> contractForHandover(PagerQuery<AppContractBusVechileDataHandoverQuery> pq) {
         return vehicleInformationHandoverService.contractForHandover(pq);
@@ -50,10 +55,10 @@ public class VehicleInformationHandoverRest implements VehicleInformationHandove
         return vehicleInformationHandoverService.saveVehicleData(dto);
     }
 
-    @Override
+//    @Override
-    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
+//    public ResultBean<AppVehicleDataHandoverDetailsVo> fetchVehicleDataBySid(String sid) {
-        return vehicleInformationHandoverService.fetchVehicleDataBySid(sid);
+//        return vehicleInformationHandoverService.fetchVehicleDataBySid(sid);
-    }
+//    }
 
     @Override
     public ResultBean<String> createPdf(AppVehicleDataHandoverDto dto) throws Exception {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/vehicleinformationhandover/VehicleInformationHandoverService.java

@@ -77,43 +77,43 @@ public class VehicleInformationHandoverService {
         return rb.success().setData(sid);
     }
 
-    /**
+//    /**
-     * 详情编辑回显
+//     * 详情编辑回显
-     *
+//     *
-     * @param sid
+//     * @param sid
-     * @return
+//     * @return
-     */
+//     */
-    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
+//    public ResultBean<AppVehicleInformationHandoverDetailsVo> fetchDetailsBySid(String sid) {
-        ResultBean rb = ResultBean.fireFail();
+//        ResultBean rb = ResultBean.fireFail();
-        BusVehicleInformationHandoverDetailsVo detailsVo = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid).getData();
+//        BusVehicleInformationHandoverDetailsVo detailsVo = busVehicleInformationHandoverFeign.fetchDetailsBySid(sid).getData();
-        AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo();
+//        AppVehicleInformationHandoverDetailsVo vo = new AppVehicleInformationHandoverDetailsVo();
-        if (null != detailsVo) {
+//        if (null != detailsVo) {
-            BeanUtil.copyProperties(detailsVo, vo);
+//            BeanUtil.copyProperties(detailsVo, vo);
-            if (null != vo.getBusVehicleInformation()) {
+//            if (null != vo.getBusVehicleInformation()) {
-                BusVehicleInformationVo informationServiceByHandoverSid = detailsVo.getBusVehicleInformation();
+//                BusVehicleInformationVo informationServiceByHandoverSid = detailsVo.getBusVehicleInformation();
-                AppVehicleInformationVo informationVo = vo.getBusVehicleInformation();
+//                AppVehicleInformationVo informationVo = vo.getBusVehicleInformation();
-                if (null == informationServiceByHandoverSid.getApplyForm()) {
+//                if (null == informationServiceByHandoverSid.getApplyForm()) {
-                    informationVo.setApplyForm("");
+//                    informationVo.setApplyForm("");
-                }
+//                }
-                if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
+//                if (null == informationServiceByHandoverSid.getVehicleKeyNum()) {
-                    informationVo.setVehicleKeyNum("");
+//                    informationVo.setVehicleKeyNum("");
-                }
+//                }
-                if (null == informationServiceByHandoverSid.getManual()) {
+//                if (null == informationServiceByHandoverSid.getManual()) {
-                    informationVo.setManual("");
+//                    informationVo.setManual("");
-                }
+//                }
-                if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
+//                if (null == informationServiceByHandoverSid.getEnvironmentalList()) {
-                    informationVo.setEnvironmentalList("");
+//                    informationVo.setEnvironmentalList("");
-                }
+//                }
-                if (null == informationServiceByHandoverSid.getDirverCard()) {
+//                if (null == informationServiceByHandoverSid.getDirverCard()) {
-                    informationVo.setDirverCard("");
+//                    informationVo.setDirverCard("");
-                }
+//                }
-                if (null == informationServiceByHandoverSid.getGasCertificate()) {
+//                if (null == informationServiceByHandoverSid.getGasCertificate()) {
-                    informationVo.setGasCertificate("");
+//                    informationVo.setGasCertificate("");
-                }
+//                }
-            }
+//            }
-        }
+//        }
-        return rb.success().setData(vo);
+//        return rb.success().setData(vo);
-    }
+//    }
 
 
     /**