优惠包申请已经开票管理增加确认按钮

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

@@ -15,6 +15,6 @@ public class AppDiscountpackageQuery implements Query {
     private String names;
     @ApiModelProperty("申请日期")
     private String date;
-    @ApiModelProperty("1待办 2已办")
+//    @ApiModelProperty("1待办 2已办")
-    private String type;
+//    private String type;
 }

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

@@ -31,7 +31,7 @@ import java.util.List;
  */
 @Api(tags = "优惠包")
 @FeignClient(
-        contextId = "basediscou-ntpackage-BaseDiscountpackage",
+        contextId = "basediscountpackage-BaseDiscountpackage",
         name = "anrui-base",
         path = "v1/basediscountpackage",
         fallback = BaseDiscountpackageFeignFallback.class)
@@ -65,9 +65,9 @@ public interface BaseDiscountpackageFeign {
     @PostMapping("selectSalesOrderList")
     ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(@RequestBody PagerQuery<BaseSalesDicountQuery> query);
 
-    @ApiOperation("移动端-销售订单获取销售政策优惠包")
+    @ApiOperation("查询本公司下优惠政策列表")
-    @GetMapping("/getAppPackage/{userSid}")
+    @GetMapping("/getAppPackageByUseOrg")
-    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
+    ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg);
 
     @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构")
     @GetMapping("/getAppPackage")
