Browse Source

修改突发情况的相关bug

zhongwei
tyty 2 years ago
parent
commit
da4cd53cde
  1. 1
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml
  2. 6
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

1
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml

@ -148,6 +148,7 @@
</select> </select>
<select id="selectByIdOneV2" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo"> <select id="selectByIdOneV2" resultType="com.hnac.hzims.operational.duty.vo.ImsSchedulingVo">
SELECT SELECT
DM.DUTY_DATE AS dutyDate,
DM.ID AS id, DM.ID AS id,
DM.DUTY_GROUP_ID AS groupId, DM.DUTY_GROUP_ID AS groupId,
DM.CLASS_ID AS classId, DM.CLASS_ID AS classId,

6
hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyMainServiceImpl.java

@ -467,7 +467,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
if (ObjectUtil.isNotEmpty(split)) { if (ObjectUtil.isNotEmpty(split)) {
for (String dutyGroupId : split) { for (String dutyGroupId : split) {
//查询班组信息 //查询班组信息
List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(dutyGroupId))); Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); List<Long> collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(dutyGroupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(collectPerson)) { if (CollectionUtil.isNotEmpty(collectPerson)) {
personIds = StringUtils.join(collectPerson, "^"); personIds = StringUtils.join(collectPerson, "^");
@ -497,7 +498,8 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I
String groupName = null; String groupName = null;
if (imsSchedulingVo.getPersonType() == 1) { if (imsSchedulingVo.getPersonType() == 1) {
//查询班组信息 //查询班组信息
List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(Long.valueOf(groupId))); Long num = Long.valueOf(StringUtils.isNotEmpty(groupId) ? groupId : "0");
List<ImsDutyGroupPEntity> list = imsDutyGroupPService.selectByGroupIds(Arrays.asList(num));
collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList()); collectPerson = list.stream().filter(iter -> iter.getGroupId().toString().equals(groupId)).map(iter -> iter.getPersonId()).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(collectPerson)) { if (CollectionUtil.isNotEmpty(collectPerson)) {
personIds = StringUtils.join(collectPerson, "^"); personIds = StringUtils.join(collectPerson, "^");

Loading…
Cancel
Save