yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe0036 5 months ago
parent
8607b3ab54 39cdaa6352
commit
abdf76fac5
44 changed files with 1904 additions and 875 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java
  2. 75
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java
  3. 65
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java
  4. 92
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java
  5. 83
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java
  6. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
  7. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
  8. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  9. 19
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
  10. 88
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  11. 39
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  12. 41
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java
  13. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  14. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
  15. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  16. 98
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  17. 35
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  18. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
  19. 10
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
  20. 10
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
  21. 28
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
  22. 29
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
  23. 190
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
  24. 2
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
  25. 10
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
  26. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
  27. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
  28. 3
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
  29. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java
  30. 16
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml
  31. 7
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
  32. 20
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java
  33. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml
  34. 90
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java
  35. 66
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
  36. 47
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDetailsVo.java
  37. 60
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
  38. 50
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyInitVo.java
  39. 4
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java
  40. 121
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml
  41. 34
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyQuery.java
  42. 1114
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
  43. 58
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java
  44. 1
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/flowable/SubmitOaMendApplyDto.java

80
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateExcelVo.java
View File

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
@Data
public class ScmSpecialRebateExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "状态", EnName = "state")
private String state;
@ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
private String createOrgName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost")
private String expectCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
private String withholdingDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
}

75
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java
View File

@ -0,0 +1,75 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatecheckapply;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
@Data
public class SpecialRebateCheckExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
private String createOrgName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
private String withholdCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks;
}

65
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java
View File

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebatewith;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class SpectalRebateWithExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "分公司", EnName = "useOrgName")
private String useOrgName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
private BigDecimal expectItureCost;
@ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
private BigDecimal expectTreatCost;
@ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
private BigDecimal expectSuppCost;
@ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
private String expectSuppRemark;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
}

92
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java
View File

@ -0,0 +1,92 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
@Data
public class ScmVehRebateExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "状态", EnName = "state")
private String state;
@ExportEntityMap(CnName = "一次核对状态", EnName = "onceCheckState")
private String onceCheckState;
@ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
private String createOrgName;
@ExportEntityMap(CnName = "品牌", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
private String vehModelName;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo;
@ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
private String calculationStandard;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预计费用", EnName = "expectCost")
private String expectCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
private String withholdingDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks;
@ExportEntityMap(CnName = "备注", EnName = "remarks")
private String remarks;
}

83
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java
View File

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebatecheckapply;
import com.yxt.common.core.utils.ExportEntityMap;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class VehRebateCheckExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
private String brandName;
@ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
private String vehModelName;
@ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String vinNo;
@ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
private String manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight;
@ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
private String rebateName;
@ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
private String estimateRebate;
@ExportEntityMap(CnName = "其中预提费用", EnName = "withholdCost")
private String withholdCost;
@ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
private String palceGenDate;
@ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
private String uploadDate;
@ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
private String uploadMoney;
@ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
private String secondaryUploadDate;
@ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
private String secondaryUploadMoney;
@ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
private String stayDetermineMoney;
@ExportEntityMap(CnName = "其中费用", EnName = "money")
private String money;
@ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
private String diffAmount;
@ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
private String isAdjustment;
@ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
private String adjustmentMoney;
@ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
private String adjustmentRemarks;
}

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java
View File

@ -36,8 +36,8 @@ import java.util.Date;
@Data @Data
public class ExcelVo { public class ExcelVo {
@ExportEntityMap(CnName = "序号", EnName = "id") @ExportEntityMap(CnName = "序号", EnName = "rankNo")
private String id; private Integer rankNo;
@ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName") @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
private String purchaseSystemName; private String purchaseSystemName;
@ExportEntityMap(CnName = "品牌名称", EnName = "brandName") @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
@ -50,9 +50,8 @@ public class ExcelVo {
private String manufactorSettlementPrice; private String manufactorSettlementPrice;
@ExportEntityMap(CnName = "其中运费", EnName = "freight") @ExportEntityMap(CnName = "其中运费", EnName = "freight")
private String freight; private String freight;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ExportEntityMap(CnName = "创建日期", EnName = "createTime") @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
private Date createTime; private String createTime;
@ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue") @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
private String rebateTypeValue; private String rebateTypeValue;
@ExportEntityMap(CnName = "返利名称", EnName = "rebateName") @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java
View File

@ -83,4 +83,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
@Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}") @Update("update scm_special_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState); void updateAdjustmentState(@Param("sid") String sid, @Param("adjustmentState") int adjustmentState);
List<ScmSpecialRebateExcelVo> excelList(@Param(Constants.WRAPPER) QueryWrapper<ScmSpecialRebate> qw);
} }

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
View File

@ -137,4 +137,20 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="excelList" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo">
SELECT
*,
@row_number := @row_number + 1 AS rankNo,
expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
expectItureCost + expectTreatCost + expectSuppCost AS withholdCost,
onceItureCost + onceTreatCost + onceSuppCost + secondItureCost + secondTreatCost + secondSuppCost AS money
FROM scm_special_rebate,(
SELECT
@row_number := 0
) AS t
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>

19
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
View File

@ -25,7 +25,10 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebate; package com.yxt.anrui.scm.biz.scmspecialrebate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.scm.api.scmspecialrebate.*; import com.yxt.anrui.scm.api.scmspecialrebate.*;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.SpecialRebateCheckExcelVo;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService; import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService; import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService;
@ -70,6 +73,22 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestBody ScmSpecialRebateQuery query) {
//得到所有要导出的数据
List<ScmSpecialRebateExcelVo> exportVoList = scmSpecialRebateService.excelList(query);
//定义导出的excel名字
String excelName = "专项返利管理";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, ScmSpecialRebateExcelVo.class, response);
}
@Override @Override
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")

