试样订单:跟踪单-审核

 package com.lframework.xingyun.sc.bo.sample.tracking;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultTracking;
@@ -160,6 +161,12 @@ public class GetSampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private String status;
 
     /**
+     * 是否展示审核按钮
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private boolean showExamine;
+
+    /**
      * 办事处主管审核意见
      */
     @ApiModelProperty("办事处主管审核意见")

 package com.lframework.xingyun.sc.bo.sample.tracking;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.inner.entity.SysUserDept;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultTracking;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
+import org.apache.commons.collections.CollectionUtils;
 
 /**
  * <p>
@@ -161,6 +168,18 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
     private String status;
 
     /**
+     * 是否展示审核按钮
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private boolean showExamine;
+
+    /**
+     * 是否展示编辑按钮
+     */
+    @ApiModelProperty("是否展示编辑按钮")
+    private boolean showAudit;
+
+    /**
      * 办事处主管审核意见
      */
     @ApiModelProperty("办事处主管审核意见")
@@ -232,6 +251,16 @@ public class QuerySampleResultTrackingBo extends BaseBo<SampleResultTracking> {
 
     @Override
     protected void afterInit(SampleResultTracking dto) {
-
+        //判断是否可编辑
+        String deptId = dto.getDeptId();
+        this.showAudit = false;
+        if (StringUtil.isNotEmpty(deptId)) {
+            SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class);
+            List<String> userIds = sysUserDeptService.listAllUserByDeptId(deptId, Boolean.TRUE);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                String userId = SecurityUtil.getCurrentUser().getId();
+                this.showAudit = (userIds.contains(userId));
+            }
+        }
     }
 }

 package com.lframework.xingyun.sc.controller.sample;
 
 import cn.hutool.core.io.resource.ClassPathResource;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.xingyun.sc.bo.sample.tracking.GetSampleResultTrackingBo;
 import com.lframework.xingyun.sc.bo.sample.tracking.QuerySampleResultTrackingBo;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
@@ -66,6 +70,8 @@ public class SampleResultTrackingController extends DefaultBaseController {
     private SampleResultTrackingService sampleResultTrackingService;
     @Resource
     private SampleFeedbackTrackingDetailService sampleFeedbackTrackingDetailService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
 
     /**
@@ -101,6 +107,14 @@ public class SampleResultTrackingController extends DefaultBaseController {
         vo.setTrackingId(id);
         List<SampleFeedbackTrackingDetail> query = sampleFeedbackTrackingDetailService.query(vo);
         result.setDetailList(query);
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isNotEmpty(flowTaskList)) {
+            List<String> businessIds = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            result.setShowExamine(businessIds.contains(result.getId()));
+        } else {
+            result.setShowExamine(false);
+        }
 
         return InvokeResultBuilder.success(result);
     }
@@ -109,7 +123,7 @@ public class SampleResultTrackingController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"sample:tracking:add"})
+    @HasPermission({"sample-order:follow-up-form:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateSampleResultTrackingVo vo) {
 

@@ -33,6 +33,11 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
     private String deptId;
 
     /**
+     * 办事处Code
+     */
+    private String deptCode;
+
+    /**
      * 客户ID
      */
     private String customerId;
@@ -147,6 +152,12 @@ public class SampleResultTracking extends BaseEntity implements BaseDto {
     private String status;
 
     /**
+     * 是否展示审核按钮
+     */
+    @TableField(exist = false)
+    private boolean showExamine;
+
+    /**
      * 办事处主管审核意见
      */
     private String officeSupervisorOpinion;

@@ -31,6 +31,7 @@ import com.lframework.xingyun.sc.service.ledger.ReceiptLedgerInfoService;
 import com.lframework.xingyun.sc.service.order.*;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.service.sample.ProductSampleConfirmationSlipService;
+import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
@@ -135,6 +136,8 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
     private SysDataDicItemService sysDataDicItemService;
     @Resource
     private ProductSampleConfirmationSlipService productSampleConfirmationSlipService;
+    @Resource
+    private SampleResultTrackingService sampleResultTrackingService;
 
 
 
@@ -207,6 +210,9 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             case "CONFIRMATION_SLIP":
                 handleConfirmationSlipData(flowStatus, businessId);
                 break;
+            case "RESULT_TRACKING":
+                handleResultTrackingData(flowStatus, businessId);
+                break;
             default:
                 break;
         }
@@ -854,4 +860,16 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             productSampleConfirmationSlipService.updateStatus(businessId, "REFUSE");
         }
     }
+
+    //产品试样跟踪单
+    private void handleResultTrackingData(String flowStatus, String businessId) {
+        if (FlowInstanceStatus.APPROVE_PASS.getCode().equals(flowStatus)
+                || FlowInstanceStatus.FINISH.getCode().equals(flowStatus)) {
+            sampleResultTrackingService.updateStatus(businessId, "PASS");
+        } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
+                || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {
+            sampleResultTrackingService.updateStatus(businessId, "REFUSE");
+        }
+    }
 }

