Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
0c7a15e194
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java
  3. 17
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java
  4. 19
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
  6. 9
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java
  7. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java
  8. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  9. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  10. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java
  11. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java
  12. 61
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
  13. 11
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  14. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
  15. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java
  16. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
  17. 7
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
  18. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java
  19. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java
  20. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java
  21. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java
  22. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml
  23. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java
  24. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java
  25. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  26. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  27. 12
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  28. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java
  29. 32
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml
  30. 10
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  31. 11
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  32. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  33. 2
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  34. 2
      anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml
  35. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java
  36. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java
  37. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java
  38. 5
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java
  39. 17
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java
  40. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java
  41. 11
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
  42. 7
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java
  43. 17
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
  44. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java
  45. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  46. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  47. 12
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
  48. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java
  49. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java
  50. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java
  51. 17
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java
  52. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java
  53. 22
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java
  54. 14
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java
  55. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
  56. 43
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java
  57. 45
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java
  58. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java
  59. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java
  60. 42
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java
  61. 56
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java
  62. 22
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java
  63. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java
  64. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java
  65. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java
  66. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java
  67. 113
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java
  68. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
  69. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
  70. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
  71. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
  72. 51
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
  73. 509
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  74. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml
  75. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
  76. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  77. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
  78. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
  79. 62
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeign.java

@ -7,6 +7,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@ -160,4 +161,9 @@ public interface BaseManufacturerFeign {
@ResponseBody
public ResultBean<BaseManufacturerVo> queryBycertOrg(@PathVariable("certOrg") String certOrg);
@ApiOperation("厂家采购获取分公司销售通路")
@GetMapping("/selectNameByOrg")
@ResponseBody
ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(@SpringQueryMap BaseManufacturerListQuery query);
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerFeignFallback.java

@ -90,4 +90,9 @@ public class BaseManufacturerFeignFallback implements BaseManufacturerFeign {
public ResultBean<BaseManufacturerVo> queryBycertOrg(String certOrg) {
return null;
}
@Override
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return null;
}
}

17
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListQuery.java

@ -0,0 +1,17 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 10:57
* @Description
*/
@Data
public class BaseManufacturerListQuery implements Query {
private static final long serialVersionUID = -8298971718012436562L;
@ApiModelProperty("分公司sid")
private String useOrgSid;
}