88
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -1565,4 +1565,92 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
public void updateAdjustmentState(String sid, int adjustmentState) { public void updateAdjustmentState(String sid, int adjustmentState) {
baseMapper.updateAdjustmentState(sid, adjustmentState); baseMapper.updateAdjustmentState(sid, adjustmentState);
} }
public List<ScmSpecialRebateExcelVo> excelList(ScmSpecialRebateQuery query) {
QueryWrapper<ScmSpecialRebate> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = new ArrayList<>();
return scmSpecialRebateExcelVos;
}
} else {
List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = new ArrayList<>();
return scmSpecialRebateExcelVos;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
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.orderByDesc("createTime");
List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = baseMapper.excelList(qw);
for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) {
if (scmSpecialRebateExcelVo.getState().equals("0")){
scmSpecialRebateExcelVo.setState("未预提");
}else if (scmSpecialRebateExcelVo.getState().equals("1")){
scmSpecialRebateExcelVo.setState("预提中");
}else if (scmSpecialRebateExcelVo.getState().equals("2")){
scmSpecialRebateExcelVo.setState("待核对");
}else if (scmSpecialRebateExcelVo.getState().equals("3")){
scmSpecialRebateExcelVo.setState("核对中");
}else if (scmSpecialRebateExcelVo.getState().equals("4")){
scmSpecialRebateExcelVo.setState("已核对");
}else if (scmSpecialRebateExcelVo.getState().equals("5")){
scmSpecialRebateExcelVo.setState("分配中");
}else if (scmSpecialRebateExcelVo.getState().equals("6")){
scmSpecialRebateExcelVo.setState("已分配");
}
scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
}
return scmSpecialRebateExcelVos;
}
} }

39
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
View File