@@ -21,6 +21,7 @@ import com.lframework.xingyun.sc.service.ledger.FundCoordinationService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.purchase.ReplenishmentOrderService;
 import com.lframework.xingyun.sc.service.sample.ProductSampleConfirmationSlipService;
+import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
 import com.lframework.xingyun.sc.vo.customer.credit.*;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderInfoVo;
 import com.lframework.xingyun.sc.vo.purchase.UpdateReplenishmentOrderVo;
@@ -51,6 +52,8 @@ public class FlowTaskServiceImpl implements FlowTaskService {
     private SysUserRoleService sysUserRoleService;
     @Resource
     private ProductSampleConfirmationSlipService productSampleConfirmationSlipService;
+    @Resource
+    private SampleResultTrackingService sampleResultTrackingService;
 
 
     @OpLog(type = OtherOpLogType.class, name = "修改客户资信，ID：{}", params = {"#id"})
@@ -340,4 +343,18 @@ public class FlowTaskServiceImpl implements FlowTaskService {
             }
         }
     }
+
+    @Override
+    public void updateResultTrackingMap(Map<String, Object> map) {
+        //流程编码
+        Object n = map.get("nodeCode");
+        String nodeCode = String.valueOf(n);
+        //审核意见
+        Object m = map.get("message");
+        String message = String.valueOf(m);
+        //主键
+        Object i = map.get("id");
+        String id = String.valueOf(i);
+        sampleResultTrackingService.updateExamine(id, nodeCode, message);
+    }
 }

@@ -240,19 +240,19 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
             updateWrapper.set(ProductSampleConfirmationSlip::getMarketingDeputyDirectorReview, StringUtil.isBlank(review) ? null : review);
             updateWrapper.set(ProductSampleConfirmationSlip::getMarketingDeputyDirectorOpinion, StringUtil.isBlank(message) ? null : message);
             updateWrapper.eq(ProductSampleConfirmationSlip::getId, id);