@@ -81,6 +81,10 @@ public interface BaseDiscountpackageFeign {
     @GetMapping("/selectAppDiscountpackageListByUserSid")
     ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
 
+    @ApiOperation("移动端-销售订单获取销售政策优惠包")
+    @GetMapping("/getAppPackage/{userSid}")
+    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
+
     /*****************************销售政策流程****************************************************/
 
     @ApiOperation("提交销售政策流程")
@@ -117,11 +121,11 @@ public interface BaseDiscountpackageFeign {
 
     @ApiOperation(value = "销售订单获取车辆的促销金额")
     @GetMapping(value = "/getMoney")
-    ResultBean<List<String>> getMoney(@RequestParam("vinSid")String vinSid,@RequestParam("orgSid")String orgSid);
+    ResultBean<List<String>> getMoney(@RequestParam("vinSid") String vinSid, @RequestParam("orgSid") String orgSid);
 
     @ApiOperation(value = "移动端销售政策详情")
     @GetMapping(value = "/selectDiscountpackage/{sid}")
-    ResultBean<AppDiscountpackagesVo> selectDiscountpackage(@PathVariable("sid")String sid);
+    ResultBean<AppDiscountpackagesVo> selectDiscountpackage(@PathVariable("sid") String sid);
 
 
 }

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

@@ -63,6 +63,11 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
         return null;

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

@@ -90,16 +90,16 @@ public class AppDiscountpackageApplyDto implements Dto {
     private String taskId; // taskId
 	@ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+//    @ApiModelProperty("合同sid")
-    private String contractSid;
+//    private String contractSid;
-    @ApiModelProperty("车型sid")
+//    @ApiModelProperty("车型sid")
-    private String modelSid;
+//    private String modelSid;
-    @ApiModelProperty("配置sid")
+//    @ApiModelProperty("配置sid")
-    private String configSid;
+//    private String configSid;
-    @ApiModelProperty("销售订单sid")
+//    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
+//    private String saleOrderSid;
-    @ApiModelProperty("成交价")
+//    @ApiModelProperty("成交价")
-    private String price;
+//    private String price;
     @ApiModelProperty("优惠包列表")
     private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
 }

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

@@ -84,14 +84,14 @@ public class BaseDiscountpackageApply extends BaseEntity {
     private String taskId; // taskId
 	@ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+//    @ApiModelProperty("合同sid")
-    private String contractSid;
+//    private String contractSid;
-    @ApiModelProperty("车型sid")
+//    @ApiModelProperty("车型sid")
-    private String modelSid;
+//    private String modelSid;
-    @ApiModelProperty("配置sid")
+//    @ApiModelProperty("配置sid")
-    private String configSid;
+//    private String configSid;
-    @ApiModelProperty("销售订单sid")
+//    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
+//    private String saleOrderSid;
-    @ApiModelProperty("成交价")
+//    @ApiModelProperty("成交价")
-    private String price;
+//    private String price;
 }

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

@@ -26,12 +26,15 @@
 package com.yxt.anrui.base.api.basediscountpackageapply;
 
 
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(优惠包申请) <br/>
  * File: BaseDiscountpackageApplyVo.java <br/>
@@ -85,14 +88,16 @@ public class BaseDiscountpackageApplyDetailsVo implements Vo {
     private String taskId; // taskId
 	@ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+//    @ApiModelProperty("合同sid")
-    private String contractSid;
+//    private String contractSid;
-    @ApiModelProperty("车型sid")
+//    @ApiModelProperty("车型sid")
-    private String modelSid;
+//    private String modelSid;
-    @ApiModelProperty("配置sid")
+//    @ApiModelProperty("配置sid")
-    private String configSid;
+//    private String configSid;
-    @ApiModelProperty("销售订单sid")
+//    @ApiModelProperty("销售订单sid")
-    private String saleOrderSid;
+//    private String saleOrderSid;
-    @ApiModelProperty("成交价")
+    @ApiModelProperty("优惠包列表")
-    private String price;
+    private List<BaseDiscountpackagelistDto> discountPackageList;
+//    @ApiModelProperty("成交价")
+//    private String price;
 }

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

@@ -26,12 +26,18 @@
 package com.yxt.anrui.base.api.basediscountpackageapply;
 
 
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackage;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
 import com.yxt.common.core.dto.Dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-base(优惠包申请) <br/>
  * File: BaseDiscountpackageApplyDto.java <br/>
@@ -51,6 +57,8 @@ public class BaseDiscountpackageApplyDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("申请人sid")
+    private String createBySid; // 申请人sid
     @ApiModelProperty("合同编号")
     private String contractId; // 合同编号
     @ApiModelProperty("申请人")
@@ -85,14 +93,18 @@ public class BaseDiscountpackageApplyDto implements Dto {
     private String taskId; // taskId
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
-    @ApiModelProperty("合同sid")
+    @ApiModelProperty("备注")
-    private String contractSid;
+    private String remarks; // 备注
-    @ApiModelProperty("车型sid")
+    @ApiModelProperty("优惠包列表")
-    private String modelSid;
+    private List<BaseDiscountpackagelistDto> discountPackageList;
-    @ApiModelProperty("配置sid")
+//    @ApiModelProperty("合同sid")
-    private String configSid;
+//    private String contractSid;
-    @ApiModelProperty("销售订单sid")
+//    @ApiModelProperty("车型sid")
-    private String saleOrderSid;
+//    private String modelSid;
-    @ApiModelProperty("成交价")
+//    @ApiModelProperty("配置sid")
-    private String price;
+//    private String configSid;
+//    @ApiModelProperty("销售订单sid")
+//    private String saleOrderSid;
+//    @ApiModelProperty("成交价")
+//    private String price;
 }

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

@@ -103,7 +103,7 @@ public interface BaseDiscountpackageApplyFeign {
 
     /**************************流程接口************************************/
 
-    @ApiOperation("提交入账申请")
+    @ApiOperation("优惠包提交申请")
     @PostMapping("/submitRecordApplication")
     public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDiscountpackageApplyDto dto);
 
@@ -134,4 +134,5 @@ public interface BaseDiscountpackageApplyFeign {
     @ApiOperation(value = "获取上一个环节")
     @GetMapping(value = "/getPreviousNodesForReject")
     ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
 }

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

@@ -49,39 +49,45 @@ import lombok.Data;
 @ApiModel(value = "优惠包申请 查询条件", description = "优惠包申请 查询条件")
 public class BaseDiscountpackageApplyQuery implements Query {
 
+    @ApiModelProperty("用户sid")
+    private String userSid; // 用户sid
     @ApiModelProperty("合同编号")
     private String contractId; // 合同编号
-	@ApiModelProperty("申请人")
-    private String applyName; // 申请人
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请开始时间")
-    private String applyDate; // 申请日期
+    private String createStartTime; // 申请开始时间
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("申请结束时间")
-    private String createOrgSid; // 创建组织sid
+    private String createEndTime; // 申请结束时间
-	@ApiModelProperty("创建组织名称")
+//	@ApiModelProperty("申请日期")
-    private String createOrgName; // 创建组织名称
+//    private String applyDate; // 申请日期
-	@ApiModelProperty("使用组织sid")
+//	@ApiModelProperty("创建组织sid")
-    private String useOrgSid; // 使用组织sid
+//    private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("使用组织名称")
+//	@ApiModelProperty("创建组织名称")
-    private String useOrgName; // 使用组织名称
+//    private String createOrgName; // 创建组织名称
-	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+//	@ApiModelProperty("使用组织sid")
-    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+//    private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("车型名称")
+//	@ApiModelProperty("使用组织名称")
-    private String model; // 车型名称
+//    private String useOrgName; // 使用组织名称
-	@ApiModelProperty("台数")
+//	@ApiModelProperty("是否显示办理按钮 提交后不显示")
-    private String number; // 台数
+//    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
-	@ApiModelProperty("流程定义的id")
+//	@ApiModelProperty("车型名称")
-    private String procDefId; // 流程定义的id
+//    private String model; // 车型名称
-	@ApiModelProperty("环节定义的sid")
+//	@ApiModelProperty("台数")
-    private String nodeSid; // 环节定义的sid
+//    private String number; // 台数
-	@ApiModelProperty("流程实例的sid")
+//	@ApiModelProperty("流程定义的id")
-    private String procInstId; // 流程实例的sid
+//    private String procDefId; // 流程定义的id
-	@ApiModelProperty("流程状态")
+//	@ApiModelProperty("环节定义的sid")
-    private String nodeState; // 流程状态
+//    private String nodeSid; // 环节定义的sid
-	@ApiModelProperty("taskId")
+//	@ApiModelProperty("流程实例的sid")
-    private String taskId; // taskId
+//    private String procInstId; // 流程实例的sid
-	@ApiModelProperty("申请人组织路径")
+//	@ApiModelProperty("流程状态")
-    private String orgSidPath; // 申请人组织路径
+//    private String nodeState; // 流程状态
+//	@ApiModelProperty("taskId")
+//    private String taskId; // taskId
+//	@ApiModelProperty("申请人组织路径")
+//    private String orgSidPath; // 申请人组织路径
+//    @ApiModelProperty("申请人")
+//    private String applyName; // 申请人
 
 }

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

@@ -31,6 +31,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * Project: anrui-base(优惠包申请) <br/>
@@ -85,5 +86,7 @@ public class BaseDiscountpackageApplyVo implements Vo {
     private String taskId; // taskId
     @ApiModelProperty("申请人组织路径")
     private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
 
 }

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

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

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

@@ -55,7 +55,7 @@ public class AppDiscountpackagelistDto implements Dto {
 	@ApiModelProperty("数量")
     private String number; // 数量
 	@ApiModelProperty("说明")
-    private String explain; // 说明
+    private String packageExplain; // 说明
 	@ApiModelProperty("优惠表申请sid")
     private String discountSid; // 优惠表申请sid
 	@ApiModelProperty("总价值")
@@ -63,4 +63,6 @@ public class AppDiscountpackagelistDto implements Dto {
 	@ApiModelProperty("优惠包名称")
     private String discountName; // 优惠包名称
 
+
+
 }

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

@@ -55,7 +55,7 @@ public class BaseDiscountpackagelist extends BaseEntity {
 	@ApiModelProperty("数量")
     private String number; // 数量
 	@ApiModelProperty("说明")
-    private String explain; // 说明
+    private String packageExplain; // 说明
 	@ApiModelProperty("优惠表申请sid")
     private String discountSid; // 优惠表申请sid
 	@ApiModelProperty("总价值")

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

@@ -50,13 +50,12 @@ import lombok.Data;
 public class BaseDiscountpackagelistDto implements Dto {
 
     private String sid; // sid
-
     @ApiModelProperty("价值")
     private String price; // 价值
     @ApiModelProperty("数量")
     private String number; // 数量
     @ApiModelProperty("说明")
-    private String explain; // 说明
+    private String packageExplain; // 说明
     @ApiModelProperty("优惠表申请sid")
     private String discountSid; // 优惠表申请sid
     @ApiModelProperty("总价值")

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

@@ -48,7 +48,7 @@ import java.util.List;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "优惠包申请")
+@Api(tags = "优惠包申请优惠包列表")
 @FeignClient(
         contextId = "anrui-base-BaseDiscountpackagelist",
         name = "anrui-base",
@@ -75,4 +75,10 @@ public interface BaseDiscountpackagelistFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据主表SID获取记录")
+    @GetMapping("/fetchDetailsByDiscountSid}")
+    @ResponseBody
+    public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid);
+
 }

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

@@ -69,4 +69,9 @@ public class BaseDiscountpackagelistFeignFallback implements BaseDiscountpackage
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-base/basediscountpackagelist/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -72,6 +72,10 @@ public interface CommonContractFeign {
     @GetMapping("/selectByBusSid")
     public ResultBean<CommonContractBuscenterVo> selectByBusSid(@RequestParam("busSid") String busSid);
 
+    @ApiOperation("根据创建人sid查询合同")
+    @ResponseBody
+    @GetMapping("/selectBycreateBySid")
+    public ResultBean<CommonContractPackageVo> selectByCreateUserSid(@RequestParam("createBySid") String createBySid);
 
     /************************************手机端接口*******************************************/
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -71,6 +71,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
+        return null;
+    }
+
     @Override
     public ResultBean updateCommonContractDeposit(String deposit, String sid) {
         ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java

@@ -73,4 +73,7 @@ public interface BaseDiscountpackageMapper extends BaseMapper<BaseDiscountpackag
     List<AppDiscountpackageListVo> selectAppDiscountpackageListByOrgSid(String orgSid);
 
     AppDiscountpackagesVo selectDiscountpackage(String sid);
+
+
+    List<BaseDiscountpackageByApplyDto> getAppPackageByUseOrg(@Param("userOrg") String userOrg);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml

@@ -73,15 +73,31 @@
         from base_discountpackage_veh bd
                  left join base_discountpackage bbd on bbd.sid = bd.mainSid
         where bd.vehSid = #{vinSid}
-          and bbd.useOrg = #{orgSid} and bbd.nodeState='已办结' and bbd.salesPolicyKey = '0001'
+          and bbd.useOrg = #{orgSid}
+          and bbd.nodeState = '已办结'
+          and bbd.salesPolicyKey = '0001'
     </select>
 
     <select id="selectAppDiscountpackageListByOrgSid"
             resultType="com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageListVo">
-        SELECT projectName,projectCost,discountExplain FROM base_discountpackage WHERE useOrg = #{orgSid}
+        SELECT projectName, projectCost, discountExplain
+        FROM base_discountpackage
+        WHERE useOrg = #{orgSid}
     </select>
 
-    <select id="selectDiscountpackage" resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppDiscountpackagesVo">
+    <select id="selectDiscountpackage"
-        select *,case isEmploy when 1 then '是' when 0 then '否' end as isEmployValue from base_discountpackage where sid = #{sid}
+            resultType="com.yxt.anrui.base.api.basediscountpackage.app.AppDiscountpackagesVo">
+        select *, case isEmploy when 1 then '是' when 0 then '否' end as isEmployValue
+        from base_discountpackage
+        where sid = #{sid}
+    </select>
+    <select id="getAppPackageByUseOrg"
+            resultType="com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageByApplyDto">
+        SELECT projectName     as discountName,
+               discountMoney   as price,
+               discountExplain as packageExplain
+        FROM base_discountpackage
+        WHERE useOrg = #{userOrg}
+          AND curdate() &lt;= effectiveDate
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -129,6 +129,16 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
         return rb.success().setData(pv);
     }
 
+    /**
+     * 查询本公司下优惠政策列表
+     * @param userOrg
+     * @return
+     */
+    @Override
+    public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        return baseDiscountpackageService.getAppPackageByUseOrg(userOrg);
+    }
+
     @Override
     public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
         AppBaseDiscountpackageQuery appBaseDiscountpackageQuery = new AppBaseDiscountpackageQuery();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -131,9 +131,9 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             qw.apply(StringUtils.isNotEmpty(effectiveStartDate), "date_format (effectiveDate,'%Y-%m-%d') >= date_format('" + effectiveStartDate + "','%Y-%m-%d')").
                     apply(StringUtils.isNotEmpty(effectiveEndDate), "date_format (effectiveDate,'%Y-%m-%d') <= date_format('" + effectiveEndDate + "','%Y-%m-%d')"
                     );
-            if(StringUtils.isNotBlank(pagerQuery.getOrgPath())){
+            if (StringUtils.isNotBlank(pagerQuery.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(pagerQuery.getOrgPath()).getData();
-                qw.eq("useOrg",orgSid);
+                qw.eq("useOrg", orgSid);
             }
 
         }
@@ -151,10 +151,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         String orgPath = dto.getOrgPath();
         String orgSid = "";//分公司sid
         String orgSidPath = "";//申请人组织机构全路径sid
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             orgSidPath = orgPath;
             orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        }else{
+        } else {
             //根据staffSid获取用户的组织全路径
             ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
             if (!orgByStaffSid.getSuccess()) {
@@ -168,7 +168,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             }
         }
         BaseDiscountpackage entity = new BaseDiscountpackage();
-        BeanUtil.copyProperties(dto, entity,"sid");
+        BeanUtil.copyProperties(dto, entity, "sid");
         entity.setUseOrg(orgSid);
         entity.setNodeState("待提交");
         entity.setOrgSidPath(orgSidPath);
@@ -176,7 +176,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
         for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
             BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
-            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
+            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh, "sid");
             baseDiscountpackageVeh.setMainSid(entity.getSid());
             baseDiscountpackageVehService.save(baseDiscountpackageVeh);
         }