19
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufacturer/BaseManufacturerListVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.base.api.basemanufacturer;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 10:55
* @Description
*/
@Data
public class BaseManufacturerListVo implements Vo {
private static final long serialVersionUID = 4951280280938626700L;
@ApiModelProperty("供应商sid")
private String sid;
@ApiModelProperty("供应商销售通路")
private String name;
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java

@ -89,7 +89,7 @@ public interface BaseMiddlemanFeign {
ResultBean<PagerVo<BaseMiddleVo>> getMiddleList(@Valid @RequestBody PagerQuery<BaseMiddleQuery> query);
@ApiOperation("车辆出库中介人员")
@PostMapping("/selectMiddleList")
@GetMapping("/selectMiddleList")
@ResponseBody
ResultBean<List<BaseMiddleListVo>> selectMiddleList(@SpringQueryMap BaseMiddleListQuery query);
}

9
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@ -140,4 +140,13 @@ public class BaseVehicle extends BaseEntity {
private String witPinStateValue;
@ApiModelProperty(value = "是否为问题车辆(0无问题 1有问题)")
private String isProblemVeh;
@ApiModelProperty(value = "采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty(value = "采购系统名称")
private String purchaseSystemName;
@ApiModelProperty(value = "厂家销售通路sid")
private String manufSaleAccessSid;
@ApiModelProperty(value = "厂家销售通路名称")
private String manufSaleAccessName;
}

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@ -106,4 +106,12 @@ public class BaseVehicleDto implements Dto {
private String witPinStateValue;
@ApiModelProperty(value = "是否为问题车辆(0无问题 1有问题)")
private String isProblemVeh;
@ApiModelProperty(value = "采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty(value = "采购系统名称")
private String purchaseSystemName;
@ApiModelProperty(value = "厂家销售通路sid")
private String manufSaleAccessSid;
@ApiModelProperty(value = "厂家销售通路名称")
private String manufSaleAccessName;
}

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -166,6 +166,17 @@ public interface BaseVehicleFeign {
@ResponseBody
@ApiOperation(value = "导入")
public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException;
/**
* 修改保存
*
* @param sid 车辆sid
* @return
*/
@ApiOperation("修改车辆台账备注")
@PostMapping("/updateVehRemarks/{remarks}/{sid}")
public ResultBean updateVehRemarks(@PathVariable("remarks") String remarks, @PathVariable("sid") String sid);
/***************************************************** PC现车接口 **********************************************************/
/**

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -98,6 +98,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean updateVehRemarks(String remarks, String sid) {
return null;
}
@Override
public ResultBean<PagerVo<BaseVehicleListVo>> exiCarPagerList(PagerQuery<ExiCarQuery> pq) {
return null;

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@ -95,4 +95,12 @@ public class BaseVehicleSelectVo implements Vo {
private String useOrgName;
@ApiModelProperty(value = "是否为问题车辆(0无问题 1有问题)")
private String isProblemVeh;
@ApiModelProperty(value = "采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty(value = "采购系统名称")
private String purchaseSystemName;
@ApiModelProperty(value = "厂家销售通路sid")
private String manufSaleAccessSid;
@ApiModelProperty(value = "厂家销售通路名称")
private String manufSaleAccessName;
}

8
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleVo.java

@ -106,6 +106,14 @@ public class BaseVehicleVo implements Vo {
private Long libraryAge;
@ApiModelProperty(value = "是否为问题车辆(0无问题 1有问题)")
private String isProblemVeh;
@ApiModelProperty(value = "采购系统sid")
private String purchaseSystemSid;
@ApiModelProperty(value = "采购系统名称")
private String purchaseSystemName;
@ApiModelProperty(value = "厂家销售通路sid")
private String manufSaleAccessSid;
@ApiModelProperty(value = "厂家销售通路名称")
private String manufSaleAccessName;
//车型配置
@ApiModelProperty("车身颜色(陕汽必须的字段)")

61
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@ -0,0 +1,61 @@
package com.yxt.anrui.base.api.basevehicleout;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/29 16:45
* @Description
*/
@Data
public class BaseVehicleOutDetailsVo implements Vo {
private static final long serialVersionUID = -7699189616162991308L;
private String vinSid;
private String vinNo;
@ApiModelProperty("出库类型")
private String type;
private String typeKey;
@ApiModelProperty("销售部门sid")
private String orgSid;
@ApiModelProperty("销售部门名称")
private String orgName;
@ApiModelProperty("销售专员sid")
private String staffSid;
@ApiModelProperty("销售专员")
private String staffName;
@ApiModelProperty("合同编号")
private String concatNo;
@ApiModelProperty("成交价")
private String price;
@ApiModelProperty("是否为终端客户:1是0不是")
private String isTerminal;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("赠品说明")
private String giftsDescription;
@ApiModelProperty("销售折让")
private String salesAllowance;
@ApiModelProperty("中介人1")
private String middleOne;
@ApiModelProperty("中介人1sid")
private String middleOneSid;
@ApiModelProperty("返利金额1")
private String rebateMoneyOne;
@ApiModelProperty("中介人2")
private String middleTwo;
@ApiModelProperty("中介人2sid")
private String middleTwoSid;
@ApiModelProperty("返利金额2")
private String rebateMoneyTwo;
@ApiModelProperty("备注")
private String remarks;
private String saleDate;
}

11
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@ -5,9 +5,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
/**
* @Author dimengzhe
@ -30,6 +28,13 @@ public interface BaseVehicleOutFeign {
@PostMapping("/pagerList")
@ResponseBody
ResultBean<PagerVo<BaseVehicleOutVo>> pagerList(@RequestBody PagerQuery<BaseVehicleOutQuery> query);
@ApiOperation("出库详情")
@GetMapping("/details/{sid}")
@ResponseBody
ResultBean<BaseVehicleOutDetailsVo> details(@PathVariable("sid") String sid);
}

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java

@ -13,6 +13,9 @@ import lombok.Data;
public class BaseVehicleOutVo implements Vo {
private static final long serialVersionUID = -1711615769602118459L;
@ApiModelProperty("sid")
private String sid;
@ApiModelProperty("车架号")
private String vinSid;

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@ -67,4 +67,9 @@ public class BusVehicleApply extends BaseEntity {
private String userSids;
private String userNames;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@ -57,4 +57,9 @@ public class BusVehicleApplyDetailsVo implements Vo {
private String userSids;
private String userNames;
private String nodeState;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

7
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@ -63,8 +63,13 @@ public class BusVehicleApplyDto implements Dto {
@ApiModelProperty("订金付款备注")
private String payRemarks;
@ApiModelProperty("选择的销售经理sid")
private String userSids;
private String userNames;
@ApiModelProperty("采购部门名称")
private String orgDeptName;
@ApiModelProperty("采购部门sid")
private String orgDeptSid;
}

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@ -25,13 +25,13 @@ import lombok.Data;
public class BusVehicleApplyDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("排产申请sid")
@ApiModelProperty("排产申请sid")
private String applySid;
@ApiModelProperty("车型sid")
@ApiModelProperty("车型sid")
private String vehicleSid;
@ApiModelProperty("车型名称")
@ApiModelProperty("车型名称")
private String vehicleName;
@ApiModelProperty("排产数量")
@ApiModelProperty("排产数量")
private String quantity;
@ApiModelProperty("使用订金")
private Integer useDeposit;
@ -47,4 +47,9 @@ public class BusVehicleApplyDetail extends BaseEntity {
private String insideCode;
@ApiModelProperty(value = "厂家合同价")
private Integer contractPrice;
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@ -45,11 +45,15 @@ public class BusVehicleApplyDetailDto implements Dto {
@ApiModelProperty("申请订金")
private String applyForDeposit;
@ApiModelProperty("备注")
private String remarks; // 备注
private String remarks;
@ApiModelProperty("内部编码")
private String insideCode;
@ApiModelProperty(value = "厂家合同价")
private String contractPrice;
private BusVehicleApplySzDto busVehicleApplySz;
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@ -55,4 +55,8 @@ public class BusVehicleApplyDetailVo implements Vo {
@ApiModelProperty(value = "上装指导价")
private Integer guidePrice;
@ApiModelProperty("厂家销售通路")
private String actualPay;
@ApiModelProperty("厂家销售通路sid")
private String actualSid;
}

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.java

@ -117,4 +117,6 @@ public interface BaseManufacturerMapper extends BaseMapper<BaseManufacturer> {
List<Map<String, String>> wcgysNamesDown(String orgSid);
List<Map<String, String>> bankNamesDown(String manufacturerSid);
List<BaseManufacturerListVo> selectNameByOrg(@Param("useOrgSid") String useOrgSid, @Param("supplierTypeValue") String supplierTypeValue);
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@ -164,4 +164,8 @@
WHERE manufacturerSid = #{manufacturerSid}
AND isDelete = 0
</select>
<select id="selectNameByOrg" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerListVo">
select sid,manufacturerName as name from base_manufacturer where useOrg = #{useOrgSid} and supplierTypeValue=#{supplierTypeValue}
</select>
</mapper>

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@ -1,15 +1,10 @@
package com.yxt.anrui.base.biz.basemanufacturer;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemanufacturer.*;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basemanufacturerfinance.BaseManufacturerFinanceService;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.JWTUtil;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -19,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@ -168,4 +162,9 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
BaseManufacturerVo vo = baseManufacturerService.queryBycertOrg(certOrg);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
return baseManufacturerService.selectNameByOrg(query);
}
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@ -407,4 +407,12 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
List<Map<String,String>> bankNames = baseMapper.bankNamesDown(manufacturerSid);
return rb.success().setData(bankNames);
}
public ResultBean<List<BaseManufacturerListVo>> selectNameByOrg(BaseManufacturerListQuery query) {
ResultBean<List<BaseManufacturerListVo>> rb = ResultBean.fireFail();
String useOrgSid = query.getUseOrgSid();
String supplierTypeValue = "主机厂";
List<BaseManufacturerListVo> list = baseMapper.selectNameByOrg(useOrgSid,supplierTypeValue);
return rb.success().setData(list);
}
}

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

@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.base.api.basevehicle.app.InputVinListVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageQuery;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
@ -460,4 +461,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<InputVinListVo> saleOrderVin(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("names") String names);
@Update("update base_vehicle set remarks = #{remarks} where sid = #{sid}")
ResultBean updateVehRemarks(@Param("remarks") String remarks,@Param("sid") String sid);
}

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

@ -420,6 +420,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
}
}
@Override
public ResultBean updateVehRemarks(String remarks, String sid) {
return baseVehicleService.updateVehRemarks(remarks,sid);
}
/**
* pc端现车分页列表
*

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

@ -2102,10 +2102,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
baseVehicleCertificate.setVehicleSid(new_baseVehicle.getSid());
baseVehicleCertificate.setTransferStateKey(CertificState.TransferState.TRANSTATE_WJS.getCode());
baseVehicleCertificate.setTransferStateValue(CertificState.TransferState.TRANSTATE_WJS.getRemarks());
baseVehicleCertificate.setCreateOrgSid(baseVehicle.getCreateOrgSid());
baseVehicleCertificate.setCreateOrgName(baseVehicle.getCreateOrgName());
baseVehicleCertificate.setUseOrgSid(baseVehicle.getUseOrgSid());
baseVehicleCertificate.setUseOrgName(baseVehicle.getUseOrgName());
baseVehicleCertificate.setCreateOrgSid(new_baseVehicle.getCreateOrgSid());
baseVehicleCertificate.setCreateOrgName(new_baseVehicle.getCreateOrgName());
baseVehicleCertificate.setUseOrgSid(new_baseVehicle.getUseOrgSid());
baseVehicleCertificate.setUseOrgName(new_baseVehicle.getUseOrgName());
baseVehicleCertificateService.save(baseVehicleCertificate);
return rb.success().setMsg("调车入库新增调入方车辆台账据成功");
}
@ -2641,4 +2641,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
PagerVo<InputVinListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean updateVehRemarks(String remarks, String sid) {
return baseMapper.updateVehRemarks(remarks,sid);
}
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -25,4 +26,6 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
BaseVehicleOutDetailsVo details(String sid);
}

32
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@ -42,10 +42,40 @@
bvo.middleOne,
bvo.middleTwo,
bvo.rebateMoneyOne,
bvo.rebateMoneyTwo
bvo.rebateMoneyTwo,
bv.configName as modelConfig,
bvo.sid
from base_vehicle_out bvo
left join base_vehicle bv on bv.sid = bvo.vinSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
select vinSid,
vinNo,
type,
typeKey,
orgSid,
orgName,
staffName,
staffSid,
concatNo,
price,
case isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
customerName,
customerSid,
mobile,
giftsDescription,
salesAllowance,
middleOne,
middleTwo,
rebateMoneyOne,
rebateMoneyTwo,
remarks,
saleDate
from base_vehicle_out
where sid = #{sid}
</select>
</mapper>

10
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@ -1,9 +1,6 @@
package com.yxt.anrui.base.biz.basevehicleout;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleout.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -36,4 +33,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
PagerVo<BaseVehicleOutVo> pv = baseVehicleOutService.pagerList(query);
return rb.success().setData(pv);
}
@Override
public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
return baseVehicleOutService.details(sid);
}
}

11
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@ -4,10 +4,7 @@ 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.BaseVehicle;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutQuery;
import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutVo;
import com.yxt.anrui.base.api.basevehicleout.*;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.common.base.service.MybatisBaseService;
@ -99,4 +96,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
PagerVo<BaseVehicleOutVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean<BaseVehicleOutDetailsVo> details(String sid) {
ResultBean<BaseVehicleOutDetailsVo> rb = ResultBean.fireFail();
BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseMapper.details(sid);
return rb.success().setData(baseVehicleOutDetailsVo);
}
}

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -37,6 +37,8 @@ public enum ProcDefEnum {
SCMSPECIALREBATEWITHAPPLY("专项返利预提申请","process_l0yxpgs2:1:590004"),
SCMSPECIALREBATECHECKAPPLY("专项返利核对申请","process_qw22vupn:1:590008"),
SCMSPECIALREBATECHEDISTRIBUTE("专项返利分配申请","process_h3w1aval:1:615004"),
SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请","process_k4lodiyg:1:630004"),
SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请","process_fgrv1mbv:1:630008"),
CONTRACTAPPLY("合同审核","process_gd8c9xd5:1:545008"),
;

2
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -450,7 +450,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
.includeProcessVariables()
.includeTaskLocalVariables()
.or()
.taskVariableValueEquals("orgSidPath","111222333")
//.taskVariableValueEquals("orgSidPath","111222333")
//.taskCandidateGroupIn(roleSidList)
.taskAssigneeLike("%" + userSid + "%")
.endOr()

2
anrui-flowable/anrui-flowable-biz/src/main/resources/application.yml

@ -45,7 +45,7 @@ logging:
flowable:
database-schema-update: true
database-schema-update: flase
common:
app:
idm-url: http://localhost:7001/flowable-idm

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java

@ -85,4 +85,9 @@ public interface SysMappingFeign {
@PostMapping("/selectMappingInfo")
@ResponseBody
public ResultBean<SysMappingInfoVo> selectMappingInfo(@RequestBody SysMappingInfoQuery query);
@ApiOperation("回显映射")
@GetMapping("/selectMappingListInfo/{dictSid}")
@ResponseBody
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(@PathVariable("dictSid") String dictSid);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java

@ -79,4 +79,9 @@ public class SysMappingFeignFallback implements SysMappingFeign {
public ResultBean<SysMappingInfoVo> selectMappingInfo(SysMappingInfoQuery query) {
return null;
}
@Override
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
return null;
}
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@ -139,4 +139,9 @@ public interface SysOrganizationFeign {
@ResponseBody
@ApiOperation("当前分公司销售部门及部门人员")
ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
@GetMapping("/selectOrgLists")
@ResponseBody
@ApiOperation("当前分公司下所有部门")
ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query);
}

5
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@ -142,4 +142,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
return null;
}
@Override
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return null;
}
}

17
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java

@ -0,0 +1,17 @@
package com.yxt.anrui.portal.api.sysorganization;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/9/30 11:28
* @Description
*/
@Data
public class SysOrganizationListsVo implements Vo {
private static final long serialVersionUID = -7021974833444298712L;
private String orgDeptSid;
private String orgDeptName;
}

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.java

@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo;
import com.yxt.anrui.portal.api.sysmapping.SysMappingQuery;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -67,4 +68,9 @@ public interface SysMappingMapper extends BaseMapper<SysMapping> {
List<SysMappingVo> selectListVo();
SysMappingInfoVo selectMappingInfo(@Param(Constants.WRAPPER) QueryWrapper<SysMappingInfoVo> qw);
List<SysMappingInfoVo> selectMappingListInfo(@Param("dictSid") String dictSid);
@Delete("delete from sys_mapping where dictSid = #{dictSid}")
void deleteByDictSid(@Param("dictSid") String dictSid);
}

11
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml

@ -44,5 +44,16 @@
LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
<where>${ew.sqlSegment}</where>
</select>
<select id="selectMappingListInfo" resultType="com.yxt.anrui.portal.api.sysmapping.SysMappingInfoVo">
SELECT sm.dictSid,
sm.map_sourceKey,
sm.map_sourceValue,
sm.map_object,
sm.map_item,
sm.map_itemKey,
sm.map_itemValue
FROM sys_mapping sm
WHERE sm.dictSid = #{dictSid}
</select>
</mapper>

7
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingRest.java

@ -110,4 +110,11 @@ public class SysMappingRest implements SysMappingFeign {
SysMappingInfoVo vo = sysMappingService.selectMappingInfo(query);
return rb.success().setData(vo);
}
@Override
public ResultBean<List<SysMappingInfoVo>> selectMappingListInfo(String dictSid) {
ResultBean<List<SysMappingInfoVo>> rb = ResultBean.fireFail();
List<SysMappingInfoVo> vo = sysMappingService.selectMappingListInfo(dictSid);
return rb.success().setData(vo);
}
}

17
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java

@ -135,11 +135,14 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
}
public void saveMappingList(List<SysMappingDto> dto) {
for (SysMappingDto sysMappingDto : dto) {
SysMapping entity = new SysMapping();
BeanUtil.copyProperties(sysMappingDto, entity);
entity.setCreateBySid(sysMappingDto.getUserSid());
save(entity);
if (dto.size() > 0) {
baseMapper.deleteByDictSid(dto.get(0).getDictSid());
for (SysMappingDto sysMappingDto : dto) {
SysMapping entity = new SysMapping();
BeanUtil.copyProperties(sysMappingDto, entity);
entity.setCreateBySid(sysMappingDto.getUserSid());
save(entity);
}
}
}
@ -163,4 +166,8 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
SysMappingInfoVo vo = baseMapper.selectMappingInfo(qw);
return vo;
}
public List<SysMappingInfoVo> selectMappingListInfo(String dictSid) {
return baseMapper.selectMappingListInfo(dictSid);
}
}

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@ -106,6 +106,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
SysOrgVo getListOrgByBrand(String sid);
List<SysOrganizationListVo> selectOrgList(String orgSid);
List<SysOrganizationListsVo> selectOrgLists(String orgSid);
List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
}

