采购：外贸客户资信-修改、变更、审核、取消

房远帅
1 parent fd958458
Showing 9 changed files with 396 additions and 10 deletions
xingyun-api/src/main/resources/db/chujiang/base.sql
xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/credit/ProcurementForeignTradeCreditController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementForeignTradeCredit.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementForeignTradeCreditServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/credit/ProcurementForeignTradeCreditService.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/CreateProcurementForeignTradeCreditVo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/QueryProcurementForeignTradeCreditVo.java
xingyun-sc/src/main/resources/mappers/procurement/credit/ProcurementForeignTradeCreditMapper.xml
--- a/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @012bbf8
+++ b/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @012bbf8
@@ -1571,6 +1571,9 @@ CREATE TABLE `procurement_foreign_trade_credit`
     `payment_method`                   varchar(500) NOT NULL COMMENT '付款方式',
     `next_review_time`                 date         NOT NULL COMMENT '下次评审时间',
     `review_department`                varchar(200) NOT NULL COMMENT '评审部门',
+    `investigator_id`                  varchar(200) NOT NULL COMMENT '资信调查人ID',
+    `investigator_name`                varchar(200) NOT NULL COMMENT '资信调查人',
+    `purchase_department`              varchar(200) NOT NULL COMMENT '采购处',
     `status`                           varchar(20)    DEFAULT NULL COMMENT '审核状态',
     `freeze`                           bool DEFAULT false COMMENT '是否冻结',
     `create_by_id`                     varchar(32)  DEFAULT NULL COMMENT '创建人ID',
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/handlers/BusinessDataHandlerServiceImpl.java
View file @012bbf8
@@ -19,7 +19,9 @@ import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
+import com.lframework.xingyun.sc.procurement.entity.ProcurementForeignTradeCredit;
 import com.lframework.xingyun.sc.procurement.service.credit.ProcurementDomesticCustomerCreditService;
+import com.lframework.xingyun.sc.procurement.service.credit.ProcurementForeignTradeCreditService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorLineService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
@@ -147,6 +149,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private OrderDetailReportService orderDetailReportService;
     @Resource
     private ProcurementDomesticCustomerCreditService procurementDomesticCustomerCreditService;
+    @Resource
+    private ProcurementForeignTradeCreditService procurementForeignTradeCreditService;
@@ -225,6 +229,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "CUSTOMER_CREDIT_IN":
                 handleResultDomesticCustomerCreditData(flowStatus, businessId);
                 break;
+            case "CUSTOMER_CREDIT_OUT":
+                handleResultForeignTradeCreditData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -1014,4 +1021,31 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             procurementDomesticCustomerCreditService.updateStatus(businessId, "REFUSE");
         }
     }
+
+    //采购-外贸资信
+    private void handleResultForeignTradeCreditData(String flowStatus, String businessId) {
+        Object o = redisHandler.get(businessId);
+        ProcurementForeignTradeCredit vo = null;
+        if (o != null) {
+            vo = JsonUtil.parseObject(o.toString(), ProcurementForeignTradeCredit.class);
+        }
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            if (vo != null) {
+                vo.setStatus("PASS");
+                vo.setFreeze(Boolean.FALSE);
+                procurementForeignTradeCreditService.updateNoFlowInstance(vo);
+                redisHandler.del(businessId);
+            } else {
+                procurementForeignTradeCreditService.updateStatus(businessId, "PASS");
+            }
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            if (vo != null) {
+                redisHandler.del(businessId);
+            }
+            procurementForeignTradeCreditService.updateStatus(businessId, "REFUSE");
+        }
+    }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/credit/ProcurementForeignTradeCreditController.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/credit/ProcurementForeignTradeCreditController.java
View file @012bbf8
 package com.lframework.xingyun.sc.procurement.controller.credit;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
 import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementForeignTradeCredit;
 import com.lframework.xingyun.sc.procurement.service.credit.ProcurementForeignTradeCreditService;
 import com.lframework.xingyun.sc.procurement.vo.credit.CreateProcurementForeignTradeCreditVo;
 import com.lframework.xingyun.sc.procurement.vo.credit.QueryProcurementForeignTradeCreditVo;
