Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

异常待办事项

Browse Source
master
赵嘉伟 4 years ago
parent 5c42465472
commit 7a2b2cc404
7 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDisposeDto.java
Unescape Escape View File

@ -189,6 +189,8 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
private String shutDown;
private String operationDescription;
public String getAbnormalNo() {
return abnormalNo;
}
@ -484,4 +486,12 @@ public class AbnormalBillDisposeDto extends AbnormalBillDispose {
public void setShutDown(String shutDown) {
this.shutDown = shutDown;
}
public String getOperationDescription() {
return operationDescription;
}
public void setOperationDescription(String operationDescription) {
this.operationDescription = operationDescription;
}
}

4
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/AbnormalBillMapper.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.anomaly.dto.AbnormalBillDto;
import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
import com.foreverwin.mesnac.common.dto.ScrapDto;
import com.foreverwin.mesnac.meapi.model.UserGroup;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -21,7 +22,8 @@ import java.util.List;
public interface AbnormalBillMapper extends BaseMapper<AbnormalBill> {
List<AbnormalBillDto> backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language);
List<AbnormalBillDto> backLog(@Param("abnormalBill")AbnormalBillDto abnormalBillDto, @Param("language")String language,
@Param("userGroupList")List<UserGroup> userGroupList);
/**
* 设备异常响应检索用

14
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -321,8 +321,18 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
@Override
public List<AbnormalBillDto> backLog(AbnormalBillDto abnormalBillDto) {
String user = CommonMethods.getUser();
String site = CommonMethods.getSite();
List<UserGroup> userGroupList = userGroupMapper.findUserGroupListByUser(site, user);
//判断该用户组中有没有administrator,如果有的话就等于null
for (UserGroup userGroup : userGroupList){
if("ADMINISTRATORS".equals(userGroup.getUserGroup())){
userGroupList = null;
break;
}
}
String language = LocaleContextHolder.getLocale().getLanguage();
return abnormalBillMapper.backLog(abnormalBillDto, language);
return abnormalBillMapper.backLog(abnormalBillDto, language,userGroupList);
}
@Override
@ -1061,7 +1071,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
messageMap.put("discover",AnomalyConstant.Discover.msg(messageContent.getDiscover()));
messageMap.put("entityLocation",messageContent.getEntityLocation());
messageMap.put("reportFrom",AnomalyConstant.ReportFrom.msg(messageContent.getReportFrom()));
messageMap.put("operation",messageContent.getOperation());
messageMap.put("operation",messageContent.getOperationDescription());
messageMap.put("reportSendUserGroup",messageContent.getReportSendUserGroup());
if(StringUtil.isBlank(messageContent.getNcCode()) || "/,".equals(messageContent.getNcCode())){
messageMap.put("ncCode","");

5
anomaly/src/main/resources/mapper/AbnormalBillDisposeMapper.xml
Unescape Escape View File

@ -68,6 +68,7 @@
<result column="RESRCE_DESCRIPTION" property="resrceDescription"/>
<result column="FULL_NAME" property="fullName"/>
<result column="OPERATION" property="operation"/>
<result column="OPERATION_DESCRIPTION" property="operationDescription"/>
<result column="REPORT_SEND_USER_GROUP" property="reportSendUserGroup"/>
<result column="CORRECTION" property="correction"/>
<result column="PROGRAM" property="program"/>
@ -723,8 +724,8 @@
INNER JOIN ITEM I ON I.HANDLE = ZAB.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = #{locale}
INNER JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE
INNER JOIN RESRCE RS ON RS.RESRCE = ZAB.RESRCE AND RS.SITE = ZAB.SITE
INNER JOIN OPERATION O ON O.OPERATION = ZAB.OPERATION AND O.SITE = ZAB.SITE AND O.CURRENT_REVISION = 'true'
LEFT JOIN RESRCE RS ON RS.RESRCE = ZAB.RESRCE AND RS.SITE = ZAB.SITE
LEFT JOIN OPERATION O ON O.OPERATION = ZAB.OPERATION AND O.SITE = ZAB.SITE AND O.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE = #{locale}
LEFT JOIN CUSTOM_FIELDS WORKORDER ON WORKORDER.HANDLE = SO.HANDLE AND WORKORDER."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS ITEMNUMBER ON ITEMNUMBER.HANDLE = SO.HANDLE AND ITEMNUMBER."ATTRIBUTE" = 'ITEM_NUMBER'

32
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -919,6 +919,7 @@
ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION,
SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION
FROM Z_ABNORMAL_BILL ZAB
LEFT JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE
LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE
LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{language}
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE
@ -961,6 +962,37 @@
<if test="abnormalBill.workOrder != null and abnormalBill.workOrder != ''">
AND CF.VALUE LIKE '%${abnormalBill.workOrder}%'
</if>
<choose>
<when test="userGroupList != null and userGroupList.size != 0">
AND (ZAB.REPORT_SEND_USER_GROUP IN
<foreach item="item" index="index" collection="userGroupList" separator="," open="(" close=")">
UPPER(#{item.userGroup})
</foreach>
OR
ZAB.CANCEL_SEND_USER_GROUP IN
<foreach item="item" index="index" collection="userGroupList" separator="," open="(" close=")">
UPPER(#{item.userGroup})
</foreach>
OR
ZABD.DUTY_SEND_USER_GROUP IN
<foreach item="item" index="index" collection="userGroupList" separator="," open="(" close=")">
UPPER(#{item.userGroup})
</foreach>
OR
ZABD.RESOLVE_SEND_USER_GROUP IN
<foreach item="item" index="index" collection="userGroupList" separator="," open="(" close=")">
UPPER(#{item.userGroup})
</foreach>)
</when>
<otherwise>
<if test="userGroupList == null">
</if>
<if test="userGroupList != null and userGroupList.size == 0">
AND 1 == 2
</if>
</otherwise>
</choose>
</if>
</where>
GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME,

2
meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/UserGroupMapper.java
Unescape Escape View File

@ -31,4 +31,6 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
Integer findUserGroupByUser(@Param("site")String site,@Param("user")String user,@Param("list")List<String> list);
List<UserGroup> findUserGroupListByUser(@Param("site")String site,@Param("user")String user);
}

8
meapi/src/main/resources/mapper/UserGroupMapper.xml
Unescape Escape View File

@ -382,5 +382,13 @@
</foreach>
</select>
<select id="findUserGroupListByUser" resultMap="BaseResultMap">
SELECT UG.USER_GROUP
FROM USR U
LEFT JOIN USER_GROUP_MEMBER UGM ON U.HANDLE = UGM.USER_OR_GROUP_GBO
LEFT JOIN USER_GROUP UG ON UG.HANDLE = UGM.USER_GROUP_BO
WHERE U.USER_ID = #{user} AND U.SITE = #{site}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save