@@ -187,16 +187,16 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
-        if(baseDiscountpackage == null){
+        if (baseDiscountpackage == null) {
             return rb.setMsg("该申请不存在");
         }
-        BeanUtil.copyProperties(dto,baseDiscountpackage, "sid","orgSidPath");
+        BeanUtil.copyProperties(dto, baseDiscountpackage, "sid", "orgSidPath");
         baseMapper.updateById(baseDiscountpackage);
         baseDiscountpackageVehService.deleteByMainSid(sid);
         List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
         for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
             BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
-            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh,"sid");
+            BeanUtil.copyProperties(baseDiscountpackageVehDto, baseDiscountpackageVeh, "sid");
             baseDiscountpackageVeh.setMainSid(sid);
             baseDiscountpackageVehService.save(baseDiscountpackageVeh);
         }
@@ -395,7 +395,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             }
         }
         qw.eq("salesPolicyKey", "0002");
-        qw.eq("nodeState","已办结");
+        qw.eq("nodeState", "已办结");
         return qw;
     }
 
@@ -434,7 +434,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String orgSidPath = "";
-        if(StringUtils.isNotBlank(dto.getOrgPath())){
+        if (StringUtils.isNotBlank(dto.getOrgPath())) {
             orgSidPath = dto.getOrgPath();
         }
         BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid());