-        } else if (nodeCode.equals("confirmation_slip_4-")) {
+        } else if (nodeCode.startsWith("confirmation_slip_4-")) {
             //分厂经营办主管
             updateWrapper.set(ProductSampleConfirmationSlip::getOfficeManagementSupervisor, StringUtil.isBlank(userId) ? null : userId);
             updateWrapper.set(ProductSampleConfirmationSlip::getOfficeManagementSupervisorReview, StringUtil.isBlank(review) ? null : review);
             updateWrapper.set(ProductSampleConfirmationSlip::getOfficeManagementSupervisorOpinion, StringUtil.isBlank(message) ? null : message);
             updateWrapper.eq(ProductSampleConfirmationSlip::getId, id);
-        } else if (nodeCode.equals("confirmation_slip_5-")) {
+        } else if (nodeCode.startsWith("confirmation_slip_5-")) {
             //分厂品质经理
             updateWrapper.set(ProductSampleConfirmationSlip::getQualityManager, StringUtil.isBlank(userId) ? null : userId);
             updateWrapper.set(ProductSampleConfirmationSlip::getQualityManagerReview, StringUtil.isBlank(review) ? null : review);
             updateWrapper.set(ProductSampleConfirmationSlip::getQualityManagerOpinion, StringUtil.isBlank(message) ? null : message);
             updateWrapper.eq(ProductSampleConfirmationSlip::getId, id);
-        } else if (nodeCode.equals("confirmation_slip_6-")) {
+        } else if (nodeCode.startsWith("confirmation_slip_6-")) {
             //分厂主管
             updateWrapper.set(ProductSampleConfirmationSlip::getBranchFactorySupervisor, StringUtil.isBlank(userId) ? null : userId);
             updateWrapper.set(ProductSampleConfirmationSlip::getBranchFactorySupervisorReview, StringUtil.isBlank(review) ? null : review);

@@ -3,7 +3,13 @@ package com.lframework.xingyun.sc.impl.sample;
 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.mappers.FlowTaskWrapperMapper;
+import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;
 import com.lframework.xingyun.sc.entity.SampleFeedbackTrackingDetail;
 import com.lframework.xingyun.sc.entity.SampleResultTracking;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -19,6 +25,7 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.mappers.SampleFeedbackTrackingDetailMapper;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.SampleResultTrackingMapper;
 import com.lframework.xingyun.sc.service.sample.SampleResultTrackingService;
@@ -29,11 +36,17 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleResultTrackingMapper, SampleResultTracking> implements SampleResultTrackingService {
+    private static final String BPM_FLAG = "RESULT_TRACKING";
     @Resource
     private SampleFeedbackTrackingDetailMapper sampleFeedbackTrackingDetailMapper;
+    @Resource
+    private FlowInstanceWrapperService flowInstanceWrapperService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
     @Override
     public PageResult<SampleResultTracking> query(Integer pageIndex, Integer pageSize, QuerySampleResultTrackingVo vo) {
@@ -43,6 +56,19 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<SampleResultTracking> datas = this.query(vo);
+        // 获取当前人员的待办任务数据
+        List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+        if (CollectionUtils.isEmpty(flowTaskList)) {
+            return PageResultUtil.convert(new PageInfo<>(datas));
+        }
+        List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+        for (SampleResultTracking sampleResultTracking : datas) {
+            if (ids.contains(sampleResultTracking.getId())) {
+                sampleResultTracking.setShowExamine(true);
+            } else {
+                sampleResultTracking.setShowExamine(false);
+            }
+        }
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -118,6 +144,9 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
 
         OpLogUtil.setVariable("id", data.getId());
         OpLogUtil.setExtra(vo);
+        //开启审核
+        SampleResultTracking result = getBaseMapper().findById(vo.getId());
+        flowInstanceWrapperService.startInstance(BPM_FLAG, result.getId(), BPM_FLAG, result);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "删除产品试样结果跟踪单，ID：{}", params = {"#id"})
@@ -127,4 +156,48 @@ public class SampleResultTrackingServiceImpl extends BaseMpServiceImpl<SampleRes
 
         getBaseMapper().deleteById(id);
     }
+
+    @OpLog(type = OtherOpLogType.class, name = "修改状态，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateStatus(String id, String status) {
+
+        SampleResultTracking data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("产品试样结果跟踪单不存在！");
+        }
+
+        LambdaUpdateWrapper<SampleResultTracking> updateWrapper = Wrappers.lambdaUpdate(SampleResultTracking.class)
+                .set(SampleResultTracking::getStatus, status)
+                .eq(SampleResultTracking::getId, id);
+
+        getBaseMapper().update(updateWrapper);
+
+    }
+
+    @Override
+    public void updateExamine(String id, String nodeCode, String message) {
+        SampleResultTracking data = getBaseMapper().selectById(id);
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("产品试样结果跟踪单不存在！");
+        }
+        LambdaUpdateWrapper<SampleResultTracking> updateWrapper = Wrappers.lambdaUpdate(SampleResultTracking.class);
+        if ("result_tracking_1".equals(nodeCode)) {
+            updateWrapper.set(SampleResultTracking::getOfficeSupervisorOpinion, message);
+            updateWrapper.eq(SampleResultTracking::getId, id);
+        } else if (nodeCode.startsWith("result_tracking_2-")) {
+            updateWrapper.set(SampleResultTracking::getQualitySupervisorOpinion, message);
+            updateWrapper.eq(SampleResultTracking::getId, id);
+        } else if (nodeCode.startsWith("result_tracking_3-")) {
+            updateWrapper.set(SampleResultTracking::getQualityManagerOpinion, message);
+            updateWrapper.eq(SampleResultTracking::getId, id);
+        } else if (nodeCode.startsWith("result_tracking_4-")) {
+            updateWrapper.set(SampleResultTracking::getOperationsDepartmentSupervisorOpinion, message);
+            updateWrapper.eq(SampleResultTracking::getId, id);
+        } else if (nodeCode.startsWith("result_tracking_5-")) {
+            updateWrapper.set(SampleResultTracking::getMarketingDeputyDirectorOpinion, message);
+            updateWrapper.eq(SampleResultTracking::getId, id);
+        }
+        getBaseMapper().update(updateWrapper);
+    }
 }

@@ -72,4 +72,21 @@ public interface SampleResultTrackingService extends BaseMpService<SampleResultT
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 修改状态
+     *
+     * @param id     主键
+     * @param status 状态
+     */
+    void updateStatus(String id, String status);
+
+    /**
+     * 更新审核意见
+     *
+     * @param id       主键
+     * @param nodeCode 节点
+     * @param message  审核意见
+     */
+    void updateExamine(String id, String nodeCode, String message);
 }

@@ -4,6 +4,8 @@
 
     <resultMap id="SampleResultTracking" type="com.lframework.xingyun.sc.entity.SampleResultTracking">
         <id column="id" property="id"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_code" property="deptCode"/>
         <result column="customer_id" property="customerId"/>
         <result column="customer_name" property="customerName"/>
         <result column="workshop_id" property="workshopId"/>
@@ -40,6 +42,8 @@
     <sql id="SampleResultTracking_sql">
         SELECT
             tb.id,
+            tb.dept_id,
+            sd.code AS dept_code,
             tb.customer_id,
             cu.name AS customer_name,
             tb.workshop_id,
@@ -75,6 +79,7 @@
         left join base_data_customer as cu on cu.id = tb.customer_id
         left join base_data_workshop as ws on ws.id = tb.workshop_id
         left join purchase_order_info as poi on poi.id = tb.order_id
+        left join sys_dept as sd on sd.id = tb.dept_id
     </sql>
 
     <select id="query" resultMap="SampleResultTracking">