Merge remote-tracking branch 'origin/master'

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/AbnormalBillService.java

@@ -9,7 +9,6 @@ import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
 import com.foreverwin.mesnac.anomaly.model.UploadPictures;
 import com.foreverwin.mesnac.common.model.Message;
 import com.foreverwin.mesnac.meapi.dto.SfcDto;
-import com.foreverwin.mesnac.meapi.model.MessageType;
 import com.foreverwin.modular.core.util.FrontPage;
 
 import java.util.HashMap;
@@ -161,7 +160,7 @@ public interface AbnormalBillService extends IService<AbnormalBill> {
      * @param abnormalBill
      * @param abnormalBillDispose
      */
-    MessageType findMessageTypeByStatusAndUserGroup(Message message, AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
+    String findMessageTypeByStatusAndUserGroup(Message message, AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose);
 
     /**
      *响应超时时要创建两个消息类型，分别时责任划分和判责提交，但是不发消息

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java

@@ -1079,9 +1079,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         abnormalMessage.setType(abnormalBill.getMessageType());
 
         //找到对应的消息类型
-        MessageType messageType = this.findMessageTypeByStatusAndUserGroup(abnormalMessage, abnormalBill, abnormalBillDispose);
+        String messageType = this.findMessageTypeByStatusAndUserGroup(abnormalMessage, abnormalBill, abnormalBillDispose);
         //设置消息类型
-        abnormalMessage.setMessageType(messageType.getMessageType());
+        abnormalMessage.setMessageType(messageType);
         //格式化消息
         String message = this.formatMessage(abnormalBill, abnormalMessage.getMessageType(), site);
         //得到消息触发的时间
@@ -1439,9 +1439,10 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
     }
 
     @Override
-    public MessageType findMessageTypeByStatusAndUserGroup(Message message, AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose) {
+    public String findMessageTypeByStatusAndUserGroup(Message message, AbnormalBill abnormalBill, AbnormalBillDispose abnormalBillDispose) {
         String status = abnormalBill.getStatus();
         String site = CommonMethods.getSite();
+        ArrayList<String> typeList = new ArrayList<>();
         String userGroup = null;
         //根据异常单的状态找到对应的用户组
         switch (status){
@@ -1467,17 +1468,29 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
         if(StringUtils.isBlank(userGroup)){
             throw new BaseException("消息发送失败，找不到对应的用户组");
         }else{
-            MessageType type = null;
-            try{
-              type = messageTypeMapper.findMessageTypeByUserGroup(site, userGroup);
-            }catch (Exception e){
-                throw new BaseException("根据发送的用户组找到有可能找到多个对应的消息类型，请检查。"+e.getMessage());
-            }
-            if(type == null){
-                throw new BaseException("根据发送的用户组找不到对应的消息类型，请维护。");
-            }else{
-                return type;
+            //可能为多个用户组
+            String[] splitUserGroup = userGroup.split(",");
+            for (String spUserGroup: splitUserGroup) {
+                MessageType thisType;
+                try{
+                     thisType = messageTypeMapper.findMessageTypeByUserGroup(site, spUserGroup);
+                }catch (Exception e){
+                    throw new BaseException("根据发送的用户组找到"+spUserGroup+"找到多个对应的消息类型，请检查。"+e.getMessage());
+                }
+                if(thisType == null){
+                    throw new BaseException("根据发送的用户组"+spUserGroup+"找不到对应的消息类型，请维护。");
+                }
+                String messageType = thisType.getMessageType();
+                if (typeList.isEmpty()){
+                    typeList.add(messageType);
+                }else {
+                    if (!typeList.contains(messageType)){
+                        throw new BaseException("根据发送的用户组找到多个对应的消息类型，请检查。");
+                    }
+                }
+
             }
+            return typeList.get(0);
 
         }
     }

production/src/main/java/com/foreverwin/mesnac/production/mapper/AccessoryLogMapper.java

@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.production.mapper;
 
 import com.foreverwin.mesnac.production.model.AccessoryLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,5 +18,5 @@ import java.util.List;
 @Repository
 public interface AccessoryLogMapper extends BaseMapper<AccessoryLog> {
 
-    List<AccessoryLog> getLabelList(String site, String sfc, String stepId);
+    List<AccessoryLog> getLabelList(@Param("site") String site,@Param("sfc") String sfc,@Param("stepId") String stepId);
 }

production/src/main/resources/mapper/AccessoryLogMapper.xml

@@ -484,5 +484,7 @@
         SELECT ZAL.*,IT.DESCRIPTION FROM Z_ACCESSORY_LOG zal
         INNER JOIN ITEM IM ON IM.SITE = zal.SITE AND IM.ITEM=zal.ITEM
         LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
+         WHERE zal.sfc=#{sfc} AND zal.SITE=#{site} AND zal.STEP_ID=#{stepId}
+         ORDER BY zal.CREATED_DATE_TIME DESC
     </select>
 </mapper>