Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
import cn.cordys.context.OrganizationContext;
import cn.cordys.crm.opportunity.domain.OpportunityQuotation;
import cn.cordys.crm.opportunity.dto.request.OpportunityQuotationAddRequest;
import cn.cordys.crm.opportunity.dto.request.OpportunityQuotationBatchRequest;
import cn.cordys.crm.opportunity.dto.request.OpportunityQuotationEditRequest;
import cn.cordys.crm.opportunity.dto.request.OpportunityQuotationPageRequest;
import cn.cordys.crm.opportunity.dto.response.OpportunityQuotationGetResponse;
import cn.cordys.crm.opportunity.dto.response.OpportunityQuotationListResponse;
import cn.cordys.crm.opportunity.service.OpportunityQuotationService;
import cn.cordys.crm.system.dto.response.BatchAffectReasonResponse;
import cn.cordys.crm.system.dto.response.BatchAffectResponse;
import cn.cordys.crm.system.dto.response.ModuleFormConfigDTO;
import cn.cordys.crm.system.service.ModuleFormCacheService;
import cn.cordys.security.SessionUtils;
Expand Down Expand Up @@ -75,6 +78,7 @@ public OpportunityQuotationGetResponse get(@PathVariable("id") String id) {

//撤销审批
@GetMapping("/revoke/{id}")
@Operation(summary = "撤销报价单审批")
public String revoke(@PathVariable("id") String id) {
return opportunityQuotationService.revoke(id, SessionUtils.getUserId());
}
Expand All @@ -87,6 +91,15 @@ public String voidQuotation(@PathVariable("id") String id) {
return opportunityQuotationService.voidQuotation(id, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

//批量作废报价单
@PostMapping("/batch/voided")
@RequiresPermissions(PermissionConstants.OPPORTUNITY_QUOTATION_UPDATE)
@Operation(summary = "批量作废报价单")
public BatchAffectReasonResponse batchVoidQuotation(@RequestBody OpportunityQuotationBatchRequest request) {
return opportunityQuotationService.batchVoidQuotation(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}


//审批
@PostMapping("/approve")
@RequiresPermissions(PermissionConstants.OPPORTUNITY_QUOTATION_APPROVAL)
Expand All @@ -95,6 +108,14 @@ public String approve(@RequestBody OpportunityQuotationEditRequest request) {
return opportunityQuotationService.approve(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

//批量审批
@PostMapping("/batch/approve")
@RequiresPermissions(PermissionConstants.OPPORTUNITY_QUOTATION_APPROVAL)
@Operation(summary = "批量审批报价单")
public BatchAffectResponse batchApprove(@RequestBody OpportunityQuotationBatchRequest request) {
return opportunityQuotationService.batchApprove(request, SessionUtils.getUserId(), OrganizationContext.getOrganizationId());
}

//删除报价单
@GetMapping("/delete/{id}")
@RequiresPermissions(PermissionConstants.OPPORTUNITY_QUOTATION_DELETE)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package cn.cordys.crm.opportunity.dto.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;

import java.util.List;

@Data
public class OpportunityQuotationBatchRequest {

@NotEmpty
@Schema(description = "ID集合")
private List<String> ids;

@NotBlank
@Schema(description = "审批状态")
private String approvalStatus;

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@
public interface ExtOpportunityQuotationMapper {

List<OpportunityQuotationListResponse> list(@Param("request") OpportunityQuotationPageRequest request, @Param("orgId") String orgId);

void batchUpdateApprovalStatus(List<String> approvingIds, String approvalStatus, String userId, long updateTime);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@

<mapper namespace="cn.cordys.crm.opportunity.mapper.ExtOpportunityQuotationMapper">

<update id="batchUpdateApprovalStatus">
update opportunity_quotation
set approval_status = #{approvalStatus},
update_user = #{userId},
update_time = #{updateTime}
where id in
<foreach collection="approvingIds" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
</update>


<select id="list" resultType="cn.cordys.crm.opportunity.dto.response.OpportunityQuotationListResponse">
select oq.id, oq.name, oq.opportunity_id, o.opportunity_name as opportunityName, oq.approval_status, oq.amount,
Expand All @@ -18,14 +29,7 @@
<include refid="fieldSortJoin">
<property name="sort" value="request.sort"/>
</include>

where oq.organization_id = #{currentOrg}
<if test="request.approvalStatus != null and request.approvalStatus != ''">
and oq.approval_status = #{request.approvalStatus}
</if>
<if test="request.amount != null and request.amount != ''">
and oq.amount = #{request.amount}
</if>
where oq.organization_id = #{orgId}
<if test="request.opportunityId != null and request.opportunityId != ''">
and o.id = #{request.opportunityId}
</if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ public List<JsonDifferenceDTO> handleLogField(List<JsonDifferenceDTO> difference
differ.setNewValueName(Translator.get(differ.getNewValue().toString()));
}
}

if (Strings.CS.equals(differ.getColumn(), "approvalStatus")) {
differ.setColumnName(Translator.get("log.approvalStatus"));
if (differ.getOldValue() != null) {
differ.setOldValueName(Translator.get("log.approvalStatus." + differ.getOldValueName().toString()));
}
if (differ.getNewValue() != null) {
differ.setNewValueName(Translator.get("log.approvalStatus." + differ.getNewValueName().toString()));
}
}
}
return differenceDTOS;
}
Expand Down
Loading
Loading