Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
aa62017e43
  1. 2
      anrui-base/anrui-base-api/pom.xml
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java
  4. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java
  5. 25
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  6. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java
  7. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  8. 4
      anrui-base/anrui-base-biz/src/main/resources/application-test.yml
  9. 1
      anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java
  10. 27
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
  11. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml
  12. 7
      anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml
  13. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java
  14. 11
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java
  15. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java
  16. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java
  17. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java
  18. 18
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java
  19. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java
  20. 10
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java
  21. 8
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java
  22. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java
  23. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java
  24. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java
  25. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java
  26. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java
  27. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java
  28. 15
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java
  29. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java
  30. 6
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java
  31. 37
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml
  32. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java
  33. 101
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
  34. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java
  35. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java
  36. 7
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java
  37. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml
  38. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java
  39. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java
  40. 20
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml
  41. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java
  42. 103
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
  43. 10
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java
  44. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java
  45. 15
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml
  46. 28
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java
  47. 9
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java
  48. 17
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml
  49. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java
  50. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java
  51. 22
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java
  52. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java
  53. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java
  54. 22
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java
  55. 14
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java
  56. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthInfoVo.java
  57. 13
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/ReportListVo.java
  58. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java
  59. 12
      doc/databases/base_tables.sql

2
anrui-base/anrui-base-api/pom.xml

@ -13,7 +13,7 @@
<artifactId>anrui-base-api</artifactId>
<groupId>com.yxt.anrui</groupId>
<version>0.0.1</version>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddleman.java