+import com.lframework.xingyun.sc.procurement.vo.credit.UpdateProcurementForeignTradeCreditVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,8 @@ public class ProcurementForeignTradeCreditController extends DefaultBaseControll
     @Resource
     private ProcurementForeignTradeCreditService procurementForeignTradeCreditService;
+    @Autowired
+    private RedisHandler redisHandler;
     @ApiOperation("新增")
     @HasPermission({"procure-manage:foreign-trade:add"})
@@ -46,11 +53,54 @@ public class ProcurementForeignTradeCreditController extends DefaultBaseControll
     }
     @ApiOperation("详情")
-    @HasPermission({"procure-manage:foreign-trade:query"})
+    @HasPermission({"procure-manage:foreign-trade:query","procure-manage:foreign-trade:review"})
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @GetMapping("/get")
     public InvokeResult<ProcurementForeignTradeCredit> get(
             @NotBlank(message = "id不能为空！") String id) {
         return InvokeResultBuilder.success(procurementForeignTradeCreditService.findById(id));
     }
+
+    /**
+     * 修改/变更
+     */
+    @ApiOperation("修改/变更")
+    @HasPermission({"procure-manage:foreign-trade:modify","procure-manage:foreign-trade:approve","procure-manage:foreign-trade:change"})
+    @PutMapping
+    public InvokeResult<Void> update(@Valid @RequestBody UpdateProcurementForeignTradeCreditVo vo) {
+        procurementForeignTradeCreditService.update(vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"procure-manage:foreign-trade:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id,
+                                     @NotBlank(message = "status不能为空！") String status) {
+        procurementForeignTradeCreditService.updateStatus(id, status);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 根据ID查询变更审核的数据
+     */
+    @ApiOperation("根据ID查询变更审核的数据")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"procure-manage:foreign-trade:approve", "procure-manage:foreign-trade:review"})
+    @GetMapping("/getExamineById")
+    public InvokeResult<ProcurementForeignTradeCredit> getExamineById(@NotBlank(message = "id不能为空！") String id) {
+        Object o = redisHandler.get(id);
+        if (o != null) {
+            return InvokeResultBuilder.success(JsonUtil.parseObject(o.toString(), ProcurementForeignTradeCredit.class));
+        }
+
+        ProcurementForeignTradeCredit data = procurementForeignTradeCreditService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("客户资信表不存在！");
+        }
+        return InvokeResultBuilder.success(data);
+    }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementForeignTradeCredit.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementForeignTradeCredit.java
View file @012bbf8
@@ -198,6 +198,33 @@ public class ProcurementForeignTradeCredit extends BaseEntity implements BaseDto
     private String reviewDepartment;
     /**
+     * 资信调查人ID
+     */
+    private String investigatorId;
+
+    /**
+     * 资信调查人
+     */
+    private String investigatorName;
+
+    /**
+     * 采购处
+     */
+    private String purchaseDepartment;
+
+    /**
+     * 采购处名称(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String purchaseDepartmentName;
+
+    /**
+     * 采购处编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String purchaseDepartmentCode;
+
+    /**
      * 审核状态
      */
     private String status;
@@ -208,6 +235,18 @@ public class ProcurementForeignTradeCredit extends BaseEntity implements BaseDto
     private Boolean freeze;
     /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine = false;