6
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -181,6 +181,12 @@
and orgAttributeKey = 'DP03_SYS'
</select>
<select id="selectOrgLists" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationListsVo">
select so.name orgDeptName, so.sid orgDeptSid
from sys_organization so
where so.psid = #{orgSid}
</select>
<select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
select distinct si.name staffName, si.sid staffSid
from sys_staff_org so

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -361,4 +361,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
return sysOrganizationService.selectOrgList(query);
}
@Override
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
return sysOrganizationService.selectOrgLists(query);
}
}

12
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@ -495,4 +495,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
}
return rb.success().setData(sysOrganizationListVos);
}
public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
ResultBean<List<SysOrganizationListsVo>> rb = ResultBean.fireFail();
//根据用户sid查询分公司sid
String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
String orgSid = getOrgSid(orgDeptSid);
//根据分公司名称查询销售部门的部门
List<SysOrganizationListsVo> sysOrganizationListVos = baseMapper.selectOrgLists(orgSid);
sysOrganizationListVos.removeAll(Collections.singleton(null));
return rb.success().setData(sysOrganizationListVos);
}
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicle.java

@ -33,4 +33,7 @@ public class ScmApplyInboundVehicle extends BaseEntity {
@ApiModelProperty("车架号(VIN)")
private String vinNo;
@ApiModelProperty("发动机号")
private String engineNo;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleDto.java

@ -38,6 +38,9 @@ public class ScmApplyInboundVehicleDto implements Dto {
@ApiModelProperty("车架号(VIN)")
private String vinNo;
@ApiModelProperty("发动机号")
private String engineNo;
@ApiModelProperty("备注")
private String remarks;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java

@ -36,6 +36,9 @@ public class ScmApplyInboundVehicleVo implements Vo {
@ApiModelProperty("车架号(VIN)")
private String vinNo;
@ApiModelProperty("发动机号")
private String engineNo;
@ApiModelProperty("备注")
private String remarks;
}

17
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeign.java

@ -75,4 +75,21 @@ public interface ScmCollectionRebateFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("回款返利未预提申请选择回款返利信息")
@PostMapping("/withApplyGetCollectionRebate")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
@ApiOperation("回款返利核对申请选择待核对回款返利信息")
@PostMapping("/checkApplyGetCollectionRebate")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
@ApiOperation("回款返利核对申请选择已上传回款返利信息")
@PostMapping("/checkApplyGetAlreadyUploadCollectionRebate")
@ResponseBody
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(@RequestBody PagerQuery<ScmCollectionRebateQuery> pq);
}

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateFeignFallback.java

@ -69,4 +69,19 @@ public class ScmCollectionRebateFeignFallback implements ScmCollectionRebateFeig
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebate/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
return null;
}
}

