diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java index ce8af0d405..2dad1da364 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseSpecialRebateDisGetVehQuery.java @@ -38,32 +38,29 @@ import java.util.List; @ApiModel(value = "专项返利分配选择车辆 查询条件", description = "专项返利分配选择车辆 查询条件") public class BaseSpecialRebateDisGetVehQuery implements Query { + @ApiModelProperty("车型") + private String vehicleAlias; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty(value = "厂家入库开始日期") + private String applicationDateStart; + @ApiModelProperty(value = "厂家入库结束日期") + private String applicationDateEnd; + @ApiModelProperty(value = "销售开始日期") + private String salesStartDate; + @ApiModelProperty(value = "销售结束日期") + private String salesEndDate; + @ApiModelProperty(value = "买断开始日期") + private String solidStartDate; + @ApiModelProperty(value = "买断结束日期") + private String solidEndDate; + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("车辆sid") private List vehSids; // 车辆sid - @ApiModelProperty(value = "功能") - private String vehicleType; - @ApiModelProperty(value = "系列") - private String productLine; - @ApiModelProperty(value = "变速箱") - private String gearboxType; - @ApiModelProperty(value = "驱动") - private String driveForm; - @ApiModelProperty(value = "排放标准") - private String emissionStandard; - @ApiModelProperty(value = "马力") - private String power; - @ApiModelProperty(value = "燃料") - private String fuelType; - @ApiModelProperty(value = "版本") - private String vehicleVersion; - @ApiModelProperty(value = "车型") - private String vehicleAlias; - @ApiModelProperty(value = "快捷检索车型") - private String modelName; - @ApiModelProperty(value = "用户sid") - private String userSid; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index b1f085b389..7af1fd423a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -3308,51 +3308,34 @@ public class BaseVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pq); QueryWrapper qw = new QueryWrapper<>(); BaseSpecialRebateDisGetVehQuery params = pq.getParams(); - //品牌 - if (StringUtils.isNotBlank(params.getBrandSid())) { - qw.eq("bvm.carBrand", params.getBrandSid()); - } - //功能 - if (StringUtils.isNotBlank(params.getVehicleType())) { - qw.eq("bvm.vehicleType", params.getVehicleType()); - } - //系列 - if (StringUtils.isNotBlank(params.getProductLine())) { - qw.eq("bvm.productLine", params.getProductLine()); - } - //变速箱 - if (StringUtils.isNotBlank(params.getGearboxType())) { - qw.eq("bvm.gearboxType", params.getGearboxType()); - } - //驱动 - if (StringUtils.isNotBlank(params.getDriveForm())) { - qw.eq("bvm.driveForm", params.getDriveForm()); - } - //排放标准 - if (StringUtils.isNotBlank(params.getEmissionStandard())) { - qw.eq("bvm.emissionStandard", params.getEmissionStandard()); - } - //马力 - if (StringUtils.isNotBlank(params.getPower())) { - qw.eq("bvm.power", params.getPower()); - } - //燃料 - if (StringUtils.isNotBlank(params.getFuelType())) { - qw.eq("bvm.fuelType", params.getFuelType()); - } - //版本 - if (StringUtils.isNotBlank(params.getVehicleVersion())) { - qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); - } //车型 if (StringUtils.isNotBlank(params.getVehicleAlias())) { qw.like("bvm.vehicleAlias", params.getVehicleAlias()); } - //快捷检索车型 - if (StringUtils.isNotBlank(params.getModelName())) { - qw.like("bvm.modelName", params.getModelName()); + //车架号 + if (StringUtils.isNotBlank(params.getVinNo())) { + qw.like("bv.vinNo", params.getVinNo()); } + //厂家入库日期 + String pricestartDate = params.getApplicationDateStart(); + String priceEndDate = params.getApplicationDateEnd(); + qw.apply(StringUtils.isNotEmpty(pricestartDate), "date_format (bv.priceDate,'%Y-%m-%d') >= date_format('" + pricestartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(priceEndDate), "date_format (bv.priceDate,'%Y-%m-%d') <= date_format('" + priceEndDate + "','%Y-%m-%d')" + ); + //销售日期 + String salesStartDate = params.getSalesStartDate(); + String salesEndDate = params.getSalesEndDate(); + qw.apply(StringUtils.isNotEmpty(salesStartDate), "date_format (bv.salesDate,'%Y-%m-%d') >= date_format('" + salesStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(salesEndDate), "date_format (bv.salesDate,'%Y-%m-%d') <= date_format('" + salesEndDate + "','%Y-%m-%d')" + ); + //买断日期 + String solidStartDate = params.getSolidStartDate(); + String solidEndDate = params.getSolidEndDate(); + qw.apply(StringUtils.isNotEmpty(solidStartDate), "date_format (bv.solidDate,'%Y-%m-%d') >= date_format('" + solidStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(solidEndDate), "date_format (bv.solidDate,'%Y-%m-%d') <= date_format('" + solidEndDate + "','%Y-%m-%d')" + ); qw.eq("bvb.sid", params.getBrandSid()); + qw.eq("bv.purchaseSystemSid",params.getPurchaseSystemSid()); qw.eq("bv.isDelete", 0); qw.eq("bv.createOrgSid", params.getCreateOrgSid()); qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index e04991494e..e79908c423 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -550,7 +550,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService - * File: LoanAppendixFeign.java
- * Class: com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixFeign
- * Description: 消贷项目附件表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-27 09:36:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "消贷项目附件表") @FeignClient( contextId = "anrui-riskcenter-LoanAppendix", name = "anrui-riskcenter", - path = "v1/loanappendix", - fallback = LoanAppendixFeignFallback.class) + path = "v1/loanappendix") public interface LoanAppendixFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("根据条件查询所有数据列表") - @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody LoanAppendixQuery query); - - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); - - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanAppendixDto dto); - - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody LoanAppendixDto dto,@PathVariable("sid") String sid); - - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids); - - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id); - - @ApiOperation("获取一条记录") - @GetMapping("/fetchSid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanappendix/LoanAppendixFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanappendix/LoanAppendixFeignFallback.java deleted file mode 100644 index 362eab03a4..0000000000 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanappendix/LoanAppendixFeignFallback.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.yxt.anrui.riskcenter.api.loanappendix; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Project: anrui-riskcenter(风控中心)
- * File: LoanAppendixFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixFeignFallback
- * Description: 消贷项目附件表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-27 09:36:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Component -public class LoanAppendixFeignFallback implements LoanAppendixFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanappendix/listPage无法访问"); - } - - @Override - public ResultBean> listAll(LoanAppendixQuery query){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanappendix/listAll无法访问"); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanappendix/list无法访问"); - } - - @Override - public ResultBean save(LoanAppendixDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanappendix/save无法访问"); - } - - @Override - public ResultBean update(LoanAppendixDto dto,String sid){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanappendix/update无法访问"); - } - - @Override - public ResultBean del(String ids){ - return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanappendix/del无法访问"); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanappendix/fetch无法访问"); - } - - @Override - public ResultBean fetchBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-riskcenter/loanappendix/fetch无法访问"); - } - -} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java index 1f4c7d4154..f592c09ec6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDetailsVo.java @@ -28,7 +28,11 @@ package com.yxt.anrui.riskcenter.api.loanaudit; import com.yxt.common.core.vo.Vo; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,8 +43,12 @@ public class LoanAuditDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("创建人sid") - private String createByName; // 创建人sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("创建人") + private String createByName; @ApiModelProperty("审计事项") private String auditMatters; // 审计事项 @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @@ -61,5 +69,6 @@ public class LoanAuditDetailsVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - + @ApiModelProperty("附件") + private List urls = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java index 2b8da15e48..7aea6601e9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditDto.java @@ -28,7 +28,11 @@ package com.yxt.anrui.riskcenter.api.loanaudit; import com.yxt.common.core.dto.Dto; import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -39,8 +43,12 @@ public class LoanAuditDto implements Dto { private String sid; // sid - @ApiModelProperty("创建人sid") - private String createByName; // 创建人sid + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("创建人") + private String createByName; @ApiModelProperty("审计事项") private String auditMatters; // 审计事项 @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @@ -61,5 +69,6 @@ public class LoanAuditDto implements Dto { private String createOrgSid; // 创建组织sid @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 - + @ApiModelProperty("附件") + private List urls = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java index a4c37d9bfb..204898ad08 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditFeign.java @@ -58,7 +58,7 @@ public interface LoanAuditFeign { public ResultBean saveResult(@RequestBody LoanAuditResulitDto dto); @ApiOperation("根据sid删除记录") - @DeleteMapping("/saveResult") + @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java index 05035ea81c..c1d4b6e579 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditQuery.java @@ -38,7 +38,7 @@ import lombok.Data; public class LoanAuditQuery implements Query { @ApiModelProperty("分公司名称") - private String useOrgName; + private String orgName; @ApiModelProperty("审计事项") private String auditMatters; @ApiModelProperty("审计开始日期") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java index d6dbd8674d..7c225f4607 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanaudit/LoanAuditResulitDto.java @@ -40,5 +40,5 @@ public class LoanAuditResulitDto implements Dto { private List sids; @ApiModelProperty("审计结果") - private String auditResults; // 审计结果 + private String result; // 审计结果 } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java index d6c82f62c3..752f244a0e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java @@ -51,6 +51,7 @@ public enum LoanFileEnum { EXECUTE("037", "案件执行立案-执行材料"), CLOSE("038", "案件结案-结案材料"), ENTRUSTLAWYER_WTXY("039", "案件委托律师-委托协议"), + AUDIT("040", "审计监管附件"), ; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.java index 59a5b2b3e3..ccf4f79d6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.java @@ -1,40 +1,19 @@ package com.yxt.anrui.riskcenter.biz.loanappendix; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendix; -import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixVo; +import org.apache.ibatis.annotations.Select; import java.util.List; -/** - * Project: anrui-riskcenter(风控中心)
- * File: LoanAppendixMapper.java
- * Class: com.yxt.anrui.riskcenter.biz.loanappendix.LoanAppendixMapper
- * Description: 消贷项目附件表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-27 09:36:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface LoanAppendixMapper extends BaseMapper { - //@Update("update loan_appendix set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_appendix") - List selectListVo(); + @Delete("delete from loan_appendix where projectSid = #{dtoSid}") + void delByLinkSid(String dtoSid); + + @Select("select * from loan_appendix where projectSid = #{sid}") + List selByLinkSid(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.xml index 3796eb60d9..5e3b51133c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixMapper.xml @@ -3,11 +3,4 @@ - - - \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixRest.java index ca660a2458..b509371bfa 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixRest.java @@ -15,80 +15,9 @@ import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixVo; import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixDto; import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixFeign; -/** - * Project: anrui-riskcenter(风控中心)
- * File: LoanAppendixFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loanappendix.LoanAppendixRest
- * Description: 消贷项目附件表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-27 09:36:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "消贷项目附件表") @RestController @RequestMapping("v1/loanappendix") -public class LoanAppendixRest implements LoanAppendixFeign { +public class LoanAppendixRest { - @Autowired - private LoanAppendixService loanAppendixService; - - @Override - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanAppendixService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean> listAll(@RequestBody LoanAppendixQuery query){ - ResultBean rb = ResultBean.fireFail(); - List list = loanAppendixService.listAllVo(query); - return rb.success().setData(list); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - List list = loanAppendixService.listVo(); - return rb.success().setData(list); - } - - @Override - public ResultBean save(LoanAppendixDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanAppendixService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - public ResultBean update(LoanAppendixDto dto,String sid){ - ResultBean rb = ResultBean.fireFail(); - loanAppendixService.updateBySid(dto.toMap(),sid); - return rb.success(); - } - - @Override - public ResultBean del(String ids){ - ResultBean rb = ResultBean.fireFail(); - loanAppendixService.delByIds(ids); - return rb.success(); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - LoanAppendixVo vo = loanAppendixService.fetchByIdVo(id); - return rb.success().setData(vo); - } - - @Override - public ResultBean fetchBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanAppendix vo = loanAppendixService.fetchBySid(sid); - return rb.success().setData(vo); - } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixService.java index 02dd606d75..56cf35f1fc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanappendix/LoanAppendixService.java @@ -1,115 +1,19 @@ package com.yxt.anrui.riskcenter.biz.loanappendix; -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendix; -import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixQuery; -import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixVo; -import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixDto; -import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendixFeign; - import org.springframework.stereotype.Service; import java.util.List; -/** - * Project: anrui-riskcenter(风控中心)
- * File: LoanAppendixService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanappendix.LoanAppendixService
- * Description: 消贷项目附件表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021-10-27 09:36:11
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanAppendixService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - LoanAppendixQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(LoanAppendixQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - private QueryWrapper createQueryWrapper(LoanAppendixQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getFileName())) { - qw.eq("fileName", query.getFileName()); - } - - if (StringUtils.isNotBlank(query.getFileType())) { - qw.eq("fileType", query.getFileType()); - } - - if (StringUtils.isNotBlank(query.getName())) { - qw.eq("name", query.getName()); - } - - if (StringUtils.isNotBlank(query.getProjectSid())) { - qw.eq("projectSid", query.getProjectSid()); - } - if (StringUtils.isNotBlank(query.getAttachType())) { - qw.eq("attachType", query.getAttachType()); - } - - if (query.getFileSize() != null) { - qw.eq("fileSize", query.getFileSize()); - } - - if (StringUtils.isNotBlank(query.getFilePath())) { - qw.eq("filePath", query.getFilePath()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanAppendixQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(LoanAppendixQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); + public void delByLinkSid(String dtoSid) { + baseMapper.delByLinkSid(dtoSid); } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(LoanAppendixDto dto){ - LoanAppendix entity = new LoanAppendix(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public LoanAppendixVo fetchByIdVo(String id){ - LoanAppendix entity = this.fetchById(id); - LoanAppendixVo vo = new LoanAppendixVo(); - BeanUtil.copyProperties(entity, vo); - return vo; + + public List selByLinkSid(String sid) { + return baseMapper.selByLinkSid(sid); } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java index 0c315f0895..a4e290e28d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditMapper.java @@ -58,4 +58,7 @@ public interface LoanAuditMapper extends BaseMapper { @Update("update loan_audit set auditResults = #{auditResults} where sid = #{sid}") void updateResulit(@Param("auditResults") String auditResults,@Param("sid") String sid); + + @Update("update loan_audit set isDelete = 1 where sid = #{sid}") + void updateIsDel(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java index 44c8037128..e15a1b591b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditRest.java @@ -45,8 +45,6 @@ public class LoanAuditRest implements LoanAuditFeign { private LoanAuditService loanAuditService; @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); PagerVo pv = loanAuditService.listPageVo(pq); @@ -54,8 +52,6 @@ public class LoanAuditRest implements LoanAuditFeign { } @Override - @ApiOperation("新增或修改") - @PostMapping("/save") public ResultBean save(@RequestBody LoanAuditDto dto){ ResultBean rb = ResultBean.fireFail(); loanAuditService.saveOrUpdateDto(dto); @@ -70,17 +66,13 @@ public class LoanAuditRest implements LoanAuditFeign { } @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); - loanAuditService.delBySids(sids); + loanAuditService.updateIsDel(sids); return rb.success(); } @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/gteInitBySid/{sid}") public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); LoanAuditDetailsVo vo = loanAuditService.fetchDetailsVoBySid(sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java index c38273e8e3..e3fd45c9c7 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanaudit/LoanAuditService.java @@ -30,8 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanappendix.LoanAppendix; import com.yxt.anrui.riskcenter.api.loanaudit.*; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; +import com.yxt.anrui.riskcenter.biz.loanappendix.LoanAppendixService; +import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -42,6 +46,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -62,7 +67,11 @@ public class LoanAuditService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanAuditQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -106,8 +115,9 @@ public class LoanAuditService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(createEndTime), "date_format (la.createEndTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + apply(StringUtils.isNotEmpty(createEndTime), "date_format (la.createEndDate,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -125,17 +135,36 @@ public class LoanAuditService extends MybatisBaseService urls = dto.getUrls(); + if (StringUtils.isBlank(dtoSid)) { + String sid = this.insertByDto(dto); + for (String url : urls) { + String filePath = url.replace(fileUploadComponent.getUrlPrefix(), ""); + LoanAppendix loanAppendix = new LoanAppendix(); + loanAppendix.setProjectSid(sid); + loanAppendix.setAttachType(LoanFileEnum.AUDIT.getAttachType()); + loanAppendix.setFilePath(filePath); + loanAppendixService.save(loanAppendix); + } return; } this.updateByDto(dto); + loanAppendixService.delByLinkSid(dtoSid); + for (String url : urls) { + String filePath = url.replace(fileUploadComponent.getUrlPrefix(), ""); + LoanAppendix loanAppendix = new LoanAppendix(); + loanAppendix.setProjectSid(dtoSid); + loanAppendix.setAttachType(LoanFileEnum.AUDIT.getAttachType()); + loanAppendix.setFilePath(filePath); + loanAppendixService.save(loanAppendix); + } } - public void insertByDto(LoanAuditDto dto){ + public String insertByDto(LoanAuditDto dto){ LoanAudit entity = new LoanAudit(); BeanUtil.copyProperties(dto, entity, "id", "sid"); baseMapper.insert(entity); + return entity.getSid(); } public void updateByDto(LoanAuditDto dto){ @@ -152,13 +181,26 @@ public class LoanAuditService extends MybatisBaseService loanAppendices = loanAppendixService.selByLinkSid(sid); + ArrayList urls = new ArrayList<>(); + for (LoanAppendix loanAppendix : loanAppendices) { + String url = fileUploadComponent.getUrlPrefix() + loanAppendix.getFilePath(); + urls.add(url); + } + vo.setUrls(urls); return vo; } public void saveResult(LoanAuditResulitDto dto) { List sids = dto.getSids(); for (String sid : sids) { - baseMapper.updateResulit(dto.getAuditResults(),sid); + baseMapper.updateResulit(dto.getResult(),sid); + } + } + + public void updateIsDel(String[] sids) { + for (String sid : sids) { + baseMapper.updateIsDel(sid); } } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java index e902b5252c..6b86bede03 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateQuery.java @@ -68,6 +68,12 @@ public class ScmSpecialRebateQuery implements Query { private String createStartTime; // 创建开始日期 @ApiModelProperty("创建结束日期") private String createEndTime; // 创建结束日期 + @ApiModelProperty("所属年月") + private String palceGenDateStart; + private String palceGenDateEnd; + @ApiModelProperty("预提日期") + private String withholdingDateStart; + private String withholdingDateEnd; @ApiModelProperty("状态") private String state; @ApiModelProperty("一次核对状态") 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 2fda896c27..6b2dcf2144 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,6 +53,12 @@ public class ScmStayDisRebateVo implements Vo { private String sid; // sid + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("采购系统sid") + private String purchaseSystemSid; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; @ApiModelProperty("状态") private String state; // 状态 @ApiModelProperty("分配数量") @@ -64,6 +70,8 @@ public class ScmStayDisRebateVo implements Vo { @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; // 创建日期 + @ApiModelProperty("预提日期") + private String withholdingDate; @ApiModelProperty("返利名称") private String rebateName; // 返利名称 @ApiModelProperty("返利类型key") @@ -74,4 +82,6 @@ public class ScmStayDisRebateVo implements Vo { private String estimateRebate; // 预提返利 @ApiModelProperty("上传总金额") private String uploadMoney; // 上传总金额 + @ApiModelProperty("所属年月") + private String palceGenDate; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java index 5e162744d8..544d21eb7c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistribute.java @@ -26,11 +26,14 @@ package com.yxt.anrui.scm.api.scmspecialrebatedistribute; 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(专项返利分配)
* File: ScmSpecialrebatedistribute.java
@@ -50,18 +53,21 @@ import lombok.Data; public class ScmSpecialrebatedistribute extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 @ApiModelProperty("分配申请") private String title; // 分配申请 @ApiModelProperty("预提返利") private String withRebate; // 预提返利 @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @ApiModelProperty("审批完成日期") - private String approvalCompleteDate; // 审批完成日期 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") @@ -80,5 +86,6 @@ public class ScmSpecialrebatedistribute extends BaseEntity { private String procInstId; // 流程实例的sid @ApiModelProperty("taskId") private String taskId; // taskId + private String orgPath; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java index bf279aa154..c11896588c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmspecialrebatedistribute; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDetailsVo; import com.yxt.common.core.vo.Vo; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -54,20 +56,23 @@ public class ScmSpecialrebatedistributeDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("分配申请") private String title; // 分配申请 @ApiModelProperty("预提返利") private String withRebate; // 预提返利 @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @ApiModelProperty("审批完成日期") - private String approvalCompleteDate; // 审批完成日期 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") @@ -86,6 +91,7 @@ public class ScmSpecialrebatedistributeDetailsVo implements Vo { private String procInstId; // 流程实例的sid @ApiModelProperty("taskId") private String taskId; // taskId + private String orgPath; @ApiModelProperty("分配申请的专项返利列表") private List scmSpecialrebatedistributedetails; // 分配申请的专项返利列表 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java index 2ba1144b12..4a760e11cf 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeDto.java @@ -26,6 +26,7 @@ package com.yxt.anrui.scm.api.scmspecialrebatedistribute; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDto; import com.yxt.common.core.dto.Dto; @@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -54,20 +56,23 @@ public class ScmSpecialrebatedistributeDto implements Dto { private String sid; // sid + @ApiModelProperty("申请部门sid") + private String deptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("申请人") + private String createByName; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; // 办结日期 @ApiModelProperty("创建人sid") private String createBySid; // 创建人sid - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("分配申请") private String title; // 分配申请 @ApiModelProperty("预提返利") private String withRebate; // 预提返利 @ApiModelProperty("分配总金额") private String distributionMoneyTotal; // 分配总金额 - @ApiModelProperty("审批完成日期") - private String approvalCompleteDate; // 审批完成日期 @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") @@ -86,6 +91,7 @@ public class ScmSpecialrebatedistributeDto implements Dto { private String procInstId; // 流程实例的sid @ApiModelProperty("taskId") private String taskId; // taskId + private String orgPath; @ApiModelProperty("分配申请的专项返利列表") private List scmSpecialrebatedistributedetails; // 分配申请的专项返利列表 } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java index 351e55b747..ec572bc6bc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeQuery.java @@ -47,10 +47,8 @@ import lombok.Data; */ @Data @ApiModel(value = "专项返利分配申请表 查询条件", description = "专项返利分配申请表 查询条件") -public class ScmSpecialrebatedistributeQuery implements Query { +public class ScmSpecialrebatedistributeQuery implements Query { - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid @ApiModelProperty("分配申请") private String title; // 分配申请 @ApiModelProperty("创建开始日期") @@ -59,4 +57,13 @@ public class ScmSpecialrebatedistributeQuery implements Query { private String createEndTime; // 创建结束日期 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("分公司") + private String createOrgName; + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + + private String userSid; + private String orgPath; + private String menuUrl; + private String menuSid; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java index 1ec64ecd7e..4a950b9db8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistribute/ScmSpecialrebatedistributeVo.java @@ -55,31 +55,31 @@ public class ScmSpecialrebatedistributeVo implements Vo { private String sid; // sid @ApiModelProperty("状态") - private String state; // 状态 + private String state; + @ApiModelProperty("申请部门") + private String deptName; + @ApiModelProperty("创建组织名称") + private String createOrgName; + @ApiModelProperty("分配申请") + private String title; + @ApiModelProperty("预提返利") + private String withRebate; + @ApiModelProperty("上传返利总金额") + private String uploadMoney; + @ApiModelProperty("分配总金额") + private String distributionMoneyTotal; + @ApiModelProperty("申请人") + private String createByName; @ApiModelProperty("申请日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private Date createTime; // 申请日期 - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 - @ApiModelProperty("分配申请") - private String title; // 分配申请 - @ApiModelProperty("预提返利") - private String withRebate; // 预提返利 - @ApiModelProperty("分配总金额") - private String distributionMoneyTotal; // 分配总金额 - @ApiModelProperty("审批完成日期") - private String approvalCompleteDate; // 审批完成日期 - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("流程状态") private String nodeState; // 流程状态 @ApiModelProperty("流程定义的id") private String procDefId; // 流程定义的id - @ApiModelProperty("环节定义的sid") - private String nodeSid; // 环节定义的sid @ApiModelProperty("流程实例的sid") private String procInstId; // 流程实例的sid - @ApiModelProperty("taskId") - private String taskId; // taskId - } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailDetailsVo.java index ef658c4e89..bd7b4f3048 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailDetailsVo.java @@ -59,6 +59,12 @@ public class ScmSpecialrebatedistributedetailDetailsVo implements Vo { private String mainSid; // 分配申请sid @ApiModelProperty("专项返利sid") private String specialRebateSid; // 专项返利sid + @ApiModelProperty("采购系统名称") + private String purchaseSystemName; + @ApiModelProperty("所属年月") + private String palceGenDate; + @ApiModelProperty("预提日期") + private String withholdingDate; @ApiModelProperty("分配数量") private String disNum; // 分配数量 @ApiModelProperty("品牌sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index 6b686e3b2d..feeaaf3fb8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -45,7 +45,12 @@ ssr.rebateTypeKey, ssr.rebateTypeValue, ssr.estimateRebate, - ssr.uploadMoney + ssr.secondaryUploadMoney as uploadMoney + ssr.createOrgName, + ssr.purchaseSystemSid, + ssr.purchaseSystemName, + ssr.palceGenDate, + ssr.withholdingDate, + ssr.uploadMoney + ssr.secondaryUploadMoney - ssr.onceItureCost - ssr.onceTreatCost - ssr.onceSuppCost - ssr.secondItureCost - ssr.secondTreatCost - ssr.secondSuppCost as uploadMoney FROM scm_specialrebate_checkapplydetail sscad LEFT JOIN scm_special_rebate ssr ON sscad.`specialRebateSid` = ssr.`sid` diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index 20e0a6bdd4..9df1abacf1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -418,11 +418,14 @@ public class ScmSpecialRebateService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(createEndTime), "date_format (ssr.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + String palceGenDateStart = query.getPalceGenDateStart(); + String palceGenDateEnd = query.getPalceGenDateEnd(); + qw.apply(StringUtils.isNotBlank(palceGenDateStart), "ssr.palceGenDate >=" + "'" + palceGenDateStart + "'"). + apply(StringUtils.isNotBlank(palceGenDateEnd), "ssr.palceGenDate <=" + "'" + palceGenDateEnd + "'"); if (query.getSidList().size() > 0) { qw.notIn("ssr.sid", query.getSidList()); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java index 9a722e7b68..8ea6baf4bf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.java @@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribute; import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistributeVo; +import org.apache.ibatis.annotations.Update; import java.util.List; import java.util.Map; @@ -54,17 +55,12 @@ import java.util.Map; @Mapper public interface ScmSpecialrebatedistributeMapper extends BaseMapper { - //@Update("update scm_specialrebatedistribute set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_specialrebatedistribute") - List selectListVo(); - int selectBySid(String join); int updateFlowFiled(Map beanToMap); + + @Update("update scm_specialrebatedistribute set state = #{state} where sid = #{sid}") + void updateState(@Param("sid") String sid, @Param("state") int state); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml index 8a29f32fa9..536f30cca0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeMapper.xml @@ -1,35 +1,46 @@ - - - - - + + + - + SELECT COUNT(*) + FROM scm_specialrebatedistribute + WHERE nodeState != '待提交' and find_in_set(sid, #{list}) - + - - UPDATE scm_specialrebatedistribute - SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} - - , procDefId=#{procDefId} - - - , procInstId=#{procInsId} - - - , taskId=#{taskId} - - WHERE sid=#{sid} + + UPDATE scm_specialrebatedistribute + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index 2faa915c11..f109e68ba8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; @@ -45,6 +46,8 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetail; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDto; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo; +import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailService; import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService; import org.apache.commons.lang3.StringUtils; @@ -63,6 +66,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.ScmSpecialrebatedistribu import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -94,29 +98,67 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService createQueryWrapper(ScmSpecialrebatedistributeQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } + @Autowired + private ScmSpecialRebateService scmSpecialRebateService; public PagerVo listPageVo(PagerQuery pq) { ScmSpecialrebatedistributeQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid", query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getBrandSid())) { - qw.eq("brandSid", query.getBrandSid()); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuUrl())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("sp.orgPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("sp.orgPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("sp.orgPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("sp.orgPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("sp.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } } if (StringUtils.isNotBlank(query.getTitle())) { - qw.like("title", query.getTitle()); + qw.like("sp.title", query.getTitle()); + } + if (StringUtils.isNotBlank(query.getCreateOrgName())) { + qw.like("sp.createOrgName", query.getCreateOrgName()); + } + if (StringUtils.isNotBlank(query.getPurchaseSystemName())) { + qw.like("sp.purchaseSystemName", query.getPurchaseSystemName()); } String createStartTime = query.getCreateStartTime(); String createEndTime = query.getCreateEndTime(); - qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (sp.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(createEndTime), "date_format (sp.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.groupBy("sp.sid"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -138,7 +180,7 @@ public class ScmSpecialrebatedistributeService 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 @@ -255,6 +295,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); + scmSpecialRebateService.updateState(businessSid, 5); return voResultBean; } if (r == 2) { @@ -313,6 +354,7 @@ public class ScmSpecialrebatedistributeService 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/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailMapper.xml index 6549203ad6..c760b68183 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistributedetail/ScmSpecialrebatedistributedetailMapper.xml @@ -22,7 +22,7 @@