+
+    /**
+     * 是否展示审核详情按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamineDetail;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementForeignTradeCreditServiceImpl.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementForeignTradeCreditServiceImpl.java
View file @012bbf8
 package com.lframework.xingyun.sc.procurement.impl.credit;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.entity.FlowInstanceWrapper;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.common.utils.ObjectUtil;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysUser;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementForeignTradeCredit;
 import com.lframework.xingyun.sc.procurement.mappers.credit.ProcurementForeignTradeCreditMapper;
 import com.lframework.xingyun.sc.procurement.service.credit.ProcurementForeignTradeCreditService;
 import com.lframework.xingyun.sc.procurement.vo.credit.CreateProcurementForeignTradeCreditVo;
 import com.lframework.xingyun.sc.procurement.vo.credit.QueryProcurementForeignTradeCreditVo;
+import com.lframework.xingyun.sc.procurement.vo.credit.UpdateProcurementForeignTradeCreditVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 @Service
 public class ProcurementForeignTradeCreditServiceImpl
         extends BaseMpServiceImpl<ProcurementForeignTradeCreditMapper, ProcurementForeignTradeCredit>
         implements ProcurementForeignTradeCreditService {
+    private static final String BPM_FLAG = "CUSTOMER_CREDIT_OUT";
     @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Autowired
+    private RedisHandler redisHandler;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
     private SysUserService sysUserService;
     @Override
     public PageResult<ProcurementForeignTradeCredit> query(Integer pageIndex, Integer pageSize,
-                                                               QueryProcurementForeignTradeCreditVo vo) {
+                                                           QueryProcurementForeignTradeCreditVo vo) {
         Assert.greaterThanZero(pageIndex);
         Assert.greaterThanZero(pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ProcurementForeignTradeCredit> datas = this.query(vo);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
+            List<FlowInstanceWrapper> flowByConditionList = flowInstanceWrapperService.getFlowByBusinessIdList(
+                    datas.stream().map(ProcurementForeignTradeCredit::getId).collect(Collectors.toList()));
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowByConditionList)) {
+                List<String> idList = flowByConditionList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+                for (ProcurementForeignTradeCredit customerCredit : datas) {
+                    customerCredit.setShowExamineDetail(idList.contains(customerCredit.getId()));
+                }
+            } else {
+                for (ProcurementForeignTradeCredit customerCredit : datas) {
+                    customerCredit.setShowExamineDetail(false);
+                }
+            }
+
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
+                List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+                for (ProcurementForeignTradeCredit customerCredit : datas) {
+                    customerCredit.setShowExamine(ids.contains(customerCredit.getId()));
+                }
+            } else {
+                for (ProcurementForeignTradeCredit customerCredit : datas) {
+                    customerCredit.setShowExamine(false);
+                }
+            }
+        }
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -48,16 +99,106 @@ public class ProcurementForeignTradeCreditServiceImpl
     @Override
     public ProcurementForeignTradeCredit findById(String id) {
-        return getBaseMapper().findById(id);
+        ProcurementForeignTradeCredit customerCredit = getBaseMapper().findById(id);
+        if (customerCredit == null) {
+            return null;
+        }
+
+        List<String> ids = new ArrayList<>();
+        ids.add(customerCredit.getId());
+        List<FlowInstanceWrapper> flowByBusinessIdList = flowInstanceWrapperService.getFlowByBusinessIdList(ids);
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowByBusinessIdList)) {
+            List<String> collect = flowByBusinessIdList.stream().map(FlowInstanceWrapper::getBusinessId).collect(Collectors.toList());
+            customerCredit.setShowExamineDetail(collect.contains(customerCredit.getId()));
+        } else {
+            customerCredit.setShowExamineDetail(false);
+        }
+
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            customerCredit.setShowExamine(businessIds.contains(customerCredit.getId()));
+        } else {
+            customerCredit.setShowExamine(false);
+        }
+        return customerCredit;
     }
     @OpLog(type = OtherOpLogType.class, name = "新增采购外贸资信调查表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateProcurementForeignTradeCreditVo vo) {
+        SysUser investigator = getInvestigator(vo.getInvestigatorId());
         ProcurementForeignTradeCredit data = new ProcurementForeignTradeCredit();
         data.setId(IdUtil.getId());
+        fillData(data, vo, investigator);
+        data.setStatus("AUDIT");
+        data.setFreeze(Boolean.FALSE);
+
+        getBaseMapper().insert(data);
+        ProcurementForeignTradeCredit customerCredit = getBaseMapper().findById(data.getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, customerCredit);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+        return data.getId();
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改采购外贸资信调查表，ID：{}", params = {"#vo.id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void update(UpdateProcurementForeignTradeCreditVo vo) {
+        if (ObjectUtil.isNull(vo.getId())) {
+            throw new DefaultClientException("资信ID不能为空！");
+        }
+
+        ProcurementForeignTradeCredit data = this.findById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("采购外贸资信调查表不存在！");
+        }
+
+        SysUser investigator = getInvestigator(vo.getInvestigatorId());
+        fillData(data, vo, investigator);
+        data.setStatus("AUDIT");
+
+        if ("CHANGE".equals(vo.getType())) {
+            redisHandler.set(data.getId(), JsonUtil.toJsonString(data));
+        } else {
+            getBaseMapper().updateById(data);
+        }
+
+        flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
+        OpLogUtil.setExtra(vo);
+    }
+
+    @Override
+    public void updateStatus(String id, String status) {
+        if (StringUtils.isBlank(id) || StringUtils.isBlank(status)) {
+            throw new DefaultClientException("资信ID、审核状态不能为空！");
+        }
+        LambdaUpdateWrapper<ProcurementForeignTradeCredit> updateWrapper = Wrappers.lambdaUpdate(ProcurementForeignTradeCredit.class)
+                .set(ProcurementForeignTradeCredit::getStatus, status)
+                .eq(ProcurementForeignTradeCredit::getId, id);
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
+    public void updateNoFlowInstance(ProcurementForeignTradeCredit customerCredit) {
+        if (ObjectUtil.isNull(customerCredit.getId())) {
+            throw new DefaultClientException("资信ID不能为空！");
+        }
+
+        ProcurementForeignTradeCredit data = this.findById(customerCredit.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("采购外贸资信调查表不存在！");
+        }
+
+        getBaseMapper().updateById(customerCredit);
+        OpLogUtil.setExtra(data);
+    }
+
+    private void fillData(ProcurementForeignTradeCredit data, CreateProcurementForeignTradeCreditVo vo, SysUser investigator) {
         data.setUnitName(vo.getUnitName());
         data.setCompanyNature(vo.getCompanyNature());
         data.setLegalRepresentative(vo.getLegalRepresentative());
@@ -93,13 +234,64 @@ public class ProcurementForeignTradeCreditServiceImpl
         data.setPaymentMethod(vo.getPaymentMethod());
         data.setNextReviewTime(vo.getNextReviewTime());
         data.setReviewDepartment(vo.getReviewDepartment());
-//        data.setStatus("AUDIT");
-        data.setFreeze(Boolean.FALSE);
+        data.setInvestigatorId(vo.getInvestigatorId());
+        data.setInvestigatorName(investigator.getName());
+        data.setPurchaseDepartment(vo.getPurchaseDepartment());
+    }
-        getBaseMapper().insert(data);
+    private void fillData(ProcurementForeignTradeCredit data, UpdateProcurementForeignTradeCreditVo vo, SysUser investigator) {
+        data.setId(vo.getId());
+        data.setUnitName(vo.getUnitName());
+        data.setCompanyNature(vo.getCompanyNature());
+        data.setLegalRepresentative(vo.getLegalRepresentative());
+        data.setPhoneAndFax(vo.getPhoneAndFax());
+        data.setRegistrationCertificateNo(vo.getRegistrationCertificateNo());
+        data.setAddress(vo.getAddress());
+        data.setDomesticBusinessPrincipal(vo.getDomesticBusinessPrincipal());
+        data.setPrincipalCertificateNo(vo.getPrincipalCertificateNo());
+        data.setEstablishedTimeAndYardScale(vo.getEstablishedTimeAndYardScale());
+        data.setOverallBusinessVarietiesScale(vo.getOverallBusinessVarietiesScale());
+        data.setExportToDomesticTime(vo.getExportToDomesticTime());
+        data.setExportToDomesticScaleVarieties(vo.getExportToDomesticScaleVarieties());
+        data.setCooperatingDomesticCompanies(vo.getCooperatingDomesticCompanies());
+        data.setCooperationEffect(vo.getCooperationEffect());
+        data.setSupplierInspection(vo.getSupplierInspection());
+        data.setDomesticSalesOfficeInspection(vo.getDomesticSalesOfficeInspection());
+        data.setGuaranteeLetter(vo.getGuaranteeLetter());
+        data.setContractDispute(vo.getContractDispute());
+        data.setInsuranceTransportMode(vo.getInsuranceTransportMode());
+        data.setDetentionDemurrageFee(vo.getDetentionDemurrageFee());
+        data.setOperationVariety(vo.getOperationVariety());
+        data.setOperationScale(vo.getOperationScale());
+        data.setPricingMode(vo.getPricingMode());
+        data.setSettlementMethod(vo.getSettlementMethod());
+        data.setWeightDifferenceAgreement(vo.getWeightDifferenceAgreement());
+        data.setQualityStandard(vo.getQualityStandard());
+        data.setSupplierCategory(vo.getSupplierCategory());
+        data.setSchemeOperationTime(vo.getSchemeOperationTime());
+        data.setSchemeOperationMode(vo.getSchemeOperationMode());
+        data.setSchemeOperationVariety(vo.getSchemeOperationVariety());
+        data.setSchemeOperationQuantity(vo.getSchemeOperationQuantity());
+        data.setShippingRequirement(vo.getShippingRequirement());
+        data.setPaymentMethod(vo.getPaymentMethod());
+        data.setNextReviewTime(vo.getNextReviewTime());
+        data.setReviewDepartment(vo.getReviewDepartment());
+        data.setInvestigatorId(vo.getInvestigatorId());
+        data.setInvestigatorName(investigator.getName());
+        data.setPurchaseDepartment(vo.getPurchaseDepartment());
+    }
-        OpLogUtil.setVariable("id", data.getId());
-        OpLogUtil.setExtra(vo);
-        return data.getId();
+    /**
+     * 获取资信调查人。
+     *
+     * @param investigatorId 资信调查人ID
+     * @return               系统用户
+     */
+    private SysUser getInvestigator(String investigatorId) {
+        SysUser investigator = sysUserService.findById(investigatorId);
+        if (investigator == null) {
+            throw new DefaultClientException("资信调查人不存在！");
+        }
+        return investigator;
     }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/credit/ProcurementForeignTradeCreditService.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/credit/ProcurementForeignTradeCreditService.java