22
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateQuery.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateQuery.java <br/>
@ -51,13 +53,19 @@ public class ScmCollectionRebateQuery implements Query {
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款日期")
private String collectionDate; // 回款日期
@ApiModelProperty(value = "创建开始日期")
private String createStartTime;
@ApiModelProperty(value = "创建结束日期")
private String createEndTime;
@ApiModelProperty("创建组织sid")
@ApiModelProperty("回款开始日期")
private String collectionStartDate; // 回款开始日期
@ApiModelProperty("回款结束日期")
private String collectionEndDate; // 回款结束日期
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("回款返利sid")
private List<String> sidList; // 回款返利sid
}

14
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebate/ScmCollectionRebateVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebate;
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;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateVo.java <br/>
@ -68,13 +71,17 @@ public class ScmCollectionRebateVo implements Vo {
@ApiModelProperty("运费")
private String freight; // 运费
@ApiModelProperty("回款日期")
private String collectionDate; // 回款日期
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date collectionDate; // 回款日期
@ApiModelProperty("计算标准")
private String calculationStandard; // 计算标准
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("预提日期")
private String withholdingDate; // 预提日期
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date withholdingDate; // 预提日期
@ApiModelProperty("预提日期(页面展示)")
private String withholdingDateCopy; // 预提日期(页面展示)
@ApiModelProperty("上传日期")
private String uploadDate; // 上传日期
@ApiModelProperty("上传金额")
@ -91,5 +98,6 @@ public class ScmCollectionRebateVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("上传状态(2未上传、3已上传)")
private String uploadState; // 上传状态
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java

@ -62,6 +62,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")

43
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeign.java

@ -25,14 +25,22 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
@ -75,4 +83,39 @@ public interface ScmCollectionRebateWithApplyFeign {
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
/**************************************回款返利预提审批流程*******************************************/
@ApiOperation("提交回款返利预提申请")
@PostMapping("/submitCollectionRebateWithApply")
public ResultBean submitCollectionRebateWithApply(@RequestBody @Valid SubmitScmCollectionRebateWithApplyDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody ScmCollectionRebateWithApplyCompleteDto dto);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
@ApiOperation(value = "流程历史流转记录")
@GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
}

45
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyFeignFallback.java

@ -25,6 +25,11 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -69,4 +74,44 @@ public class ScmCollectionRebateWithApplyFeignFallback implements ScmCollectionR
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmcollectionrebatewithapply/fetchDetailsBySid无法访问");
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return null;
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return null;
}
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 10:42
* @Description
*/
@Data
public class GetNodeQuery implements Query {
private static final long serialVersionUID = -5674867230708197611L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/GetNodeVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/28 11:09
* @Description
*/
@Data
public class GetNodeVo implements Vo {
private static final long serialVersionUID = 8802774014747063504L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

42
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyCompleteDto.java

@ -0,0 +1,42 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.HashMap;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 9:01
* @Description
*/
@Data
public class ScmCollectionRebateWithApplyCompleteDto implements Dto {
private static final long serialVersionUID = 3240453987322803352L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
@NotBlank(message = "参数错误:orgSidPath")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
// @NotBlank(message = "参数错误:comment")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables = new HashMap<>();
}

56
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/ScmCollectionRebateWithApplyTaskQuery.java

@ -0,0 +1,56 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/6/28 17:29
* @Description 终止撤回驳回查询参数
*/
@Data
public class ScmCollectionRebateWithApplyTaskQuery implements Query {
private static final long serialVersionUID = -4006020771892400451L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
/*@ApiModelProperty("用户Id")
private String userId;
@ApiModelProperty("节点")
private String targetKey;
@ApiModelProperty("流程变量信息")
private Map<String, Object> values = new HashMap<>();
@ApiModelProperty("审批人")
private String assignee;
@ApiModelProperty("候选人")
private List<String> candidateUsers = new ArrayList<>();
@ApiModelProperty("审批组")
private List<String> candidateGroups = new ArrayList<>();*/
}

22
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/flow/SubmitScmCollectionRebateWithApplyDto.java

@ -0,0 +1,22 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/6/27 13:38
* @Description
*/
@Data
public class SubmitScmCollectionRebateWithApplyDto extends ScmCollectionRebateWithApplyDto {
private static final long serialVersionUID = 378585162071125756L;
@ApiModelProperty("意见")
private String comment;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/AppScmVehiclePatrolinspectionsheetInfoVo.java

@ -58,4 +58,9 @@ public class AppScmVehiclePatrolinspectionsheetInfoVo implements Vo {
@ApiModelProperty("用户sid")
private String userName;
@ApiModelProperty("存放地点sid")
private String warehouseSid;
@ApiModelProperty("存放地点")
private String warehouse;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/ScmVehInventorymonthVo.java

@ -54,7 +54,7 @@ public class ScmVehInventorymonthVo implements Vo {
private String sid; // sid
@ApiModelProperty("生成报告状态")
private String state;
private int state;
@ApiModelProperty("编号(yyyyMMdd)")
private String billNo; // 编号(yyyyMMdd)
@ApiModelProperty("创建时间")

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateMapper.java

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -62,4 +63,10 @@ public interface ScmCollectionRebateMapper extends BaseMapper<ScmCollectionRebat
@Select("select * from scm_collection_rebate")
List<ScmCollectionRebateVo> selectListVo();
@Update("update scm_collection_rebate set withholdingDate = CURRENT_TIMESTAMP where sid = #{collectionRebateSid}")
void updateWithholdingDateBySid(String collectionRebateSid);
@Update("update scm_collection_rebate set state = 1 where sid = #{collectionRebateSid}")
void updateState(String collectionRebateSid);
}

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateRest.java

@ -92,13 +92,13 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
for (String s : stringList) {
ScmCollectionRebateWithApply scmCollectionRebateWithApply = scmCollectionRebateWithApplyService.fetchBySid(s);
if (!scmCollectionRebateWithApply.getNodeState().equals("待提交")) {
return rb.setMsg("所选数据中包含已提交专项返利信息,无法删除");
return rb.setMsg("所选数据中包含已提交回款返利信息,无法删除");
}
}
ScmCollectionRebate scmCollectionRebate = scmCollectionRebateService.fetchBySid(sid);
Integer state = scmCollectionRebate.getState();
if (state == 1) {
return rb.setMsg("所选数据中包含已预提专项返利信息,无法删除");
return rb.setMsg("所选数据中包含已预提回款返利信息,无法删除");
}
}
scmCollectionRebateService.delBySids(sids);
@ -113,4 +113,25 @@ public class ScmCollectionRebateRest implements ScmCollectionRebateFeign {
ScmCollectionRebateDetailsVo vo = scmCollectionRebateService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.withApplyGetCollectionRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.checkApplyGetCollectionRebate(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<ScmCollectionRebateVo>> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<ScmCollectionRebateVo> pv = scmCollectionRebateService.checkApplyGetAlreadyUploadCollectionRebate(pq);
return rb.success().setData(pv);
}
}

113
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebate/ScmCollectionRebateService.java

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.biz.scmcollectionrebate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
@ -43,6 +44,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
@ -74,9 +76,11 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
if (StringUtils.isNotBlank(query.getCollectionTypeKey())){
qw.eq("collectionTypeKey",query.getCollectionTypeKey());
}
if (StringUtils.isNotBlank(query.getCollectionDate())){
qw.eq("collectionDate",query.getCollectionDate());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -122,4 +126,107 @@ public class ScmCollectionRebateService extends MybatisBaseService<ScmCollection
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void updateWithholdingDateBySid(String collectionRebateSid) {
baseMapper.updateWithholdingDateBySid(collectionRebateSid);
}
public void updateState(String collectionRebateSid) {
baseMapper.updateState(collectionRebateSid);
}
public PagerVo<ScmCollectionRebateVo> withApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 0);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.ne("state", 0);
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
//上传状态:未上传
if (StringUtils.isBlank(record.getUploadDate()) && StringUtils.isBlank(record.getUploadMoney())) {
record.setUploadState("2");
}
//上传状态:已上传
if (StringUtils.isNotBlank(record.getUploadDate()) && StringUtils.isNotBlank(record.getUploadMoney())) {
record.setUploadState("3");
}
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<ScmCollectionRebateVo> checkApplyGetAlreadyUploadCollectionRebate(PagerQuery<ScmCollectionRebateQuery> pq) {
ScmCollectionRebateQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebate> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
qw.eq("collectionTypeKey", query.getCollectionTypeKey());
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("createOrgSid", query.getCreateOrgSid());
qw.eq("state", 3);
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
IPage<ScmCollectionRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmCollectionRebateVo record : pagging.getRecords()) {
Date withholdingDate = record.getWithholdingDate();
int year = DateUtil.year(withholdingDate);
int month = DateUtil.month(withholdingDate) + 1;
String withholdingDateCopy = year + "年" + month + "月";
record.setWithholdingDateCopy(withholdingDateCopy);
}
PagerVo<ScmCollectionRebateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java

@ -72,4 +72,7 @@ public interface ScmCollectionRebateWithMapper extends BaseMapper<ScmCollectionR
void delByMainSid(String dtoSid);
List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid);
@Select("select collectionRebateSid from scm_collection_rebate_with where mainSid = #{businessSid}")
List<String> fetchCollectionReBateSidByMainSid(String businessSid);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java

@ -119,4 +119,8 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
public List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
public List<String> fetchCollectionReBateSidByMainSid(String businessSid) {
return baseMapper.fetchCollectionReBateSidByMainSid(businessSid);
}
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java

@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-scm(回款返利) <br/>
@ -64,4 +65,6 @@ public interface ScmCollectionRebateWithApplyMapper extends BaseMapper<ScmCollec
List<ScmCollectionRebateWithApplyVo> selectListVo();
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> beanToMap);
}

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml

