diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java index 38b028f3c7..2b6d8b9c82 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java +++ b/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") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index c0e6d87eaa..29bf890c6b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/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") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java index d1a976a103..7e35c0fa0a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java +++ b/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") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index e328f83d33..4fd6c59059 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/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") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java index 52d0717e0d..2fda896c27 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmStayDisRebateVo.java +++ b/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; // 分配数量 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java index 143cba925f..6854601cd6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java +++ b/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 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index 440c9272f5..4d0feaff61 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/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 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java index f8c1c22e54..3ef1a6f5f0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java +++ b/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; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java index 449a3fe5a3..eb655727c0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVehDto.java +++ b/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 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index 62e11ebd9d..3260c8f72f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/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; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index c2f33e2d5d..939cf1e59f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/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 { @Select("select * from scm_veh_rebate") List 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 { 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); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java index 1a648887d8..f5c1dacf8a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java +++ b/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("修改成功"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index aa79fd7b2d..37a0df5869 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/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= 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= 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= 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= 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 pagging = baseMapper.selectPageVo(page, qw); List 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 p = PagerUtil.pageToVo(pagging, null); return p; @@ -283,32 +283,32 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService 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 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 appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map 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 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 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 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>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList()); + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); // List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java index 6cc5971275..07bc177e09 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java +++ b/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 { @Select("select vehRebateSid from scm_veh_rebate_with where mainSid = #{businessSid}") List fetchVehReBateSidByMainSid(String businessSid); + + @Select("select * from scm_veh_rebate_with where mainSid = #{businessSid}") + List selByMainSid(String businessSid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index 73fecc3e56..c2f632df28 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/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 fetchVehReBateSidByMainSid(String businessSid) { return baseMapper.fetchVehReBateSidByMainSid(businessSid); } + + public List selByMainSid(String businessSid) { + return baseMapper.selByMainSid(businessSid); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index e990b4ace7..11da916004 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/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 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 scmVehRebateWithDetailsVos = scmVehRebateWithService.fetchByMainSid(sid); for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) { String[] vehRebateSids = scmVehRebateWithDetailsVo.getVehRebateSid().split(","); @@ -307,9 +308,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService appMap = new HashMap<>(); - appMap.put("sid",businessSid); - variables.put("app",appMap); + Map 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 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 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 resultBean = flowableFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + Map 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 resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map 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>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m),GetNodeVo.class)).collect(Collectors.toList()); + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); // List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyDetailsVo.java new file mode 100644 index 0000000000..02358f44e7 --- /dev/null +++ b/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(旧件处理申请)
+ * File: AsOldparthandleApplyVo.java
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo
+ * Description: 旧件处理申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-23 17:56:59
+ * + * @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 files = new ArrayList<>(); + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("待处理旧件列表") + private List asOldparthandleList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleApplyFeign.java new file mode 100644 index 0000000000..43c9aece88 --- /dev/null +++ b/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 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 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); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/AppOldparthandleDetailsVo.java new file mode 100644 index 0000000000..301eee8a48 --- /dev/null +++ b/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(旧件处理申请)
+ * File: AsOldparthandleVo.java
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo
+ * Description: 处理旧件列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-23 17:56:59
+ * + * @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; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..9a11a0b142 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowDto.java new file mode 100644 index 0000000000..93bf236f3b --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowQuery.java new file mode 100644 index 0000000000..8e27aae899 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparthandleapply/flowable/AppFlowTaskQuery.java new file mode 100644 index 0000000000..3e48a7ee9d --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index e1c563e966..d474e58a69 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/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) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyRest.java new file mode 100644 index 0000000000..a5f4f25925 --- /dev/null +++ b/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 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 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); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparthandleapply/AppOldparthandleApplyService.java new file mode 100644 index 0000000000..f5d35ff3b7 --- /dev/null +++ b/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 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 filePaths = data.getFilePaths(); + ArrayList files = new ArrayList<>(); + for (String path : filePaths) { + files.add(path); + } + appOldparthandleApplyDetailsVo.setFiles(files); + BigDecimal totalProfit = new BigDecimal("0"); + List 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 userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean 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 getFlowOperateTitle(AppFlowQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + AsOldparthandleApplyNodeQuery getNodeQuery = new AsOldparthandleApplyNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> 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> 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(); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyDetailsVo.java new file mode 100644 index 0000000000..5c8acfbca2 --- /dev/null +++ b/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(旧件处理申请)
+ * File: AsOldparthandleApplyVo.java
+ * Class: com.yxt.anrui.as.api.asoldparthandleapply.AsOldparthandleApplyVo
+ * Description: 旧件处理申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-23 17:56:59
+ * + * @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 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 asOldparthandleList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyFegin.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleApplyFegin.java new file mode 100644 index 0000000000..3c5aee6310 --- /dev/null +++ b/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 fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation(value = "办理(同意)") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody AsOldparthandleApplyCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldparthandleApplyNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> 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); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/AsOldparthandleDetailsVo.java new file mode 100644 index 0000000000..8bbafd997a --- /dev/null +++ b/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(旧件处理申请)
+ * File: AsOldparthandleVo.java
+ * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo
+ * Description: 处理旧件列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-04-23 17:56:59
+ * + * @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; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyCompleteDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyCompleteDto.java new file mode 100644 index 0000000000..d1faba7b70 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyDelegateQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyDelegateQuery.java new file mode 100644 index 0000000000..ef88fd71bc --- /dev/null +++ b/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; + + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeQuery.java new file mode 100644 index 0000000000..47ee89c488 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyNodeVo.java new file mode 100644 index 0000000000..017e6bc13a --- /dev/null +++ b/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 candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyTaskQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/asoldparthandleapply/flowable/AsOldparthandleApplyTaskQuery.java new file mode 100644 index 0000000000..9027892762 --- /dev/null +++ b/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; +}