@@ -572,7 +572,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         Boolean i = false;
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> formVariables = bv.getFormVariables();
-        if(StringUtils.isNotBlank(query.getDiscountTypeKey())){
+        if (StringUtils.isNotBlank(query.getDiscountTypeKey())) {
             if ("0001".equals(query.getDiscountTypeKey())) {
                 i = true;
             }
@@ -583,7 +583,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
                 formVariables.put("isAdj", i);
             }
         }
-        if(StringUtils.isNotBlank(query.getBusinessSid())){
+        if (StringUtils.isNotBlank(query.getBusinessSid())) {
             BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid());
             if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())) {
                 i = true;
@@ -733,14 +733,14 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     public ResultBean<AppDiscountpackagesVo> selectDiscountpackage(String sid) {
         ResultBean<AppDiscountpackagesVo> rb = ResultBean.fireFail();
         BaseDiscountpackage baseDiscountpackage = fetchBySid(sid);
-        if(baseDiscountpackage == null){
+        if (baseDiscountpackage == null) {
             return rb.setMsg("该销售政策不存在");
         }
         AppDiscountpackagesVo appDiscountpackageVo = baseMapper.selectDiscountpackage(sid);
-        if(appDiscountpackageVo != null){
+        if (appDiscountpackageVo != null) {
-            if("0001".equals(appDiscountpackageVo.getSalesPolicyKey())){
+            if ("0001".equals(appDiscountpackageVo.getSalesPolicyKey())) {
                 appDiscountpackageVo.setShowList(true);
-            }else{
+            } else {
                 appDiscountpackageVo.setShowList(false);
             }
             List<BaseDiscountpackageVehDetailsVo> baseDiscountpackageVehDetailsVos = baseDiscountpackageVehService.fetchByMainSid(sid);
@@ -758,4 +758,10 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         }
         return rb.success().setData(appDiscountpackageVo);
     }
+
+    public ResultBean<List<BaseDiscountpackageByApplyDto>> getAppPackageByUseOrg(String userOrg) {
+        ResultBean<List<BaseDiscountpackageByApplyDto>> rb = ResultBean.fireFail();
+        List<BaseDiscountpackageByApplyDto> applyDtos = baseMapper.getAppPackageByUseOrg(userOrg);
+        return rb.success().setData(applyDtos);
+    }
 }

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

@@ -31,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackagePageListVo;
 import com.yxt.anrui.base.api.basediscountpackageapply.*;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
 import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeVo;
@@ -39,8 +40,15 @@ import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDeta
 import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDto;
 import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist;
 import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.flow.FlowTaskVo;
 import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService;
+import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverDto;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackageHandoverFeign;
+import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -48,6 +56,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUser;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import org.apache.commons.lang3.StringUtils;
@@ -60,10 +69,8 @@ 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.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -92,25 +99,63 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
     private SysUserFeign sysUserFeign;
     @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    private CommonContractService commonContractService;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private SysUserFeign userFeign;
+    @Autowired
+    private BusDiscountpackageHandoverFeign busDiscountpackageHandoverFeign;
 
     private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
+        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+        qw.eq("createOrgSid", orgSid);
+        qw.eq("createBySid",query.getUserSid());
+        if (StringUtils.isNotBlank(query.getContractId())) {
+            qw.like("contractId", query.getContractId());
+        }
+        if (StringUtils.isNotBlank(query.getCustomerName())) {
+            qw.like("customerName", query.getCustomerName());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        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')"
+                );
         return qw;
     }
 
     public PagerVo<BaseDiscountpackageApplyVo> listPageVo(PagerQuery<BaseDiscountpackageApplyQuery> pq) {
         BaseDiscountpackageApplyQuery query = pq.getParams();
-		QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
+        QueryWrapper<BaseDiscountpackageApply> qw = createQueryWrapper(query);
-
         IPage<BaseDiscountpackageApply> page = PagerUtil.queryToPage(pq);
         IPage<BaseDiscountpackageApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BaseDiscountpackageApplyVo> records = pagging.getRecords();
+        if (null != records) {
+            for (BaseDiscountpackageApplyVo applyVo : records) {
+                applyVo.setShowHandleBtn(true);
+                if (StringUtils.isNotBlank(applyVo.getNodeState())) {
+                    if (!("待提交".equals(applyVo.getNodeState()) || "销售专员申请".equals(applyVo.getNodeState()))) {
+                        applyVo.setShowHandleBtn(false);
+                    }
+                }
+                CommonContract contract = commonContractService.selectByNo(applyVo.getContractId()).getData();
+                if (null != contract) {
+                    if (StringUtils.isNotBlank(contract.getBusSid())) {
+                        applyVo.setSaleOrderSid(contract.getBusSid());
+                    }
+                }
+            }
+        }
         PagerVo<BaseDiscountpackageApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-	public void saveOrUpdateDto(BaseDiscountpackageApplyDto dto){
+    public void saveOrUpdateDto(BaseDiscountpackageApplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
@@ -119,16 +164,18 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         this.updateByDto(dto);
     }
 
-	public String insertByDto(BaseDiscountpackageApplyDto dto){
+    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);
-		baseMapper.insert(entity);
+        entity.setApplyDate(sdf.format(new Date()));
+        int i = baseMapper.insert(entity);
         return entity.getSid();
     }
 
-	public void updateByDto(BaseDiscountpackageApplyDto dto){
+    public void updateByDto(BaseDiscountpackageApplyDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
@@ -138,10 +185,13 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         baseMapper.updateById(entity);
     }
 
-	public BaseDiscountpackageApplyDetailsVo fetchDetailsVoBySid(String sid){
+    public BaseDiscountpackageApplyDetailsVo fetchDetailsVoBySid(String sid) {
         BaseDiscountpackageApply entity = fetchBySid(sid);
         BaseDiscountpackageApplyDetailsVo vo = new BaseDiscountpackageApplyDetailsVo();
         BeanUtil.copyProperties(entity, vo);
+        //根据优惠包申请sid查询对应优惠包列表
+        List<BaseDiscountpackagelistDto> dtoList = baseDiscountpackagelistService.fetchDetailsByDiscountSid(sid);
+        vo.setDiscountPackageList(dtoList);
         return vo;
     }
 
@@ -150,14 +200,15 @@ 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("createOrgSid", orgSid);
-		qw.eq("state",params.getType());
+//        qw.eq("state", params.getType());
-		qw.eq("isDelete",0);
+        qw.eq("isDelete", 0);
-		if (StringUtils.isNotBlank(params.getNames())){
+        if (StringUtils.isNotBlank(params.getNames())) {
             qw.and(wrapper -> wrapper.like("contractId", params.getNames()).or().like("customerName", params.getNames()));
         }
-		if (StringUtils.isNotBlank(params.getDate())){
+        if (StringUtils.isNotBlank(params.getDate())) {
-			qw.like("applyDate",params.getDate());
+            qw.like("applyDate", params.getDate());
         }
         IPage<AppDiscountpackageVo> busOrderDiscountPageListVoIPage = baseMapper.getDiscountManageApplyList(page, qw);
         return busOrderDiscountPageListVoIPage;
@@ -180,8 +231,9 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
         if (StringUtils.isBlank(dtoSid)) {
             BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
-			BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
+            BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
             baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
+            baseDiscountpackageApplyDto.setCreateBySid(dto.getUserSid());
             String sid = this.insertByDto(baseDiscountpackageApplyDto);
             for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
                 BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
@@ -192,12 +244,12 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
             return rb.success().setMsg("添加成功").setData(sid);
         }
         BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid);
-		if (baseDiscountpackageApply == null){
+        if (baseDiscountpackageApply == null) {
             return rb.setMsg("该优惠包申请不存在");
         }
         baseDiscountpackagelistService.delByDiscountSid(dtoSid);
         BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
-		BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
+        BeanUtil.copyProperties(dto, baseDiscountpackageApplyDto);
         baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
         this.updateByDto(baseDiscountpackageApplyDto);
         for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
@@ -213,12 +265,18 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         ResultBean rb = ResultBean.fireFail();
         AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
         BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(sid);
-		BeanUtil.copyProperties(baseDiscountpackageApply,appDiscountpackageApplyDetailsVo);
+        BeanUtil.copyProperties(baseDiscountpackageApply, appDiscountpackageApplyDetailsVo);
         List<AppDiscountpackagelistDetailsVo> appDiscountpackagelistDetailsVos = baseDiscountpackagelistService.fetchByDiscountSid(sid);
         appDiscountpackageApplyDetailsVo.setAppDiscountpackagelists(appDiscountpackagelistDetailsVos);
         return rb.success().setData(appDiscountpackageApplyDetailsVo);
     }
 
+    /**
+     * 优惠包提交申请
+     *
+     * @param dto
+     * @return
+     */
     public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dto.getSid());
@@ -239,8 +297,11 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
         Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        Map<String, Object> appMap = new HashMap<>();
         //若有网关，则赋值网关中判断的字段。
         variables.put("businessSid", businessSid);
+        appMap.put("businessSid", businessSid);
+        variables.put("appMap", appMap);
         BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid);
         //用户的部门全路径sid
         bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath());
@@ -297,7 +358,6 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
             } else {
                 r = 3;
             }
-
         }
         return r;
     }