View file @012bbf8
@@ -5,6 +5,7 @@ import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementForeignTradeCredit;
 import com.lframework.xingyun.sc.procurement.vo.credit.CreateProcurementForeignTradeCreditVo;
 import com.lframework.xingyun.sc.procurement.vo.credit.QueryProcurementForeignTradeCreditVo;
+import com.lframework.xingyun.sc.procurement.vo.credit.UpdateProcurementForeignTradeCreditVo;
 import java.util.List;
@@ -44,4 +45,26 @@ public interface ProcurementForeignTradeCreditService extends BaseMpService<Proc
      * @return ID
      */
     String create(CreateProcurementForeignTradeCreditVo vo);
+
+    /**
+     * 修改
+     *
+     * @param vo 修改参数
+     */
+    void update(UpdateProcurementForeignTradeCreditVo vo);
+
+    /**
+     * 更新审核状态
+     *
+     * @param id     ID
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 修改(不走审核)
+     *
+     * @param customerCredit 客户资信
+     */
+    void updateNoFlowInstance(ProcurementForeignTradeCredit customerCredit);
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/CreateProcurementForeignTradeCreditVo.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/CreateProcurementForeignTradeCreditVo.java
View file @012bbf8
@@ -187,4 +187,20 @@ public class CreateProcurementForeignTradeCreditVo implements BaseVo, Serializab
     @NotBlank(message = "评审部门不能为空！")
     @Length(max = 200, message = "评审部门最多允许200个字符！")
     private String reviewDepartment;