@ -26,12 +26,18 @@
package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply; package com.yxt.anrui.scm.biz.scmspecialrebatecheckapply;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.*; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.*;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*; import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.*;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.VehRebateCheckExcelVo;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath; import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -40,6 +46,10 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Api(tags = "专项返利核对申请表") @Api(tags = "专项返利核对申请表")
@ -49,6 +59,10 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
@Autowired @Autowired
private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService; private ScmSpecialrebateCheckapplyService scmSpecialrebateCheckapplyService;
@Autowired
private ScmSpecialrebateCheckapplydetailService scmSpecialrebateCheckapplydetailService;
@Autowired
HttpServletResponse response;
@Override @Override
public ResultBean rePushVoucher(String sid) { public ResultBean rePushVoucher(String sid) {
@ -94,6 +108,31 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
return rb.success().setData(pdf); return rb.success().setData(pdf);
} }
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestParam("sid") String sid) {
List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid).getData();
List<SpecialRebateCheckExcelVo> excelVos = new ArrayList<>();
Integer i = 1;
for (ScmSpecialRebateDetailsVo datum : data) {
SpecialRebateCheckExcelVo excelVo = new SpecialRebateCheckExcelVo();
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
i = i + 1;
excelVos.add(excelVo);
}
//定义导出的excel名字
String excelName = "专项返利核对明细导出模板";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, excelVos, SpecialRebateCheckExcelVo.class, response);
}
@Override @Override
public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) { public ResultBean submitSpecialRebateCheckApply(SubmitScmSpecialRebateCheckApplyDto dto) {
return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto); return scmSpecialrebateCheckapplyService.submitSpecialRebateCheckApply(dto);

41
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithRest.java
View File

@ -25,15 +25,27 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebatewith; package com.yxt.anrui.scm.biz.scmspecialrebatewith;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatewith.SpectalRebateWithExcelVo;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ExcelVo;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithFeign;
import javax.servlet.http.HttpServletResponse;
/** /**
* Project: anrui-scm(专项返利) <br/> * Project: anrui-scm(专项返利) <br/>
* File: ScmSpecialRebateWithFeignFallback.java <br/> * File: ScmSpecialRebateWithFeignFallback.java <br/>
@ -54,9 +66,38 @@ public class ScmSpecialRebateWithRest implements ScmSpecialRebateWithFeign {
@Autowired @Autowired
private ScmSpecialRebateWithService scmSpecialRebateWithService; private ScmSpecialRebateWithService scmSpecialRebateWithService;
@Autowired
HttpServletResponse response;
@Override @Override
public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) { public ResultBean<List<ScmSpecialRebateDetailsVo>> specialRebateWithDetails(String sid) {
return scmSpecialRebateWithService.specialRebateWithDetails(sid); return scmSpecialRebateWithService.specialRebateWithDetails(sid);
} }
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestParam("sid") String sid) {
List<String> strings = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(sid);
String specialSid = String.join(",", strings);
List<ScmSpecialRebateDetailsVo> data = scmSpecialRebateWithService.specialRebateWithDetails(specialSid).getData();
List<SpectalRebateWithExcelVo> excelVos = new ArrayList<>();
Integer i = 1;
for (ScmSpecialRebateDetailsVo datum : data) {
SpectalRebateWithExcelVo excelVo = new SpectalRebateWithExcelVo();
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
i = i + 1;
excelVos.add(excelVo);
}
//定义导出的excel名字
String excelName = "专项返利预提明细导出模板";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, excelVos, SpectalRebateWithExcelVo.class, response);
}
} }

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
View File

@ -30,11 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo; import com.yxt.anrui.scm.api.scmvehrebate.*;
import com.yxt.anrui.scm.api.scmvehrebate.TwoExcelVo;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo;
import java.util.List; import java.util.List;
@ -82,4 +79,6 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
@Delete("delete from scm_veh_rebate where vehSid = #{vehSid}") @Delete("delete from scm_veh_rebate where vehSid = #{vehSid}")
void delByVehSid(String vehSid); void delByVehSid(String vehSid);
List<ScmVehRebateExcelVo> excelList(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
} }

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml
View File

@ -104,4 +104,22 @@
diffAmount = #{diffAmount} diffAmount = #{diffAmount}
WHERE sid = #{sid} WHERE sid = #{sid}
</update> </update>
<select id="excelList" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo">
SELECT
*,
@row_number := @row_number + 1 AS rankNo,
sid AS vehRebateSid,
expectTreatCost + expectSuppCost AS expectCost,
expectTreatCost + expectSuppCost AS withholdCost,
onceTreatCost + onceSuppCost + secondTreatCost + secondSuppCost AS money
FROM
scm_veh_rebate,(
SELECT
@row_number := 0
) AS t
<where>
${ew.sqlSegment}
</where>
</select>
</mapper> </mapper>

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
View File

@ -25,6 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmvehrebate; package com.yxt.anrui.scm.biz.scmvehrebate;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateQuery;
import com.yxt.anrui.scm.api.scmvehrebate.*; import com.yxt.anrui.scm.api.scmvehrebate.*;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.StringUtils;
@ -77,6 +79,22 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestBody ScmVehRebateQuery query) {
//得到所有要导出的数据
List<ScmVehRebateExcelVo> exportVoList = scmVehRebateService.excelList(query);
//定义导出的excel名字
String excelName = "单车返利管理";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, ScmVehRebateExcelVo.class, response);
}
@Override @Override
public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) { public ResultBean<PagerVo<ScmVehRebateVo>> withApplyGetVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();

98
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -40,6 +40,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo;
import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateExcelVo;
import com.yxt.anrui.scm.api.scmvehrebate.*; import com.yxt.anrui.scm.api.scmvehrebate.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
@ -1921,4 +1922,101 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
baseMapper.delByVehSid(vehSid); baseMapper.delByVehSid(vehSid);
return rb.success(); return rb.success();
} }
public List<ScmVehRebateExcelVo> excelList(ScmVehRebateQuery query) {
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl())) {
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("orgPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("orgPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("orgPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("orgPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("createBySid", query.getUserSid());
} else {
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = new ArrayList<>();
return scmVehRebateExcelVos;
}
} else {
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = new ArrayList<>();
return scmVehRebateExcelVos;
}
}
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
}
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getRebateTypeKey())) {
qw.eq("rebateTypeKey", query.getRebateTypeKey());
}
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
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.orderByDesc("createTime");
List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
if (scmVehRebateExcelVo.getState().equals("0")){
scmVehRebateExcelVo.setState("未预提");
}else if (scmVehRebateExcelVo.getState().equals("1")){
scmVehRebateExcelVo.setState("预提中");
}else if (scmVehRebateExcelVo.getState().equals("2")){
scmVehRebateExcelVo.setState("待核对");
}else if (scmVehRebateExcelVo.getState().equals("3")){
scmVehRebateExcelVo.setState("核对中");
}else if (scmVehRebateExcelVo.getState().equals("4")){
scmVehRebateExcelVo.setState("已核对");
}
scmVehRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmVehRebateExcelVo.getCreateTime())));
if (scmVehRebateExcelVo.getOnceCheckState().equals("0")){
scmVehRebateExcelVo.setOnceCheckState("否");
}else if (scmVehRebateExcelVo.getOnceCheckState().equals("1")){
scmVehRebateExcelVo.setOnceCheckState("是");
}else if (scmVehRebateExcelVo.getOnceCheckState().equals("2")){
scmVehRebateExcelVo.setOnceCheckState("一次核对中");
}
}
return scmVehRebateExcelVos;
}
} }

35
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
View File

@ -26,13 +26,17 @@
package com.yxt.anrui.scm.biz.scmvehrebatecheckapply; package com.yxt.anrui.scm.biz.scmvehrebatecheckapply;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.*; import com.yxt.anrui.scm.api.scmvehrebatecheckapply.*;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.*; import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.*;
import com.yxt.anrui.scm.api.scmvehrebatewith.ExcelVo;
import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath; import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
@ -41,6 +45,10 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -65,6 +73,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
private ScmVehrebateCheckapplyService scmVehrebateCheckapplyService; private ScmVehrebateCheckapplyService scmVehrebateCheckapplyService;
@Autowired @Autowired
private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService; private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
@Autowired
private HttpServletResponse response;
@Override @Override
public ResultBean rePushVoucher(String sid) { public ResultBean rePushVoucher(String sid) {
@ -108,6 +118,31 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
return rb.success().setData(pdf); return rb.success().setData(pdf);
} }
@ApiOperation("导出")
@PostMapping("/excelList")
public void excelList(@RequestParam("sid") String sid) {
List<ScmVehRebateDetailsVo> scmVehRebateDetailsVos = scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid).getData();
List<VehRebateCheckExcelVo> excelVos = new ArrayList<>();
Integer i = 1;
for (ScmVehRebateDetailsVo datum : scmVehRebateDetailsVos) {
VehRebateCheckExcelVo excelVo = new VehRebateCheckExcelVo();
BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
i = i + 1;
excelVos.add(excelVo);
}
//定义导出的excel名字
String excelName = "单车返利核对明细导出模板";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, excelVos, VehRebateCheckExcelVo.class, response);
}
@Override @Override
public ResultBean submitVehRebateCheckApply(SubmitScmVehRebateCheckApplyDto dto) { public ResultBean submitVehRebateCheckApply(SubmitScmVehRebateCheckApplyDto dto) {
return scmVehrebateCheckapplyService.submitVehRebateCheckApply(dto); return scmVehrebateCheckapplyService.submitVehRebateCheckApply(dto);

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.biz.scmvehrebatewith; package com.yxt.anrui.scm.biz.scmvehrebatewith;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.*; import com.yxt.anrui.scm.api.scmvehrebatewith.*;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
@ -34,6 +35,7 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.http.client.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -110,11 +112,17 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
@ApiOperation("导出") @ApiOperation("导出")
@PostMapping("/excelList") @PostMapping("/excelList")
public void excelList(@RequestParam("sid") String sid) { public void excelList(@RequestParam("sid") String sid) {
List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(sid).getData(); List<String> strings = scmVehRebateWithService.fetchVehReBateSidByMainSid(sid);
String vehRebateSid = String.join(",", strings);
List<ScmVehRebateDetailsVo> data = scmVehRebateWithService.vehRebateWithDetails(vehRebateSid).getData();
List<ExcelVo> excelVos = new ArrayList<>(); List<ExcelVo> excelVos = new ArrayList<>();
Integer i = 1;
for (ScmVehRebateDetailsVo datum : data) { for (ScmVehRebateDetailsVo datum : data) {
ExcelVo excelVo = new ExcelVo(); ExcelVo excelVo = new ExcelVo();
BeanUtil.copyProperties(datum,excelVo); BeanUtil.copyProperties(datum,excelVo);
excelVo.setRankNo(i);
excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
i = i + 1;
excelVos.add(excelVo); excelVos.add(excelVo);
} }
//定义导出的excel名字 //定义导出的excel名字

10
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
View File

@ -53,6 +53,16 @@ export default {
method: 'get' method: 'get'
}) })
}, },
// 导出
exportExcel: function(data) {
return request({
url: '/scm/v1/scmvehrebate/excelList',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
},
// 下载模板 // 下载模板
downloadExcel: function() { downloadExcel: function() {
return request({ return request({

10
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
View File

@ -34,5 +34,15 @@ export default {
url: '/scm/v1/scmspecialrebate/fetchDetailsBySid/' + data, url: '/scm/v1/scmspecialrebate/fetchDetailsBySid/' + data,
method: 'get' method: 'get'
}) })
},
// 导出
exportExcel: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/excelList',
method: 'post',
data: data,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
} }
} }

28
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
View File

@ -315,6 +315,9 @@ export default {
case 'doImport': case 'doImport':
this.doImport() this.doImport()
break break
case 'doExport':
this.doExport()
break
case 'doDel': case 'doDel':
this.doDel() this.doDel()
break break
@ -483,6 +486,31 @@ export default {
this.getList() this.getList()
} }
}, },
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '单车返利' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
// 合计 // 合计
getSummaries(param) { getSummaries(param) {
const { columns, data } = param const { columns, data } = param

29
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
View File

@ -244,8 +244,8 @@ export default {
case 'toAdd': case 'toAdd':
this.toAdd() this.toAdd()
break break
case 'doImport': case 'doExport':
this.doImport() this.doExport()
break break
case 'doDel': case 'doDel':
this.doDel() this.doDel()
@ -357,6 +357,31 @@ export default {
}).catch(() => { }).catch(() => {
}) })
}, },
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '专项返利' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
// 合计 // 合计
getSummaries(param) { getSummaries(param) {
const { columns, data } = param const { columns, data } = param

190
yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaMendApplyRest.java
View File

@ -61,103 +61,101 @@ import javax.validation.Valid;
@RequestMapping("v1/oamendapply") @RequestMapping("v1/oamendapply")
public class OaMendApplyRest { public class OaMendApplyRest {
@Autowired @Autowired
private OaMendApplyService oaMendApplyService; private OaMendApplyService oaMendApplyService;
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
public ResultBean<PagerVo<OaMendApplyVo>> listPage(@RequestBody PagerQuery<OaMendApplyQuery> pq){ public ResultBean<PagerVo<OaMendApplyVo>> listPage(@RequestBody PagerQuery<OaMendApplyQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
PagerVo<OaMendApplyVo> pv = oaMendApplyService.listPageVo(pq); PagerVo<OaMendApplyVo> pv = oaMendApplyService.listPageVo(pq);
return rb.success().setData(pv); return rb.success().setData(pv);
} }
@ApiOperation("新增或修改") @ApiOperation("新增或修改")
@PostMapping("/save") @PostMapping("/save")
public ResultBean save(@RequestBody OaMendApplyDto dto){ public ResultBean<String> save(@RequestBody OaMendApplyDto dto) {
ResultBean rb = ResultBean.fireFail(); return oaMendApplyService.saveOrUpdateDto(dto);
oaMendApplyService.saveOrUpdateDto(dto); }
return rb.success();
} @ApiOperation("根据sid批量删除")
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids") @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){ public ResultBean delBySids(@RequestBody String[] sids) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
oaMendApplyService.delAll(sids); oaMendApplyService.delAll(sids);
return rb.success(); return rb.success();
} }
@ApiOperation("根据SID获取一条记录") @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}") @GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<OaMendApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){ public ResultBean<OaMendApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
OaMendApplyDetailsVo vo = oaMendApplyService.fetchDetailsVoBySid(sid); OaMendApplyDetailsVo vo = oaMendApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ApiOperation("初始化") @ApiOperation("初始化")
@GetMapping("/init") @GetMapping("/init")
public ResultBean<OaMendApplyInitVo> init(@RequestParam(value = "sid",required = false) String sid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath) { public ResultBean<OaMendApplyInitVo> init(@RequestParam(value = "sid", required = false) String sid, @RequestParam("orgPath") String orgPath) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
OaMendApplyInitVo vo = oaMendApplyService.init(sid, userSid, orgPath); OaMendApplyInitVo vo = oaMendApplyService.init(sid, orgPath);
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@ApiOperation("提交审批流程") @ApiOperation("提交审批流程")
@PostMapping("/submit") @PostMapping("/submit")
public ResultBean submit(@RequestBody @Valid SubmitOaMendApplyDto dto) { public ResultBean submit(@RequestBody @Valid SubmitOaMendApplyDto dto) {
return oaMendApplyService.submit(dto); return oaMendApplyService.submit(dto);
} }
@ApiOperation(value = "办理（同意）") @ApiOperation(value = "办理（同意）")
@PostMapping("/complete") @PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody OaLeaveApplyCompleteDto query) { public ResultBean complete(@Valid @RequestBody OaLeaveApplyCompleteDto query) {
BusinessVariables bv = new BusinessVariables(); BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv); BeanUtil.copyProperties(query, bv);
return oaMendApplyService.complete(bv); return oaMendApplyService.complete(bv);
} }
@ApiOperation(value = "获取上一个环节") @ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject") @GetMapping(value = "/getPreviousNodesForReject")
public ResultBean<List<OaMendApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap OaMendApplyNodeQuery query) { public ResultBean<List<OaMendApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap OaMendApplyNodeQuery query) {
return oaMendApplyService.getPreviousNodesForReject(query); return oaMendApplyService.getPreviousNodesForReject(query);
} }
@ApiOperation(value = "获取下一个环节") @ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit") @GetMapping(value = "/getNextNodesForSubmit")
public ResultBean<List<OaMendApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap OaMendApplyNodeQuery query) { public ResultBean<List<OaMendApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap OaMendApplyNodeQuery query) {
return oaMendApplyService.getNextNodesForSubmit(query); return oaMendApplyService.getNextNodesForSubmit(query);
} }
@ApiOperation(value = "驳回任务") @ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject") @PostMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody OaMendApplyTaskQuery query) { public ResultBean reject(@Valid @RequestBody OaMendApplyTaskQuery query) {
return oaMendApplyService.reject(query); return oaMendApplyService.reject(query);
} }
@ApiOperation(value = "撤回流程") @ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess") @PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody OaMendApplyTaskQuery query) { public ResultBean revokeProcess(@Valid @RequestBody OaMendApplyTaskQuery query) {
return oaMendApplyService.revokeProcess(query); return oaMendApplyService.revokeProcess(query);
} }
@ApiOperation(value = "终止任务") @ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess") @PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody OaMendApplyTaskQuery query) { public ResultBean breakProcess(@Valid @RequestBody OaMendApplyTaskQuery query) {
return oaMendApplyService.breakProcess(query); return oaMendApplyService.breakProcess(query);
} }
@ApiOperation(value = "加签") @ApiOperation(value = "加签")
@PostMapping(value = "/delegate") @PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody OaMendApplyDelegateQuery query) { public ResultBean delegate(@RequestBody OaMendApplyDelegateQuery query) {
return oaMendApplyService.delegate(query); return oaMendApplyService.delegate(query);
} }
@ApiOperation(value = "转办") @ApiOperation(value = "转办")
@PutMapping(value = "/assignTask") @PutMapping(value = "/assignTask")
@ResponseBody @ResponseBody
public ResultBean assignTask(@RequestBody OaMendApplyDelegateQuery query) { public ResultBean assignTask(@RequestBody OaMendApplyDelegateQuery query) {
return oaMendApplyService.assignTask(query); return oaMendApplyService.assignTask(query);
} }
} }

2
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.java
View File

@ -36,4 +36,6 @@ public interface OaAppendixMapper extends BaseMapper<OaAppendix> {
@Select("select * from oa_appendix where linkSid = #{linkSid}") @Select("select * from oa_appendix where linkSid = #{linkSid}")
List<OaAppendix> fetchByLinkSid(String linkSid); List<OaAppendix> fetchByLinkSid(String linkSid);
int deleteByLinkSid(String sid);
} }

10
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixMapper.xml
View File

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.oa.biz.oaappendix.OaAppendixMapper"> <mapper namespace="com.yxt.anrui.oa.biz.oaappendix.OaAppendixMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<delete id="deleteByLinkSid">
delete
from oa_appendix
where linkSid = #{sid}
</delete>
</mapper> </mapper>

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaappendix/OaAppendixService.java
View File

@ -36,4 +36,8 @@ public class OaAppendixService extends MybatisBaseService<OaAppendixMapper, OaAp
public List<OaAppendix> fetchByLinkSid(String linkSid) { public List<OaAppendix> fetchByLinkSid(String linkSid) {
return baseMapper.fetchByLinkSid(linkSid); return baseMapper.fetchByLinkSid(linkSid);
} }
public int deleteByLinkSid(String sid) {
return baseMapper.deleteByLinkSid(sid);
}
} }

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java
View File

@ -44,10 +44,6 @@ public class OaForm extends BaseEntity {
private String createOrgSid; private String createOrgSid;
@ApiModelProperty("创建组织") @ApiModelProperty("创建组织")
private String createOrgName; private String createOrgName;
@ApiModelProperty("图片，冗余字段")
private String imgs;
@ApiModelProperty("附件，冗余字段")
private String appendixs;
@ApiModelProperty("关联审批单") @ApiModelProperty("关联审批单")
private String linkFormSids; private String linkFormSids;

3
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormDto.java
View File

@ -15,9 +15,10 @@ import java.util.Date;
public class OaFormDto { public class OaFormDto {
private String sid; private String sid;
private String createBySid;
@ApiModelProperty("创建人") @ApiModelProperty("创建人")
private String createByName; private String createByName;
private String billNo;
@ApiModelProperty("公司sid") @ApiModelProperty("公司sid")
private String useOrgSid; private String useOrgSid;
@ApiModelProperty("公司名称") @ApiModelProperty("公司名称")

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.java
View File

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Map;
/** /**
* @description: * @description:
* @author: dimengzhe * @author: dimengzhe
@ -17,4 +19,6 @@ public interface OaFormMapper extends BaseMapper<OaForm> {
OaFormDetailsVo fetchDetailsBySid(String sid); OaFormDetailsVo fetchDetailsBySid(String sid);
IPage<OaFormVo> selectPageVo(IPage<OaForm> page, @Param(Constants.WRAPPER) QueryWrapper<OaForm> qw); IPage<OaFormVo> selectPageVo(IPage<OaForm> page, @Param(Constants.WRAPPER) QueryWrapper<OaForm> qw);
int updateFlowFiled(Map<String, Object> map);
} }

16
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormMapper.xml
View File

@ -15,4 +15,20 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<update id="updateFlowFiled">
UPDATE oa_form
SET nodeState=#{nodeState}
, nodeId=#{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> </mapper>

7
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
View File

@ -7,6 +7,7 @@ import com.yxt.anrui.oa.biz.oahireapply.OaHireApplyDetailsVo;
import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApply; import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApply;
import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyQuery; import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyQuery;
import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyVo; import com.yxt.anrui.oa.biz.oaleaveapply.OaLeaveApplyVo;
import com.yxt.anrui.oa.feign.flowable.flow.UpdateFlowFieldVo;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.StringUtils;
@ -16,6 +17,8 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Map;
/** /**
* @description: * @description:
* @author: dimengzhe * @author: dimengzhe
@ -62,4 +65,8 @@ public class OaFormService extends MybatisBaseService<OaFormMapper, OaForm> {
delBySids(sids); delBySids(sids);
return rb.success(); return rb.success();
} }
public int updateFlow(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
} }

20
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.java
View File

@ -32,8 +32,6 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo;
import java.util.List; import java.util.List;
@ -53,13 +51,13 @@ import java.util.List;
@Mapper @Mapper
public interface OaHireDetailsMapper extends BaseMapper<OaHireDetails> { public interface OaHireDetailsMapper extends BaseMapper<OaHireDetails> {
//@Update("update oa_hire_details set name=#{msg} where id=#{id}") //@Update("update oa_hire_details set name=#{msg} where id=#{id}")
//IPage<OaHireDetailsVo> voPage(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) QueryWrapper<OaHireDetails> qw); //IPage<OaHireDetailsVo> voPage(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) QueryWrapper<OaHireDetails> qw);
IPage<OaHireDetailsVo> selectPageVo(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw); IPage<OaHireDetailsVo> selectPageVo(IPage<OaHireDetails> page, @Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
List<OaHireDetailsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw); List<OaHireDetailsVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<OaHireDetails> qw);
@Select("select * from oa_hire_details") @Select("select * from oa_hire_details")
List<OaHireDetailsVo> selectListVo(); List<OaHireDetailsVo> selectListVo();
} }

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsMapper.xml
View File

@ -3,11 +3,11 @@
<mapper namespace="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsMapper"> <mapper namespace="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo"> <select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsVo">
SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where> SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where>
</select> </select>
<select id="selectListAllVo" resultType="com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo"> <select id="selectListAllVo" resultType="com.yxt.anrui.oa.biz.oahiredetails.OaHireDetailsVo">
SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where> SELECT * FROM oa_hire_details <where> ${ew.sqlSegment} </where>
</select> </select>
</mapper> </mapper>

90
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahiredetails/OaHireDetailsService.java
View File

@ -34,12 +34,6 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetails;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsQuery;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDetailsVo;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsDto;
import com.yxt.anrui.oa.api.oahiredetails.OaHireDetailsFeign;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -60,51 +54,51 @@ import java.util.List;
*/ */
@Service @Service
public class OaHireDetailsService extends MybatisBaseService<OaHireDetailsMapper, OaHireDetails> { public class OaHireDetailsService extends MybatisBaseService<OaHireDetailsMapper, OaHireDetails> {
private QueryWrapper<OaHireDetails> createQueryWrapper(OaHireDetailsQuery query) { private QueryWrapper<OaHireDetails> createQueryWrapper(OaHireDetailsQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<OaHireDetails> qw = new QueryWrapper<>(); QueryWrapper<OaHireDetails> qw = new QueryWrapper<>();
return qw; return qw;
} }
public PagerVo<OaHireDetailsVo> listPageVo(PagerQuery<OaHireDetailsQuery> pq) { public PagerVo<OaHireDetailsVo> listPageVo(PagerQuery<OaHireDetailsQuery> pq) {
OaHireDetailsQuery query = pq.getParams(); OaHireDetailsQuery query = pq.getParams();
QueryWrapper<OaHireDetails> qw = createQueryWrapper(query); QueryWrapper<OaHireDetails> qw = createQueryWrapper(query);
IPage<OaHireDetails> page = PagerUtil.queryToPage(pq); IPage<OaHireDetails> page = PagerUtil.queryToPage(pq);
IPage<OaHireDetailsVo> pagging = baseMapper.selectPageVo(page, qw); IPage<OaHireDetailsVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<OaHireDetailsVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<OaHireDetailsVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public void saveOrUpdateDto(OaHireDetailsDto dto){ public void saveOrUpdateDto(OaHireDetailsDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); this.insertByDto(dto);
return; return;
} }
this.updateByDto(dto); this.updateByDto(dto);
} }
public void insertByDto(OaHireDetailsDto dto){ public void insertByDto(OaHireDetailsDto dto) {
OaHireDetails entity = new OaHireDetails(); OaHireDetails entity = new OaHireDetails();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);
} }
public void updateByDto(OaHireDetailsDto dto){ public void updateByDto(OaHireDetailsDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
OaHireDetails entity = fetchBySid(dtoSid); OaHireDetails entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid){ public OaHireDetailsDetailsVo fetchDetailsVoBySid(String sid) {
OaHireDetails entity = fetchBySid(sid); OaHireDetails entity = fetchBySid(sid);
OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo(); OaHireDetailsDetailsVo vo = new OaHireDetailsDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
return vo; return vo;
} }
} }