@@ -325,6 +385,59 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDisc
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                //推送优惠包交接
+                BusDiscountpackageHandoverDto handoverDto = new BusDiscountpackageHandoverDto();
+                handoverDto.setBusSid(businessSid);
+                //获取合同编号
+                String contractId = baseDiscountpackageApply.getContractId();
+                //根据合同编号获取销售订单sid
+                CommonContract contract = commonContractService.selectByNo(contractId).getData();
+                if (null != contract) {
+                    if (StringUtils.isNotBlank(contract.getBusSid())) {
+                        //销售订单sid
+                        String busSid = contract.getBusSid();
+                        //根据销售订单sid查询车架号
+                        List<String> vinNos = busSalesOrderVehicleFeign.selectList(busSid).getData();
+                        StringBuffer sb = new StringBuffer();
+                        if (null != vinNos && vinNos.size() > 0) {
+                            for (String vinNo : vinNos) {
+                                sb.append(vinNo).append(",");
+                            }
+                            sb.delete(sb.length() - 1, sb.length());
+                            handoverDto.setVinNo(sb.toString());
+                        }
+                    }
+                }
+                handoverDto.setRecName(baseDiscountpackageApply.getApplyName());
+                handoverDto.setContractNo(contractId);
+                handoverDto.setCustomerName(baseDiscountpackageApply.getCustomerName());
+                handoverDto.setCreateBySid(baseDiscountpackageApply.getCreateBySid());
+                handoverDto.setCreateOrgSid(baseDiscountpackageApply.getCreateOrgSid());
+                handoverDto.setRecUserSid(baseDiscountpackageApply.getCreateBySid());
+                handoverDto.setUseOrgSid(baseDiscountpackageApply.getUseOrgSid());
+                handoverDto.setCreateOrgName(baseDiscountpackageApply.getCreateOrgName());
+                handoverDto.setUseOrgName(baseDiscountpackageApply.getUseOrgName());
+                SysUser sysUser = userFeign.selectBySid(baseDiscountpackageApply.getCreateBySid()).getData();
+                if (null != sysUser) {
+                    if (StringUtils.isNotBlank(sysUser.getMobile())) {
+                        handoverDto.setRecPhone(sysUser.getMobile());
+                    }
+                }
+                handoverDto.setVehCount(baseDiscountpackageApply.getNumber());
+                handoverDto.setVehModel(baseDiscountpackageApply.getModel());
+                //根据优惠包申请sid获取优惠包列表
+                List<BaseDiscountpackagelistDto> dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(businessSid);
+                List<BusDiscountpackageHandoverListDto> listDtos = new ArrayList<>();
+                if (null != dtos) {
+                    for (BaseDiscountpackagelistDto dto : dtos) {
+                        BusDiscountpackageHandoverListDto listDto = new BusDiscountpackageHandoverListDto();
+                        BeanUtil.copyProperties(dto, listDto, "id", "sid");
+                        listDto.setMainSid(handoverDto.getSid());
+                        listDtos.add(listDto);
+                    }
+                }
+                handoverDto.setBusDiscountpackageHandoverLists(listDtos);
+                busDiscountpackageHandoverFeign.save(handoverDto);
             }
             return rb.success().setData(resultBean.getData());
         } else {

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

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -70,4 +71,6 @@ public interface BaseDiscountpackagelistMapper extends BaseMapper<BaseDiscountpa
 
     @Select("select * from base_discountpackagelist from discountSid = #{sid}")
     List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid);
