采购计划：记录节点审核人

房远帅
1 parent fa8f621a
Showing 9 changed files with 147 additions and 11 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/plan/ProcurementPlanController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/quotation/SalesmanQuotationServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/mappers/quotation/SalesmanQuotationMapper.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/quotation/SalesmanQuotationService.java
xingyun-sc/src/main/resources/mappers/procurement/quotation/SalesmanQuotationMapper.xml
xingyun-sc/src/main/resources/templates/planAndBuyoutTemplate.xlsx
xingyun-sc/src/main/resources/templates/planTemplate.xlsx
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/procurement/GetProcurementPlanBo.java
View file @430c437
@@ -402,31 +402,31 @@ public class GetProcurementPlanBo extends BaseBo<ProcurementPlan> {
   /**
    * 总经理审核人（name）
    */
-  @ApiModelProperty("总经理审核人")
+  @ApiModelProperty("总经理")
   private String generalManagerName;
   /**
    * 营销分管审核人（name）
    */
-  @ApiModelProperty("营销分管审核人")
+  @ApiModelProperty("营销分管")
   private String marketingManagerName;
   /**
    * 供应部经理审核人（name）
    */
-  @ApiModelProperty("供应部经理审核人")
+  @ApiModelProperty("供应部主管")
   private String supplyManagerName;
   /**
    * 管理科审核人（name）
    */
-  @ApiModelProperty("管理科审核人")
+  @ApiModelProperty("供应管理科主管")
   private String managementDeptName;
   /**
    * 采购处审核人（name）
    */
-  @ApiModelProperty("采购处审核人")
+  @ApiModelProperty("采购处主管")
   private String purchaseDeptName;
   /**
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/plan/ProcurementPlanController.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/controller/plan/ProcurementPlanController.java
View file @430c437
@@ -409,7 +409,16 @@ public class ProcurementPlanController extends DefaultBaseController {
           }
           //制单人
           planDataMap.put("createBy", nvl(plan.getCreateBy()));
-
+          //采购处主管
+          planDataMap.put("purchaseDeptName", nvl(plan.getPurchaseDeptName()));
+          //供应管理科主管
+          planDataMap.put("managementDeptName", nvl(plan.getManagementDeptName()));
+          //供应部主管
+          planDataMap.put("supplyManagerName", nvl(plan.getSupplyManagerName()));
+          //营销分管
+          planDataMap.put("marketingManagerName", nvl(plan.getMarketingManagerName()));
+          //总经理
+          planDataMap.put("generalManagerName", nvl(plan.getGeneralManagerName()));
           processTemplateSheet(sheet1, planDataMap);
           // === Sheet2：买断操作申请单（仅当存在时填充）===
@@ -446,6 +455,16 @@ public class ProcurementPlanController extends DefaultBaseController {
             buyoutDataMap.put("supplierName", nvl(buyoutApply.getSupplierName()));
             buyoutDataMap.put("paintLoss", formatDecimal(buyoutApply.getPaintLoss()));
             buyoutDataMap.put("createBy", nvl(buyoutApply.getCreateBy()));
+            //采购处主管
+            planDataMap.put("purchaseDeptName", nvl(plan.getPurchaseDeptName()));
+            //供应管理科主管
+            planDataMap.put("managementDeptName", nvl(plan.getManagementDeptName()));
+            //供应部主管
+            planDataMap.put("supplyManagerName", nvl(plan.getSupplyManagerName()));
+            //营销分管
+            planDataMap.put("marketingManagerName", nvl(plan.getMarketingManagerName()));
+            //总经理
+            planDataMap.put("generalManagerName", nvl(plan.getGeneralManagerName()));
             processTemplateSheet(sheet2, buyoutDataMap);
           }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/plan/ProcurementPlanServiceImpl.java
View file @430c437
@@ -32,6 +32,7 @@ import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.bo.procurement.GetProcurementPlanBo;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
+import com.lframework.xingyun.sc.procurement.dto.DomesticReviewerDto;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlan;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanChange;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementPlanLine;
@@ -39,6 +40,7 @@ import com.lframework.xingyun.sc.procurement.mappers.plan.ProcurementPlanMapper;
 import com.lframework.xingyun.sc.procurement.service.buyout.ProcurementBuyoutApplyService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService;
 import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService;
+import com.lframework.xingyun.sc.procurement.service.quotation.SalesmanQuotationService;
 import com.lframework.xingyun.sc.procurement.vo.buyout.CreateProcurementBuyoutApplyVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.CreateProcurementPlanVo;
 import com.lframework.xingyun.sc.procurement.vo.plan.ProcurementPlanLineVo;
@@ -77,6 +79,8 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
   private FlowTaskWrapperMapper flowTaskWrapperMapper;
   @Resource
   private SysRoleService sysRoleService;
+  @Resource
+  private SalesmanQuotationService salesmanQuotationService;
   @Override
   public PageResult<ProcurementPlan> query(Integer pageIndex, Integer pageSize,
@@ -186,7 +190,10 @@ public class ProcurementPlanServiceImpl extends BaseMpServiceImpl<ProcurementPla
             || roleCodes.contains("htcgeczg") || roleCodes.contains("htcgyczg")) {
       plan.setPurchaseDeptName(SecurityUtil.getCurrentUser().getName());
     } else if (roleCodes.contains("qyjl") || roleCodes.contains("nmcgkywy")) {
-      //todo 查找报价的 采购处主管审核人
+      DomesticReviewerDto reviewer = salesmanQuotationService.getReviewerById(vo.getSalesmanQuotationId());
+      if (reviewer != null) {
+        plan.setPurchaseDeptName(reviewer.getProcurementOffice());
+      }
     }
     getBaseMapper().insert(plan);
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/quotation/SalesmanQuotationServiceImpl.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/quotation/SalesmanQuotationServiceImpl.java
View file @430c437
 package com.lframework.xingyun.sc.procurement.impl.quotation;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,10 +19,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
-import com.lframework.starter.web.core.utils.IdUtil;
-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.core.utils.*;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.entity.SysUser;
@@ -33,6 +32,7 @@ import com.lframework.xingyun.basedata.service.breed.BreedRelationshipService;
 import com.lframework.xingyun.basedata.service.price.PriceService;
 import com.lframework.xingyun.sc.enums.CustomerDevelopStatus;
 import com.lframework.xingyun.sc.events.quotation.CommonChangedEvent;
+import com.lframework.xingyun.sc.procurement.dto.DomesticReviewerDto;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotationLine;
@@ -817,6 +817,97 @@ public class SalesmanQuotationServiceImpl
         getBaseMapper().update(null, updateWrapper);
     }
+    @Override
+    public DomesticReviewerDto getReviewerById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return new DomesticReviewerDto();
+        }
+        DomesticReviewerDto reviewer = new DomesticReviewerDto();
+        reviewer.setId(id);
+
+        String defJson = getBaseMapper().getLatestFlowDefJson(id);
+        if (StringUtils.isBlank(defJson)) {
+            return reviewer;
+        }
+
+        JSONObject flowJson = JsonUtil.parseObj(defJson);
+        Object nodeListObj = flowJson.get("nodeList");
+        if (ObjectUtil.isNull(nodeListObj)) {
+            return reviewer;
+        }
+
+        JSONArray nodeList = JsonUtil.parseArray(nodeListObj);
+        for (Object nodeObj : nodeList) {
+            if (ObjectUtil.isNull(nodeObj)) {
+                continue;
+            }
+
+            JSONObject nodeJson = JsonUtil.parseObj(nodeObj);
+            String nodeCode = nodeJson.getStr("nodeCode");
+            if (StringUtils.isBlank(nodeCode)) {
+                continue;
+            }
+
+            String approverName = getFirstApproverName(nodeJson);
+            if (StringUtils.isBlank(approverName)) {
+                continue;
+            }
+
+            if (isProcurementOfficeNode(nodeCode)) {
+                reviewer.setProcurementOffice(approverName);
+            }
+        }
+        return reviewer;
+    }
+
+    /**
+     * 获取节点首个审批人名称
+     *
+     * @param nodeJson 流程节点JSON
+     * @return 审批人名称
+     */
+    private String getFirstApproverName(JSONObject nodeJson) {
+        if (nodeJson == null) {
+            return null;
+        }
+
+        JSONObject extMap = nodeJson.getJSONObject("extMap");
+        if (extMap == null) {
+            return null;
+        }
+
+        Object handleInfosObj = extMap.get("handleInfos");
+        if (ObjectUtil.isNull(handleInfosObj)) {
+            return null;
+        }
+
+        JSONArray handleInfos = JsonUtil.parseArray(handleInfosObj);
+        if (handleInfos.isEmpty()) {
+            return null;
+        }
+
+        JSONObject firstHandleInfo = JsonUtil.parseObj(handleInfos.get(0));
+        return firstHandleInfo.getStr("createBy");
+    }
+
+
+    /**
+     * 判断是否为采购处主管节点
+     *
+     * @param nodeCode 节点编码
+     * @return 是否为采购处主管节点
+     */
+    private boolean isProcurementOfficeNode(String nodeCode) {
+        return "b5e75530-1ba4-4c4d-8126-794cb26c8d97".equals(nodeCode)
+                || "f23419c3-d140-4599-a292-ef36c9f4b0c5".equals(nodeCode)
+                || "632f5695-bc77-48d0-a762-1f3f15db7462".equals(nodeCode)
+                || "325626ed-2b6d-4ac3-a325-5c1a0541a5fa".equals(nodeCode)
+                || "92586737-0498-445d-8c64-709ac4dfe076".equals(nodeCode)
+                || "f5e7c291-80d4-4789-95f3-8dea295c8cb9".equals(nodeCode)
+                || "47d3801f-d914-4835-a8cb-8ca328a24d85".equals(nodeCode)
+                || "dfc6af29-264e-4f55-93ad-26015de82560".equals(nodeCode);
+    }
+
     /**
      * 生成编号
      *
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/mappers/quotation/SalesmanQuotationMapper.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/mappers/quotation/SalesmanQuotationMapper.java
View file @430c437
@@ -40,4 +40,9 @@ public interface SalesmanQuotationMapper extends BaseMapper<SalesmanQuotation> {
      * @return 最大编号
      */
     String getMaxCodeByMonth(@Param("monthPrefix") String monthPrefix);
+
+    /**
+     * 查询最新流程定义JSON
+     */
+    String getLatestFlowDefJson(@Param("id") String id);
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/quotation/SalesmanQuotationService.java
View file @430c437
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/service/quotation/SalesmanQuotationService.java
View file @430c437
@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.procurement.service.quotation;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.xingyun.sc.procurement.dto.DomesticReviewerDto;
 import com.lframework.xingyun.sc.procurement.entity.SalesmanQuotation;
 import com.lframework.xingyun.sc.procurement.vo.quotation.CreateSalesmanQuotationVo;
 import com.lframework.xingyun.sc.procurement.vo.quotation.QuerySalesmanQuotationVo;
@@ -89,4 +90,9 @@ public interface SalesmanQuotationService extends BaseMpService<SalesmanQuotatio
      * @param id 报价主键
      */
     void createPlan(String id);
+
+    /**
+     * 获取审核人
+     */
+    DomesticReviewerDto getReviewerById(String id);
 }
--- a/xingyun-sc/src/main/resources/mappers/procurement/quotation/SalesmanQuotationMapper.xml
View file @430c437
+++ b/xingyun-sc/src/main/resources/mappers/procurement/quotation/SalesmanQuotationMapper.xml
View file @430c437
@@ -169,4 +169,12 @@
         ORDER BY CAST(RIGHT(tb.code, 4) AS UNSIGNED) DESC
         LIMIT 1
     </select>
+
+    <select id="getLatestFlowDefJson" resultType="java.lang.String">
+        SELECT def_json
+        FROM flow_instance
+        WHERE business_id = #{id}
+        ORDER BY create_time DESC
+            LIMIT 1
+    </select>
 </mapper>
--- a/xingyun-sc/src/main/resources/templates/planAndBuyoutTemplate.xlsx
View file @430c437
+++ b/xingyun-sc/src/main/resources/templates/planAndBuyoutTemplate.xlsx
View file @430c437
--- a/xingyun-sc/src/main/resources/templates/planTemplate.xlsx
View file @430c437
+++ b/xingyun-sc/src/main/resources/templates/planTemplate.xlsx
View file @430c437