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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 4 months ago
parent
e8123b33ef 170e86de31
commit
2285ac50c5
12 changed files with 164 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
  2. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java
  3. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java
  4. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
  5. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
  6. 23
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyQuery.java
  7. 39
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
  8. 53
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  9. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
  10. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java
  11. 18
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
  12. 48
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java
View File

@ -51,8 +51,8 @@ import java.util.List;
@ApiModel(value = "单车返利表 查询条件", description = "单车返利表 查询条件")
public class ScmVehRebateQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid;
@ApiModelProperty("品牌")
private String brandName;
@ApiModelProperty("车型名称")
private String vehModelName;
@ApiModelProperty("车架号")
@ -73,6 +73,10 @@ public class ScmVehRebateQuery implements Query {
private List<String> sidList;
@ApiModelProperty("调整状态")
private String adjustmentState;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("采购系统")
private String purchaseSystemName;
private String userSid;
private String orgPath;

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailsVo.java
View File

@ -54,6 +54,10 @@ public class ScmVehRebateWithDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("采购系统")
private String purchaseSystemName;
@ApiModelProperty("品牌名称")
private String brandName;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("预提返利")

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApply.java
View File

@ -26,11 +26,14 @@
package com.yxt.anrui.scm.api.scmvehrebatewithapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* Project: anrui-scm(单车返利预提申请) <br/>
* File: ScmVehRebateWithApply.java <br/>
@ -50,6 +53,8 @@ import lombok.Data;
public class ScmVehRebateWithApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("部门sid")
private String deptSid;
@ApiModelProperty("部门")
@ -82,4 +87,7 @@ public class ScmVehRebateWithApply extends BaseEntity {
private String taskId;
@ApiModelProperty("组织全路径")
private String orgPath;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
}

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java
View File

@ -26,6 +26,7 @@
package com.yxt.anrui.scm.api.scmvehrebatewithapply;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
import com.yxt.common.core.vo.Vo;
@ -34,6 +35,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@ -55,6 +57,11 @@ public class ScmVehRebateWithApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("申请人sid")
private String createBySid; // 申请人sid
@ApiModelProperty("备注")

18
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDto.java
View File

@ -54,29 +54,31 @@ public class ScmVehRebateWithApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("部门sid")
private String deptSid;
@ApiModelProperty("部门")
private String deptName;
@ApiModelProperty("品牌sid")
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("预提申请")
@ApiModelProperty("预提申请")
private String withApply; // 预提申请
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("创建人姓名")
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程定义的id")
private String procDefId;

23
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyQuery.java
View File

@ -51,18 +51,21 @@ public class ScmVehRebateWithApplyQuery implements Query {
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("部门")
private String deptName;
@ApiModelProperty("创建人")
private String createByName;
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("预提申请")
private String withApply; // 预提申请
@ApiModelProperty("创建开始日期")
private String createStartTime; // 创建开始日期
@ApiModelProperty("创建结束日期")
private String createEndTime; // 创建结束日期
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("预提申请")
private String withApply;
@ApiModelProperty("创建日期")
private String createStartTime;
private String createEndTime;
@ApiModelProperty("办结日期")
private String finishTimeStart;
private String finishTimeEnd;
private String userSid;
private String orgPath;

39
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyVo.java
View File

@ -55,31 +55,28 @@ public class ScmVehRebateWithApplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建日期")
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("使用组织名称")
private String useOrgName;
@ApiModelProperty("部门")
private String deptName;
@ApiModelProperty("创建人姓名")
private String createByName;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建日期")
private Date createTime; // 创建日期
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("预提申请")
private String withApply; // 预提申请
@ApiModelProperty("预提返利合计")
private BigDecimal withRebateTotal; // 预提返利合计
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结日期")
private Date finishTime;
@ApiModelProperty("预提申请")
private String withApply;
@ApiModelProperty("预提费用")
private BigDecimal withholdCost;
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("预提返利合计")
private BigDecimal withRebateTotal;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")

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

@ -141,8 +141,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -159,6 +159,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -175,8 +181,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -190,6 +196,9 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -248,8 +257,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -263,6 +272,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getRebateName())) {
qw.like("rebateName", query.getRebateName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -327,8 +342,14 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -400,8 +421,14 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPurchaseSystemName())) {
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -435,8 +462,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
ScmVehRebateQuery query = pq.getParams();
QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
qw.eq("createOrgSid", query.getCreateOrgSid());
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
if (StringUtils.isNotBlank(query.getVehModelName())) {
qw.like("vehModelName", query.getVehModelName());
@ -513,6 +540,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
scmVehRebate.setOrgPath(dto.getOrgPath());
scmVehRebate.setCreateBySid(dto.getCreateBySid());
scmVehRebate.setState(0);
scmVehRebate.setPurchaseSystemSid(scmVehRebateVeh.getPurchaseSystemSid());
scmVehRebate.setPurchaseSystemName(scmVehRebateVeh.getPurchaseSystemName());
save(scmVehRebate);
}
return rb.success().setMsg("保存成功");

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml
View File

@ -19,16 +19,18 @@
<select id="fetchByMainSid" resultType="com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo">
SELECT svr.rebateTypeKey,
svr.`rebateTypeValue`,
SUM(svr.`estimateRebate`) withRebate,
svr.rebateTypeValue,
SUM(svr.estimateRebate) withRebate,
SUM(svr.expectTreatCost) as expectTreatCost,
SUM(svr.expectSuppCost) as expectSuppCost,
COUNT(*) num,
GROUP_CONCAT(svrw.`vehRebateSid`) vehRebateSid
GROUP_CONCAT(svrw.vehRebateSid) vehRebateSid,
svr.purchaseSystemName,
svr.brandName
FROM scm_veh_rebate_with svrw
LEFT JOIN scm_veh_rebate svr
ON svr.`sid` = svrw.`vehRebateSid`
WHERE svrw.`mainSid` = #{sid}
GROUP BY svr.`calculationModeKey`
ON svr.sid = svrw.vehRebateSid
WHERE svrw.mainSid = #{sid}
GROUP BY svr.calculationModeKey
</select>
</mapper>

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.java
View File

@ -54,17 +54,11 @@ import java.util.Map;
@Mapper
public interface ScmVehRebateWithApplyMapper extends BaseMapper<ScmVehRebateWithApply> {
//@Update("update scm_veh_rebate_with_apply set name=#{msg} where id=#{id}")
//IPage<ScmVehRebateWithApplyVo> voPage(IPage<ScmVehRebateWithApply> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehRebateWithApply> qw);
IPage<ScmVehRebateWithApplyVo> selectPageVo(IPage<ScmVehRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebateWithApply> qw);
List<ScmVehRebateWithApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehRebateWithApply> qw);
@Select("select * from scm_veh_rebate_with_apply")
List<ScmVehRebateWithApplyVo> selectListVo();
IPage<ScmVehRebateWithApplyVo> selectPageVo(IPage<ScmVehRebateWithApply> page, @Param(Constants.WRAPPER) Wrapper<ScmVehRebateWithApply> qw);
int updateFlowFiled(Map<String, Object> beanToMap);
int selectBySid(String join);
String selectNum(String billNo);
}