66
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java
View File

@ -25,14 +25,18 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.oa.biz.oamendapply; package com.yxt.anrui.oa.biz.oamendapply;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.anrui.oa.biz.oaform.OaForm; import com.yxt.anrui.oa.biz.oaform.OaForm;
import com.yxt.common.core.domain.BaseEntity; import com.yxt.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.Transient;
/** /**
* Project: yxt-oa(补卡申请) <br/> * Project: yxt-oa(补卡申请) <br/>
@ -50,35 +54,41 @@ import lombok.Data;
@Data @Data
@ApiModel(value = "补卡申请", description = "补卡申请") @ApiModel(value = "补卡申请", description = "补卡申请")
@TableName("oa_mend_apply") @TableName("oa_mend_apply")
public class OaMendApply extends OaForm { public class OaMendApply extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String formSid; private String formSid;
@ApiModelProperty("单据编号") @ApiModelProperty("补卡时间")
private String billNo; // 单据编号 private String time;
@ApiModelProperty("申请人")
private String createByName; // 申请人 @TableField(exist = false)
@ApiModelProperty("申请部门sid") private OaForm oaForm = new OaForm();
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 /* @ApiModelProperty("单据编号")
@ApiModelProperty("补卡时间") private String billNo;
private String time; // 补卡时间 @ApiModelProperty("申请人")
@ApiModelProperty("分公司sid") private String createByName;
private String useOrgSid; // 分公司sid @ApiModelProperty("申请部门sid")
@ApiModelProperty("分公司名称") private String deptSid;
private String useOrgName; // 分公司名称 @ApiModelProperty("申请部门名称")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String deptName;
@ApiModelProperty("办结日期")
private Date finishTime; // 办结日期 @ApiModelProperty("分公司sid")
@ApiModelProperty("实例id") private String useOrgSid;
private String procInstId; // 实例id @ApiModelProperty("分公司名称")
@ApiModelProperty("流程定义id") private String useOrgName;
private String procDefId; // 流程定义id @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("任务id") @ApiModelProperty("办结日期")
private String taskId; // 任务id private Date finishTime;
@ApiModelProperty("环节id") @ApiModelProperty("实例id")
private String nodeId; // 环节id private String procInstId;
@ApiModelProperty("流程状态") @ApiModelProperty("流程定义id")
private String nodeState; // 流程状态 private String procDefId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("环节id")
private String nodeId;
@ApiModelProperty("流程状态")
private String nodeState;*/
} }

