Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 8 months ago
parent
commit
6373f1ba45
  1. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java
  2. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java
  3. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java
  4. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java
  5. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java
  6. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java
  7. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java
  8. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java
  9. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java
  10. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java
  11. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java
  12. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java
  13. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  14. 54
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
  15. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java
  16. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java
  17. 42
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
  18. 81
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyDetailsVo.java
  19. 64
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyFeign.java
  20. 81
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleDetailsVo.java
  21. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppDelegateQuery.java
  22. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowDto.java
  23. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowQuery.java
  24. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowTaskQuery.java
  25. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
  26. 85
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyRest.java
  27. 186
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyService.java
  28. 102
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java
  29. 57
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyFegin.java
  30. 95
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleDetailsVo.java
  31. 37
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyCompleteDto.java
  32. 26
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyDelegateQuery.java
  33. 25
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeQuery.java
  34. 26
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeVo.java
  35. 48
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyTaskQuery.java

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java

@ -84,6 +84,8 @@ public class ScmSpecialRebate extends BaseEntity {
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java

@ -95,6 +95,8 @@ public class ScmSpecialRebateDetailsVo implements Vo {
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java

@ -89,6 +89,8 @@ public class ScmSpecialRebateDto implements Dto {
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@ -57,7 +57,7 @@ public class ScmSpecialRebateVo implements Vo {
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ -96,6 +96,8 @@ public class ScmSpecialRebateVo implements Vo {
private String adjustmentMoney; // 调整金额
@ApiModelProperty("调整说明")
private String adjustmentRemarks; // 调整说明
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("计算方式key")
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java

@ -53,7 +53,7 @@ public class ScmStayDisRebateVo implements Vo {
private String sid; // sid
@ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("分配数量")
private String disNum; // 分配数量

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@ -105,7 +105,7 @@ public class ScmVehRebate extends BaseEntity {
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java

@ -113,7 +113,7 @@ public class ScmVehRebateDetailsVo implements Vo {
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java

@ -67,7 +67,7 @@ public class ScmVehRebateDto implements Dto {
private String calculationModeKey;
@ApiModelProperty("计算方式Value")
private String calculationModeValue;
@ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("组织全路径")
private String orgPath;

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java

@ -108,7 +108,7 @@ public class ScmVehRebateVehDto implements Dto {
private String calculationModeKey; // 计算方式key
@ApiModelProperty("计算方式Value")
private String calculationModeValue; // 计算方式Value
@ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
@ApiModelProperty("调整状态")
private Integer adjustmentState;
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@ -57,7 +57,7 @@ public class ScmVehRebateVo implements Vo {
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("状态(0未预提、1已预提、2未上传、3已上传、4已核对)")
@ApiModelProperty("状态")
private String state; // 状态
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ -127,6 +127,6 @@ public class ScmVehRebateVo implements Vo {
private String uploadState; // 上传状态
@ApiModelProperty("是否可以点击是否调整")
private Boolean adjustOrNot;
@ApiModelProperty("调整状态(0未调整1待核对2核对中3已调整)")
@ApiModelProperty("调整状态")
private Integer adjustmentState;
}

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

@ -64,8 +64,8 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
@Select("select * from scm_veh_rebate")
List<ScmVehRebateVo> selectListVo();
@Update("update scm_veh_rebate set state = 1 where sid = #{sid}")
void updateState(String sid);
@Update("update scm_veh_rebate set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid,@Param("state") Integer state);
ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
@ -81,7 +81,4 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
void updateOneExcelInfo(@Param("uploadDate") String uploadDate,@Param("uploadMoney") String uploadMoney,@Param("stayDetermineMoney") String stayDetermineMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate,@Param("secondaryUploadMoney") String secondaryUploadMoney,@Param("money") String money,@Param("adjustmentRemarks") String adjustmentRemarks,@Param("sid") String sid);
@Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{sid}")
void updateAdjustmentState(@Param("adjustmentState") Integer adjustmentState,@Param("sid") String sid);
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@ -147,15 +147,10 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
@Override
public ResultBean update(ScmVehRebateVehDto dto) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(dto.getState())){
if (dto.getState().equals("1")){
dto.setState("3");
}
}
if ("是".equals(dto.getIsAdjustment())){
dto.setAdjustmentState(1);
}else {
dto.setAdjustmentState(0);
dto.setAdjustmentState(2);
}
scmVehRebateService.updateBySid(dto,dto.getSid());
return rb.success().setMsg("修改成功");

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@ -268,7 +268,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
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.ne("state", 0);
qw.eq("state", 2);
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
@ -283,7 +283,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
record.setUploadState("1");
}
//是否调整
if (0 == record.getAdjustmentState()){
if (0 == record.getAdjustmentState()) {
if (new BigDecimal(record.getStayDetermineMoney()).compareTo(BigDecimal.ZERO) == 0) {
BigDecimal decimal = new BigDecimal(StringUtils.isNotBlank(record.getUploadMoney()) ? record.getUploadMoney() : "0").add(new BigDecimal(StringUtils.isNotBlank(record.getSecondaryUploadMoney()) ? record.getSecondaryUploadMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getMoney()) ? record.getMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getStayDetermineMoney()) ? record.getStayDetermineMoney() : "0")).subtract(new BigDecimal(StringUtils.isNotBlank(record.getEstimateRebate()) ? record.getEstimateRebate() : "0"));
int i = decimal.compareTo(BigDecimal.ZERO);
@ -373,8 +373,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("adjustmentState", 0);
qw.ne("state", 0);
qw.ne("adjustmentState", 1);
qw.eq("state", 2);
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
@ -448,8 +448,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("adjustmentState", 0);
qw.ne("state", 0);
qw.ne("adjustmentState", 1);
qw.eq("state", 2);
qw.isNotNull("uploadDate");
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
@ -485,7 +486,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("state", 3);
qw.eq("adjustmentState", 1);
qw.isNotNull("uploadDate");
if (query.getSidList().size() > 0) {
qw.notIn("sid", query.getSidList());
}
@ -556,8 +558,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return rb.success().setMsg("保存成功");
}
public void updateState(String sid) {
baseMapper.updateState(sid);
public void updateState(String sid,Integer state) {
baseMapper.updateState(sid,state);
}
public ResultBean adjustment(ScmVehRebateVehAdjDto dto) {
@ -1653,8 +1655,4 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
importReturn.setInfos(importVoList);
return importReturn;
}
public void updateAdjustmentState(Integer adjustmentState, String sid) {
baseMapper.updateAdjustmentState(adjustmentState,sid);
}
}

54
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

@ -168,11 +168,11 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
IPage<ScmVehrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmVehrebateCheckapplyVo> records = pagging.getRecords();
for (ScmVehrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0,record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0,record.getMoney().lastIndexOf(".")));
record.setEstimateRebate(record.getEstimateRebate().substring(0, record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0, record.getUploadMoney().lastIndexOf(".")));
record.setStayDetermineMoney(record.getStayDetermineMoney().substring(0, record.getStayDetermineMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0, record.getAdjustmentMoney().lastIndexOf(".")));
record.setMoney(record.getMoney().substring(0, record.getMoney().lastIndexOf(".")));
}
PagerVo<ScmVehrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
@ -283,32 +283,32 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
ResultBean rb = ResultBean.fireFail();
ScmVehrebateCheckapplyDetailsVo scmVehrebateCheckapplyDetailsVo = new ScmVehrebateCheckapplyDetailsVo();
ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(sid);
BeanUtil.copyProperties(scmVehrebateCheckapply,scmVehrebateCheckapplyDetailsVo);
BeanUtil.copyProperties(scmVehrebateCheckapply, scmVehrebateCheckapplyDetailsVo);
List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchWhenDetailsVoBySid(sid);
if (scmWhenVehrebateCheckapplydetailDetailsVos.size() > 0){
if (scmWhenVehrebateCheckapplydetailDetailsVos.size() > 0) {
for (ScmVehrebateCheckapplydetailDetailsVo scmWhenVehrebateCheckapplydetailDetailsVo : scmWhenVehrebateCheckapplydetailDetailsVos) {
String vehRebateSid = scmWhenVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
String[] vehRebateSids = vehRebateSid.split(",");
scmWhenVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
scmWhenVehrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setWithRebate(scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmWhenVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmWhenVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmWhenVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmWhenVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmWhenVehrebateCheckapplydetailDetailsVo.setMoney(scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmWhenVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
}
}
scmVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(scmWhenVehrebateCheckapplydetailDetailsVos);
List<ScmVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetailsVos = scmVehrebateCheckapplydetailService.fetchLastDetailsVoBySid(sid);
if (scmLastVehrebateCheckapplydetailDetailsVos.size() > 0){
if (scmLastVehrebateCheckapplydetailDetailsVos.size() > 0) {
for (ScmVehrebateCheckapplydetailDetailsVo scmLastVehrebateCheckapplydetailDetailsVo : scmLastVehrebateCheckapplydetailDetailsVos) {
String vehRebateSid = scmLastVehrebateCheckapplydetailDetailsVo.getVehRebateSid();
String[] vehRebateSids = vehRebateSid.split(",");
scmLastVehrebateCheckapplydetailDetailsVo.setVehRebateSids(Arrays.asList(vehRebateSids));
scmLastVehrebateCheckapplydetailDetailsVo.setWithRebate(scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setMoney(scmLastVehrebateCheckapplydetailDetailsVo.getMoney().substring(0,scmLastVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setWithRebate(scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().substring(0, scmLastVehrebateCheckapplydetailDetailsVo.getWithRebate().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setUploadMoney(scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().substring(0, scmLastVehrebateCheckapplydetailDetailsVo.getUploadMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setStayDetermineMoney(scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().substring(0, scmLastVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setAdjustmentMoney(scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().substring(0, scmLastVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().lastIndexOf(".")));
scmLastVehrebateCheckapplydetailDetailsVo.setMoney(scmLastVehrebateCheckapplydetailDetailsVo.getMoney().substring(0, scmLastVehrebateCheckapplydetailDetailsVo.getMoney().lastIndexOf(".")));
String withholdingDate = scmLastVehrebateCheckapplydetailDetailsVo.getWithholdingDate();
Date parse = DateUtil.parse(withholdingDate);
int year = DateUtil.year(parse);
@ -356,9 +356,9 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//=====================添加app所需参数
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",businessSid);
variables.put("app",appMap);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -375,7 +375,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
scmVehRebateService.updateAdjustmentState(2,scmVehrebateCheckapplydetailVo.getVehRebateSid());
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 3);
}
return voResultBean;
}
@ -389,7 +389,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
bv.setInstanceId(dto.getInstanceId());
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
scmVehRebateService.updateAdjustmentState(2,scmVehrebateCheckapplydetailVo.getVehRebateSid());
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 3);
}
return complete(bv);
}
@ -440,7 +440,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
scmVehRebateService.updateAdjustmentState(3,scmVehrebateCheckapplydetailVo.getVehRebateSid());
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
}
}
return rb.success().setData(resultBean.getData());
@ -519,7 +519,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
scmVehRebateService.updateAdjustmentState(1,scmVehrebateCheckapplydetailVo.getVehRebateSid());
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
} else {
@ -533,7 +533,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
scmVehRebateService.updateAdjustmentState(1,scmVehrebateCheckapplydetailVo.getVehRebateSid());
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 2);
}
return rb.success().setData(resultBean.getData());
}
@ -566,7 +566,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java

@ -72,4 +72,7 @@ public interface ScmVehRebateWithMapper extends BaseMapper<ScmVehRebateWith> {
@Select("select vehRebateSid from scm_veh_rebate_with where mainSid = #{businessSid}")
List<String> fetchVehReBateSidByMainSid(String businessSid);
@Select("select * from scm_veh_rebate_with where mainSid = #{businessSid}")
List<ScmVehRebateWithDetailsVo> selByMainSid(String businessSid);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java

@ -155,4 +155,8 @@ public class ScmVehRebateWithService extends MybatisBaseService<ScmVehRebateWith
public List<String> fetchVehReBateSidByMainSid(String businessSid) {
return baseMapper.fetchVehReBateSidByMainSid(businessSid);
}
public List<ScmVehRebateWithDetailsVo> selByMainSid(String businessSid) {
return baseMapper.selByMainSid(businessSid);
}
}

42
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@ -43,6 +43,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.flow.FlowTaskVo;
import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDto;
import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
@ -167,7 +168,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
IPage<ScmVehRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehRebateWithApplyVo record : pagging.getRecords()) {
String withRebateTotal = record.getWithRebateTotal();
if (StringUtils.isBlank(withRebateTotal)){
if (StringUtils.isBlank(withRebateTotal)) {
withRebateTotal = "0.0";
}
withRebateTotal = withRebateTotal.substring(0, withRebateTotal.lastIndexOf("."));
@ -198,7 +199,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
return rb.success().setMsg("添加成功").setData(sid);
}
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(dtoSid);
if (scmVehRebateWithApply == null){
if (scmVehRebateWithApply == null) {
rb.setMsg("该单车返利预提申请单不存在");
}
this.updateByDto(dto);
@ -259,7 +260,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
ResultBean rb = ResultBean.fireFail();
ScmVehRebateWithApplyDetailsVo scmVehRebateWithApplyDetailsVo = new ScmVehRebateWithApplyDetailsVo();
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(sid);
BeanUtil.copyProperties(scmVehRebateWithApply,scmVehRebateWithApplyDetailsVo);
BeanUtil.copyProperties(scmVehRebateWithApply, scmVehRebateWithApplyDetailsVo);
List<ScmVehRebateWithDetailsVo> scmVehRebateWithDetailsVos = scmVehRebateWithService.fetchByMainSid(sid);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
String[] vehRebateSids = scmVehRebateWithDetailsVo.getVehRebateSid().split(",");
@ -307,9 +308,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
//若有网关,则赋值网关中判断的字段。
variables.put("businessSid", businessSid);
//=====================添加app所需参数
Map<String,Object> appMap = new HashMap<>();
appMap.put("sid",businessSid);
variables.put("app",appMap);
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
@ -325,6 +326,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
List<String> vehRebateSids = scmVehRebateWith.getVehRebateSids();
for (String vehRebateSid : vehRebateSids) {
scmVehRebateService.updateWithholdingDateBySid(vehRebateSid);
scmVehRebateService.updateState(vehRebateSid, 1);
}
}
if (r == 1) {
@ -391,7 +393,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String vehRebateSid : vehRebateSids) {
scmVehRebateService.updateState(vehRebateSid);
scmVehRebateService.updateState(vehRebateSid, 2);
}
}
return rb.success().setData(resultBean.getData());
@ -458,16 +460,36 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmVehRebateWithApply.getTaskId();
List<ScmVehRebateWithDetailsVo> scmVehRebateWithDetailsVos = scmVehRebateWithService.selByMainSid(query.getBusinessSid());
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (query.getUserSid().equals(scmVehRebateWithApply.getCreateBySid())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0);
}
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0);
}
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
@ -496,7 +518,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList());
List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
// List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}

81
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyDetailsVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.as.oldparthandleapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
public class AppOldparthandleApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("制单人姓名")
private String createByName;
@ApiModelProperty("发起部门名称")
private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("处理原因value")
private String handleReasonValue;
@ApiModelProperty("处理方式value")
private String handleModeValue;
@ApiModelProperty("收益总额")
private String totalProfit;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> files = new ArrayList<>();
@ApiModelProperty("流程实例的sid")
private String procInsId;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("待处理旧件列表")
private List<AppOldparthandleDetailsVo> asOldparthandleList;
}

64
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyFeign.java

@ -0,0 +1,64 @@
package com.yxt.anrui.terminal.api.as.oldparthandleapply;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowDto;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowQuery;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowTaskQuery;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
/**
* @Author
* @Date
* @Description
*/
@FeignClient(
contextId = "terminal-AppOldparthandleApply",
name = "anrui-terminal",
path = "v1/oldparthandleapply")
public interface AppOldparthandleApplyFeign {
@ApiOperation("详情")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AppOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
/**********************************************流程********************************************/
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody AppFlowDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody AppFlowTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap AppFlowQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
}

81
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleDetailsVo.java

@ -0,0 +1,81 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.as.oldparthandleapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
* Description: 处理旧件列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
public class AppOldparthandleDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("商品ID")
private String goodsID;
@ApiModelProperty("商品ID")
private String goodsSkuId;
@ApiModelProperty("商品sku名称")
private String goodsSkuTitle;
@ApiModelProperty("商品sku名称")
private String goodsSkuName;
@ApiModelProperty("图号")
private String goodsSkuCode;
@ApiModelProperty("规格")
private String goodsSkuOwnSpec;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("厂家名称")
private String manufactor;
@ApiModelProperty("单位")
private String unit;
@ApiModelProperty("仓库名称")
private String warehouseName;
@ApiModelProperty("库位编码")
private String warehouseRackCode;
@ApiModelProperty("数量")
private BigDecimal count;
@ApiModelProperty("收益金额")
private BigDecimal profit;
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppDelegateQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 10:16
*/
@Data
public class AppDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:09
* @Description
*/
@Data
public class AppFlowDto implements Dto {
private static final long serialVersionUID = 3626473483180150495L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
}

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowQuery.java

@ -0,0 +1,28 @@
package com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:15
* @Description
*/
@Data
public class AppFlowQuery implements Query {
private static final long serialVersionUID = 5514095179438249641L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误:next")
private Integer next;
@ApiModelProperty("组织机构全路径")
private String orgPath;
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowTaskQuery.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:11
* @Description
*/
@Data
public class AppFlowTaskQuery implements Query {
private static final long serialVersionUID = -7082170710942810289L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.terminal",
"com.yxt.common.base.config"
},exclude = {DataSourceAutoConfiguration.class})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply"})
public class TerminalApplication {
public static void main(String[] args) {

85
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyRest.java

@ -0,0 +1,85 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleApplyDetailsVo;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleApplyFeign;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowDto;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowQuery;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.AppFlowTaskQuery;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("v1/oldparthandleapply")
public class AppOldparthandleApplyRest implements AppOldparthandleApplyFeign {
@Autowired
private AppOldparthandleApplyService appOldparthandleApplyService;
@Override
public ResultBean<AppOldparthandleApplyDetailsVo> fetchDetailsBySid(String sid) {
return appOldparthandleApplyService.fetchDetailsBySid(sid);
}
@Override
public ResultBean agreeCreditInfo(AppFlowDto dto) {
return appOldparthandleApplyService.agreeCreditInfo(dto);
}
@Override
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
return appOldparthandleApplyService.rejectCreditInfo(query);
}
@Override
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
return appOldparthandleApplyService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
return appOldparthandleApplyService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
return appOldparthandleApplyService.getFlowOperateTitle(query);
}
@Override
public ResultBean delegate(AppDelegateQuery delegateQuery) {
return appOldparthandleApplyService.delegate(delegateQuery);
}
@Override
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
return appOldparthandleApplyService.assignTask(delegateQuery);
}
}

186
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyService.java

@ -0,0 +1,186 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.as.oldparthandleapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleApplyDetailsVo;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.AppOldparthandleDetailsVo;
import com.yxt.anrui.terminal.api.as.oldparthandleapply.flowable.*;
import com.yxt.anrui.terminal.fegin.asoldparthandleapply.AsOldparthandleApplyDetailsVo;
import com.yxt.anrui.terminal.fegin.asoldparthandleapply.AsOldparthandleApplyFegin;
import com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable.*;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Service
public class AppOldparthandleApplyService {
@Resource
private AsOldparthandleApplyFegin asOldparthandleApplyFegin;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
public ResultBean<AppOldparthandleApplyDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyDetailsVo data = asOldparthandleApplyFegin.fetchDetailsBySid(sid).getData();
AppOldparthandleApplyDetailsVo appOldparthandleApplyDetailsVo = new AppOldparthandleApplyDetailsVo();
BeanUtil.copyProperties(data,appOldparthandleApplyDetailsVo);
appOldparthandleApplyDetailsVo.setProcInsId(data.getProcInstId());
List<String> filePaths = data.getFilePaths();
ArrayList<String> files = new ArrayList<>();
for (String path : filePaths) {
files.add(path);
}
appOldparthandleApplyDetailsVo.setFiles(files);
BigDecimal totalProfit = new BigDecimal("0");
List<AppOldparthandleDetailsVo> asOldparthandleList = appOldparthandleApplyDetailsVo.getAsOldparthandleList();
for (AppOldparthandleDetailsVo appOldparthandleDetailsVo : asOldparthandleList) {
appOldparthandleDetailsVo.setGoodsSkuId(appOldparthandleDetailsVo.getGoodsID());
appOldparthandleDetailsVo.setGoodsSkuName(appOldparthandleDetailsVo.getGoodsSkuTitle());
appOldparthandleDetailsVo.setManufactor(appOldparthandleDetailsVo.getManufacturerName());
totalProfit = totalProfit.add(appOldparthandleDetailsVo.getProfit());
}
appOldparthandleApplyDetailsVo.setTotalProfit(totalProfit.toString());
return rb.success().setData(appOldparthandleApplyDetailsVo);
}
public ResultBean agreeCreditInfo(AppFlowDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
AsOldparthandleApplyCompleteDto asOldparthandleApplyCompleteDto = new AsOldparthandleApplyCompleteDto();
BeanUtil.copyProperties(dto, asOldparthandleApplyCompleteDto);
asOldparthandleApplyCompleteDto.setOrgPath(orgSidPath);
ResultBean resultBean = asOldparthandleApplyFegin.complete(asOldparthandleApplyCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyTaskQuery asOldparthandleApplyTaskQuery = new AsOldparthandleApplyTaskQuery();
BeanUtil.copyProperties(query, asOldparthandleApplyTaskQuery);
ResultBean resultBean = asOldparthandleApplyFegin.taskReject(asOldparthandleApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyTaskQuery asOldparthandleApplyTaskQuery = new AsOldparthandleApplyTaskQuery();
BeanUtil.copyProperties(query, asOldparthandleApplyTaskQuery);
ResultBean resultBean = asOldparthandleApplyFegin.revokeProcess(asOldparthandleApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfo(AppFlowTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyTaskQuery asOldparthandleApplyTaskQuery = new AsOldparthandleApplyTaskQuery();
BeanUtil.copyProperties(query, asOldparthandleApplyTaskQuery);
ResultBean resultBean = asOldparthandleApplyFegin.breakProcess(asOldparthandleApplyTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(AppFlowQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
AsOldparthandleApplyNodeQuery getNodeQuery = new AsOldparthandleApplyNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject = asOldparthandleApplyFegin.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit = asOldparthandleApplyFegin.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
public ResultBean delegate(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyDelegateQuery delegateQuery1 = new
AsOldparthandleApplyDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
asOldparthandleApplyFegin.delegate(delegateQuery1);
return rb.success();
}
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
AsOldparthandleApplyDelegateQuery delegateQuery1 = new
AsOldparthandleApplyDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
asOldparthandleApplyFegin.assignTask(delegateQuery1);
return rb.success();
}
}

102
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java

@ -0,0 +1,102 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.asoldparthandleapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleApplyVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo <br/>
* Description: 旧件处理申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "旧件处理申请 视图数据详情", description = "旧件处理申请 视图数据详情")
public class AsOldparthandleApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("制单人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("发起部门sid")
private String deptSid; // 发起部门sid
@ApiModelProperty("发起部门名称")
private String deptName; // 发起部门名称
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("附件路径(多个附件之间英文逗号隔开)")
private List<String> filePaths = new ArrayList<>(); // 附件路径(多个附件之间英文逗号隔开)
@ApiModelProperty("处理原因key")
private String handleReasonKey; // 处理原因key
@ApiModelProperty("处理原因value")
private String handleReasonValue; // 处理原因value
@ApiModelProperty("处理方式key")
private String handleModeKey; // 处理方式key
@ApiModelProperty("处理方式value")
private String handleModeValue; // 处理方式value
@ApiModelProperty("分公司sid")
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("待处理旧件列表")
private List<AsOldparthandleDetailsVo> asOldparthandleList;
}

57
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyFegin.java

@ -0,0 +1,57 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply;
import com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable.*;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@FeignClient(
contextId = "yxt-as-AsOldparthandleApply",
name = "yxt-as",
path = "v1/asoldparthandleapply"
)
public interface AsOldparthandleApplyFegin {
@ApiOperation("详情")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AsOldparthandleApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<AsOldparthandleApplyNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<AsOldparthandleApplyNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody AsOldparthandleApplyTaskQuery query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody AsOldparthandleApplyTaskQuery query);
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AsOldparthandleApplyDelegateQuery query);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody AsOldparthandleApplyDelegateQuery query);
}

95
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleDetailsVo.java

@ -0,0 +1,95 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.asoldparthandleapply;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-as(旧件处理申请) <br/>
* File: AsOldparthandleVo.java <br/>
* Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo <br/>
* Description: 处理旧件列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-04-23 17:56:59 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
public class AsOldparthandleDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("主表sid")
private String mainSid; // 主表sid
@ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@ApiModelProperty("商品spuSid")
private String goodsSpuSid;
@ApiModelProperty("商品spu名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品sku名称")
private String goodsSkuTitle;
@ApiModelProperty("图号")
private String goodsSkuCode;
@ApiModelProperty("规格")
private String goodsSkuOwnSpec;
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid
@ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
@ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
@ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码
@ApiModelProperty("数量")
private BigDecimal count; // 数量
@ApiModelProperty("收益金额")
private BigDecimal profit;
}

37
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyCompleteDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 14:57
* @Description
*/
@Data
public class AsOldparthandleApplyCompleteDto implements Dto {
private static final long serialVersionUID = 6378752532534735663L;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id(PC)")
private String instanceId;
@ApiModelProperty(value = "流程id(移动)")
private String procInsId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
private String orgPath;
}

26
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyDelegateQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 9:28
*/
@Data
public class AsOldparthandleApplyDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
// @JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

25
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:04
* @Description
*/
@Data
public class AsOldparthandleApplyNodeQuery implements Query {
private static final long serialVersionUID = 9117613683840483366L;
@ApiModelProperty(value = "环节定义id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
private Integer next;
}

26
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:03
* @Description
*/
@Data
public class AsOldparthandleApplyNodeVo implements Vo {
private static final long serialVersionUID = -833419512294877848L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

48
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyTaskQuery.java

@ -0,0 +1,48 @@
package com.yxt.anrui.terminal.fegin.asoldparthandleapply.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/9/6 15:06
* @Description
*/
@Data
public class AsOldparthandleApplyTaskQuery implements Query {
private static final long serialVersionUID = 1288615499873178778L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id(PC)")
private String instanceId;
@ApiModelProperty("流程实例Id(移动)")
private String procInsId;
}
Loading…
Cancel
Save