From 31aadaa71b95da77447d6e3d2e7fce9af54c8227 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 17:26:48 +0800
Subject: [PATCH] yys 商机管理修改
---
src/main/java/com/ruoyi/sales/controller/BusinessOpportunityController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/BusinessOpportunityController.java b/src/main/java/com/ruoyi/sales/controller/BusinessOpportunityController.java
index d614b9d..49e311c 100644
--- a/src/main/java/com/ruoyi/sales/controller/BusinessOpportunityController.java
+++ b/src/main/java/com/ruoyi/sales/controller/BusinessOpportunityController.java
@@ -35,10 +35,22 @@
private BusinessOpportunityService businessOpportunityService;
@Autowired
- private BusinessDescriptionMapper BusinessDescriptionMapper;
+ private BusinessDescriptionMapper businessDescriptionMapper;
@Autowired
private CommonFileServiceImpl commonFileService;
+
+ @ApiOperation("鑾峰彇鐪佺骇鍒楄〃")
+ @GetMapping("/getProvinceList")
+ public AjaxResult getProvinceList() {
+ return AjaxResult.success(businessOpportunityService.getProvinceList());
+ }
+
+ @ApiOperation("閫氳繃鐪佺骇id鑾峰彇鍩庡競鍒楄〃")
+ @GetMapping("/getCityList")
+ public AjaxResult getCityList(@RequestParam("provinceId") Integer provinceId) {
+ return AjaxResult.success(businessOpportunityService.getCityList(provinceId));
+ }
@GetMapping("/listPage")
@ApiOperation("鍟嗘満鍒楄〃")
@@ -46,8 +58,9 @@
IPage<BusinessOpportunity> businessOpportunityIPage = businessOpportunityService.listPage(page, businessOpportunity);
businessOpportunityIPage.getRecords().forEach(item -> {
item.setBusinessCommonFiles(commonFileService.getFileList(item.getId(),9));
- item.setBusinessDescription(BusinessDescriptionMapper.selectList(Wrappers.lambdaQuery(BusinessDescription.class)
- .eq(BusinessDescription::getBusinessOpportunityId, item.getId())));
+ item.setBusinessDescription(businessDescriptionMapper.selectList(Wrappers.lambdaQuery(BusinessDescription.class)
+ .eq(BusinessDescription::getBusinessOpportunityId, item.getId())
+ .orderByDesc(BusinessDescription::getCreateTime)));
});
return AjaxResult.success(businessOpportunityIPage);
}
@@ -63,21 +76,28 @@
businessDescription.setBusinessOpportunityId(businessOpportunity.getId());
// 杩佺Щ涓存椂鏂囦欢鍒版寮忔枃浠�
commonFileService.migrateTempFilesToFormal(businessOpportunity.getId(), businessOpportunity.getTempFileIds());
- return BusinessDescriptionMapper.insert(businessDescription) > 0 ? success() : error();
+ return businessDescriptionMapper.insert(businessDescription) > 0 ? success() : error();
}
@PostMapping("/addDescription")
@ApiOperation("娣诲姞鍟嗘満鎻忚堪")
@Log(title = "鍟嗘満绠＄悊-娣诲姞鍟嗘満鎻忚堪", businessType = BusinessType.INSERT)
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult addDescription(@RequestBody BusinessDescription businessDescription) throws Exception{
// 杩佺Щ涓存椂鏂囦欢鍒版寮忔枃浠�
commonFileService.migrateTempFilesToFormal(businessDescription.getBusinessOpportunityId(), businessDescription.getTempFileIds());
- return BusinessDescriptionMapper.insert(businessDescription) > 0 ? success() : error();
+ BusinessOpportunity byId = businessOpportunityService.getById(businessDescription.getBusinessOpportunityId());
+ if(byId != null){
+ byId.setStatus(businessDescription.getStatus());
+ businessOpportunityService.updateById(byId);
+ }
+ return businessDescriptionMapper.insert(businessDescription) > 0 ? success() : error();
}
@PostMapping("/update")
@ApiOperation("淇敼鍟嗘満")
@Log(title = "鍟嗘満绠＄悊-淇敼鍟嗘満", businessType = BusinessType.UPDATE)
+ @Transactional(rollbackFor = Exception.class)
public AjaxResult update(@RequestBody BusinessOpportunity businessOpportunity) throws Exception{
// 杩佺Щ涓存椂鏂囦欢鍒版寮忔枃浠�
commonFileService.migrateTempFilesToFormal(businessOpportunity.getId(), businessOpportunity.getTempFileIds());
--
Gitblit v1.9.3