47
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDetailsVo.java
View File

@ -55,39 +55,26 @@ import lombok.Data;
@ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情") @ApiModel(value = "补卡申请 视图数据详情", description = "补卡申请 视图数据详情")
public class OaMendApplyDetailsVo implements Vo { public class OaMendApplyDetailsVo implements Vo {
private String sid; // sid private static final long serialVersionUID = -8377279007782913681L;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("补卡原因") @ApiModelProperty("补卡原因")
private String remarks; private String remarks;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String createByName; // 申请人 private String createByName;
@ApiModelProperty("申请部门sid") private String createBySid;
private String deptSid; // 申请部门sid @ApiModelProperty("申请部门sid")
@ApiModelProperty("申请部门名称") private String deptSid;
private String deptName; // 申请部门名称 @ApiModelProperty("申请部门名称")
@ApiModelProperty("补卡时间") private String deptName;
private String time; // 补卡时间 @ApiModelProperty("补卡时间")
@ApiModelProperty("分公司sid") private String time;
private String useOrgSid; // 分公司sid @ApiModelProperty("分公司sid")
@ApiModelProperty("分公司名称") private String useOrgSid;
private String useOrgName; // 分公司名称 @ApiModelProperty("分公司名称")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String useOrgName;
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("实例id")
private String procInstId; // 实例id
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("图片") @ApiModelProperty("图片")
private List<String> files = new ArrayList<>(); private List<String> files = new ArrayList<>();
} }

