Merge remote-tracking branch 'origin/master_0929' into master_0929

 package com.lframework.xingyun.sc.handlers;
 package com.lframework.xingyun.sc.handlers;
 
 
+import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
-import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper;
-import com.lframework.starter.web.inner.service.system.SysUserDeptService;
-import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
+import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 @Component
 @Component
 @Slf4j
 @Slf4j
 public class MessageHandler {
 public class MessageHandler {
 
 
 
 
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private MqProducerService mqProducerService;
+
+
     /**
     /**
      * 消息通知
      * 消息通知
      *
      *
      * @param roleCodes 角色编号集合
      * @param roleCodes 角色编号集合
      * @param userId    人员ID
      * @param userId    人员ID
-     * @return          List<String>
      */
      */
-    public List<String> sendMsg(String userId, List<String> roleCodes) {
+    public void sendMsg(String userId, List<String> roleCodes, String businessType, String sendUserId) {
         log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCodes:{}", userId, JsonUtil.toJsonString(roleCodes));
         log.info("================== MessageHandler sendMsg invoke start, userId:{}, roleCodes:{}", userId, JsonUtil.toJsonString(roleCodes));
+        List<String> receiveUserIds = new ArrayList<>();
+        if (StringUtils.isBlank(userId)) {
+            receiveUserIds.add(userId);
+        }
+        if (CollectionUtils.isEmpty(roleCodes)) {
+            // 获取角色下人员ID
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(roleCodes);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                receiveUserIds.addAll(userIds);
+            }
+        }
+        if (CollectionUtils.isEmpty(receiveUserIds)) {
+            return;
+        }
+        // 去重
+        receiveUserIds = receiveUserIds.stream().distinct().collect(Collectors.toList());
+        log.info("================== MessageHandler sendMsg receiveUserIds size:{}", receiveUserIds.size());
+        SysSiteMessageDto siteMessageDto = new SysSiteMessageDto();
+        siteMessageDto.setUserIdList(receiveUserIds);
+        // todo 完善消息标题、内容
+        String title = "";
+        String content = "";
+        String bizKey = "";
+        if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
+        }
+        siteMessageDto.setTitle(title);
+        siteMessageDto.setContent(content);
+        siteMessageDto.setBizKey(bizKey);
+        if (StringUtils.isBlank(sendUserId)) {
+            // 系统自动发送
+            siteMessageDto.setCreateUserId(null);
+        } else {
+            siteMessageDto.setCreateUserId(sendUserId);
+        }
 
 
-        return null;
+        mqProducerService.createSysSiteMessage(siteMessageDto);
+        log.info("================== MessageHandler sendMsg invoke end!");
     }
     }
 }
 }

@@ -3,6 +3,7 @@ package com.lframework.xingyun.sc.handlers;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper;
 import com.lframework.starter.web.inner.mappers.system.SysUserRoleMapper;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserDeptService;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Component;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -21,7 +23,7 @@ public class TransactorHandler {
     @Resource
     @Resource
     private SysUserDeptService userDeptService;
     private SysUserDeptService userDeptService;
     @Resource
     @Resource
-    private SysUserRoleMapper sysUserRoleMapper;
+    private SysUserRoleService sysUserRoleService;
     @Resource
     @Resource
     private WorkshopService workshopService;
     private WorkshopService workshopService;
 
 
@@ -36,7 +38,7 @@ public class TransactorHandler {
     public List<String> listTransactorsByRoleCode(String roleCode, String userId) {
     public List<String> listTransactorsByRoleCode(String roleCode, String userId) {
         log.info("================== listTransactorsByRoleCode invoke start, roleCode:{}, userId:{}", roleCode, userId);
         log.info("================== listTransactorsByRoleCode invoke start, roleCode:{}, userId:{}", roleCode, userId);
         // 获取角色下人员
         // 获取角色下人员
-        List<String> userIdList = sysUserRoleMapper.listUserIdByRoleCode(roleCode);
+        List<String> userIdList = sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList(roleCode));
         if (CollectionUtils.isEmpty(userIdList)) {
         if (CollectionUtils.isEmpty(userIdList)) {
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }
@@ -73,7 +75,7 @@ public class TransactorHandler {
         }
         }
         String workshopName = workshop.getName();
         String workshopName = workshop.getName();
         // 获取角色下人员
         // 获取角色下人员
-        List<String> userIdList = sysUserRoleMapper.listUserIdByRoleCode(roleCode);
+        List<String> userIdList = sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList(roleCode));
         if (CollectionUtils.isEmpty(userIdList)) {
         if (CollectionUtils.isEmpty(userIdList)) {
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }

@@ -21,6 +21,7 @@ import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
+import com.lframework.xingyun.sc.handlers.MessageHandler;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
@@ -60,6 +61,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
     private CustomerCreditService customerCreditService;
     private CustomerCreditService customerCreditService;
     @Resource
     @Resource
     private RedisHandler redisHandler;
     private RedisHandler redisHandler;
+    @Resource
+    private MessageHandler messageHandler;
 
 
 
 
     @Override
     @Override
@@ -289,4 +292,21 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
         // 更新订货单物料行数据
         // 更新订货单物料行数据
         purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
         purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
     }
     }
+
+    @Override
+    public void output(String id) {
+        if (StringUtils.isBlank(id)) {
+            return;
+        }
+        OrderInfoChangeRecord record = getById(id);
+        if (record == null) {
+            throw new DefaultClientException("订货单变更记录不存在！");
+        }
+        LambdaUpdateWrapper<OrderInfoChangeRecord> updateWrapper = Wrappers.lambdaUpdate(OrderInfoChangeRecord.class);
+        updateWrapper.set(OrderInfoChangeRecord::getOutput, true)
+                .eq(OrderInfoChangeRecord::getId, id);
+        getBaseMapper().update(updateWrapper);
+        // 消息通知
+        messageHandler.sendMsg(record.getCreateById(), Collections.singletonList("jybjhy"), "SPEC_CHANGE_SUBMIT", null);
+    }
 }
 }

 package com.lframework.xingyun.sc.listeners.flow;
 package com.lframework.xingyun.sc.listeners.flow;
 
 
 import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
 import com.lframework.starter.bpm.dto.FlowInstanceExtDto;