+
+    /**
+     * 资信调查人ID
+     */
+    @ApiModelProperty(value = "资信调查人ID", required = true)
+    @NotBlank(message = "资信调查人ID不能为空！")
+    @Length(max = 200, message = "资信调查人ID内容过长！")
+    private String investigatorId;
+
+    /**
+     * 采购处
+     */
+    @ApiModelProperty(value = "采购处", required = true)
+    @NotBlank(message = "采购处不能为空！")
+    @Length(max = 200, message = "采购处最多允许200个字符！")
+    private String purchaseDepartment;
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/QueryProcurementForeignTradeCreditVo.java
View file @012bbf8
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/vo/credit/QueryProcurementForeignTradeCreditVo.java
View file @012bbf8
@@ -21,6 +21,15 @@ public class QueryProcurementForeignTradeCreditVo extends PageVo implements Base
     @ApiModelProperty("供应商分类")
     private String supplierCategory;
+    @ApiModelProperty("资信调查人ID")
+    private String investigatorId;
+
+    @ApiModelProperty("资信调查人")
+    private String investigatorName;
+
+    @ApiModelProperty("采购处")
+    private String purchaseDepartment;
+
     @ApiModelProperty("下次评审时间开始")
     private LocalDate nextReviewTimeStart;
--- a/xingyun-sc/src/main/resources/mappers/procurement/credit/ProcurementForeignTradeCreditMapper.xml
View file @012bbf8
+++ b/xingyun-sc/src/main/resources/mappers/procurement/credit/ProcurementForeignTradeCreditMapper.xml
View file @012bbf8
@@ -40,6 +40,11 @@
         <result column="payment_method" property="paymentMethod"/>
         <result column="next_review_time" property="nextReviewTime"/>
         <result column="review_department" property="reviewDepartment"/>