60
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyDto.java
View File

@ -55,39 +55,41 @@ import lombok.Data;
@ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象") @ApiModel(value = "补卡申请 数据传输对象", description = "补卡申请 数据传输对象")
public class OaMendApplyDto implements Dto { public class OaMendApplyDto implements Dto {
private String sid; // sid private static final long serialVersionUID = -4536006302677264298L;
private String userSid; private String sid;
private String createBySid;
private String orgPath; private String orgPath;
@ApiModelProperty("补卡原因") @ApiModelProperty("补卡原因")
private String remarks; private String remarks;
@ApiModelProperty("单据编号") @ApiModelProperty("补卡时间")
private String time;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
/* @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo; // 单据编号
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String createByName; // 申请人 private String createByName;
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid;
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName;
@ApiModelProperty("补卡时间")
private String time; // 补卡时间 @ApiModelProperty("分公司sid")
@ApiModelProperty("分公司sid") private String useOrgSid;
private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称")
@ApiModelProperty("分公司名称") private String useOrgName;
private String useOrgName; // 分公司名称 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期") @ApiModelProperty("办结日期")
private Date finishTime; private Date finishTime;
@ApiModelProperty("实例id") @ApiModelProperty("实例id")
private String procInstId; // 实例id private String procInstId;
@ApiModelProperty("流程定义id") @ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id private String procDefId;
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId;
@ApiModelProperty("环节id") @ApiModelProperty("环节id")
private String nodeId; // 环节id private String nodeId;
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState;*/
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
} }