+
+    List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(@Param("discountSid") String discountSid);
 }

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

@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
-		SELECT * FROM base_discountpackagelist <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_discountpackagelist
+        <where>${ew.sqlSegment}</where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo">
-		SELECT * FROM base_discountpackagelist <where> ${ew.sqlSegment} </where>
+        SELECT * FROM base_discountpackagelist
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="fetchDetailsByDiscountSid"
+            resultType="com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto">
+        SELECT sid, price, `number`, packageExplain, totalPrice, discountName, discountSid
+        FROM base_discountpackagelist
+        WHERE discountSid = #{discountSid}
     </select>
 </mapper>

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

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+
 import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist;
 import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistQuery;
 import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo;
@@ -65,7 +66,7 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackagelistQuery> pq){
+    public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackagelistQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BaseDiscountpackagelistVo> pv = baseDiscountpackagelistService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -74,7 +75,7 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign
     @Override
     @ApiOperation("新增或修改")
     @PostMapping("/save")
-	public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto){
+    public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto) {
         ResultBean rb = ResultBean.fireFail();
         baseDiscountpackagelistService.saveOrUpdateDto(dto);
         return rb.success();
@@ -83,7 +84,7 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign
     @Override
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
+    public ResultBean delBySids(@RequestBody String[] sids) {
         ResultBean rb = ResultBean.fireFail();
         baseDiscountpackagelistService.delBySids(sids);
         return rb.success();
@@ -92,9 +93,16 @@ public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackagelistDetailsVo vo = baseDiscountpackagelistService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean<List<BaseDiscountpackagelistDto>> fetchDetailsByDiscountSid(String discountSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseDiscountpackagelistDto> dtos = baseDiscountpackagelistService.fetchDetailsByDiscountSid(discountSid);
+        return rb.success().setData(dtos);
+    }
 }

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

@@ -110,4 +110,8 @@ public class BaseDiscountpackagelistService extends MybatisBaseService<BaseDisco
 	public List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid) {
 		return baseMapper.fetchByDiscountSid(sid);
 	}
