Merge branch 'mater_procurement' into master_quotation

房远帅
2 parents 874a716d 57f9a42d
Showing 2 changed files with 62 additions and 1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementDomesticCustomerCredit.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementDomesticCustomerCreditServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementDomesticCustomerCredit.java
View file @72fe299
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/entity/ProcurementDomesticCustomerCredit.java
View file @72fe299
@@ -321,6 +321,12 @@ public class ProcurementDomesticCustomerCredit extends BaseEntity implements Bas
     private Boolean showChangeReviewExamineDetail;
     /**
+     * 角色编码(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String roleCode;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementDomesticCustomerCreditServiceImpl.java
View file @72fe299
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/procurement/impl/credit/ProcurementDomesticCustomerCreditServiceImpl.java
View file @72fe299
@@ -14,6 +14,7 @@ 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.CollectionUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
@@ -24,7 +25,9 @@ import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.procurement.dto.DomesticReviewerDto;
 import com.lframework.xingyun.sc.procurement.entity.ProcurementDomesticCustomerCredit;
@@ -65,6 +68,9 @@ public class ProcurementDomesticCustomerCreditServiceImpl
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Autowired
     private MqProducerService mqProducerService;
+    @Autowired
+    private SysRoleService sysRoleService;
+
     @Override
     public PageResult<ProcurementDomesticCustomerCredit> query(Integer pageIndex, Integer pageSize,
@@ -166,6 +172,31 @@ public class ProcurementDomesticCustomerCreditServiceImpl
         //开启审核
         ProcurementDomesticCustomerCredit customerCredit = getBaseMapper().findById(data.getId());
+        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+        String roleCode = null;
+        if (CollectionUtil.isNotEmpty(sysRoleList)) {
+            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
+            Set<String> roleCodeSet = sysRoleList.stream()
+                    .map(SysRole::getCode)
+                    .collect(Collectors.toSet());
+
+            // 2. 判断是否包含采购主管相关的角色
+            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
+                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
+                roleCode = "cgczg";
+            } else if (roleCodeSet.contains("qyjl")) {
+                // 3. 如果没有，继续判断是否包含区域经理
+                roleCode = "qyjl";
+            } else if (roleCodeSet.contains("nmcgkywy")) {
+                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
+                roleCode = "nmcgkywy";
+            } else {
+                throw new DefaultClientException("当前角色无法发起审核！");
+            }
+        } else {
+            throw new DefaultClientException("当前角色无法发起审核！");
+        }
+        customerCredit.setRoleCode(roleCode);
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, customerCredit);
         OpLogUtil.setVariable("id", data.getId());
@@ -253,7 +284,31 @@ public class ProcurementDomesticCustomerCreditServiceImpl
             //编辑-直接更新入库
             getBaseMapper().updateById(data);
         }
-
+        List<SysRole> sysRoleList = sysRoleService.getByUserId(SecurityUtil.getCurrentUser().getId());
+        String roleCode = null;
+        if (CollectionUtil.isNotEmpty(sysRoleList)) {
+            // 1. 提取角色列表中的所有 code，转换为 Set 集合，提升后续判断效率
+            Set<String> roleCodeSet = sysRoleList.stream()
+                    .map(SysRole::getCode)
+                    .collect(Collectors.toSet());
+
+            // 2. 判断是否包含采购主管相关的角色
+            if (roleCodeSet.contains("htcgeczg") || roleCodeSet.contains("htcgyczg")
+                    || roleCodeSet.contains("ltcgczg") || roleCodeSet.contains("ztcgczg")) {
+                roleCode = "cgczg";
+            } else if (roleCodeSet.contains("qyjl")) {
+                // 3. 如果没有，继续判断是否包含区域经理
+                roleCode = "qyjl";
+            } else if (roleCodeSet.contains("nmcgkywy")) {
+                // 4. 如果还没有，继续判断是否包含内贸采购科业务员
+                roleCode = "nmcgkywy";
+            } else {
+                throw new DefaultClientException("当前角色无法发起审核！");
+            }
+        } else {
+            throw new DefaultClientException("当前角色无法发起审核！");
+        }
+        data.setRoleCode(roleCode);
         //开启审核
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);