50
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyInitVo.java
View File

@ -51,36 +51,30 @@ import java.util.Date;
@ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象") @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
public class OaMendApplyInitVo implements Vo { public class OaMendApplyInitVo implements Vo {
private static final long serialVersionUID = -2109900644174208483L;
private String sid; // sid private String sid; // sid
private String userSid; private String createBySid;
private String orgPath; private String orgPath;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String createByName; // 申请人 private String createByName;
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid;
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName;
@ApiModelProperty("补卡时间") @ApiModelProperty("补卡时间")
private String time; // 补卡时间 private String time;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid;
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("实例id")
@ApiModelProperty("办结日期") private String procInstId;
private Date finishTime; @ApiModelProperty("流程定义id")
@ApiModelProperty("实例id") private String procDefId;
private String procInstId; // 实例id @ApiModelProperty("任务id")
@ApiModelProperty("流程定义id") private String taskId;
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
} }

4
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.java
View File

@ -56,4 +56,8 @@ public interface OaMendApplyMapper extends BaseMapper<OaMendApply> {
int selectBySid(String join); int selectBySid(String join);
String selectNum(String billNo); String selectNum(String billNo);
OaMendApplyDetailsVo fetchDetailsVoBySid(String sid);
OaMendApplyInitVo init(String sid);
} }

121
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyMapper.xml
View File