+import com.lframework.starter.bpm.enums.FlowInstanceStatus;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.order.OrderChangeRecordService;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.UpdateCustomerCreditVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -23,6 +25,8 @@ public class NodeFinishListener implements Listener {
 
 
     @Resource
     @Resource
     private CustomerCreditService customerCreditService;
     private CustomerCreditService customerCreditService;
+    @Resource
+    private OrderChangeRecordService orderChangeRecordService;
 
 
 
 
     /**
     /**
@@ -52,6 +56,7 @@ public class NodeFinishListener implements Listener {
             FlowInstanceExtDto flowInstanceExtDto = JsonUtil.parseObject(ext, FlowInstanceExtDto.class);
             FlowInstanceExtDto flowInstanceExtDto = JsonUtil.parseObject(ext, FlowInstanceExtDto.class);
             businessType = flowInstanceExtDto.getBizFlag();
             businessType = flowInstanceExtDto.getBizFlag();
         }
         }
+        String flowStatus = instance.getFlowStatus();
         if ("CUSTOMER_CREDIT".equals(businessType)) {
         if ("CUSTOMER_CREDIT".equals(businessType)) {
             // 更新业务数据
             // 更新业务数据
             switch (nodeCode) {
             switch (nodeCode) {
@@ -74,6 +79,13 @@ public class NodeFinishListener implements Listener {
                 default:
                 default:
                     break;
                     break;
             }
             }
+        } else if ("SPEC_CHANGE_SUBMIT".equals(businessType)) {
+            // 订货单变更提交
+            if ("final_node".equals(nodeCode)
+                    && (FlowInstanceStatus.REFUSE.getCode().equals(flowStatus) || FlowInstanceStatus.REVOKE.getCode().equals(flowStatus))) {
+                // 标识订货单已产出
+                orderChangeRecordService.output(businessId);
+            }
         }
         }
         log.info("==================== 流程节点完成监听器结束......");
         log.info("==================== 流程节点完成监听器结束......");
     }
     }

@@ -72,4 +72,11 @@ public interface OrderChangeRecordService extends BaseMpService<OrderInfoChangeR
      * @param id        主键ID
      * @param id        主键ID
      */
      */
     void reviewPass(String id);
     void reviewPass(String id);
+
+    /**
+     * 已产出，有损
+     *
+     * @param id        主键ID
+     */
+    void output(String id);
 }
 }

@@ -31,6 +31,12 @@ public class QueryCustomerDevelopPlanVo extends SortPageVo implements BaseVo, Se
     private String customerId;
     private String customerId;
 
 
     /**
     /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
      * 厂房ID
      * 厂房ID
      */
      */
     @ApiModelProperty("厂房ID")
     @ApiModelProperty("厂房ID")

@@ -88,6 +88,15 @@
                     #{item}
                     #{item}
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="vo.createStartTime != null">
+                AND tb.create_time >= #{vo.createStartTime}
+            </if>
+            <if test="vo.createEndTime != null">
+                AND tb.create_time &lt;= #{vo.createEndTime}
+            </if>
+            <if test="vo.customerName != null and vo.customerName != ''">
+                AND c.name LIKE CONCAT('%', #{vo.customerName}, '%')
+            </if>
         </where>
         </where>
     </sql>
     </sql>