试样订单:产品试样确认单-按钮展示

房远帅
1 parent 814fb677
Showing 8 changed files with 144 additions and 9 deletions
xingyun-api/src/main/resources/db/chujiang/base.sql
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/GetProductSampleConfirmationSlipBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/QueryProductSampleConfirmationSlipBo.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sample/ProductSampleConfirmationSlipController.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductSampleConfirmationSlip.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sample/ProductSampleConfirmationSlipServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/CreateProductSampleConfirmationSlipVo.java
xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
--- a/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @09fa860
+++ b/xingyun-api/src/main/resources/db/chujiang/base.sql
View file @09fa860
@@ -1235,6 +1235,8 @@ alter table tbl_purchase_order_line add column contract_distributor_line_id varc
 CREATE TABLE `product_sample_confirmation_slip` (
     `id`                                   varchar(32) NOT NULL COMMENT 'ID',
+    `order_id`                             varchar(32)  DEFAULT NULL COMMENT '订货单ID',
+    `region`                               varchar(32)  DEFAULT NULL COMMENT '区域',
     `ordering_unit`                        varchar(32)  DEFAULT NULL COMMENT '订货单位ID',
     `sample_type`                          varchar(50)  DEFAULT NULL COMMENT '试样种类',
     `customer_type`                        varchar(50)  DEFAULT NULL comment '客户类型',
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/GetProductSampleConfirmationSlipBo.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/GetProductSampleConfirmationSlipBo.java
View file @09fa860
@@ -3,17 +3,25 @@ package com.lframework.xingyun.sc.bo.sample.confirm;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysUserDept;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.collections.CollectionUtils;
 /**
  * <p>
@@ -142,7 +150,13 @@ public class GetProductSampleConfirmationSlipBo extends BaseBo<ProductSampleConf
      * 是否展示编辑按钮
      */
     @ApiModelProperty("是否展示编辑按钮")
-    private String showAudit;
+    private boolean showAudit;
+
+    /**
+     * 是否展示审核按钮
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private boolean showExamine;
     /**
      * 产品试样确认单详情
@@ -419,5 +433,18 @@ public class GetProductSampleConfirmationSlipBo extends BaseBo<ProductSampleConf
         this.sampleTypeName = dataDicItem == null ? "" : dataDicItem.getName();
         SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", dto.getCustomerType());
         this.customerTypeName = dataDicItem1 == null ? "" : dataDicItem1.getName();
+        //判断是否可编辑
+        //区域
+        String region = dto.getRegion();
+        this.showAudit = false;
+        if (StringUtil.isNotEmpty(region)) {
+            SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class);
+            List<SysUserDept> byDeptId = sysUserDeptService.getByDeptId(region);
+            if (CollectionUtils.isNotEmpty(byDeptId)) {
+                List<String> userIds = byDeptId.stream().map(SysUserDept::getUserId).collect(Collectors.toList());
+                String userId = SecurityUtil.getCurrentUser().getId();
+                this.showAudit = (userIds.contains(userId));
+            }
+        }
     }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/QueryProductSampleConfirmationSlipBo.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/bo/sample/confirm/QueryProductSampleConfirmationSlipBo.java
View file @09fa860
@@ -3,15 +3,25 @@ package com.lframework.xingyun.sc.bo.sample.confirm;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.web.core.bo.BaseBo;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.ApplicationUtil;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.entity.SysUserDept;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.collections.CollectionUtils;
 /**
  * <p>
@@ -142,7 +152,13 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
      * 是否展示编辑按钮
      */
     @ApiModelProperty("是否展示编辑按钮")
-    private String showAudit;
+    private boolean showAudit;
+
+    /**
+     * 是否展示审核按钮
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private boolean showExamine;
     /**
      * 创建人ID
@@ -203,5 +219,17 @@ public class QueryProductSampleConfirmationSlipBo extends BaseBo<ProductSampleCo
         this.sampleTypeName = dataDicItem == null ? "" : dataDicItem.getName();
         SysDataDicItem dataDicItem1 = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", dto.getCustomerType());
         this.customerTypeName = dataDicItem1 == null ? "" : dataDicItem1.getName();
+        //判断是否可编辑
+        String region = dto.getRegion();
+        this.showAudit = false;
+        if (StringUtil.isNotEmpty(region)) {
+            SysUserDeptService sysUserDeptService = ApplicationUtil.getBean(SysUserDeptService.class);
+            List<SysUserDept> byDeptId = sysUserDeptService.getByDeptId(region);
+            if (CollectionUtils.isNotEmpty(byDeptId)) {
+                List<String> userIds = byDeptId.stream().map(SysUserDept::getUserId).collect(Collectors.toList());
+                String userId = SecurityUtil.getCurrentUser().getId();
+                this.showAudit = (userIds.contains(userId));
+            }
+        }
     }
 }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sample/ProductSampleConfirmationSlipController.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/sample/ProductSampleConfirmationSlipController.java
View file @09fa860
 package com.lframework.xingyun.sc.controller.sample;
+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.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.InvokeResult;
-
 import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import com.lframework.xingyun.sc.bo.sample.confirm.GetProductSampleConfirmationSlipBo;
@@ -25,8 +28,8 @@ import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import io.swagger.annotations.ApiOperation;
 import com.lframework.starter.common.utils.CollectionUtil;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
@@ -47,6 +50,8 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
     private ProductSampleConfirmationSlipService productSampleConfirmationSlipService;
     @Resource
     private ProductSampleConfirmationSlipDetailService productSampleConfirmationSlipDetailService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
     /**
      * 查询列表
@@ -91,6 +96,14 @@ public class ProductSampleConfirmationSlipController extends DefaultBaseControll
             detailBoList = detailList.stream().map(QueryProductSampleConfirmationSlipDetailBo::new).collect(Collectors.toList());
             result.setProductSampleConfirmationSlipDetailList(detailBoList);
         }
+        // 获取当前人员的待办任务数据
+        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);
     }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductSampleConfirmationSlip.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/entity/ProductSampleConfirmationSlip.java
View file @09fa860
@@ -29,6 +29,16 @@ public class ProductSampleConfirmationSlip extends BaseEntity implements BaseDto
     private String id;
     /**
+     * 订货单ID
+     */
+    private String orderId;
+
+    /**
+     * 区域
+     */
+    private String region;
+
+    /**
      * 订货单位ID
      */
     private String orderingUnit;
@@ -106,6 +116,18 @@ public class ProductSampleConfirmationSlip extends BaseEntity implements BaseDto
     private String status;
     /**
+     * 是否展示编辑按钮
+     */
+    @TableField(exist = false)
+    private boolean showAudit;
+
+    /**
+     * 是否展示审核按钮
+     */
+    @TableField(exist = false)
+    private boolean showExamine;
+
+    /**
      * 办事处内勤ID
      */
     private String officeClerk;
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sample/ProductSampleConfirmationSlipServiceImpl.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/sample/ProductSampleConfirmationSlipServiceImpl.java
View file @09fa860
@@ -3,6 +3,9 @@ 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.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -18,6 +21,7 @@ import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.mappers.ProductSampleConfirmationSlipMapper;
 import com.lframework.xingyun.sc.service.sample.ProductSampleConfirmationSlipDetailService;
 import com.lframework.xingyun.sc.service.sample.ProductSampleConfirmationSlipService;
@@ -27,11 +31,14 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 @Service
 public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<ProductSampleConfirmationSlipMapper, ProductSampleConfirmationSlip> implements ProductSampleConfirmationSlipService {
     @Resource
     private ProductSampleConfirmationSlipDetailService productSampleConfirmationSlipDetailService;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
     @Override
     public PageResult<ProductSampleConfirmationSlip> query(Integer pageIndex, Integer pageSize, QueryProductSampleConfirmationSlipVo vo) {
@@ -42,6 +49,22 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<ProductSampleConfirmationSlip> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            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 (ProductSampleConfirmationSlip sampleConfirmationSlip : datas) {
+                if (ids.contains(sampleConfirmationSlip.getId())) {
+                    sampleConfirmationSlip.setShowExamine(true);
+                } else {
+                    sampleConfirmationSlip.setShowExamine(false);
+                }
+            }
+        }
+
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -64,6 +87,10 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
         ProductSampleConfirmationSlip data = new ProductSampleConfirmationSlip();
         data.setId(IdUtil.getId());
+        data.setOrderId(vo.getOrderId());
+        if (!StringUtil.isBlank(vo.getRegion())) {
+            data.setRegion(vo.getRegion());
+        }
         data.setOrderingUnit(vo.getOrderingUnit());
         if (!StringUtil.isBlank(vo.getWorkshopId())) {
             data.setWorkshopId(vo.getWorkshopId());
@@ -112,7 +139,7 @@ public class ProductSampleConfirmationSlipServiceImpl extends BaseMpServiceImpl<
                 .set(ProductSampleConfirmationSlip::getSampleFrequency, StringUtil.isBlank(vo.getSampleFrequency()) ? null : vo.getSampleFrequency())
                 .set(ProductSampleConfirmationSlip::getEarlyNonconformityDescription, StringUtil.isBlank(vo.getEarlyNonconformityDescription()) ? null : vo.getEarlyNonconformityDescription())
                 .set(ProductSampleConfirmationSlip::getPreparedBy, StringUtil.isBlank(vo.getPreparedBy()) ? null : vo.getPreparedBy())
-                .set(ProductSampleConfirmationSlip::getStatus, StringUtil.isBlank(vo.getStatus()) ? null : vo.getStatus())
+                .set(ProductSampleConfirmationSlip::getStatus, "AUDIT")
                 .eq(ProductSampleConfirmationSlip::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/CreateProductSampleConfirmationSlipVo.java
View file @09fa860
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sample/confirm/CreateProductSampleConfirmationSlipVo.java
View file @09fa860
@@ -3,11 +3,7 @@ package com.lframework.xingyun.sc.vo.sample.confirm;
 import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 import com.lframework.starter.web.core.vo.BaseVo;
-import javax.validation.constraints.NotNull;
-
-import com.lframework.xingyun.sc.bo.sample.confirm.QueryProductSampleConfirmationSlipDetailBo;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
@@ -21,6 +17,22 @@ public class CreateProductSampleConfirmationSlipVo implements BaseVo, Serializab
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单ID
+     */
+    @ApiModelProperty(value = "订货单ID", required = true)
+    @NotBlank(message = "请输入订货单ID！")
+    @Length(message = "订货单ID最多允许32个字符！")
+    private String orderId;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    @Length(message = "区域最多允许32个字符！")
+    private String region;
+
     /**
      * 订货单位ID
      */
--- a/xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
View file @09fa860
+++ b/xingyun-sc/src/main/resources/mappers/sample/ProductSampleConfirmationSlipMapper.xml
View file @09fa860
@@ -4,6 +4,8 @@
     <resultMap id="ProductSampleConfirmationSlip" type="com.lframework.xingyun.sc.entity.ProductSampleConfirmationSlip">
         <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
+        <result column="region" property="region"/>
         <result column="ordering_unit" property="orderingUnit"/>
         <result column="ordering_unit_name" property="orderingUnitName"/>
         <result column="sample_type" property="sampleType"/>
@@ -56,6 +58,8 @@
     <sql id="ProductSampleConfirmationSlip_sql">
         SELECT
             tb.id,
+            tb.order_id,
+            tb.region,
             tb.ordering_unit,
             cu.name AS ordering_unit_name,
             tb.sample_type,