18
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyMapper.xml
View File

@ -19,16 +19,12 @@
</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo">
SELECT * FROM scm_veh_rebate_with_apply
<where>
${ew.sqlSegment}
</where>
</select>
<update id="updateFlowFiled">
UPDATE scm_veh_rebate_with_apply
SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
@ -47,4 +43,12 @@
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from scm_veh_rebate_with_apply
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
limit 1
</select>
</mapper>

48
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
View File

@ -26,11 +26,13 @@
package com.yxt.anrui.scm.biz.scmvehrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@ -110,6 +112,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseVehicleFeign baseVehicleFeign;
private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -161,13 +164,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.eq("svrwa.useOrgName", query.getUseOrgName());
qw.like("svrwa.useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("svrwa.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.eq("svrwa.createByName", query.getCreateByName());
qw.like("svrwa.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("svrwa.brandSid", query.getBrandSid());
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("svrwa.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getWithApply())) {
qw.like("svrwa.withApply", query.getWithApply());
@ -177,6 +183,11 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (svrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (svrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishTimeStart = query.getFinishTimeStart();
String finishTimeEnd = query.getFinishTimeEnd();
qw.apply(StringUtils.isNotBlank(finishTimeStart), "date_format (svrwa.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(finishTimeEnd), "date_format (svrwa.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')"
);
qw.groupBy("svrwa.sid");
qw.orderByDesc("svrwa.createTime");
IPage<ScmVehRebateWithApply> page = PagerUtil.queryToPage(pq);
@ -193,6 +204,18 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
return rb.setMsg("请选择单车返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMM");
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
billNo = "DCFLYT" + sysOrganizationVo.getOrgCode() + date;
String i = baseMapper.selectNum(billNo);
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
dto.setBillNo(billNo);
String sid = this.insertByDto(dto).getData();
for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) {
List<String> vehRebateSids = scmVehRebateWith.getVehRebateSids();
@ -383,17 +406,18 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
/**
* 推送单车返利预提凭证
*
* @param sid
*/
public void pushVehRebateWithVoucher(String sid) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance();
int month=calendar.get(Calendar.MONTH);
calendar.set(Calendar.MONTH, month-1);
Calendar calendar = Calendar.getInstance();
int month = calendar.get(Calendar.MONTH);
calendar.set(Calendar.MONTH, month - 1);
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
Date endTime = calendar.getTime();//上个月最后一天
String format = sdf.format(endTime);
String summaryTag = "";//摘要前缀
String summaryTag = "";//摘要前缀
ScmVehRebateWithApply entity = fetchBySid(sid);
if (null != entity) {
if (StringUtils.isNotBlank(entity.getWithApply())) {
@ -495,8 +519,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
}
});
}
}
private int updateFlowFiled(Map<String, Object> beanToMap) {
@ -516,7 +538,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
for (String vehRebateSid : vehRebateSids) {
scmVehRebateService.updateState(vehRebateSid, 2);
scmVehRebateService.updateWithholdingDateBySid(vehRebateSid,scmVehRebateWithApply.getWithApply());
scmVehRebateService.updateWithholdingDateBySid(vehRebateSid, scmVehRebateWithApply.getWithApply());
}
//推送单车返利预提凭证
pushVehRebateWithVoucher(bv.getBusinessSid());
@ -598,7 +620,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0);
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0);
}
return rb.success().setData(resultBean.getData());
} else {
@ -612,7 +634,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (ScmVehRebateWithDetailsVo scmVehRebateWithDetailsVo : scmVehRebateWithDetailsVos) {
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(),0);
scmVehRebateService.updateState(scmVehRebateWithDetailsVo.getVehRebateSid(), 0);
}
return rb.success().setData(resultBean.getData());
}

Write Preview
Loading…
Cancel
Save