@ -28,4 +28,19 @@
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
<update id="updateFlowFiled">
UPDATE scm_collection_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid=#{sid}
</update>
</mapper>

51
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java

@ -25,6 +25,14 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.ScmCollectionRebateWithApplyCompleteDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -91,4 +99,47 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
}
@Override
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
return scmCollectionRebateWithApplyService.submitCollectionRebateWithApply(dto);
}
@Override
public ResultBean complete(ScmCollectionRebateWithApplyCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
return scmCollectionRebateWithApplyService.complete(bv);
}
@Override
public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.revokeProcess(flowTaskVo);
}
@Override
public ResultBean taskReject(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.taskReject(flowTaskVo);
}
@Override
public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
return scmCollectionRebateWithApplyService.breakProcess(flowTaskVo);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmCollectionRebateWithApplyService.flowRecord(procInsId);
}
@Override
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
return scmCollectionRebateWithApplyService.getPreviousNodesForReject(query);
}
}

509
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@ -26,11 +26,26 @@
package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
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.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.SubmitScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -48,8 +63,8 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-scm(回款返利) <br/>
@ -67,131 +82,371 @@ import java.util.List;
@Service
public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmCollectionRebateWithApplyMapper, ScmCollectionRebateWithApply> {
@Autowired
private ScmCollectionRebateWithService scmCollectionRebateWithService;
private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
ScmCollectionRebateWithApplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("scrwa.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCollectionApply())) {
qw.like("scrwa.withApply", query.getCollectionApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
qw.groupBy("scrwa.sid");
qw.orderByDesc("scrwa.createTime");
IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
if (scmCollectionRebateWiths == null) {
return rb.setMsg("请选择回款返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(sid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("添加成功").setData(sid);
}
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
if (scmCollectionRebateWithApply == null) {
rb.setMsg("该回款返利预提申请单不存在");
}
this.updateByDto(dto);
scmCollectionRebateWithService.delByMainSid(dtoSid);
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(dtoSid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public ResultBean<String> insertByDto(ScmCollectionRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionRebateWithApplyDto dto){
String dtoSid = dto.getSid();
@Autowired
private ScmCollectionRebateWithService scmCollectionRebateWithService;
@Autowired
private ScmCollectionRebateService scmCollectionRebateService;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private SysUserFeign sysUserFeign;
private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
ScmCollectionRebateWithApplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("scrwa.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCollectionApply())) {
qw.like("scrwa.withApply", query.getCollectionApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
qw.groupBy("scrwa.sid");
qw.orderByDesc("scrwa.createTime");
IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
if (scmCollectionRebateWiths == null) {
return rb.setMsg("请选择回款返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(sid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("添加成功").setData(sid);
}
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
if (scmCollectionRebateWithApply == null) {
rb.setMsg("该回款返利预提申请单不存在");
}
this.updateByDto(dto);
scmCollectionRebateWithService.delByMainSid(dtoSid);
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(dtoSid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public ResultBean<String> insertByDto(ScmCollectionRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionRebateWithApplyDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
ScmCollectionRebateWithApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid){
ScmCollectionRebateWithApply entity = fetchBySid(sid);
ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
for (String sid : sids) {
scmCollectionRebateWithService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
String[] specialRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(specialRebateSids));
String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
}
scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
}
}
ScmCollectionRebateWithApply entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public ScmCollectionRebateWithApplyDetailsVo fetchDetailsVoBySid(String sid) {
ScmCollectionRebateWithApply entity = fetchBySid(sid);
ScmCollectionRebateWithApplyDetailsVo vo = new ScmCollectionRebateWithApplyDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
for (String sid : sids) {
scmCollectionRebateWithService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
String[] collectionRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(collectionRebateSids));
String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
}
scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
}
public ResultBean submitCollectionRebateWithApply(SubmitScmCollectionRebateWithApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!orgByStaffSid.getSuccess()) {
return rb.setMsg(orgByStaffSid.getMsg());
}
//用户的组织全路径
String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmCollectionRebateWithApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
ResultBean<String> resultBean = saveOrUpdateDto(dto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String businessSid = resultBean.getData();
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//=====================添加app所需参数
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
//流程定义id
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
//获取回款返利sid
List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
for (ScmCollectionRebateWithDto scmCollectionRebateWith : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWith.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
scmCollectionRebateService.updateWithholdingDateBySid(collectionRebateSid);
}
}
if (r == 1) {
ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
bv.setTaskId(scmCollectionRebateWithApply.getTaskId());
bv.setTaskDefKey(scmCollectionRebateWithApply.getNodeSid());
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return rb;
}
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(SubmitScmCollectionRebateWithApplyDto dto, ScmCollectionRebateWithApply scmCollectionRebateWithApply) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (scmCollectionRebateWithApply != null) {
String businessTaskId = scmCollectionRebateWithApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
}
return r;
}
private int updateFlowFiled(Map<String, Object> beanToMap) {
return baseMapper.updateFlowFiled(beanToMap);
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(bv.getBusinessSid());
List<String> collectionRebateSids = scmCollectionRebateWithService.fetchCollectionReBateSidByMainSid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmCollectionRebateWithApply.getTaskId())) {
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String collectionRebateSid : collectionRebateSids) {
scmCollectionRebateService.updateState(collectionRebateSid);
}
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean revokeProcess(FlowTaskVo query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
//根据业务sid查询排内购申请
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmCollectionRebateWithApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
flowTaskVo.setValues(BeanUtil.beanToMap(scmCollectionRebateWithApply));
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败,提交的数据不一致!");
}
public ResultBean taskReject(FlowTaskVo query) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
if (scmCollectionRebateWithApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = scmCollectionRebateWithApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
//更新业务中的流程相关的参数
updateFlowFiled(map);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean breakProcess(FlowTaskVo query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmCollectionRebateWithApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean flowRecord(String procInsId) {
return flowTaskFeign.businessFlowRecord(procInsId);
}
public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.SCMCOLLECTIONREBATEWITHAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml

@ -118,11 +118,11 @@
<select id="getMonthByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehinventorymonth.AppVehInventorymonthVo">
SELECT count(*),
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '001' and svi.mainSid = #{mainSid}) AS totalNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS normalNumber ,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS lossNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey != '003' and svi.mainSid = #{mainSid}) AS totalNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS normalNumber ,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '004' and svi.mainSid = #{mainSid}) AS lossNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '002' and svi.mainSid = #{mainSid}) AS damageNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '001' and svi.mainSid = #{mainSid}) AS profitNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryStateKey = '003' and svi.mainSid = #{mainSid}) AS profitNumber,
(SELECT count(*) FROM scm_vehicle_inventory svi WHERE svi.InventoryState = '无' and svi.mainSid = #{mainSid}) AS surplusNumber
FROM scm_vehicle_inventory svi
WHERE svi.mainSid = #{mainSid}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@ -99,7 +99,7 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
List<AppVinAndRemarksVo> getMonthRemarksByMainSid(@Param("sid") String sid, @Param("stateKey") String stateKey);
@Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
@Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid}")
void updatePatrolInspectionState(@Param("sid") String sid);
@Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@ -134,7 +134,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
String id = record.getId();
String createOrgSid = record.getCreateOrgSid();
List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(vinNo, id, createOrgSid);
if (scmVehicleStayPatrolinspectionVos.size() > 0){
if (scmVehicleStayPatrolinspectionVos.size() > 0) {
ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo = scmVehicleStayPatrolinspectionVos.get(0);
record.setPatrolInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
record.setPatrolInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
@ -147,7 +147,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
record.setLiableName(scmWarehouse.getLibTubeName());
String sid1 = record.getSid();
AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(sid1);
if (appScmVehiclePatrolinspectionsheetInfoVo != null){
if (appScmVehiclePatrolinspectionsheetInfoVo != null) {
record.setSituationExplain(appScmVehiclePatrolinspectionsheetInfoVo.getExplain());
record.setProblems(appScmVehiclePatrolinspectionsheetInfoVo.getProblems());
String sid = appScmVehiclePatrolinspectionsheetInfoVo.getSid();
@ -209,6 +209,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
pagerQuery.getParams().setUseOrgSid(useOrgSid);
QueryWrapper<AppScmVehicleStayPatrolinspectionPageVo> qw = new QueryWrapper<>();
qw.and(wrapper -> wrapper.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001"));
qw.eq("svp.isDelete", 0);
if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
@ -216,7 +217,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
if (StringUtils.isNotBlank(pagerQuery.getParams().getWarehouseSid())) {
qw.eq("svp.locationSid", pagerQuery.getParams().getWarehouseSid());
}
qw.eq("svp.patrolInspectionStateKey", "000").or().eq("svp.patrolInspectionStateKey", "001");
AppScmVehicleStayPatrolinspectionPageQuery params = pagerQuery.getParams();
IPage<AppScmVehicleStayPatrolinspectionPageVo> iPage = baseMapper.getInventoryList(page, qw, params.getNames());
List<AppScmVehicleStayPatrolinspectionPageVo> records = iPage.getRecords();
@ -328,15 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
}
public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid,String vin) {
return baseMapper.selectByMandSid(sid,vin);
public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid, String vin) {
return baseMapper.selectByMandSid(sid, vin);
}
public void deleteByVinNo(String vinNo, String id) {
baseMapper.deleteByVinNo(vinNo,id);
baseMapper.deleteByVinNo(vinNo, id);
}
public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo,String useOrgSid) {
return baseMapper.selectByVinNo(vinNo,useOrgSid);
public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo, String useOrgSid) {
return baseMapper.selectByVinNo(vinNo, useOrgSid);
}
}

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml

@ -21,21 +21,21 @@
<select id="getInspection"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo">
SELECT sid,
mainSid as recordSid,
vinNo as vin,
model,
modelSid,
situationExplain as `explain`,
problems,
results,
dutyName as liableName,
dutySid as liableSid,
location,
address,
createBySid as userSid
FROM scm_vehicle_patrolinspectionsheet
WHERE mainSid = #{recordSid}
SELECT svps.sid,
svps.mainSid as recordSid,
svps.vinNo as vin,
svps.model,
svps.modelSid,
svps.situationExplain as `explain`,
svps.problems,
svps.results,
svps.dutyName as liableName,
svps.dutySid as liableSid,
svps.location,
svps.address,
svps.createBySid as userSid
FROM scm_vehicle_patrolinspectionsheet svps
WHERE svps.mainSid = #{recordSid}
</select>
<select id="getPCInspection"
@ -76,7 +76,7 @@
svp.patrolInspectionDate,
svp.patrolInspectionName
from scm_vehicle_patrolinspection svp
left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
where svp.sid = #{recordSid}
</select>

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@ -123,7 +123,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
if (record.getState().equals(0)) {
if (record.getState() == 0) {
if (vo.getSurplusNumber() == 0) {
record.setShowBtn(true);
} else {
@ -317,9 +317,9 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
//本次应盘数量
vo.setTotalNumber(String.valueOf(appScmVehInventorymonthVo.getTotalNumber()));
String inventoryStateKey1 = "001";
String inventoryStateKey2 = "002";
String inventoryStateKey3 = "003";
String inventoryStateKey1 = "003";
String inventoryStateKey2 = "004";
String inventoryStateKey3 = "002";
List<AppVinAndRemarksVo> profitRemarks = scmVehicleInventoryService.getMonthRemarksByMainSid(sid, inventoryStateKey1);
String profitRemark = "";
for (AppVinAndRemarksVo remark : profitRemarks) {

62
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@ -29,21 +29,28 @@ 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.AppScmInventoryRecordsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspection;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheet;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspection;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.ScmVehicleStayPatrolinspectionVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.*;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreport;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
import com.yxt.anrui.scm.biz.scmvehpatrolinspectionreport.ScmVehPatrolinspectionreportService;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -88,7 +95,13 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
@Autowired
ScmVehiclePatrolinspectionService scmVehiclePatrolinspectionService;
@Autowired
ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
@Autowired
ScmVehPatrolinspectionreportService scmVehPatrolinspectionreportService;
@Autowired
FileUploadComponent fileUploadComponent;
@Autowired
ScmFileService scmFileService;
private QueryWrapper<ScmVehPatrolinspectionmonth> createQueryWrapper(ScmVehPatrolinspectionmonthQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -175,6 +188,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserVo.getStaffSid()).getData();
List<String> vinNoList = new ArrayList<>();
List<String> mainList = new ArrayList<>();
List<ScmVehiclePatrolinspectionVo> patrolinspectionVos = scmVehiclePatrolinspectionService.selectListAll(useOrgSid);
List<AppScmInventoryRecordsVo> list = new ArrayList<>();
if (patrolinspectionVos.size() > 0) {
@ -186,7 +200,9 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
}
if ("001".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
String vinNo = patrolinspectionVo.getVinNo();
String sid = patrolinspectionVo.getSid();
vinNoList.add(vinNo);
mainList.add(sid);
}
if ("000".equals(patrolinspectionVo.getPatrolInspectionStateKey())) {
scmVehiclePatrolinspectionService.updateState(patrolinspectionVo.getSid());
@ -221,6 +237,52 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
}
if (mainList.size() > 0) {
for (String sid : mainList) {
AppScmVehiclePatrolinspectionsheetInfoVo inspection = scmVehiclePatrolinspectionsheetService.getInspection(sid);
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(inspection.getVin());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonth.getSid());
BaseVehicle vehicle = baseVehicleFeign.selectByVinNoAndOrgSid(inspection.getVin(), useOrgSid).getData();
scmVehiclePatrolinspection.setLocation(vehicle.getLocationName());
scmVehiclePatrolinspection.setLocationSid(vehicle.getLocation());
scmVehiclePatrolinspection.setPatrolInspectionState("问题未解决");
scmVehiclePatrolinspection.setPatrolInspectionStateKey("001");
scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());
scmVehiclePatrolinspectionsheet.setVinNo(inspection.getVin());
scmVehiclePatrolinspectionsheet.setDutySid(inspection.getLiableSid());
scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setCreateBySid(inspection.getUserSid());
scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
scmVehiclePatrolinspectionsheet.setModel(inspection.getModel());
scmVehiclePatrolinspectionsheet.setModelSid(inspection.getModelSid());
scmVehiclePatrolinspectionsheet.setLocation(inspection.getLocation());
scmVehiclePatrolinspectionsheet.setAddress(inspection.getAddress());
scmVehiclePatrolinspectionsheet.setProblems(inspection.getProblems());
scmVehiclePatrolinspectionsheet.setSituationExplain(inspection.getExplain());
scmVehiclePatrolinspectionsheet.setResults(inspection.getResults());
scmVehiclePatrolinspectionsheetService.save(scmVehiclePatrolinspectionsheet);
String s1 = "";
String type = "06"; //巡检相关照片
List<String> images = inspection.getImages();
for (String s : images) {
if (s.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
s1 = s.replace(fileUploadComponent.getUrlPrefix(), "");
}
ScmFile scmFile1 = new ScmFile();
scmFile1.setAttachType(type);
scmFile1.setFileName("巡检相关照片");
scmFile1.setFilePath(s1);
scmFile1.setLinkSid(scmVehiclePatrolinspectionsheet.getSid());
scmFileService.save(scmFile1);
}
}
}
} else {
return rb.setMsg("暂无需要巡检记录");
}

Loading…
Cancel
Save