+
+	public List<BaseDiscountpackagelistDto> fetchDetailsByDiscountSid(String discountSid) {
+		return baseMapper.fetchDetailsByDiscountSid(discountSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@@ -99,4 +99,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
     IPage<CommonContractVo> selectByStaffSid(IPage<CommonContract> page,@Param(Constants.WRAPPER) QueryWrapper<CommonContractVo> qw);
 
     IPage<ContractPageVo> getApprovalContractList(IPage<ContractPageVo> page,@Param(Constants.WRAPPER) QueryWrapper<ContractPageVo> qw);
+
+    List<CommonContractPackageVo> selectByCreateUserSid(@Param("createBySid") String createBySid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -238,4 +238,14 @@
         </where>
         order by createDate desc
     </select>
+    <select id="selectByCreateUserSid"
+            resultType="com.yxt.anrui.base.api.commoncontract.CommonContractPackageVo">
+        SELECT contractNo as contractId,
+               modelName  as model,
+               num as number,
+               busSid
+        FROM common_contract
+        WHERE createBySid = #{createBySid}
+        ORDER BY createTime DESC
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@@ -243,6 +243,16 @@ public class CommonContractRest implements CommonContractFeign {
         return rb.success().setData(commonContractBuscenterVo);
     }
 
+    /**
+     * 根据创建人查合同信息
+     * @param createBySid
+     * @return
+     */
+    @Override
+    public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
+        return commonContractService.selectByCreateUserSid(createBySid);
+    }
+
     @Override
     public ResultBean updateCommonContractDeposit(String deposit, String sid) {
         return commonContractService.updateCommonContractDeposit(deposit, sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -27,6 +27,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
@@ -2625,10 +2626,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         ResultBean rb = ResultBean.fireFail();
         CommonContractQKQuery params = query.getParams();
         QueryWrapper<CommonContractVo> qw = new QueryWrapper<>();
-        ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(),params.getOrgPath());
-        if(!busList.getData().isEmpty()){
-            qw.in("busSid",busList.getData());
-        }
         if (StringUtils.isNotBlank(params.getCustomerName())){
             qw.like("partyB",params.getCustomerName());
         }
@@ -2680,4 +2677,28 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         IPage<ContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw);
         return iPage;
     }
+
+    /**
+     * 根据创建人查询合同信息
+     *
+     * @param createBySid
+     * @return
+     */
+    public ResultBean<CommonContractPackageVo> selectByCreateUserSid(String createBySid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<CommonContractPackageVo> contractPackageVos = baseMapper.selectByCreateUserSid(createBySid);
+        if (null != contractPackageVos) {
+            for (CommonContractPackageVo contractPackageVo : contractPackageVos) {
+                if (StringUtils.isNotBlank(contractPackageVo.getBusSid())) {
+                    BusSalesOrderDetailsVo data = busSalesOrderFeign.fetchDetailsBySid(contractPackageVo.getBusSid()).getData();
+                    if (null != data) {
+                        if (StringUtils.isNotBlank(data.getCustomerName())) {
+                            contractPackageVo.setCustomerName(data.getCustomerName());
+                        }
+                    }
+                }
+            }
+        }
+        return rb.success().setData(contractPackageVos);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyFeign.java

@@ -93,7 +93,6 @@ public interface BusAdvanceGinvoiceapplyFeign {
 
     /*************************************************APP提前开票接口***************************************************/
 
-
     @ApiOperation("手机端-获取提前开票列表")
     @PostMapping("/getAdvanceInvoiceList")
     @ResponseBody

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -319,6 +319,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         return rb.success().setMsg("修改成功");
     }
 
+
     public ResultBean  submitAdvanceGinvoiceaapply(BusAdvanceGinvoiceapplyDto dto) {
         String orgSid = checkUserOrg(dto.getUserSid());
         String businessSid = "";

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -58,6 +58,7 @@
                if(bo.nodeState = '已办结', true, false)  as showStopBtn,
                bo.nodeState is null                   as showUpdateBtn,
                bo.nodeState is null                   as showDeleteBtn,
+               bo.nodeState is not null                   as showRePublishBtn,
                0                                      as showFinancialBtn,
                bo.type,
                bo.contractNo                          as contractId,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1769,9 +1769,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
-            if (pq.getParams().getType().equals("2")) {
-                record.setShowRePublishBtn(true);
-            }
             ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
             if (commonContractVoResultBean.getData() != null) {
                 record.setContractId(commonContractVoResultBean.getData().getContractNo());

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

@@ -70,5 +70,6 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
     private List<String> billingFilePaths;
     @ApiModelProperty("合格证照片")
     private List<String> certificatePaths;
-
+    @ApiModelProperty("临时保存")
+    private Boolean tempSave;
 }

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

@@ -115,5 +115,7 @@ public class FinVehicleInvoiceDto implements Dto {
     private String billingSid;
     @ApiModelProperty("开票申请附件")
     private List<String> billingFilePaths;
+    @ApiModelProperty("临时保存")
+    private Boolean tempSave;
 
 }

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

@@ -272,11 +272,15 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
             sb.delete(sb.length() - 1, sb.length());
             dto.setFilePath(sb.toString());
         }
+        if (null != dto.getTempSave()) {
+            if (!dto.getTempSave()) {
                 if (com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getFilePath())) {
                     dto.setBillingStateKey("002");
                     dto.setBillingState("已开票");
                     dto.setInvoiceDate((new Date()));
                 }
+            }
+        }
         if (com.yxt.common.base.utils.StringUtils.isNotEmpty(dto.getVinNo())) {
             String VIN = dto.getVinNo();
             dto.setVIN(VIN);

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

@@ -15,7 +15,7 @@ import javax.validation.Valid;
 
 @Api(tags = "优惠包申请列表")
 @FeignClient(
-        contextId = "terminal-Discountpackage",
+        contextId = "terminal-DiscountpackageApply",
         name = "anrui-terminal",
         path = "/autoservice/v1/discountPackageApply",
         fallback = AppScmVehicleGressionFeignFallback.class)
@@ -46,6 +46,7 @@ public interface AppDiscountpackageFegin {
     @ResponseBody
     public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplysCompleteDto dto);
 
+
     @ApiOperation(value = "撤回流程")
     @PutMapping(value = "/recallDiscountPackageApplyInfo")
     @ResponseBody