Skip to content

A
amos-boot-biz
Commit f0708648 authored by tangwei's avatar tangwei
Browse files
Options

修改扫描错误

parent 3c1d6f3c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 219 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary; import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto; import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.mapper.DutyPersonShiftMapper; import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
import com.yeejoin.amos.boot.module.common.biz.enums.DataDictionaryTypeEnum; import com.yeejoin.amos.boot.module.common.biz.enums.DataDictionaryTypeEnum;
import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCodeEnum; import com.yeejoin.amos.boot.module.common.biz.enums.DynamicGroupCodeEnum;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
...@@ -23,19 +18,11 @@ import org.springframework.stereotype.Service; ...@@ -23,19 +18,11 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.alibaba.fastjson.JSONArray; import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import java.util.stream.Collectors;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
/** /**
* @author DELL * @author DELL
...@@ -299,33 +286,8 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType ...@@ -299,33 +286,8 @@ public Object BuildScheduleDetails(String dutyDay, Long shiftId, String postType
return postType; return postType;
} }
public static void main(String[] args) {
String ssString="[{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1437585222345547778\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"\",\"dutyArea\":\"测试控制室\",\"dutyAreaId\":\"1382166994773610497\",\"postTypeName\":\"\",\"userName\":\"故障报修\",\"userId\":\"1428653787706347522\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"晚班\",\"instanceId\":\"1447490875843239937\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"},{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1432883228491972609\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"\",\"dutyArea\":\"消防小室-shg\",\"dutyAreaId\":\"1382530839199387650\",\"postTypeName\":\"\",\"userName\":\"78678676\",\"userId\":\"1435886728803000322\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"夜班\",\"instanceId\":\"1447490812534415361\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"},{\"teamName\":\"发士大夫大师傅\",\"shiftId\":\"1432883228491972609\",\"carName\":\"特种消防车(46586458)\",\"postType\":\"1\",\"dutyArea\":\"建构住-shg\",\"dutyAreaId\":\"1382157469081407490\",\"postTypeName\":\"指挥员\",\"userName\":\"张小四6\",\"userId\":\"1435072204550225922\",\"dutyDate\":\"2021-10-12 00:00:00\",\"carId\":\"1432590747256770562\",\"shiftName\":\"夜班\",\"instanceId\":\"1447490699435008001\",\"teamId\":\"1404995716634050561\",\"groupCode\":\"dutyCar\"}]\r\n"
+ "";
List<Map> jjList= JSON.parseArray(ssString, Map.class);
Map< String, String> map20 = new HashMap<String, String>();
jjList.forEach(i->{
List<Object> fieldsList= new ArrayList<Object>();
List<Object>infoList= new ArrayList<Object>();
Map<String, String> map = new HashMap<String, String>();
map.put("name", WXXFZ);
map.put(VALUE,i.get("carName").toString());
map.put("id","1");
fieldsList.add(map);
Map<String, String> map1 = new HashMap<String, String>();
map1.put("name", WXXFZ);
map1.put(VALUE,i.get("teamName").toString());
map1.put("id","2");
fieldsList.add(map1);
if(!map20.containsKey(i.get("shiftName").toString())) {
map20.put(ssString, ssString);
}
});
}
@Override @Override
public List<Map<String, Object>> queryByCompanyId(List<String> bizNames){ public List<Map<String, Object>> queryByCompanyId(List<String> bizNames){
return dutyPersonShiftMapper.queryByCompanyId(bizNames); return dutyPersonShiftMapper.queryByCompanyId(bizNames);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureMaintainServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService; import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain; import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum; import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureMaintainMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FailureMaintainMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService; import com.yeejoin.amos.boot.module.common.api.service.IFailureMaintainService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/** /**
* 服务实现类 * 服务实现类
...@@ -77,7 +63,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -77,7 +63,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
private static int MAINTENANCE_ADD = 1; private static int MAINTENANCE_ADD = 1;
private static String[] PROCESS_RESULT = {"验证通过", "验证未通过"};
...@@ -119,8 +104,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -119,8 +104,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
} }
String nextTaskId = failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr()); String nextTaskId = failureDetailsService.checkIsInMaintenance(failureDetailsDto.getSequenceNbr());
if (nextTaskId == null) { if (nextTaskId == null) {
if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) { if (!failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) {
} else {
throw new RuntimeException("执行维修中流程失败"); throw new RuntimeException("执行维修中流程失败");
} }
} else { } else {
...@@ -150,7 +134,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -150,7 +134,6 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
failureMaintainDto.setDepartment(orgUsr.getBizOrgName()); failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr()); failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
failureMaintainDto.setRecoreType(RECORE_TYPE); failureMaintainDto.setRecoreType(RECORE_TYPE);
// this.createWithModel(failureMaintainDto);
// 添加完成后修改保修单状态为维修完成 // 添加完成后修改保修单状态为维修完成
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId()); FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode()); failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
...@@ -166,8 +149,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto, ...@@ -166,8 +149,7 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(), sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),
failureMaintainDto.getAttachment()); failureMaintainDto.getAttachment());
} }
if (failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) { if (!failureDetailsService.excuteTask(failureMaintainDto.getFaultId(), userInfo, condition)) {
} else {
throw new RuntimeException("执行维修完成流程失败"); throw new RuntimeException("执行维修完成流程失败");
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureRepairlogServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.List;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -12,6 +7,11 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto; ...@@ -12,6 +7,11 @@ import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog; import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
import com.yeejoin.amos.boot.module.common.api.mapper.FailureRepairlogMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FailureRepairlogMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService; import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
/** /**
* 流程日志服务实现类 * 流程日志服务实现类
...@@ -40,7 +40,6 @@ public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto ...@@ -40,7 +40,6 @@ public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto
* 根据FaultId查询 * 根据FaultId查询
*/ */
public List<FailureRepairlog> findByfaultIdLog(Long faultId) { public List<FailureRepairlog> findByfaultIdLog(Long faultId) {
Page<FailureRepairlogDto> page = new Page<>();
QueryWrapper<FailureRepairlog> queryWrapper = new QueryWrapper<>(); QueryWrapper<FailureRepairlog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("fault_id", faultId).orderByAsc("process_time"); queryWrapper.eq("fault_id", faultId).orderByAsc("process_time");
return baseMapper.selectList(queryWrapper); return baseMapper.selectList(queryWrapper);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureVerifyServiceImpl.java
View file @ f0708648
...@@ -3,9 +3,9 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl; ...@@ -3,9 +3,9 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto; import com.yeejoin.amos.boot.module.common.api.dto.FailureRepairlogDto;
import com.yeejoin.amos.boot.module.common.api.dto.FailureVerifyDto;
import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify; import com.yeejoin.amos.boot.module.common.api.entity.FailureVerify;
import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr; import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum; import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
...@@ -14,10 +14,9 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper; ...@@ -14,10 +14,9 @@ import com.yeejoin.amos.boot.module.common.api.mapper.FailureVerifyMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFailureVerifyService; import com.yeejoin.amos.boot.module.common.api.service.IFailureVerifyService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -55,14 +54,14 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail ...@@ -55,14 +54,14 @@ public class FailureVerifyServiceImpl extends BaseService<FailureVerifyDto, Fail
if (!result) { if (!result) {
return new RuntimeException("无权限"); return new RuntimeException("无权限");
} }
Boolean repairResult = null;
//根据验收的结果进行业务操作 //根据验收的结果进行业务操作
if (condition == (AuditResultEnum.REFUSE.getCode())) { if (condition == (AuditResultEnum.REFUSE.getCode())) {
verifyResult = AuditResultEnum.REFUSE.getCode(); verifyResult = AuditResultEnum.REFUSE.getCode();
repairResult = updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition); updateStatus(model, FailureStatuEnum.REFUSE, userInfo, condition);
} else if (condition == AuditResultEnum.AGREE.getCode()) { } else if (condition == AuditResultEnum.AGREE.getCode()) {
verifyResult = AuditResultEnum.AGREE.getCode(); verifyResult = AuditResultEnum.AGREE.getCode();
repairResult = updateStatus(model, FailureStatuEnum.FINISH, userInfo, condition); updateStatus(model, FailureStatuEnum.FINISH, userInfo, condition);
} }
model.setVerifyResult(verifyResult); model.setVerifyResult(verifyResult);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireChemicalServiceImpl.java
View file @ f0708648
...@@ -54,7 +54,7 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe ...@@ -54,7 +54,7 @@ public class FireChemicalServiceImpl extends BaseService<FireChemicalDto,FireChe
/** /**
* 删除 * 删除
* */ * */
public Boolean updateisDelete( List sequenceNbr) { public Boolean updateisDelete( List<Object> sequenceNbr) {
return this.update(new UpdateWrapper<FireChemical>().in("sequence_nbr", sequenceNbr).set("is_delete", 1)); return this.update(new UpdateWrapper<FireChemical>().in("sequence_nbr", sequenceNbr).set("is_delete", 1));
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FireStationServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.itextpdf.text.log.SysoCounter; import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom; import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.biz.common.utils.TreeParser; import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto; import com.yeejoin.amos.boot.module.common.api.dto.FireStationDto;
...@@ -35,6 +17,21 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient; ...@@ -35,6 +17,21 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper; import com.yeejoin.amos.boot.module.common.api.mapper.FireStationMapper;
import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper; import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFireStationService; import com.yeejoin.amos.boot.module.common.api.service.IFireStationService;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/** /**
* 微型消防站服务实现类 * 微型消防站服务实现类
...@@ -57,8 +54,9 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -57,8 +54,9 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
@Autowired @Autowired
EquipFeignClient equipFeignClient; EquipFeignClient equipFeignClient;
private static final String CHILDREN= "children";
private static final String COUNT= "count";
private static final String PARENTID="parentId";
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -227,14 +225,16 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -227,14 +225,16 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public List<Map<String, Object>> fireStationCountAndBuildingTree(String bizOrgCode) { public List<Map<String, Object>> fireStationCountAndBuildingTree(String bizOrgCode) {
List<Map<String, Object>> lit=null;
Map<String, Integer> FireStationCountMap = parseFireStationCount(bizOrgCode); Map<String, Integer> FireStationCountMap = parseFireStationCount(bizOrgCode);
ResponseModel<Object> response = equipFeignClient.getBuildingTree(); ResponseModel<Object> response = equipFeignClient.getBuildingTree();
List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult(); List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
if(buildingMapList==null || buildingMapList.size()<1) { if(buildingMapList==null || buildingMapList.size()<1) {
return null; return lit;
} }
List<Map<String, Object>> childrens = ((List<Map<String, Object>>) buildingMapList.get(0).get("children")).stream().filter(i-> i.containsKey("bizOrgCode") && i.get("bizOrgCode").toString().contains(bizOrgCode)).collect(Collectors.toList()); List<Map<String, Object>> childrens = ((List<Map<String, Object>>) buildingMapList.get(0).get(CHILDREN)).stream().filter(i-> i.containsKey("bizOrgCode") && i.get("bizOrgCode").toString().contains(bizOrgCode)).collect(Collectors.toList());
return parseTree(childrens,FireStationCountMap); lit=parseTree(childrens,FireStationCountMap);
return lit;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
...@@ -245,15 +245,15 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -245,15 +245,15 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
for (Map<String, Object> child : children) { for (Map<String, Object> child : children) {
if (child.get("id") != null) { if (child.get("id") != null) {
if (keySiteCountMap.containsKey(child.get("id").toString())) { if (keySiteCountMap.containsKey(child.get("id").toString())) {
child.put("count",keySiteCountMap.get(child.get("id").toString())); child.put(COUNT,keySiteCountMap.get(child.get("id").toString()));
}else { }else {
child.put("count",0); child.put(COUNT,0);
} }
}else { }else {
child.put("count",0); child.put(COUNT,0);
} }
if (!ValidationUtil.isEmpty(child.get("children"))) { if (!ValidationUtil.isEmpty(child.get(CHILDREN))) {
parseTree((List<Map<String, Object>>) child.get("children"), keySiteCountMap); parseTree((List<Map<String, Object>>) child.get(CHILDREN), keySiteCountMap);
} }
} }
} }
...@@ -272,10 +272,10 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -272,10 +272,10 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
for (int i = 0; i < parentBuilingIdArray.length; i++) { for (int i = 0; i < parentBuilingIdArray.length; i++) {
if (map.containsKey(parentBuilingIdArray[i])) { if (map.containsKey(parentBuilingIdArray[i])) {
int num = map.get(parentBuilingIdArray[i]).intValue(); int num = map.get(parentBuilingIdArray[i]).intValue();
num = num + Integer.parseInt(map2.get("count").toString()); num = num + Integer.parseInt(map2.get(COUNT).toString());
map.put(parentBuilingIdArray[i], num); map.put(parentBuilingIdArray[i], num);
} else { } else {
map.put(parentBuilingIdArray[i], Integer.parseInt(map2.get("count").toString())); map.put(parentBuilingIdArray[i], Integer.parseInt(map2.get(COUNT).toString()));
} }
} }
} }
...@@ -300,27 +300,29 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat ...@@ -300,27 +300,29 @@ public class FireStationServiceImpl extends BaseService<FireStationDto, FireStat
private String getNodeAllParentIds(List<Map<String, Object>> list , String id,String tegartString){ private String getNodeAllParentIds(List<Map<String, Object>> list , String id,String tegartString){
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("id").toString().equals(id) && map.get("parentId")!=null ) { if(map.get("id").toString().equals(id) && map.get(PARENTID)!=null ) {
tegartString=tegartString+","+map.get("parentId").toString(); tegartString=tegartString+","+map.get(PARENTID).toString();
getNodeAllParentIds(list,map.get("parentId").toString(),tegartString); getNodeAllParentIds(list,map.get(PARENTID).toString(),tegartString);
} }
} }
return tegartString; return tegartString;
} }
public List<String> getNodeAllnodeIds(String id) { public List<String> getNodeAllnodeIds(String id) {
List<String> listdate=null;
List<String> resultList = new ArrayList<String>(); List<String> resultList = new ArrayList<String>();
resultList.add(id); resultList.add(id);
ResponseModel<List<Map<String, Object>>> response= equipFeignClient.getBuildingTreeList(); ResponseModel<List<Map<String, Object>>> response= equipFeignClient.getBuildingTreeList();
List<Map<String, Object>> responseList =response.getResult(); List<Map<String, Object>> responseList =response.getResult();
if(response.getResult()==null && response.getResult().size()<1) { if(response.getResult()==null && response.getResult().size()<1) {
return null; return listdate;
} }
return getNodeAllnodeIds(resultList, responseList,id.toString()); listdate=getNodeAllnodeIds(resultList, responseList,id.toString());
return listdate;
} }
private List<String> getNodeAllnodeIds(List<String> resultList,List<Map<String, Object>> list,String id){ private List<String> getNodeAllnodeIds(List<String> resultList,List<Map<String, Object>> list,String id){
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
if(map.get("parentId").toString().equals(id) && map.get("parentId")!=null ) { if(map.get(PARENTID).toString().equals(id) && map.get(PARENTID)!=null ) {
resultList.add(map.get("id").toString()); resultList.add(map.get("id").toString());
getNodeAllnodeIds(resultList,list,map.get("id").toString()); getNodeAllnodeIds(resultList,list,map.get("id").toString());
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -80,7 +80,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU ...@@ -80,7 +80,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
String inAgreement, String inAgreement,
String bizOrgCode) { String bizOrgCode) {
Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement, bizOrgCode); Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement, bizOrgCode);
List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class); List<Map> linkageUnitListMap = JSON.parseArray(JSON.toJSONString(linkageUnitList.getRecords()), Map.class);
List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode()); List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
linkageUnitListMap.forEach(i -> { linkageUnitListMap.forEach(i -> {
...@@ -92,7 +92,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU ...@@ -92,7 +92,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
}); });
}); });
List<LinkageUnitDto> resultDtoList = JSONArray.parseArray(JSONArray.toJSONString(linkageUnitListMap), List<LinkageUnitDto> resultDtoList = JSON.parseArray(JSON.toJSONString(linkageUnitListMap),
LinkageUnitDto.class); LinkageUnitDto.class);
List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> { List<LinkageUnitDto> detaiList = resultDtoList.stream().map(item -> {
Date now = new Date(); Date now = new Date();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...@@ -80,6 +80,12 @@ public class MaintenanceCompanyServiceImpl ...@@ -80,6 +80,12 @@ public class MaintenanceCompanyServiceImpl
SourceFileServiceImpl sourceFileService; SourceFileServiceImpl sourceFileService;
@Autowired @Autowired
OrgUsrMapper orgUsrMapper; OrgUsrMapper orgUsrMapper;
private static final String STATUS ="status";
private static final String PARENTID="parentId";
/** /**
* 分页查询 * 分页查询
*/ */
...@@ -243,6 +249,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -243,6 +249,7 @@ public class MaintenanceCompanyServiceImpl
@Override @Override
public List<Map<String, Object>> getAllMaintenanceList(String maintenanceType) { public List<Map<String, Object>> getAllMaintenanceList(String maintenanceType) {
List<Map<String, Object>> da=null;
String type = null; String type = null;
switch (maintenanceType.toUpperCase()) { switch (maintenanceType.toUpperCase()) {
case PERSON: case PERSON:
...@@ -255,7 +262,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -255,7 +262,7 @@ public class MaintenanceCompanyServiceImpl
type = MAINTENANCE_COMPANY; type = MAINTENANCE_COMPANY;
} }
if (StringUtils.isBlank(type)) { if (StringUtils.isBlank(type)) {
return null; return da;
} }
List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type); List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type);
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>(); LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
...@@ -278,7 +285,8 @@ public class MaintenanceCompanyServiceImpl ...@@ -278,7 +285,8 @@ public class MaintenanceCompanyServiceImpl
return dynamicFormList; return dynamicFormList;
} }
public List<Map<String, Object>> getAllMaintenanceEexcleList(String maintenanceType, Map parms) { public List<Map<String, Object>> getAllMaintenanceEexcleList(String maintenanceType, Map<String, Object> parms) {
List<Map<String, Object>> da=null;
String type = null; String type = null;
switch (maintenanceType.toUpperCase()) { switch (maintenanceType.toUpperCase()) {
case PERSON: case PERSON:
...@@ -291,7 +299,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -291,7 +299,7 @@ public class MaintenanceCompanyServiceImpl
type = MAINTENANCE_COMPANY; type = MAINTENANCE_COMPANY;
} }
if (StringUtils.isBlank(type)) { if (StringUtils.isBlank(type)) {
return null; return da;
} }
List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type); List<Map<String, Object>> dynamicFormList = dynamicFormInstanceService.listAll(type);
LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>(); LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
...@@ -299,7 +307,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -299,7 +307,7 @@ public class MaintenanceCompanyServiceImpl
wrapper.eq(MaintenanceCompany::getIsDelete, false); wrapper.eq(MaintenanceCompany::getIsDelete, false);
if (parms != null && parms.size() > 0) { if (parms != null && parms.size() > 0) {
String name = parms.containsKey("name") ? parms.get("name").toString() : null; String name = parms.containsKey("name") ? parms.get("name").toString() : null;
String parentId = parms.containsKey("parentId") ? parms.get("parentId").toString() : null; String parentId = parms.containsKey(PARENTID) ? parms.get(PARENTID).toString() : null;
if (name != null) { if (name != null) {
wrapper.like(MaintenanceCompany::getName, name); wrapper.like(MaintenanceCompany::getName, name);
} }
...@@ -328,7 +336,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -328,7 +336,7 @@ public class MaintenanceCompanyServiceImpl
@Override @Override
public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(Map map) { public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(Map map) {
List<Map<String, Object>> list = this.getAllMaintenanceEexcleList(PERSON, map); List<Map<String, Object>> list = this.getAllMaintenanceEexcleList(PERSON, map);
return JSONArray.parseArray(JSONArray.toJSONString(list), MaintenancePersonExcleDto.class); return JSON.parseArray(JSON.toJSONString(list), MaintenancePersonExcleDto.class);
} }
@Override @Override
...@@ -421,8 +429,8 @@ public class MaintenanceCompanyServiceImpl ...@@ -421,8 +429,8 @@ public class MaintenanceCompanyServiceImpl
case PERSON: case PERSON:
type = MAINTENANCE_PERSON; type = MAINTENANCE_PERSON;
filedParamsMap = new HashMap<>(); filedParamsMap = new HashMap<>();
if (paramsMap.containsKey("status")) { if (paramsMap.containsKey(STATUS)) {
filedParamsMap.put("status", paramsMap.get("status").toString()); filedParamsMap.put(STATUS, paramsMap.get(STATUS).toString());
} }
mainTableList = this.checkMaintenanceCompanyList(wrapper, paramsMap); mainTableList = this.checkMaintenanceCompanyList(wrapper, paramsMap);
/*BUG 2503 人员头像存在附件中，获取附件信息返回前端 start*/ /*BUG 2503 人员头像存在附件中，获取附件信息返回前端 start*/
...@@ -470,8 +478,8 @@ public class MaintenanceCompanyServiceImpl ...@@ -470,8 +478,8 @@ public class MaintenanceCompanyServiceImpl
if (paramsMap.containsKey("name")) { if (paramsMap.containsKey("name")) {
wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString()); wrapper.like(MaintenanceCompany::getName, paramsMap.get("name").toString());
} }
if (paramsMap.containsKey("parentId") && !"-1".equals(paramsMap.get("parentId"))) { if (paramsMap.containsKey(PARENTID) && !"-1".equals(paramsMap.get(PARENTID))) {
Long parentId = Long.parseLong(paramsMap.get("parentId").toString()); Long parentId = Long.parseLong(paramsMap.get(PARENTID).toString());
MaintenanceCompany company = getOne( MaintenanceCompany company = getOne(
new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId)); new LambdaQueryWrapper<MaintenanceCompany>().eq(MaintenanceCompany::getSequenceNbr, parentId));
wrapper.likeRight(MaintenanceCompany::getCode, company.getCode()); wrapper.likeRight(MaintenanceCompany::getCode, company.getCode());
...@@ -651,7 +659,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -651,7 +659,7 @@ public class MaintenanceCompanyServiceImpl
* @return * @return
*/ */
public Page<Map<String, Object>> queryOrgUsrMsgPage(int pageNum, int pageSize, Long seq, String amosUserId) { public Page<Map<String, Object>> queryOrgUsrMsgPage(int pageNum, int pageSize, Long seq, String amosUserId) {
MaintenanceCompany maintenanceCompany = new MaintenanceCompany(); MaintenanceCompany maintenanceCompany = null;
if (ValidationUtil.isEmpty(seq)) { if (ValidationUtil.isEmpty(seq)) {
maintenanceCompany = getMaintenanceCompany(amosUserId); maintenanceCompany = getMaintenanceCompany(amosUserId);
seq = maintenanceCompany.getSequenceNbr(); seq = maintenanceCompany.getSequenceNbr();
...@@ -660,7 +668,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -660,7 +668,7 @@ public class MaintenanceCompanyServiceImpl
if (pageNum == -1 || pageSize == -1) { if (pageNum == -1 || pageSize == -1) {
pageSize = Integer.MAX_VALUE; pageSize = Integer.MAX_VALUE;
} }
Page page = new Page(pageNum, pageSize); Page<OrgUsrDto> page = new Page<>(pageNum, pageSize);
Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize); Page<Map<String, Object>> companys = new Page<>(pageNum, pageSize);
Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, seq); Page<OrgUsrDto> pageResult = this.baseMapper.selectOrgUsrPageList(page, seq);
List<Map<String, Object>> finalResultMap = Lists.newArrayList(); List<Map<String, Object>> finalResultMap = Lists.newArrayList();
...@@ -687,17 +695,11 @@ public class MaintenanceCompanyServiceImpl ...@@ -687,17 +695,11 @@ public class MaintenanceCompanyServiceImpl
wrapper.eq(MaintenanceCompany::getIsDelete, false); wrapper.eq(MaintenanceCompany::getIsDelete, false);
wrapper.eq(MaintenanceCompany::getAmosId, amosUserId); wrapper.eq(MaintenanceCompany::getAmosId, amosUserId);
MaintenanceCompany maintenancePerson = this.baseMapper.selectOne(wrapper); MaintenanceCompany maintenancePerson = this.baseMapper.selectOne(wrapper);
// DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
// new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
// .eq(DynamicFormInstance::getFieldValue, amosUserId));
if (ValidationUtil.isEmpty(maintenancePerson)) { if (ValidationUtil.isEmpty(maintenancePerson)) {
throw new BadRequest("维保账号不存在或未关联系统账号."); throw new BadRequest("维保账号不存在或未关联系统账号.");
} }
// MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
// .eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
// if (ValidationUtil.isEmpty(person)) {
// throw new BadRequest("维保账号不存在或未关联系统账号.");
// }
MaintenanceCompany maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>() MaintenanceCompany maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
.eq(MaintenanceCompany::getSequenceNbr, maintenancePerson.getParentId())); .eq(MaintenanceCompany::getSequenceNbr, maintenancePerson.getParentId()));
if (ValidationUtil.isEmpty(maintenanceCompany)) { if (ValidationUtil.isEmpty(maintenanceCompany)) {
...@@ -713,14 +715,13 @@ public class MaintenanceCompanyServiceImpl ...@@ -713,14 +715,13 @@ public class MaintenanceCompanyServiceImpl
wrapper.eq(MaintenanceCompany::getType, COMPANY); wrapper.eq(MaintenanceCompany::getType, COMPANY);
// 查询所有维保单位信息 // 查询所有维保单位信息
List<MaintenanceCompany> lists = maintenanceCompanyMapper.selectList(wrapper); List<MaintenanceCompany> lists = maintenanceCompanyMapper.selectList(wrapper);
//List<MaintenanceCompany> lists = this.list();
lists.forEach(list -> { lists.forEach(list -> {
Map<String, Object> maintenanceCompany = new HashMap<>(); Map<String, Object> maintenanceCompany = new HashMap<>();
maintenanceCompany.put("id", list.getSequenceNbr()); maintenanceCompany.put("id", list.getSequenceNbr());
maintenanceCompany.put("code", list.getCode()); maintenanceCompany.put("code", list.getCode());
maintenanceCompany.put("name", list.getName()); maintenanceCompany.put("name", list.getName());
maintenanceCompany.put("type", 1); maintenanceCompany.put("type", 1);
maintenanceCompany.put("parentId", 0); maintenanceCompany.put(PARENTID, 0);
// 查询该维保单位下的业主信息 // 查询该维保单位下的业主信息
List<OrgUsrDto> orgUsrDtos = orgUsrMapper.selectOrgUsrList(list.getSequenceNbr()); List<OrgUsrDto> orgUsrDtos = orgUsrMapper.selectOrgUsrList(list.getSequenceNbr());
orgUsrDtos.forEach(orgUsrDto -> { orgUsrDtos.forEach(orgUsrDto -> {
...@@ -729,7 +730,7 @@ public class MaintenanceCompanyServiceImpl ...@@ -729,7 +730,7 @@ public class MaintenanceCompanyServiceImpl
airCompany.put("code", orgUsrDto.getBizOrgCode()); airCompany.put("code", orgUsrDto.getBizOrgCode());
airCompany.put("name", orgUsrDto.getBizOrgName()); airCompany.put("name", orgUsrDto.getBizOrgName());
airCompany.put("type", 2); airCompany.put("type", 2);
airCompany.put("parentId", list.getSequenceNbr()); airCompany.put(PARENTID, list.getSequenceNbr());
airCompany.put("contractId", orgUsrDto.getContractId()); airCompany.put("contractId", orgUsrDto.getContractId());
companysMsg.add(airCompany); companysMsg.add(airCompany);
}); });
...@@ -745,17 +746,17 @@ public class MaintenanceCompanyServiceImpl ...@@ -745,17 +746,17 @@ public class MaintenanceCompanyServiceImpl
* @param resultMap 拷贝后的对象 * @param resultMap 拷贝后的对象
* @explain 将paramsMap中的键值对全部拷贝到resultMap中； * @explain 将paramsMap中的键值对全部拷贝到resultMap中；
*/ */
private static void mapCopy(Map paramsMap, Map resultMap) { private static void mapCopy(Map<String, Object> paramsMap, Map<String, Object> resultMap) {
if (resultMap == null) { if (resultMap == null) {
return; return;
} }
if (paramsMap == null) { if (paramsMap == null) {
return; return;
} }
Iterator it = paramsMap.entrySet().iterator(); Iterator<Map.Entry<String, Object>> it = paramsMap.entrySet().iterator();
while (it.hasNext()) { while (it.hasNext()) {
Map.Entry entry = (Map.Entry) it.next(); Map.Entry<String, Object> entry = (Map.Entry) it.next();
Object key = entry.getKey(); String key = entry.getKey().toString();
resultMap.put(key, paramsMap.get(key) != null ? paramsMap.get(key) : ""); resultMap.put(key, paramsMap.get(key) != null ? paramsMap.get(key) : "");
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/RescueEquipmentServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom; import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment; import com.yeejoin.amos.boot.module.common.api.entity.RescueEquipment;
import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
import com.yeejoin.amos.boot.module.common.api.mapper.RescueEquipmentMapper; import com.yeejoin.amos.boot.module.common.api.mapper.RescueEquipmentMapper;
import com.yeejoin.amos.boot.module.common.api.service.IRescueEquipmentService; import com.yeejoin.amos.boot.module.common.api.service.IRescueEquipmentService;
import com.yeejoin.amos.boot.module.common.api.dto.RescueEquipmentDto;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator; import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -69,14 +69,14 @@ public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto, ...@@ -69,14 +69,14 @@ public class RescueEquipmentServiceImpl extends BaseService<RescueEquipmentDto,
// 查询已有数据的岗位类型 // 查询已有数据的岗位类型
List<Long> vehicleCodeCodeList = this.baseMapper.getVehicleCodeCodeList(false, companyId); List<Long> vehicleCodeCodeList = this.baseMapper.getVehicleCodeCodeList(false, companyId);
// 排除已有数据的，返回 // 排除已有数据的，返回
List<MenuFrom> menuListd=new ArrayList<>();
for (int i = 0; i < menuList.size(); i++) { for (int i = 0; i < menuList.size(); i++) {
if (vehicleCodeCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) { if (!vehicleCodeCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {
menuList.remove(i); menuListd.add(menuList.get(i));
i--;
} }
} }
HashMap<Object, Object> objectObjectHashMap = new HashMap<>(); HashMap<Object, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("JYZBLX", menuList); objectObjectHashMap.put("JYZBLX", menuListd);
return objectObjectHashMap; return objectObjectHashMap;
} }
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SourceFileServiceImpl.java
View file @ f0708648
...@@ -77,23 +77,20 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile ...@@ -77,23 +77,20 @@ public class SourceFileServiceImpl extends BaseService<SourceFileDto, SourceFile
return new ArrayList<>(); return new ArrayList<>();
} }
// sourceFiles.forEach(s -> {
// s.setSourceId(sourceId);
// this.saveOrUpdate(s);
// });
boolean flag =false; boolean flag =false;
for (SourceFile sourceFile : sourceFiles) { for (SourceFile sourceFile : sourceFiles) {
sourceFile.setSourceId(sourceId); sourceFile.setSourceId(sourceId);
flag =this.saveOrUpdate(sourceFile); flag =this.saveOrUpdate(sourceFile);
} }
// boolean flag = this.saveOrUpdate(sourceFiles); return flag ? sourceFiles : Collections.EMPTY_LIST;
return false ? sourceFiles : Collections.EMPTY_LIST;
} }
/** /**
* 保存附件 * 保存附件
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void saveAttachments(Long sequenceNbr, Map<String, List<AttachmentDto>> attachmentMap) { public void saveAttachments(Long sequenceNbr, Map<String, List<AttachmentDto>> attachmentMap) {
if (!ValidationUtil.isEmpty(attachmentMap)) { if (!ValidationUtil.isEmpty(attachmentMap)) {
List<SourceFile> sourceFiles = Lists.newArrayList(); List<SourceFile> sourceFiles = Lists.newArrayList();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/SpecialPositionStaffServiceImpl.java
View file @ f0708648
package com.yeejoin.amos.boot.module.common.biz.service.impl; package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.MenuFrom; import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto;
import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff; import com.yeejoin.amos.boot.module.common.api.entity.SpecialPositionStaff;
import com.yeejoin.amos.boot.module.common.api.mapper.SpecialPositionStaffMapper; import com.yeejoin.amos.boot.module.common.api.mapper.SpecialPositionStaffMapper;
import com.yeejoin.amos.boot.module.common.api.service.ISpecialPositionStaffService; import com.yeejoin.amos.boot.module.common.api.service.ISpecialPositionStaffService;
import com.yeejoin.amos.boot.module.common.api.dto.SpecialPositionStaffDto;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
import org.typroject.tyboot.core.rdbms.annotation.Operator; import org.typroject.tyboot.core.rdbms.annotation.Operator;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* 特岗人员服务实现类 * 特岗人员服务实现类
...@@ -72,6 +70,7 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition ...@@ -72,6 +70,7 @@ public class SpecialPositionStaffServiceImpl extends BaseService<SpecialPosition
List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false,companyId); List<Long> positionStaffCodeList = this.baseMapper.getPositionStaffCodeList(false,companyId);
// 排除已有数据的，返回 // 排除已有数据的，返回
/*bug 3483 陈召 2021-11-18 开始*/ /*bug 3483 陈召 2021-11-18 开始*/
List<MenuFrom> menuListds=new ArrayList<>();
for (int i = 0; i < menuList.size(); i++) { for (int i = 0; i < menuList.size(); i++) {
//排除父岗位是否已有 有就删除 //排除父岗位是否已有 有就删除
if (positionStaffCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) { if (positionStaffCodeList.contains(Long.valueOf(menuList.get(i).getKey()))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment