|
@@ -13,6 +13,7 @@ import cn.com.ty.lift.business.maintenance.service.*;
|
|
|
import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
|
|
|
import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
|
|
|
import cn.com.ty.lift.common.utils.Judge;
|
|
|
+import cn.com.ty.lift.common.utils.Judger;
|
|
|
import cn.com.xwy.boot.web.dto.RestResponse;
|
|
|
import cn.hutool.core.collection.IterUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -60,11 +61,9 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("pageRecord")
|
|
|
+ @Judger(fields = {"mtCompanyId"})
|
|
|
public RestResponse pageRecord(@RequestBody MtRecordRequest request){
|
|
|
- Long mtCompanyId = request.getMtCompanyId();
|
|
|
- Judge.id(mtCompanyId);
|
|
|
IPage<MtRecordResponse> pages = maintenanceRecordService.pageRecordByCondition(request);
|
|
|
- Judge.notNull(pages);
|
|
|
long count = maintenanceRecordService.countRecordByCondition(request);
|
|
|
CountPage<MtRecordResponse> countPage = new CountPage<>(count,pages);
|
|
|
return RestResponse.success(countPage);
|
|
@@ -76,32 +75,31 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("pagePlan")
|
|
|
+ @Judger(fields = {"mtCompanyId"})
|
|
|
public RestResponse pagePlan(@RequestBody MtPlanRequest request){
|
|
|
- Long mtCompanyId = request.getMtCompanyId();
|
|
|
- Judge.id(mtCompanyId);
|
|
|
IPage<MtPlanResponse> pages = maintenancePlanService.pagePlanByCondition(request);
|
|
|
Judge.notNull(pages);
|
|
|
- long count = maintenancePlanService.countPlanByCondition(request);
|
|
|
List<MtPlanResponse> records = pages.getRecords();
|
|
|
if(IterUtil.isNotEmpty(records)){
|
|
|
- List<ProjectLiftRelevance> relevances = projectLiftRelevanceService.listByMtCompany(mtCompanyId);
|
|
|
+ List<ProjectLiftRelevance> relevances = projectLiftRelevanceService.listByMtCompany(request.getMtCompanyId());
|
|
|
records.forEach(record -> {
|
|
|
- Optional<ProjectLiftRelevance> liftRelevance = relevances.stream().filter(r -> (
|
|
|
- r.getLiftId().equals(record.getLiftId()) &&
|
|
|
- r.getProjectId().equals(record.getProjectId()))).findFirst();
|
|
|
- if(liftRelevance.isPresent()){
|
|
|
- ProjectLiftRelevance relevance = liftRelevance.get();
|
|
|
+ Optional<ProjectLiftRelevance> liftRelevance = relevances
|
|
|
+ .stream()
|
|
|
+ .filter(r -> (r.getLiftId().equals(record.getLiftId()) && r.getProjectId().equals(record.getProjectId())))
|
|
|
+ .findFirst();
|
|
|
+ liftRelevance.ifPresent(lr -> {
|
|
|
log.info("PlanDate: {}",record.getPlanDate());
|
|
|
- LocalDate deadline = record.getPlanDate().plusDays(maintenance_interval - relevance.getPlanInterval());
|
|
|
+ LocalDate deadline = record.getPlanDate().plusDays(maintenance_interval - lr.getPlanInterval());
|
|
|
log.info("deadline: {}",deadline);
|
|
|
//如果超过法规15天,法规超期LocalDate.now() < deadline
|
|
|
LocalDateTime max = LocalDateTime.of(deadline,LocalTime.MAX);
|
|
|
log.info("maxtime: {}",max);
|
|
|
record.setOverdue(LocalDateTime.now().isBefore(max) ? 1 : 2);
|
|
|
log.info("overdue: {}",record.getOverdue());
|
|
|
- }
|
|
|
+ });
|
|
|
});
|
|
|
}
|
|
|
+ long count = maintenancePlanService.countPlanByCondition(request);
|
|
|
CountPage<MtPlanResponse> countPage = new CountPage<>(count,pages);
|
|
|
return RestResponse.success(countPage);
|
|
|
}
|
|
@@ -112,9 +110,8 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("one")
|
|
|
+ @Judger(fields = {"id"})
|
|
|
public RestResponse one(@RequestBody MtRecordRequest request){
|
|
|
- Long id = request.getId();
|
|
|
- Judge.id(id);
|
|
|
MtRecordResponse entity = maintenanceRecordService.findByIdWithInfo(request);
|
|
|
Judge.notNull(entity);
|
|
|
/**
|
|
@@ -134,6 +131,7 @@ public class MaintenanceRecordController {
|
|
|
});
|
|
|
entity.setMtOptions(mtOptions);
|
|
|
}
|
|
|
+ Long id = request.getId();
|
|
|
//查询费用项
|
|
|
entity.setMtRecordCosts(mtRecordCostService.listByRecord(id));
|
|
|
//查询图片
|
|
@@ -147,12 +145,11 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("treeOptions")
|
|
|
+ @Judger(fields = {"mtCompanyId","type","liftType"})
|
|
|
public RestResponse treeOptions(@RequestBody MtRecordRequest request){
|
|
|
Integer type = request.getType();
|
|
|
Integer liftType = request.getLiftType();
|
|
|
Long mtCompanyId = request.getMtCompanyId();
|
|
|
- Judge.id(mtCompanyId);
|
|
|
- Judge.gt0(type,liftType);
|
|
|
List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
|
|
|
Judge.notNull(optionList);
|
|
|
//按照sort groupby
|
|
@@ -171,12 +168,11 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("listOptions")
|
|
|
+ @Judger(fields = {"mtCompanyId","type","liftType"})
|
|
|
public RestResponse listOptions(@RequestBody MtRecordRequest request){
|
|
|
Integer type = request.getType();
|
|
|
Integer liftType = request.getLiftType();
|
|
|
Long mtCompanyId = request.getMtCompanyId();
|
|
|
- Judge.id(mtCompanyId);
|
|
|
- Judge.gt0(type,liftType);
|
|
|
List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
|
|
|
return RestResponse.success(optionList);
|
|
|
}
|
|
@@ -199,16 +195,11 @@ public class MaintenanceRecordController {
|
|
|
* @return RestResponse
|
|
|
*/
|
|
|
@PostMapping("fill")
|
|
|
+ @Judger(fields = {"id","maintenanceOption","imgs"})
|
|
|
public RestResponse fill(@RequestBody MtRecordRequest request){
|
|
|
Long id = request.getId();
|
|
|
- Judge.id(id);
|
|
|
- //维保项不能为空
|
|
|
String maintenanceOption = request.getMaintenanceOption();
|
|
|
- Judge.notNull(maintenanceOption,"维保项不能为空");
|
|
|
-
|
|
|
List<String> imgs = request.getImgs();
|
|
|
- Judge.notNull(imgs,"维保图片不能为空");
|
|
|
-
|
|
|
List<MtRecordImg> mtRecordImgs = new ArrayList<>();
|
|
|
for (int i = 0; i < imgs.size(); i++) {
|
|
|
MtRecordImg mri = new MtRecordImg();
|