@ -1,42 +1,93 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyMapper"> <mapper namespace="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyVo"> <select id="selectPageVo" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyVo">
SELECT * FROM oa_mend_apply <where> ${ew.sqlSegment} </where> SELECT oa.sid,oa.remarks,
</select> oa.time,
oa.formSid
ofm.billNo,
ofm.createByName,
ofm.deptSid,
ofm.deptName,
ofm.useOrgSid,
ofm.useOrgName,
DATE_FORMAT(ofm.finishTime) as finishTime,
ofm.procInstId,
ofm.procDefId,
ofm.taskId,
ofm.nodeId,
ofm.nodeState
FROM oa_mend_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
<where>
${ew.sqlSegment}
</where>
</select>
<update id="updateFlowFiled"> <update id="updateFlowFiled">
UPDATE oa_mend_apply UPDATE oa_mend_apply
SET nodeState=#{nodeState}, nodeId=#{taskDefKey} SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'"> <if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW() , finishTime = NOW()
</if> </if>
<if test="procDefId != null and procDefId != ''"> <if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId} , procDefId=#{procDefId}
</if> </if>
<if test="procInsId != null and procInsId != ''"> <if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId} , procInstId=#{procInsId}
</if> </if>
<if test="taskId != null and taskId != ''"> <if test="taskId != null and taskId != ''">
, taskId=#{taskId} , taskId=#{taskId}
</if> </if>
WHERE sid=#{sid} WHERE sid=#{sid}
</update> </update>
<select id="selectBySid" resultType="int"> <select id="selectBySid" resultType="int">
SELECT COUNT(*) SELECT COUNT(*)
FROM oa_mend_apply FROM oa_mend_apply
WHERE nodeState != '待提交' WHERE nodeState != '待提交'
and find_in_set(sid, #{list}) and find_in_set(sid, #{list})
</select> </select>
<select id="selectNum" resultType="java.lang.String"> <select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4) select RIGHT(billNo, 4)
from oa_mend_apply from oa_mend_apply
where billNo LIKE concat(#{billNo}, '%') where billNo LIKE concat(#{billNo}, '%')
order by billNo desc order by billNo desc
limit 1 limit 1
</select> </select>
<select id="fetchDetailsVoBySid" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDetailsVo">
select oa.sid,
oa.remarks,
ofm.billNo,
ofm.createByName,
ofm.createBySid,
ofm.deptSid,
ofm.deptName,
oa.time,
ofm.useOrgSid,
ofm.useOrgName
from oa_menu_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
where oa.sid = #{sid}
</select>
<select id="init" resultType="com.yxt.anrui.oa.biz.oamendapply.OaMendApplyInitVo">
select oa.sid,
oa.remarks,
ofm.billNo,
ofm.createByName,
ofm.createBySid,
ofm.deptSid,
ofm.deptName,
oa.time,
ofm.useOrgSid,
ofm.useOrgName
from oa_menu_apply oa
left join oa_form ofm on oa.formSid = ofm.sid
where oa.sid = #{sid}
</select>
</mapper> </mapper>

34
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyQuery.java
View File

@ -29,7 +29,9 @@ package com.yxt.anrui.oa.biz.oamendapply;
import com.yxt.common.core.query.Query; import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -51,33 +53,9 @@ import lombok.Data;
@ApiModel(value = "补卡申请 查询条件", description = "补卡申请 查询条件") @ApiModel(value = "补卡申请 查询条件", description = "补卡申请 查询条件")
public class OaMendApplyQuery implements Query { public class OaMendApplyQuery implements Query {
@ApiModelProperty("单据编号") private static final long serialVersionUID = -7211977992786497538L;
private String billNo; // 单据编号 @ApiModelProperty("单据编号")
@ApiModelProperty("申请人") private String billNo;
private String createByName; // 申请人
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("补卡时间")
private String time; // 补卡时间
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTimeStart; // 办结日期
private Date finishTimeEnd; // 办结日期
@ApiModelProperty("实例id")
private String procInstId; // 实例id
@ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("环节id")
private String nodeId; // 环节id
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
} }

1114
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyService.java
View File

File diff suppressed because it is too large

58
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApplyVo.java
View File

@ -29,7 +29,9 @@ package com.yxt.anrui.oa.biz.oamendapply;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date; import java.util.Date;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -51,34 +53,36 @@ import lombok.Data;
@ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象") @ApiModel(value = "补卡申请 视图数据对象", description = "补卡申请 视图数据对象")
public class OaMendApplyVo implements Vo { public class OaMendApplyVo implements Vo {
private String sid; // sid private static final long serialVersionUID = 5358032202923713923L;
private String sid;
private String remarks;
private String formSid;
@ApiModelProperty("单据编号") @ApiModelProperty("单据编号")
private String billNo; // 单据编号 private String billNo;
@ApiModelProperty("申请人") @ApiModelProperty("申请人")
private String createByName; // 申请人 private String createByName;
@ApiModelProperty("申请部门sid") @ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid private String deptSid;
@ApiModelProperty("申请部门名称") @ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称 private String deptName;
@ApiModelProperty("补卡时间") @ApiModelProperty("补卡时间")
private String time; // 补卡时间 private String time;
@ApiModelProperty("分公司sid") @ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid private String useOrgSid;
@ApiModelProperty("分公司名称") @ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称 private String useOrgName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期") @ApiModelProperty("办结日期")
private Date finishTime; private String finishTime;
@ApiModelProperty("实例id") @ApiModelProperty("实例id")
private String procInstId; // 实例id private String procInstId;
@ApiModelProperty("流程定义id") @ApiModelProperty("流程定义id")
private String procDefId; // 流程定义id private String procDefId;
@ApiModelProperty("任务id") @ApiModelProperty("任务id")
private String taskId; // 任务id private String taskId;
@ApiModelProperty("环节id") @ApiModelProperty("环节id")
private String nodeId; // 环节id private String nodeId;
@ApiModelProperty("流程状态") @ApiModelProperty("流程状态")
private String nodeState; // 流程状态 private String nodeState;
} }

1
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/flowable/SubmitOaMendApplyDto.java
View File

@ -16,6 +16,7 @@ import lombok.Data;
@Data @Data
public class SubmitOaMendApplyDto extends OaMendApplyDto { public class SubmitOaMendApplyDto extends OaMendApplyDto {
private static final long serialVersionUID = 8607710587497609779L;
@ApiModelProperty("意见") @ApiModelProperty("意见")
private String comment; private String comment;
@ApiModelProperty("流程实例id") @ApiModelProperty("流程实例id")

Write Preview
Loading…
Cancel
Save