+        <result column="investigator_id" property="investigatorId"/>
+        <result column="investigator_name" property="investigatorName"/>
+        <result column="purchase_department" property="purchaseDepartment"/>
+        <result column="purchase_department_name" property="purchaseDepartmentName"/>
+        <result column="purchase_department_code" property="purchaseDepartmentCode"/>
         <result column="status" property="status"/>
         <result column="freeze" property="freeze"/>
         <result column="create_by_id" property="createById"/>
@@ -88,6 +93,11 @@
             tb.payment_method,
             tb.next_review_time,
             tb.review_department,
+            tb.investigator_id,
+            tb.investigator_name,
+            tb.purchase_department,
+            sd.name AS purchase_department_name,
+            sd.code AS purchase_department_code,
             tb.status,
             tb.freeze,
             tb.create_by_id,
@@ -97,6 +107,7 @@
             tb.create_time,
             tb.update_time
         FROM procurement_foreign_trade_credit tb
+        LEFT JOIN sys_dept AS sd ON sd.id = tb.purchase_department
     </sql>
     <select id="query" resultMap="ProcurementForeignTradeCredit">
@@ -109,7 +120,16 @@
                 AND tb.company_nature LIKE CONCAT('%', #{vo.companyNature}, '%')
             </if>
             <if test="vo.supplierCategory != null and vo.supplierCategory != ''">
-                AND tb.supplier_category = #{supplierCategory}
+                AND tb.supplier_category = #{vo.supplierCategory}
+            </if>
+            <if test="vo.investigatorId != null and vo.investigatorId != ''">
+                AND tb.investigator_id = #{vo.investigatorId}
+            </if>
+            <if test="vo.investigatorName != null and vo.investigatorName != ''">
+                AND tb.investigator_name LIKE CONCAT('%', #{vo.investigatorName}, '%')
+            </if>
+            <if test="vo.purchaseDepartment != null and vo.purchaseDepartment != ''">
+                AND tb.purchase_department = #{vo.purchaseDepartment}
             </if>
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}