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

更改枚举类名（首字母改大写）

master
alllenliufor3 3 years ago
parent
5bf0d75665
commit
c7f4f32f21
8 changed files with 20 additions and 22 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. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
  2. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java
  5. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
  6. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  7. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
  8. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdiscount/BusOrderDiscountService.java

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

@ -8,7 +8,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -201,7 +201,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(procDefEnum.SALESPOLICY.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.SALESPOLICY.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
View File

@ -16,7 +16,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@ -29,11 +29,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* Project: anrui-scm(进销存) <br/> * Project: anrui-scm(进销存) <br/>
@ -220,7 +218,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(procDefEnum.VEHICLEAPPLY.getProDefId(), dto.getCreateBySid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.VEHICLEAPPLY.getProDefId(), dto.getCreateBySid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);

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

@ -25,7 +25,7 @@ import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign;
import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
@ -902,7 +902,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
variables.put("businessSid", dto.getBusinessSid()); variables.put("businessSid", dto.getBusinessSid());
variables.put("orgSid", resultBean.getData()); variables.put("orgSid", resultBean.getData());
return flowableService.businessStart(procDefEnum.CARSALECONTRACTAPPROVE.getProDefId(), dto.getUserSid(), variables); return flowableService.businessStart(ProcDefEnum.CARSALECONTRACTAPPROVE.getProDefId(), dto.getUserSid(), variables);
} }
public ResultBean<CommonContractVo> fetchAllBySid(String sid) { public ResultBean<CommonContractVo> fetchAllBySid(String sid) {

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

@ -41,7 +41,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
@ -291,7 +291,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(procDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ADVANCEGINVOICEAPPLY.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);

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

@ -14,7 +14,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -307,7 +307,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(procDefEnum.ARREARSCARRYVEHICLE.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -46,7 +46,7 @@ import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService;
import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.flowable.api.sysformlink.*; import com.yxt.anrui.flowable.api.sysformlink.*;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -713,13 +713,13 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid);//部门sid variables.put("orgSid", orgSid);//部门sid
ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
/*saveSysFormLink(map);*/ /*saveSysFormLink(map);*/
//更新虚拟订单审批（订金）业务表中的流程状态 //更新虚拟订单审批（订金）业务表中的流程状态
modifiBusMainDepositFlowState(businessSid, modifiBusMainDepositFlowState(businessSid,
procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId
map.get("nodeState"),//state map.get("nodeState"),//state
map.get("procInsId"),//procInstSid map.get("procInsId"),//procInstSid
map.get("taskDefKey")//nodeSid map.get("taskDefKey")//nodeSid
@ -850,7 +850,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid); variables.put("orgSid", orgSid);
ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);
@ -885,7 +885,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", false); variables.put("isLoan", false);
variables.put("orgSid", orgSid); variables.put("orgSid", orgSid);
ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);
@ -920,7 +920,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
variables.put("businessSid", businessSid); variables.put("businessSid", businessSid);
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid); variables.put("orgSid", orgSid);
ResultBean resultBean = flowableService.businessStart(procDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables); ResultBean resultBean = flowableService.businessStart(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId(), dto.getUserSid(), variables);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
Map<String, String> map = (Map<String, String>) resultBean.getData(); Map<String, String> map = (Map<String, String>) resultBean.getData();
saveSysFormLink(map); saveSysFormLink(map);

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
View File

@ -36,7 +36,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTask;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@ -813,7 +813,7 @@ public class BusOrderService extends MybatisBaseService<BusOrderMapper, BusOrder
}else{ }else{
variables.put("modelName","");//车型名称 variables.put("modelName","");//车型名称
} }
return flowableService.businessStart(procDefEnum.ORDERAPPROVE.getProDefId(),userSid,variables); return flowableService.businessStart(ProcDefEnum.ORDERAPPROVE.getProDefId(),userSid,variables);
} }
public ResultBean businessComplete(BusOrderflowDto1 dto) { public ResultBean businessComplete(BusOrderflowDto1 dto) {

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdiscount/BusOrderDiscountService.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busorderdiscount.*; import com.yxt.anrui.buscenter.api.busorderdiscount.*;
import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
@ -218,7 +218,7 @@ public class BusOrderDiscountService extends MybatisBaseService<BusOrderDiscount
variables.put("isLoan", true); variables.put("isLoan", true);
variables.put("orgSid", orgSid); variables.put("orgSid", orgSid);
return flowableService.businessStart(procDefEnum.SALESPOLICY.getProDefId(),dto.getUserSid(),variables); return flowableService.businessStart(ProcDefEnum.SALESPOLICY.getProDefId(),dto.getUserSid(),variables);
} }
/** /**

Write Preview
Loading…
Cancel
Save