|
@@ -65,9 +65,23 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
|
|
|
* @date 2020/2/3 11:38 上午
|
|
|
*/
|
|
|
public IPage<CapitalRepairResponse> list(CapitalRepairRequest request) {
|
|
|
+ request.addDesc("end_date");
|
|
|
return baseMapper.findByCondition(request.getPage(), request);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * @param request 维保公司ID
|
|
|
+ * @return List<Map<String,Object>> 项目ID和名称列表
|
|
|
+ * @description 项目ID和名称列表
|
|
|
+ * @date 2020/4/30 10:39 上午
|
|
|
+ */
|
|
|
+ public List<Map<String,Object>> projectIDList(CapitalRepairRequest request) {
|
|
|
+ QueryWrapper<CapitalRepair> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq(ObjectUtil.isNotEmpty(request.getMtCompanyId()), "mt_company_id", request.getMtCompanyId());
|
|
|
+ queryWrapper.select("id projectId", "project_name projectName");
|
|
|
+ return listMaps(queryWrapper);
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @param request 电梯列表查询条件
|
|
|
* @return IPage<LiftResponse> 大修项目电梯列表
|
|
@@ -225,10 +239,9 @@ public class CapitalRepairService extends ServiceImpl<CapitalRepairMapper, Capit
|
|
|
if (Objects.equals(0, request.getType())) {
|
|
|
if (Objects.equals(0, request.getPass())) {
|
|
|
capitalRepair.setOverdueFlag(0);
|
|
|
+ } else {
|
|
|
+ capitalRepair.setOverdueFlag(1);
|
|
|
}
|
|
|
- //延期后的结束时间
|
|
|
- capitalRepair.setDelayTime(capitalRepair.getOverdueDate());
|
|
|
- capitalRepair.setOverdueFlag(1);
|
|
|
}
|
|
|
//竣工审核
|
|
|
capitalRepair.setProjectStatus(Objects.equals(0, request.getPass()) ?
|