Commit f65026ad authored by 刘林's avatar 刘林

fix(jg):暂存功能问题处理

parent 904ab70f
......@@ -90,7 +90,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
throw new LocalBadRequest(devMessage);
} catch (Exception e) {
log.error("调用工作流完成任务接口失败", e);
throw new RuntimeException("调用工作流完成任务接口失败");
throw new RuntimeException(e.getMessage());
}
return processTaskDTO;
}
......
......@@ -75,6 +75,8 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.*;
/**
* 服务实现类
*
......@@ -584,7 +586,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
public List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {
try {
JgMaintainNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgMaintainNoticeDtoMap.get(TABLE_PAGE_ID)), JgMaintainNoticeDto.class);
Map<String, Object> tableData = (Map<String, Object>) jgMaintainNoticeDtoMap.get(TABLE_PAGE_ID);
// 字段转换
convertField(model);
// 获取告知设备列表
......@@ -639,20 +641,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
if (SUBMIT_TYPE_TEMP.equals(submitType)) {
notice.setIsTemporaryStatus("1");
}
notice.setEquListCode(
Optional.ofNullable(deviceList)
.filter(list -> !list.isEmpty() && list.get(0) != null)
.map(list -> list.get(0).get("EQU_LIST_CODE"))
.map(String::valueOf)
.orElse("")
);
notice.setEquCategory(
Optional.ofNullable(deviceList)
.filter(list -> !list.isEmpty() && list.get(0) != null)
.map(list -> list.get(0).get("EQU_CATEGORY_CODE"))
.map(String::valueOf)
.orElse("")
);
notice.setEquListCode(Objects.toString(tableData.get(EQU_LIST_CODE),""));
notice.setEquCategory(Objects.toString(tableData.get(EQU_CATEGORY_CODE),""));
notice.setInstallUnitName(reginParams.getCompany().getCompanyName());
notice.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
notice.setCreateUserName(reginParams.getUserModel().getRealName());
......@@ -660,16 +650,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
DataDictionary dictionary = iDataDictionaryService.getByCode(notice.getMaintainType(), "WXLX");
notice.setMaintainTypeDesc(dictionary.getName());
notice.setFullAddress(notice.getProvinceName() + notice.getCityName() + notice.getCountyName() + notice.getStreetName() + notice.getAddress());
notice.setEquCategoryDesc(Optional.ofNullable(deviceList)
.filter(list -> !list.isEmpty() && list.get(0) != null)
.map(list -> list.get(0).get("EQU_CATEGORY"))
.map(String::valueOf)
.orElse(""));
notice.setEquList(Optional.ofNullable(deviceList)
.filter(list -> !list.isEmpty() && list.get(0) != null)
.map(list -> list.get(0).get("EQU_LIST"))
.map(String::valueOf)
.orElse(""));
if (!CollectionUtils.isEmpty(deviceList)){
deviceList.forEach(obj -> {
JgMaintainNoticeEq jgRelationEquip = new JgMaintainNoticeEq();
......
......@@ -22,10 +22,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
import com.yeejoin.amos.boot.module.jg.api.mapper.*;
import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.TransferVo;
......@@ -69,6 +66,9 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQU_CATEGORY_CODE;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgRegisterInfoServiceImpl.EQU_LIST_CODE;
/**
* 移装告知服务实现类
*
......@@ -124,6 +124,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
@Autowired
ESElavtorRepository esElavtorRepository;
@Autowired
JgVehicleInformationMapper jgVehicleInformationMapper;
/**
* 根据sequenceNbr查询
......@@ -511,6 +513,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
public List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
try {
JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
Map<String, Object> tableData = (Map<String, Object>) jgTransferNoticeDtoMap.get(TABLE_PAGE_ID);
model.setEquListCode(Objects.toString(tableData.get(EQU_LIST_CODE),""));
model.setEquCategory(Objects.toString(tableData.get(EQU_CATEGORY_CODE),""));
// 字段转换
convertField(model);
// 获取告知设备列表
......@@ -625,27 +630,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
if (SUBMIT_TYPE_TEMP.equals(submitType)){
dto.setIsTemporaryStatus("1");
}
dto.setEquCategory(
Optional.ofNullable(deviceList)
.filter(v -> !v.isEmpty() && v.get(0) != null)
.map(v -> v.get(0).get("EQU_CATEGORY"))
.map(String::valueOf)
.orElse("")
);
dto.setEquList(
Optional.ofNullable(deviceList)
.filter(v -> !v.isEmpty() && v.get(0) != null)
.map(v -> v.get(0).get("EQU_LIST"))
.map(String::valueOf)
.orElse("")
);
dto.setEquListCode(
Optional.ofNullable(deviceList)
.filter(v -> !v.isEmpty() && v.get(0) != null)
.map(v -> v.get(0).get("EQU_LIST_CODE"))
.map(String::valueOf)
.orElse("")
);
dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
if (!CollectionUtils.isEmpty(workflowResultList)) {
......@@ -657,7 +641,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
dto.setCreateUserName(reginParams.getUserModel().getRealName());
dto.setCreateUserId(reginParams.getUserModel().getUserId());
dto.setCreateDate(new Date());
// dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
dto.setEquList(jgVehicleInformationMapper.getEquCategoryNameByCode(model.getEquListCode()));
dto.setEquCategory(jgVehicleInformationMapper.getEquCategoryNameByCode(model.getEquCategory()));
list.add(dto);
this.saveOrUpdate(list.get(0));
if (!CollectionUtils.isEmpty(deviceList)){
......
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