|
@@ -71,7 +71,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
|
|
|
calendar.setTime(startTime);
|
|
|
calendar.add(Calendar.DATE, Integer.valueOf(dayIsolated));
|
|
|
Date endTime = calendar.getTime();
|
|
|
- String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCreateUser();
|
|
|
+ String userName = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum)).getCargoOwner();
|
|
|
billIsolated.setInspectionName(userName+"的隔离信息");
|
|
|
billIsolated.setInspectionNum(inspectionNum);
|
|
|
billIsolated.setIsolatedPosition(isolatedPosition);
|
|
@@ -80,7 +80,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
|
|
|
billIsolated.setEndIsolated(endTime);
|
|
|
billIsolated.setCreateTime(DateTime.now());
|
|
|
billIsolated.setCreateUser(TokenSign.getUserName(httpServletRequest));
|
|
|
- this.save(billIsolated);
|
|
|
+
|
|
|
|
|
|
BillLandingInspection billLandingInspection = landingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum).ne("inspection_sch", 5));
|
|
|
String eartags = billLandingInspection.getEartags();
|
|
@@ -180,8 +180,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
|
|
|
billLandingInspection.setReviewed(TokenSign.getUserName(httpServletRequest));
|
|
|
billLandingInspection.setReviewedTime(DateTime.now());
|
|
|
landingInspectionMapper.updateById(billLandingInspection);
|
|
|
-
|
|
|
-
|
|
|
+ this.save(billIsolated);
|
|
|
return Result.SUCCESS();
|
|
|
|
|
|
|