@ -64,5 +64,7 @@ public class BaseMiddleman extends BaseEntity {
private String createOrgSid;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("编码")
private String middleCode;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* Project: anrui-base(基础) <br/>
* File: BaseMiddlemanDto.java <br/>
@ -53,8 +55,10 @@ public class BaseMiddlemanDto implements Dto {
private String sid;
@ApiModelProperty("姓名")
@NotBlank(message = "姓名不能为空")
private String name;
@ApiModelProperty("手机号")
@NotBlank(message = "手机号不能为空")
private String mobile;
@ApiModelProperty("所在单位")
private String company;
@ -63,6 +67,7 @@ public class BaseMiddlemanDto implements Dto {
@ApiModelProperty("银行账号")
private String bankAccount;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:用户sid不能为空")
private String createBySid;
@ApiModelProperty(value = "备注")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemiddleman/BaseMiddlemanFeign.java

@ -64,7 +64,7 @@ public interface BaseMiddlemanFeign {
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseMiddlemanDto dto);
public ResultBean save(@Valid @RequestBody BaseMiddlemanDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")

25
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@ -15,7 +15,9 @@ import java.util.List;
public class BaseVehicleOutDto implements Dto {
private static final long serialVersionUID = 7393182384733981516L;
private List<BaseVehicleOutQuery> queryList;
private String vinSid;
private String vinNo;
@ApiModelProperty("出库类型")
private String type;
private String typeKey;
@ -41,17 +43,26 @@ public class BaseVehicleOutDto implements Dto {
private String mobile;
@ApiModelProperty("赠品说明")
private String giftsDescription;
@ApiModelProperty("二次经销商")
private String distributorName;
@ApiModelProperty("二次经销商sid")
private String distributorSid;
@ApiModelProperty("返利金额")
private String rebateAmount;
@ApiModelProperty("实际购车人名称")
/* @ApiModelProperty("实际购车人名称")
private String actualCustomer;
@ApiModelProperty("实际购车人电话")
private String actualMobile;
@ApiModelProperty("实际购车人sid")
private String actualSid;
private String actualSid;*/
/* @ApiModelProperty("二次经销商")
private String distributorName;
@ApiModelProperty("二次经销商sid")
private String distributorSid;*/
private List<BaseVehicleOutQuery> queryList;
//销售折让
//中介人1
//返利金额1
//中介人2
//返利金额2
//备注
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemiddleman/BaseMiddlemanService.java

@ -32,6 +32,7 @@ import com.yxt.anrui.base.api.basemiddleman.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -85,6 +86,8 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
BeanUtil.copyProperties(dto, baseMiddleman, "sid");
baseMiddleman.setCreateOrgSid(resultBean.getData());
baseMiddleman.setUseOrgSid(resultBean.getData());
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMapper.insert(baseMiddleman);
} else {
BaseMiddleman baseMiddleman = fetchBySid(dtoSid);
@ -92,6 +95,8 @@ public class BaseMiddlemanService extends MybatisBaseService<BaseMiddlemanMapper
return rb.setMsg("该数据不存在");
}
BeanUtil.copyProperties(dto, baseMiddleman);
String middleCode = HanZiConverterPinYin.getPinYinFirst(baseMiddleman.getName()) + baseMiddleman.getMobile();
baseMiddleman.setMiddleCode(middleCode);
baseMapper.updateById(baseMiddleman);
}
return rb.success();

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -2588,12 +2588,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
pagerQuery.getParams().setUseOrgSid(useOrgSid);
QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
qw.like("bv.vinNo", pagerQuery.getParams().getName());
}
qw.like("bv.vinNo", pagerQuery.getParams().getName());
qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
qw.eq("bv.isDelete", 0);
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
// qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
IPage<InspectionVinVo> iPage = baseMapper.getInspectionVinList(page, qw);
for (InspectionVinVo record : iPage.getRecords()) {
String addressSid = record.getAddressSid();

4
anrui-base/anrui-base-biz/src/main/resources/application-test.yml

@ -21,3 +21,7 @@ spring:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
templateUrl:
uploadUrl: http://anrui.yyundong.com/template
prefixUrl: http://120.46.131.15:8111//template/

1
anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AppCrmCustomerTempDto.java

@ -47,6 +47,7 @@ public class AppCrmCustomerTempDto implements Dto {
private String name;
@ApiModelProperty("联系电话")
@NotBlank(message = "联系电话不能为空")
private String mobile;
@ApiModelProperty("微信号码")

27
anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@ -31,6 +31,7 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import com.yxt.common.base.utils.HttpStatusEnum;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -217,11 +218,6 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
}
} else { // 修改
if (StringUtils.isNotBlank(dto.getMobile())) {
// map.put("mobile", dto.getMobile());
// CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobileOrWx(map);
// if (crmCustomerTempVo != null && !crmCustomerTempVo.getStaffSid().equals(userOrgInfoVo.getStaffSid())) {
// return new ResultBean().fail().setMsg("该手机号已绑定其它客户,请重新添加");
// }
AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
String mobile = appCrmCustomerTempInfoVo.getMobile();
if (!mobile.equals(dto.getMobile())) {
@ -262,6 +258,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
customerTemp.setCustomerPhoto(customerTemp.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
}
customerTemp.setUpdateBySid(dto.getUserSid());
//客户编码
String customerNo = HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
customerTemp.setCustomerNo(customerNo);
boolean updateBoolean = updateById(customerTemp);
if (updateBoolean) {
// 更新附件表
@ -568,11 +567,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
if (StringUtils.isNotBlank(customerTemp.getCustomerPhoto())) {
customerTemp.setCustomerPhoto(customerTemp.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
}
Map<String, String> map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
// Map<String, String> map = genetrateCustomerNum(dto.getCustomerTypeKey(), userOrgInfoVo);
customerTemp.setCreateBySid(dto.getUserSid());
customerTemp.setStaffSid(userOrgInfoVo.getStaffSid());
customerTemp.setCreateOrgSid(userOrgInfoVo.getOrgSid());
customerTemp.setCustomerNo(map.get("code"));
// customerTemp.setCustomerNo(map.get("code"));
customerTemp.setCertificateTypeKey(customerTemp.getCustomerTypeKey().equals("1") ? "01" : "02");
customerTemp.setCertificateType(customerTemp.getCustomerTypeKey().equals("1") ? "身份证" : "营业执照");
ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
@ -592,6 +591,9 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
} else if ("1".equals(dto.getIsOnRemindkey())) {
customerTemp.setRemind_day(dto.getRemind_day());
}
//客户编码
String customerNo = HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
customerTemp.setCustomerNo(customerNo);
save(customerTemp);
// 增加跟进记录
Map<String, String> paramMap = new HashMap<>();
@ -756,14 +758,17 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
crmCustomerTemp.setCreateBySid(dto.getUserSid());
crmCustomerTemp.setStaffSid(sysUserInfoVo.getStaffSid());
crmCustomerTemp.setCreateOrgSid(sysUserInfoVo.getOrgSid());
Map<String, String> map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo);
crmCustomerTemp.setCustomerNo(map.get("code"));
/*Map<String, String> map = genetrateCustomerNumO(dto.getCustomerTypeKey(), sysUserInfoVo);
crmCustomerTemp.setCustomerNo(map.get("code"));*/
ResultBean resultBean = dictCommonFeign.getFirstDictKeyByType(DictCommonType.FOLLOW_STATE, "0");
if (resultBean.getSuccess() && resultBean.getData() != null) {
String key = resultBean.getData().toString();
crmCustomerTemp.setFollow_state_key(key);
crmCustomerTemp.setFollow_state(dictCommonFeign.selectBykey(key, DictCommonType.FOLLOW_STATE).getData().getDictValue());
}
//客户编码
String customerNo = HanZiConverterPinYin.getPinYinFirst(crmCustomerTemp.getName()) + crmCustomerTemp.getMobile();
crmCustomerTemp.setCustomerNo(customerNo);
save(crmCustomerTemp);
// 增加跟进记录
String visitSid = crmVisitService.insertCrmVisitOne(dto.getUserSid(), crmCustomerTemp.getSid(), crmCustomerTemp.getIsOnRemindkey(), crmCustomerTemp.getIsOnRemind(), dto.getVisitWay(), dto.getVisitWayKey());
@ -839,8 +844,10 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
return rb.setMsg("该客户信息不存在");
}
BeanUtil.copyProperties(dto, customerTemp);
//客户编码
String customerNo = HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
customerTemp.setCustomerNo(customerNo);
baseMapper.updateById(customerTemp);
// int count = updateBySid(dto, sid);
//更新运营信息
CrmBusinessDto crmBusinessDto = dto.getCrmBusinessDto();
crmBusinessService.updateByCusSid(crmBusinessDto, sid);

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingMapper.xml

@ -20,7 +20,7 @@
FROM
sys_mapping sm
LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
<where>${ew.sqlSegment}</where>
</select>
@ -41,7 +41,7 @@
FROM
sys_mapping sm
LEFT JOIN dict_common dc ON sm.dictSid = dc.sid
LEFT JOIN dict_type dt ON dc.parentSid = dt.sid
LEFT JOIN dict_type dt ON dc.dictType = dt.dictTypeCode
<where>${ew.sqlSegment}</where>
</select>

7
anrui-portal/anrui-portal-biz/src/main/resources/application-test.yml

@ -20,11 +20,12 @@ spring:
password:
port: 6379
timeout: 0 # 连接超时时间(毫秒)
image:
upload:
path: D:\\anrui\\upload\\
path: /home/lzh/docker_data/nginx/html/anrui-system-ui/upload
url:
prefix: http://127.0.0.1:7003/upload/
prefix: http://anrui.yyundong.com/upload/
login:
path: D:\\images\\pic-click
path: /home/lzh/webapps/anrui/anrui-portal/images/pic-click

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDetailsVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplyVo.java <br/>
@ -51,6 +54,8 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -78,4 +83,9 @@ public class ScmCollectionrebateCheckapplyDetailsVo implements Vo {
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传回款返利信息")
private List<ScmCollectionrebateCheckapplydetailDetailsVo> scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息
@ApiModelProperty("本月核对往月已上传回款返利信息")
private List<ScmCollectionrebateCheckapplydetailDetailsVo> scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息
}

11
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyDto.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatecheckapply;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplyDto.java <br/>
@ -51,6 +54,10 @@ public class ScmCollectionrebateCheckapplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("创建人sid")
private String createBySid; // 创建人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -78,4 +85,8 @@ public class ScmCollectionrebateCheckapplyDto implements Dto {
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("本月核对本月已上传回款返利信息")
private List<ScmCollectionrebateCheckapplydetailDto> scmWhenCollectionrebateCheckapplydetailDetails; // 本月核对本月已上传回款返利信息
@ApiModelProperty("本月核对往月已上传回款返利信息")
private List<ScmCollectionrebateCheckapplydetailDto> scmLastCollectionrebateCheckapplydetailDetails; // 本月核对往月已上传回款返利信息
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyQuery.java

@ -51,29 +51,12 @@ public class ScmCollectionrebateCheckapplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("核对申请标题")
private String checkApply; // 核对申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty(value = "创建开始日期")
private String createStartTime;
@ApiModelProperty(value = "创建结束日期")
private String createEndTime;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@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
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyVo.java

@ -67,6 +67,14 @@ public class ScmCollectionrebateCheckapplyVo implements Vo {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("回款金额")
private String collectionMoney; // 回款金额
@ApiModelProperty("预计返利")
private String estimateRebate; // 预计返利
@ApiModelProperty("上传金额")
private String uploadMoney; // 上传金额
@ApiModelProperty("调整金额")
private String adjustmentMoney; // 调整金额
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("流程定义的id")

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionrebateCheckapplydetailDto.java <br/>
@ -51,8 +53,8 @@ public class ScmCollectionrebateCheckapplydetailDto implements Dto {
private String sid; // sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("核对申请sid")
private String mainSid; // 核对申请sid

18
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDetailsVo.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateWithVo.java <br/>
@ -51,9 +53,21 @@ public class ScmCollectionRebateWithDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("回款返利sid")
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("预提返利")
private String withRebate; // 预提返利
@ApiModelProperty("台数")
private String num; // 台数
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")
@ApiModelProperty("回款方式key")
private String collectionTypeKey; // 回款方式key
@ApiModelProperty("回款方式value")
private String collectionTypeValue; // 回款方式value
@ApiModelProperty("回款返利预提申请sid")
private String mainSid; // 回款返利预提申请sid
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewith/ScmCollectionRebateWithDto.java

@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateWithDto.java <br/>
@ -51,6 +53,8 @@ public class ScmCollectionRebateWithDto implements Dto {
private String sid; // sid
@ApiModelProperty("回款返利sid")
private List<String> collectionRebateSids; // 回款返利sid
@ApiModelProperty("回款返利sid")
private String collectionRebateSid; // 回款返利sid
@ApiModelProperty("回款返利预提申请sid")

10
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDetailsVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateWithApplyVo.java <br/>
@ -51,6 +54,10 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("申请人sid")
private String createBySid; // 申请人sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -77,5 +84,6 @@ public class ScmCollectionRebateWithApplyDetailsVo implements Vo {
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("回款返利预提列表")
private List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWiths; // 回款返利预提列表
}

8
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyDto.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateWithApplyDto.java <br/>
@ -51,6 +54,8 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
private String sid; // sid
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
@ -77,5 +82,6 @@ public class ScmCollectionRebateWithApplyDto implements Dto {
private String procInstId; // 流程实例的sid
@ApiModelProperty("taskId")
private String taskId; // taskId
@ApiModelProperty("回款返利预提列表")
private List<ScmCollectionRebateWithDto> scmCollectionRebateWiths; // 回款返利预提列表
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyQuery.java

@ -51,29 +51,12 @@ public class ScmCollectionRebateWithApplyQuery implements Query {
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")
private String brandName; // 品牌名称
@ApiModelProperty("回款申请标题")
private String collectionApply; // 回款申请标题
@ApiModelProperty("创建人姓名")
private String createByName; // 创建人姓名
@ApiModelProperty("使用组织sid")
private String useOrgSid; // 使用组织sid
@ApiModelProperty("使用组织名称")
private String useOrgName; // 使用组织名称
@ApiModelProperty(value = "创建开始日期")
private String createStartTime;
@ApiModelProperty(value = "创建结束日期")
private String createEndTime;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@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
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmcollectionrebatewithapply;
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.Date;
/**
* Project: anrui-scm(回款返利) <br/>
* File: ScmCollectionRebateWithApplyVo.java <br/>
@ -51,6 +54,9 @@ public class ScmCollectionRebateWithApplyVo implements Vo {
private String sid; // sid
@ApiModelProperty("创建日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime; // 创建日期
@ApiModelProperty("品牌sid")
private String brandSid; // 品牌sid
@ApiModelProperty("品牌名称")

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/AppScmVehiclePatrolinspectionPageVo.java

@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
@Data
public class AppScmVehiclePatrolinspectionPageVo implements Vo {
private String id;
@ApiModelProperty("记录sid")
private String sid;

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java

@ -1,9 +1,13 @@
package com.yxt.anrui.scm.api.scmvehinventorymonth;
import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppScmVehInventorymonthInfoVo implements Vo {
private static final long serialVersionUID = -8077170646957590520L;
@ -30,6 +34,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo {
private String recipient;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("接收人集合")
private List<RecipientListVo> recipientList = new ArrayList<>();
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java

@ -50,7 +50,7 @@ public class AppScmVehInventorymonthVo implements Vo {
private String sid; // sid
@ApiModelProperty("生成报告状态")
private String state;
private int state;
@ApiModelProperty("编号(yyyyMMdd)")
private String reportId; // 编号(yyyyMMdd)
@ApiModelProperty("创建时间")

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java

@ -0,0 +1,16 @@
package com.yxt.anrui.scm.api.scmvehinventoryreport;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class RecipientListVo implements Vo {
private static final long serialVersionUID = -2236972592829923353L;
@ApiModelProperty("接收人sid")
private String sid; // 接收人sid
@ApiModelProperty("接收人姓名")
private String name; // 接收人姓名
}

15
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java

@ -0,0 +1,15 @@
package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppLiableListVo implements Vo {
private static final long serialVersionUID = -1049339684785700179L;
@ApiModelProperty("相关责任人名称")
private String liableName;
@ApiModelProperty("相关责任人sid")
private String liableSid;
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java

@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
private static final long serialVersionUID = -5082102320532147476L;
@ -23,4 +26,7 @@ public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("接收人集合")
private List<AppLiableListVo> recipientList = new ArrayList<>();
}

6
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthVo.java

@ -26,12 +26,15 @@
package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
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.Date;
/**
* Project: aaa(aaa) <br/>
* File: ScmVehPatrolinspectionmonthVo.java <br/>
@ -57,7 +60,8 @@ public class ScmVehPatrolinspectionmonthVo implements Vo {
@ApiModelProperty("创建人sid")
private String createBySid;
@ApiModelProperty("创建时间")
private String createTime;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty("剩余巡检记录数量")
private String surplusNumber;
@ApiModelProperty("巡检记录总数数量")

37
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyMapper.xml

@ -1,13 +1,32 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
SELECT * FROM scm_collectionrebate_checkapply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
SELECT * FROM scm_collectionrebate_checkapply <where> ${ew.sqlSegment} </where>
</select>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
SELECT
scc.*,
SUM(scr.`estimateRebate`) estimateRebate,
SUM(scr.`uploadMoney`) uploadMoney,
SUM(scr.`collectionMoney`) collectionMoney,
SUM(scr.`adjustmentMoney`) adjustmentMoney
FROM
scm_collectionrebate_checkapply scc
LEFT JOIN scm_collectionrebate_checkapplydetail sccd
ON scc.`sid` = sccd.`mainSid`
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = sccd.`collectionRebateSid`
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo">
SELECT * FROM scm_collectionrebate_checkapply
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyRest.java

@ -75,9 +75,7 @@ public class ScmCollectionrebateCheckapplyRest implements ScmCollectionrebateChe
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionrebateCheckapplyDto dto){
ResultBean rb = ResultBean.fireFail();
scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
return rb.success();
return scmCollectionrebateCheckapplyService.saveOrUpdateDto(dto);
}
@Override

101
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java

@ -28,19 +28,22 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatecheckapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetail;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
import com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService;
import com.yxt.common.core.result.ResultBean;
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.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapply;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyQuery;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.ScmCollectionrebateCheckapplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@ -60,6 +63,10 @@ import java.util.List;
*/
@Service
public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<ScmCollectionrebateCheckapplyMapper, ScmCollectionrebateCheckapply> {
@Autowired
private ScmCollectionrebateCheckapplydetailService scmCollectionrebateCheckapplydetailService;
private QueryWrapper<ScmCollectionrebateCheckapply> createQueryWrapper(ScmCollectionrebateCheckapplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -69,26 +76,100 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
public PagerVo<ScmCollectionrebateCheckapplyVo> listPageVo(PagerQuery<ScmCollectionrebateCheckapplyQuery> pq) {
ScmCollectionrebateCheckapplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionrebateCheckapply> qw = createQueryWrapper(query);
QueryWrapper<ScmCollectionrebateCheckapply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("ssc.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCheckApply())) {
qw.like("ssc.checkApply", query.getCheckApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (ssc.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (ssc.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("ssc.createOrgSid", query.getCreateOrgSid());
IPage<ScmCollectionrebateCheckapply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionrebateCheckapplyVo> pagging = baseMapper.selectPageVo(page, qw);
List<ScmCollectionrebateCheckapplyVo> records = pagging.getRecords();
for (ScmCollectionrebateCheckapplyVo record : records) {
record.setEstimateRebate(record.getEstimateRebate().substring(0,record.getEstimateRebate().lastIndexOf(".")));
record.setUploadMoney(record.getUploadMoney().substring(0,record.getUploadMoney().lastIndexOf(".")));
record.setCollectionMoney(record.getCollectionMoney().substring(0,record.getCollectionMoney().lastIndexOf(".")));
record.setAdjustmentMoney(record.getAdjustmentMoney().substring(0,record.getAdjustmentMoney().lastIndexOf(".")));
}
PagerVo<ScmCollectionrebateCheckapplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
public ResultBean saveOrUpdateDto(ScmCollectionrebateCheckapplyDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionrebateCheckapplydetailDto> scmWhenCollectionrebateCheckapplydetailDetails = dto.getScmWhenCollectionrebateCheckapplydetailDetails();
List<ScmCollectionrebateCheckapplydetailDto> scmLastCollectionrebateCheckapplydetailDetails = dto.getScmLastCollectionrebateCheckapplydetailDetails();
if (scmWhenCollectionrebateCheckapplydetailDetails.size() < 1 && scmLastCollectionrebateCheckapplydetailDetails.size() < 1) {
return rb.setMsg("请选择已核对回款返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(sid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
}
}
}
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(sid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("添加成功").setData(sid);
}
ScmCollectionrebateCheckapply scmCollectionrebateCheckapply = fetchBySid(dtoSid);
if (scmCollectionrebateCheckapply == null) {
return rb.setMsg("该核对申请单不存在");
}
this.updateByDto(dto);
scmCollectionrebateCheckapplydetailService.delByMainSid(dtoSid);
if (scmWhenCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmWhenCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
}
}
}
if (scmLastCollectionrebateCheckapplydetailDetails.size() > 0) {
for (ScmCollectionrebateCheckapplydetailDto scmCollectionrebateCheckapplydetail : scmLastCollectionrebateCheckapplydetailDetails) {
for (String CollectionRebateSid : scmCollectionrebateCheckapplydetail.getCollectionRebateSids()) {
ScmCollectionrebateCheckapplydetail scmCollectionrebateCheckapplydetail1 = new ScmCollectionrebateCheckapplydetail();
scmCollectionrebateCheckapplydetail1.setCollectionRebateSid(CollectionRebateSid);
scmCollectionrebateCheckapplydetail1.setMainSid(dtoSid);
scmCollectionrebateCheckapplydetailService.save(scmCollectionrebateCheckapplydetail1);
}
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public void insertByDto(ScmCollectionrebateCheckapplyDto dto){
public ResultBean<String> insertByDto(ScmCollectionrebateCheckapplyDto dto){
ResultBean rb = ResultBean.fireFail();
ScmCollectionrebateCheckapply entity = new ScmCollectionrebateCheckapply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionrebateCheckapplyDto dto){

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailMapper.java

@ -29,6 +29,7 @@ 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;
@ -62,4 +63,7 @@ public interface ScmCollectionrebateCheckapplydetailMapper extends BaseMapper<Sc
@Select("select * from scm_collectionrebate_checkapplydetail")
List<ScmCollectionrebateCheckapplydetailVo> selectListVo();
@Delete("delete from scm_collectionrebate_checkapplydetail where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapplydetail/ScmCollectionrebateCheckapplydetailService.java

@ -107,4 +107,8 @@ public class ScmCollectionrebateCheckapplydetailService extends MybatisBaseServi
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
}

7
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.java

@ -29,6 +29,8 @@ 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 com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -65,4 +67,9 @@ public interface ScmCollectionRebateWithMapper extends BaseMapper<ScmCollectionR
@Select("SELECT mainSid FROM scm_collection_rebate_with WHERE collectionRebateSid = #{sid}")
List<String> fetchByCollectionReBateSid(String sid);
@Delete("delete from scm_collection_rebate_with where mainSid = #{dtoSid}")
void delByMainSid(String dtoSid);
List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid);
}

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithMapper.xml

@ -10,4 +10,18 @@
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithVo">
SELECT * FROM scm_collection_rebate_with <where> ${ew.sqlSegment} </where>
</select>
<select id="fetchByMainSid"
resultType="com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo">
SELECT scr.collectionTypeKey,
scr.`collectionTypeValue`,
SUM(scr.`estimateRebate`) withRebate,
COUNT(*) num,
GROUP_CONCAT(scrw.`specialRebateSid`) specialRebateSid
FROM scm_special_rebate_with scrw
LEFT JOIN scm_special_rebate scr
ON scr.`sid` = scrw.`specialRebateSid`
WHERE scrw.`mainSid` = #{sid}
GROUP BY scr.`calculationModeKey`
</select>
</mapper>

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewith/ScmCollectionRebateWithService.java

@ -111,4 +111,12 @@ public class ScmCollectionRebateWithService extends MybatisBaseService<ScmCollec
public List<String> fetchByCollectionReBateSid(String sid) {
return baseMapper.fetchByCollectionReBateSid(sid);
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<ScmCollectionRebateWithDetailsVo> fetchByMainSid(String sid) {
return baseMapper.fetchByMainSid(sid);
}
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.java

@ -62,4 +62,6 @@ public interface ScmCollectionRebateWithApplyMapper extends BaseMapper<ScmCollec
@Select("select * from scm_collection_rebate_with_apply")
List<ScmCollectionRebateWithApplyVo> selectListVo();
int selectBySid(String join);
}

20
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyMapper.xml

@ -4,10 +4,28 @@
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT * FROM scm_collection_rebate_with_apply <where> ${ew.sqlSegment} </where>
SELECT
scrwa.*,
SUM(scr.`estimateRebate`) withRebateTotal
FROM
scm_collection_rebate_with_apply scrwa
LEFT JOIN scm_collection_rebate_with scrw
ON scrwa.`sid` = scrw.`mainSid`
LEFT JOIN scm_collection_rebate scr
ON scr.`sid` = scrw.`collectionRebateSid`
<where>
${ew.sqlSegment}
</where> <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo">
SELECT * FROM scm_collection_rebate_with_apply <where> ${ew.sqlSegment} </where>
</select>
<select id="selectBySid" resultType="int">
SELECT COUNT(*)
FROM scm_collection_rebate_with_apply
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
</mapper>

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyRest.java

@ -75,26 +75,20 @@ public class ScmCollectionRebateWithApplyRest implements ScmCollectionRebateWith
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody ScmCollectionRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
return rb.success();
return scmCollectionRebateWithApplyService.saveOrUpdateDto(dto);
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
scmCollectionRebateWithApplyService.delBySids(sids);
return rb.success();
return scmCollectionRebateWithApplyService.delAll(sids);
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApplyDetailsVo vo = scmCollectionRebateWithApplyService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
return scmCollectionRebateWithApplyService.fetchAllDetailsVo(sid);
}
}

103
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java

@ -28,6 +28,10 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatewithapply;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWith;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDetailsVo;
import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -41,8 +45,10 @@ import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWit
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyDto;
import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyFeign;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
/**
@ -60,6 +66,10 @@ import java.util.List;
*/
@Service
public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmCollectionRebateWithApplyMapper, ScmCollectionRebateWithApply> {
@Autowired
private ScmCollectionRebateWithService scmCollectionRebateWithService;
private QueryWrapper<ScmCollectionRebateWithApply> createQueryWrapper(ScmCollectionRebateWithApplyQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -69,26 +79,72 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
public PagerVo<ScmCollectionRebateWithApplyVo> listPageVo(PagerQuery<ScmCollectionRebateWithApplyQuery> pq) {
ScmCollectionRebateWithApplyQuery query = pq.getParams();
QueryWrapper<ScmCollectionRebateWithApply> qw = createQueryWrapper(query);
QueryWrapper<ScmCollectionRebateWithApply> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getBrandSid())) {
qw.eq("scrwa.brandSid", query.getBrandSid());
}
if (StringUtils.isNotBlank(query.getCollectionApply())) {
qw.like("scrwa.withApply", query.getCollectionApply());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (scrwa.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (scrwa.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("scrwa.createOrgSid", query.getCreateOrgSid());
qw.groupBy("scrwa.sid");
qw.orderByDesc("scrwa.createTime");
IPage<ScmCollectionRebateWithApply> page = PagerUtil.queryToPage(pq);
IPage<ScmCollectionRebateWithApplyVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmCollectionRebateWithApplyVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
public ResultBean saveOrUpdateDto(ScmCollectionRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
String dtoSid = dto.getSid();
List<ScmCollectionRebateWithDto> scmCollectionRebateWiths = dto.getScmCollectionRebateWiths();
if (scmCollectionRebateWiths == null) {
return rb.setMsg("请选择回款返利信息");
}
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto).getData();
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(sid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("添加成功").setData(sid);
}
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(dtoSid);
if (scmCollectionRebateWithApply == null) {
rb.setMsg("该回款返利预提申请单不存在");
}
this.updateByDto(dto);
scmCollectionRebateWithService.delByMainSid(dtoSid);
for (ScmCollectionRebateWithDto scmCollectionRebateWithDto : scmCollectionRebateWiths) {
List<String> collectionRebateSids = scmCollectionRebateWithDto.getCollectionRebateSids();
for (String collectionRebateSid : collectionRebateSids) {
ScmCollectionRebateWith scmCollectionRebateWith = new ScmCollectionRebateWith();
scmCollectionRebateWith.setCollectionRebateSid(collectionRebateSid);
scmCollectionRebateWith.setMainSid(dtoSid);
scmCollectionRebateWithService.save(scmCollectionRebateWith);
}
}
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public void insertByDto(ScmCollectionRebateWithApplyDto dto){
public ResultBean<String> insertByDto(ScmCollectionRebateWithApplyDto dto){
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApply entity = new ScmCollectionRebateWithApply();
BeanUtil.copyProperties(dto, entity, "id", "sid");
entity.setNodeState("待提交");
baseMapper.insert(entity);
return rb.success().setData(entity.getSid());
}
public void updateByDto(ScmCollectionRebateWithApplyDto dto){
@ -107,4 +163,35 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
BeanUtil.copyProperties(entity, vo);
return vo;
}
public ResultBean delAll(String[] sids) {
ResultBean rb = ResultBean.fireFail();
//查询该sid中是否有流程不是待提交的
int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
if (count > 0) {
return rb.setMsg("删除的数据中包含已经提交审批的数据,删除失败");
}
delBySids(sids);
for (String sid : sids) {
scmCollectionRebateWithService.delByMainSid(sid);
}
return rb.success().setMsg("删除成功");
}
public ResultBean<ScmCollectionRebateWithApplyDetailsVo> fetchAllDetailsVo(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmCollectionRebateWithApplyDetailsVo scmCollectionRebateWithApplyDetailsVo = new ScmCollectionRebateWithApplyDetailsVo();
ScmCollectionRebateWithApply scmCollectionRebateWithApply = fetchBySid(sid);
BeanUtil.copyProperties(scmCollectionRebateWithApply, scmCollectionRebateWithApplyDetailsVo);
List<ScmCollectionRebateWithDetailsVo> scmCollectionRebateWithDetailsVos = scmCollectionRebateWithService.fetchByMainSid(sid);
for (ScmCollectionRebateWithDetailsVo scmCollectionRebateWithDetailsVo : scmCollectionRebateWithDetailsVos) {
String[] specialRebateSids = scmCollectionRebateWithDetailsVo.getCollectionRebateSid().split(",");
scmCollectionRebateWithDetailsVo.setCollectionRebateSids(Arrays.asList(specialRebateSids));
String withRebate = scmCollectionRebateWithDetailsVo.getWithRebate();
withRebate = withRebate.substring(0, withRebate.lastIndexOf("."));
scmCollectionRebateWithDetailsVo.setWithRebate(withRebate);
}
scmCollectionRebateWithApplyDetailsVo.setScmCollectionRebateWiths(scmCollectionRebateWithDetailsVos);
return rb.success().setData(scmCollectionRebateWithApplyDetailsVo);
}
}

10
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@ -144,7 +144,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
String createOrgSid = record.getCreateOrgSid();
String id = record.getId();
List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid);
if (scmVehicleStayInventoryVos.size() > 0){
if (scmVehicleStayInventoryVos.size() > 0) {
ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate());
@ -370,10 +370,10 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
return rb.setMsg("备注请填写盘损原因");
}
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
return rb.setMsg("今日已盘车辆,请勿重复提交");
}
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
// if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
// return rb.setMsg("今日已盘车辆,请勿重复提交");
// }
String sid = dto.getSid();
if (StringUtils.isBlank(sid)) {
BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.java

@ -101,4 +101,12 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
@Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
void updatePatrolInspectionState(@Param("sid") String sid);
@Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")
List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(@Param("sid") String sid, @Param("vin") String vin);
@Update("update scm_vehicle_patrolinspection set isDelete = 1 where vinNo = #{vinNo} and id = #{id} ")
void deleteByVinNo(@Param("vinNo") String vinNo,@Param("id") String id);
List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
}

15
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@ -97,6 +97,21 @@
and svp.patrolInspectionStateKey = #{stateKey}
</select>
<select id="selectByVinNo"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
SELECT id,
sid,
vinNo as vin,
mainSid,
location as warehouse,
patrolInspectionState as `state`,
patrolInspectionStateKey as stateKey,
patrolInspectionDate as newInspectionDate,
patrolInspectionName as newInspectionName
FROM scm_vehicle_patrolinspection svp
WHERE vinNo = #{vinNo} AND createOrgSid = #{useOrgSid} ORDER BY id DESC
</select>
<update id="updateByMainSid">
update scm_vehicle_patrolinspection
set patrolInspectionStateKey = #{stateKey},

28
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@ -34,6 +34,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmfile.ScmFile;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.*;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo;
import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetDetailsVo;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageVo;
@ -108,7 +109,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
qw.apply(StringUtils.isNotEmpty(patrolInspectionStartDate), "date_format (patrolInspectionDate,'%Y-%m-%d') >= date_format('" + patrolInspectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(patrolInspectionEndDate), "date_format (patrolInspectionDate,'%Y-%m-%d') <= date_format('" + patrolInspectionEndDate + "','%Y-%m-%d')"
);
qw.eq("patrolInspectionStateKey",002).or().eq("patrolInspectionStateKey",003);
qw.and(wrapper -> wrapper.eq("patrolInspectionStateKey", "002").or().eq("patrolInspectionStateKey", "003"));
IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<ScmVehiclePatrolinspectionVo> p = PagerUtil.pageToVo(pagging, null);
@ -125,7 +126,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
if (StringUtils.isNotBlank(query.getLocationSid())) {
qw.eq("locationSid", query.getLocationSid());
}
qw.eq("patrolInspectionStateKey",000).or().eq("patrolInspectionStateKey",001);
qw.and(wrapper -> wrapper.eq("patrolInspectionStateKey", "000").or().eq("patrolInspectionStateKey", "001"));
IPage<ScmVehiclePatrolinspection> page = PagerUtil.queryToPage(pq);
IPage<ScmVehiclePatrolinspectionVo> pagging = baseMapper.selectPageVo(page, qw);
for (ScmVehiclePatrolinspectionVo record : pagging.getRecords()) {
@ -144,12 +145,12 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
ScmWarehouse scmWarehouse = scmWarehouseService.fetchBySid(locationSid);
record.setLiableSid(scmWarehouse.getLibTubeSid());
record.setLiableName(scmWarehouse.getLibTubeName());
String mainSid = record.getMainSid();
ScmVehiclePatrolinspectionsheetDetailsVo scmVehiclePatrolinspectionsheetDetailsVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(mainSid);
if (scmVehiclePatrolinspectionsheetDetailsVo != null){
record.setSituationExplain(scmVehiclePatrolinspectionsheetDetailsVo.getSituationExplain());
record.setProblems(scmVehiclePatrolinspectionsheetDetailsVo.getProblemsAndResults());
String sid = scmVehiclePatrolinspectionsheetDetailsVo.getSid();
String sid1 = record.getSid();
AppScmVehiclePatrolinspectionsheetInfoVo appScmVehiclePatrolinspectionsheetInfoVo = scmVehiclePatrolinspectionsheetService.fetchByMainSid(sid1);
if (appScmVehiclePatrolinspectionsheetInfoVo != null){
record.setSituationExplain(appScmVehiclePatrolinspectionsheetInfoVo.getExplain());
record.setProblems(appScmVehiclePatrolinspectionsheetInfoVo.getProblems());
String sid = appScmVehiclePatrolinspectionsheetInfoVo.getSid();
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
List<String> strings = new ArrayList<>();
for (ScmFileVo scmFileVo : scmFileVos) {
@ -327,4 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
}
public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid,String vin) {
return baseMapper.selectByMandSid(sid,vin);
}
public void deleteByVinNo(String vinNo, String id) {
baseMapper.deleteByVinNo(vinNo,id);
}
public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo,String useOrgSid) {
return baseMapper.selectByVinNo(vinNo,useOrgSid);
}
}

9
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.java

@ -85,6 +85,11 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
AppScmVehiclePatroVo getInspectionInfo(String recordSid);
@Select("select * from scm_vehicle_patrolinspectionsheet where mainSid = #{mainSid}")
ScmVehiclePatrolinspectionsheetDetailsVo fetchByMainSid(String mainSid);
AppScmVehiclePatrolinspectionsheetInfoVo fetchByMainSid(String mainSid);
@Update("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{mainSid} ")
void deleteByMainSid(@Param("mainSid") String mainSid);
@Select("SELECT count(*) FROM scm_vehicle_patrolinspectionsheet WHERE mainSid = #{mainSid}")
int selectByMainSidNum(@Param("mainSid") String mainSid);
}

17
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetMapper.xml

@ -6,13 +6,17 @@
<select id="selectPageVo"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo">
SELECT * FROM scm_vehicle_patrolinspectionsheet
<where>${ew.sqlSegment}</where>
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectListAllVo"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetVo">
SELECT * FROM scm_vehicle_patrolinspectionsheet
<where>${ew.sqlSegment}</where>
<where>
${ew.sqlSegment}
</where>
</select>
<select id="getInspection"
@ -72,7 +76,14 @@
svp.patrolInspectionDate,
svp.patrolInspectionName
from scm_vehicle_patrolinspection svp
left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
left join scm_vehicle_patrolinspectionsheet svps on svps.mainSid = svp.sid
where svp.sid = #{recordSid}
</select>
<select id="fetchByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppScmVehiclePatrolinspectionsheetInfoVo">
SELECT sid, situationExplain AS 'explain', problems
FROM scm_vehicle_patrolinspectionsheet
WHERE mainSid = #{mainSid}
</select>
</mapper>

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@ -27,6 +27,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@ -114,6 +115,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
@Autowired
ScmVehPatrolinspectionmonthService scmVehPatrolinspectionmonthService;
@Autowired
ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
@Autowired
SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
SysUserFeign sysUserFeign;
@ -279,6 +282,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
}
List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
if (list.size() > 0) {
String id = list.get(0).getId();
String mainSid = list.get(0).getSid();
scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
int count = baseMapper.selectByMainSidNum(mainSid);
if (count > 0) {
baseMapper.deleteByMainSid(mainSid);
}
}
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@ -413,7 +426,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
scmVehPatrolinspectionmonthVo = monthVoList.get(0);
}
List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
if (list.size() > 0) {
String id = list.get(0).getId();
String mainSid = list.get(0).getSid();
scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
int count = baseMapper.selectByMainSidNum(mainSid);
if (count > 0) {
baseMapper.deleteByMainSid(mainSid);
}
}
ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@ -435,8 +457,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
if (vehicleVo != null) {
scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
}
save(scmVehiclePatrolinspectionsheet);
scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
@ -665,7 +689,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
return billNo;
}
public ScmVehiclePatrolinspectionsheetDetailsVo fetchByMainSid(String mainSid) {
public AppScmVehiclePatrolinspectionsheetInfoVo fetchByMainSid(String mainSid) {
return baseMapper.fetchByMainSid(mainSid);
}
}

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@ -40,8 +40,12 @@ import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionDto;
import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo;
import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
import com.yxt.anrui.scm.biz.scmvehinventoryreport.ScmVehInventoryreportService;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -58,9 +62,7 @@ import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* Project: aaa(aaa) <br/>
@ -86,6 +88,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
SysUserFeign sysUserFeign;
@Autowired
ScmVehicleInventoryService scmVehicleInventoryService;
@Autowired
ScmVehInventoryreportService scmVehInventoryreportService;
private QueryWrapper<ScmVehInventorymonth> createQueryWrapper(ScmVehInventorymonthQuery query) {
@ -263,7 +267,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
if (record.getState().equals(0)) {
if (record.getState() == 0) {
if (vo.getSurplusNumber() == 0) {
record.setShowBtn(true);
} else {
@ -280,6 +284,21 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
ResultBean<AppScmVehInventorymonthInfoVo> rb = ResultBean.fireFail();
AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo();
AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
List<RecipientListVo> recipientListVos = scmVehInventoryreportService.selectByMainSid();
if (recipientListVos.size() > 0) {
if (StringUtils.isNotBlank(recipientListVos.get(0).getName())) {
List<RecipientListVo> list = new ArrayList<>();
List<String> splitName = Arrays.asList(recipientListVos.get(0).getName().split(","));
List<String> splitSid = Arrays.asList(recipientListVos.get(0).getSid().split(","));
for (int i = 0; i < splitName.size(); i++) {
RecipientListVo v = new RecipientListVo();
v.setName(splitName.get(i));
v.setSid(splitSid.get(i));
list.add(v);
}
vo.setRecipientList(list);
}
}
if (appScmVehInventorymonthInfoVo != null) {
vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient());
vo.setDate(appScmVehInventorymonthInfoVo.getDate());

22
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java

@ -29,6 +29,7 @@ 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 com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -53,13 +54,16 @@ import java.util.List;
@Mapper
public interface ScmVehInventoryreportMapper extends BaseMapper<ScmVehInventoryreport> {
//@Update("update scm_veh_inventoryreport set name=#{msg} where id=#{id}")
//IPage<ScmVehInventoryreportVo> voPage(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventoryreport> qw);
IPage<ScmVehInventoryreportVo> selectPageVo(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
List<ScmVehInventoryreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
@Select("select * from scm_veh_inventoryreport")
List<ScmVehInventoryreportVo> selectListVo();
//@Update("update scm_veh_inventoryreport set name=#{msg} where id=#{id}")
//IPage<ScmVehInventoryreportVo> voPage(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventoryreport> qw);
IPage<ScmVehInventoryreportVo> selectPageVo(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
List<ScmVehInventoryreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
@Select("select * from scm_veh_inventoryreport")
List<ScmVehInventoryreportVo> selectListVo();
@Select("select receiverSids as sid, receiverNames as name from scm_veh_inventoryreport order by id desc")
List<RecipientListVo> selectByMainSid();
}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@ -50,6 +50,7 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.omg.CORBA.BAD_CONTEXT;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -239,4 +240,8 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
// JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名
System.out.println("process end");
}
public List<RecipientListVo> selectByMainSid() {
return baseMapper.selectByMainSid();
}
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@ -59,6 +59,7 @@ import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -301,6 +302,21 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient());
vo.setDate(appScmVehInventorymonthInfoVo.getDate());
}
List<AppLiableListVo> appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid();
if (appLiableListVos.size() > 0) {
if (StringUtils.isNotBlank(appLiableListVos.get(0).getLiableName())) {
List<AppLiableListVo> list = new ArrayList<>();
List<String> splitName = Arrays.asList(appLiableListVos.get(0).getLiableName().split(","));
List<String> splitSid = Arrays.asList(appLiableListVos.get(0).getLiableSid().split(","));
for (int i = 0; i < splitName.size(); i++) {
AppLiableListVo v = new AppLiableListVo();
v.setLiableName(splitName.get(i));
v.setLiableSid(splitSid.get(i));
list.add(v);
}
vo.setRecipientList(list);
}
}
VehPatrolinspectionmonthVo vehPatrolinspectionmonthVo = scmVehiclePatrolinspectionService.getMonthByMainSid(sid);
vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getNormalNumber() + vehPatrolinspectionmonthVo.getUnHandledNumber() + vehPatrolinspectionmonthVo.getProcessedNumber()));
vo.setTotalNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber()));

22
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java

@ -29,6 +29,7 @@ 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 com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -53,13 +54,16 @@ import java.util.List;
@Mapper
public interface ScmVehPatrolinspectionreportMapper extends BaseMapper<ScmVehPatrolinspectionreport> {
//@Update("update scm_veh_patrolinspectionreport set name=#{msg} where id=#{id}")
//IPage<ScmVehPatrolinspectionreportVo> voPage(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionreport> qw);
IPage<ScmVehPatrolinspectionreportVo> selectPageVo(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
List<ScmVehPatrolinspectionreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
@Select("select * from scm_veh_patrolinspectionreport")
List<ScmVehPatrolinspectionreportVo> selectListVo();
//@Update("update scm_veh_patrolinspectionreport set name=#{msg} where id=#{id}")
//IPage<ScmVehPatrolinspectionreportVo> voPage(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionreport> qw);
IPage<ScmVehPatrolinspectionreportVo> selectPageVo(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
List<ScmVehPatrolinspectionreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
@Select("select * from scm_veh_patrolinspectionreport")
List<ScmVehPatrolinspectionreportVo> selectListVo();
@Select("select receiverSids as liableSid, receiverNames as liableName from scm_veh_patrolinspectionreport order by id desc")
List<AppLiableListVo> selectByMainSid();
}

14
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java

@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppPatrolinspection
import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto;
import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
@ -171,6 +172,15 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
question.append("(问题已解决)");
question.append("\n");
}
List<AppLiableListDto> liableList = dto.getList();
String DutyName = "";
String DutySid = "";
for (AppLiableListDto appLiableListDto : liableList) {
DutyName = appLiableListDto.getLiableName() + "," + DutyName;
DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
}
scmVehPatrolinspectionreport.setReceiverNames(DutyName.substring(0, DutyName.length() - 1));
scmVehPatrolinspectionreport.setReceiverSids(DutySid.substring(0, DutySid.length() - 1));
save(scmVehPatrolinspectionreport);
scmVehiclePatrolinspectionService.updateState(dto.getMainSid());
scmVehPatrolinspectionmonthService.updateBySidState(dto.getMainSid());
@ -188,4 +198,8 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
scmVehiclePatrolinspectionsheetService.sendMessage(appPatrolinspectionDto);
return rb.success();
}
public List<AppLiableListVo> selectByMainSid() {
return baseMapper.selectByMainSid();
}
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthInfoVo.java

@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class VehPatrolinspectionmonthInfoVo implements Vo {
private static final long serialVersionUID = 7694954957647668016L;
@ -16,4 +18,10 @@ public class VehPatrolinspectionmonthInfoVo implements Vo {
@ApiModelProperty("存在的问题")
private String question;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("接收人集合")
private List<LiableListVo> recipientList;
}

13
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/ReportListVo.java

@ -0,0 +1,13 @@
package com.yxt.anrui.terminal.api.supplychain.inventory;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
@Data
public class ReportListVo implements Vo {
private static final long serialVersionUID = 7297399311087477036L;
private String name;
private String sid;
}

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java

@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
public class VehInventorymonthInfoVo implements Vo {
private static final long serialVersionUID = 8050057958864145264L;
@ -30,4 +33,7 @@ public class VehInventorymonthInfoVo implements Vo {
private String recipient;
@ApiModelProperty("创建日期")
private String date;
@ApiModelProperty("接收人集合")
private List<ReportListVo> recipientList;
}

12
doc/databases/base_tables.sql

@ -917,19 +917,19 @@ CREATE TABLE `base_vehicle_out`
`orgName` varchar(255) DEFAULT NULL COMMENT '销售部门名称',
`staffSid` varchar(64) DEFAULT NULL COMMENT '销售专员sid',
`staffName` varchar(255) DEFAULT NULL COMMENT '销售专员',
`saleDate` varchar(255) DEFAULT NULL COMMENT '销售日期',
`concatNo` varchar(255) DEFAULT NULL COMMENT '合同编号',
`price` varchar(255) DEFAULT NULL COMMENT '成交价',
`isTerminal` varchar(64) DEFAULT NULL COMMENT '是否为终端客户',
`customerName` varchar(255) DEFAULT NULL COMMENT '客户名称',
`mobile` varchar(255) DEFAULT NULL COMMENT '手机号',
`customerSid` varchar(255) DEFAULT NULL COMMENT '客户sid',
`actualCustomer` varchar(255) DEFAULT NULL COMMENT '实际购车人名称',
`actualMobile` varchar(255) DEFAULT NULL COMMENT '实际购车人手机号',
`actualSid` varchar(255) DEFAULT NULL COMMENT '实际购车人sid',
`giftsDescription` varchar(255) DEFAULT NULL COMMENT '赠品说明',
`distributorName` varchar(255) DEFAULT NULL COMMENT '二次经销商',
`distributorSid` varchar(255) DEFAULT NULL COMMENT '二次经销商sid',
`rebateAmount` varchar(255) DEFAULT NULL COMMENT '返利金额',
`salesAllowance` varchar(255) DEFAULT NULL COMMENT '销售折让',
`middleOne` varchar(255) DEFAULT NULL COMMENT '中介人1',
`rebateMoneyOne` varchar(255) DEFAULT NULL COMMENT '返利金额1',
`middleTwo` varchar(255) DEFAULT NULL COMMENT '中介人2',
`rebateMoneyTwo` varchar(255) DEFAULT NULL COMMENT '返利金额2',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB

Loading…
Cancel
Save