mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：推送CRM相关调整

dev_1.0.2
jiangpeng 2026-07-10 18:05:17 +08:00
parent 6d4923ac8b
commit 934b2990f1
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oms_web/oms_vue/src/views/system/product/index.vue
View File

@ -566,11 +566,8 @@ export default {
}); });
}, },
handleLevel2TypeChange(level2Type) { handleLevel2TypeChange(level2Type) {
/* // 产品类型为硬件时显示云终端配置
产品类型：硬件 if (this.form.type == 2) {
二级类型：汇智云终端、H3C云终端、转售云终端
*/
if (this.form.type == 2 && (level2Type == 3 || level2Type == 4 || level2Type == 5)) {
this.level2TypeRelation = true; this.level2TypeRelation = true;
// 显示时添加必填验证 // 显示时添加必填验证
this.rules.terminalType = [{ required: true, message: "终端类型不能为空", trigger: "change" }]; this.rules.terminalType = [{ required: true, message: "终端类型不能为空", trigger: "change" }];

6
ruoyi-sip/src/main/java/com/ruoyi/sip/controller/DataProcessController.java
View File

@ -50,8 +50,10 @@ public class DataProcessController extends BaseController {
//项目推送CRM //项目推送CRM
@Anonymous @Anonymous
@GetMapping("/projectPushCRM") @GetMapping("/projectPushCRM")
public void projectSendCRM(@RequestParam("projectId") Long projectId) { public void projectSendCRM(@RequestParam("projectId") String projectIds) {
dataProcessService.projectSendCRM(projectId); for (String projectId : projectIds.split(",")) {
dataProcessService.projectSendCRM(Long.valueOf(projectId.trim()));
}
} }
//生成虚拟采购单（已发货未绑定采购单的数据） //生成虚拟采购单（已发货未绑定采购单的数据）

6
ruoyi-sip/src/main/java/com/ruoyi/sip/dto/integration/OpportunityUpdateRequestDto.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.sip.dto.integration;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.time.OffsetDateTime;
@Data @Data
public class OpportunityUpdateRequestDto { public class OpportunityUpdateRequestDto {
@ -63,4 +63,8 @@ public class OpportunityUpdateRequestDto {
* 是否归档 * 是否归档
*/ */
private Boolean archived; private Boolean archived;
/**
* 签约时间
*/
private OffsetDateTime archivedAt;
} }

7
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectInfoServiceImpl.java
View File

@ -398,6 +398,10 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
? firstOrder.getActualPurchaseAmount() ? firstOrder.getActualPurchaseAmount()
: firstOrder.getShipmentAmount(); : firstOrder.getShipmentAmount();
requestDto.setActualSignedAmount(actualSignedAmount); requestDto.setActualSignedAmount(actualSignedAmount);
if (firstOrder.getApproveTime() != null) {
requestDto.setArchivedAt(firstOrder.getApproveTime().toInstant()
.atZone(ZoneId.systemDefault()).toOffsetDateTime());
}
} }
} }
requestDto.setExpectedCloseDate(formatterDate(projectInfo.getEstimatedOrderTime(), DateUtils.YYYY_MM_DD)); requestDto.setExpectedCloseDate(formatterDate(projectInfo.getEstimatedOrderTime(), DateUtils.YYYY_MM_DD));
@ -431,7 +435,8 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
|| requestDto.getPreSalesId() != null || requestDto.getPreSalesId() != null
|| StringUtils.isNotEmpty(requestDto.getPreSalesName()) || StringUtils.isNotEmpty(requestDto.getPreSalesName())
|| StringUtils.isNotEmpty(requestDto.getCompetitorName()) || StringUtils.isNotEmpty(requestDto.getCompetitorName())
|| requestDto.getArchived() != null; || requestDto.getArchived() != null
|| requestDto.getArchivedAt() != null;
} }
private void recordOperationLogs(ProjectInfo projectInfo, ProjectInfo oldProjectInfo) { private void recordOperationLogs(ProjectInfo projectInfo, ProjectInfo oldProjectInfo) {