|
@@ -7191,11 +7191,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
|
|
|
rm.setFailed();
|
|
rm.setFailed();
|
|
|
try {
|
|
try {
|
|
|
if(!CollectionUtils.isEmpty(models)){
|
|
if(!CollectionUtils.isEmpty(models)){
|
|
|
|
|
+ int lcCount = 0;
|
|
|
|
|
+ for (MeterWorkRailwayActFirst model : models) {
|
|
|
|
|
+ MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
|
|
|
|
|
+ if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
|
|
|
|
|
+ lcCount ++;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
|
String afl = sdf.format(new Date());
|
|
String afl = sdf.format(new Date());
|
|
|
String lcNo = meterWorkRailwayActFirstMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
|
|
String lcNo = meterWorkRailwayActFirstMapper.getLcNo(afl, models.get(0).getBaseSpotNo());
|
|
|
int count = 0;
|
|
int count = 0;
|
|
|
|
|
+
|
|
|
for (MeterWorkRailwayActFirst model : models) {
|
|
for (MeterWorkRailwayActFirst model : models) {
|
|
|
|
|
+ MeterWorkRailwayActFirst actFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
|
|
|
|
|
+ if(actFirst != null && StringUtils.isNotEmpty(actFirst.getLcNo())) {
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
MeterBaseOperationLog logModel = new MeterBaseOperationLog();
|
|
MeterBaseOperationLog logModel = new MeterBaseOperationLog();
|
|
|
logModel.setId(PublicMethod.IdCreate(2));
|
|
logModel.setId(PublicMethod.IdCreate(2));
|
|
|
logModel.setCreateManNo(model.getCreateManNo());
|
|
logModel.setCreateManNo(model.getCreateManNo());
|
|
@@ -7211,7 +7223,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
|
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
|
.replaceAll("轨道衡", "")
|
|
.replaceAll("轨道衡", "")
|
|
|
.replaceAll("静轨", "")
|
|
.replaceAll("静轨", "")
|
|
|
- .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
|
|
|
|
|
|
|
+ .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
|
|
|
meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
|
|
meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
|
|
|
MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectActual(model.getActualFirstNo());
|
|
MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectActual(model.getActualFirstNo());
|
|
|
if(actualModel != null) {
|
|
if(actualModel != null) {
|