feat(dms): 优化待巡检工单

- 在 DmsBaseMaintStationVo 中添加标准编号字段
- 新增点巡检工单生成逻辑,包括工单编号生成和负责人员设置
- 在 Seq 类中添加检查工单序列相关常量
master
zch 4 days ago
parent e05196aaa2
commit 3e5d70a916

@ -66,6 +66,15 @@ public class Seq {
// 检查工单序列类型
public static final String dmsInspectInstanceSeqType = "INSPECTINSTANCE";
// 检查工单接口序列数
private static AtomicInteger dmsInspectInstanceSeq = new AtomicInteger(1);
// 检查工单标识
public static final String dmsInspectInstanceCode = "IIC";
//检修计划序列类型 //检修计划序列类型
public static final String planRepairSeqType = "PLANREPAIR"; public static final String planRepairSeqType = "PLANREPAIR";
@ -180,6 +189,8 @@ public class Seq {
atomicInt = dmsPlanLubeSeq; atomicInt = dmsPlanLubeSeq;
}else if (dmsLubeInstanceSeqType.equals(type)) { }else if (dmsLubeInstanceSeqType.equals(type)) {
atomicInt = dmsLubeInstanceSeq; atomicInt = dmsLubeInstanceSeq;
}else if (dmsInspectInstanceSeqType.equals(type)) {
atomicInt = dmsInspectInstanceSeq;
}else if (planMaintSeqType.equals(type)) { }else if (planMaintSeqType.equals(type)) {
atomicInt = planMaintSeq; atomicInt = planMaintSeq;
}else if(maintInstanceSeqType.equals(type)) { }else if(maintInstanceSeqType.equals(type)) {

@ -75,6 +75,11 @@ public class DmsBaseMaintStationVo implements Serializable {
*/ */
private String deviceTypeName;//JOIN private String deviceTypeName;//JOIN
/**
*
*/
private String maintStandardCode;//JOIN
@ExcelProperty(value = "保养项目") @ExcelProperty(value = "保养项目")
private List<DmsBaseMaintProjectVo> dmsBaseMaintProjectList; private List<DmsBaseMaintProjectVo> dmsBaseMaintProjectList;

@ -13,6 +13,7 @@ import org.apache.dubbo.rpc.RpcContext;
import org.dromara.common.core.constant.DmsConstants; import org.dromara.common.core.constant.DmsConstants;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.uuid.Seq;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.dms.api.RemoteInspectInstanceService; import org.dromara.dms.api.RemoteInspectInstanceService;
import org.dromara.dms.domain.*; import org.dromara.dms.domain.*;
@ -155,12 +156,14 @@ public class RemoteInspectInstanceServiceImpl implements RemoteInspectInstanceSe
// 创建新的检查实例对象 // 创建新的检查实例对象
DmsBillsInspectInstance dmsBillsInspectInstance = new DmsBillsInspectInstance(); DmsBillsInspectInstance dmsBillsInspectInstance = new DmsBillsInspectInstance();
// 设置检查实例的相关属性 // 设置检查实例的相关属性
// 设置工单编号
dmsBillsInspectInstance.setBillsInspectCode(Seq.getId(Seq.dmsInspectInstanceSeqType, Seq.dmsInspectInstanceCode));
dmsBillsInspectInstance.setPlanInspectId(dmsPlanInspect.getPlanInspectId()); dmsBillsInspectInstance.setPlanInspectId(dmsPlanInspect.getPlanInspectId());
dmsBillsInspectInstance.setInspectType(dmsPlanInspect.getInspectType());//检查类型(1巡检 2点检) dmsBillsInspectInstance.setInspectType(dmsPlanInspect.getInspectType());//检查类型(1巡检 2点检)
dmsBillsInspectInstance.setPlanBeginTime(dmsPlanInspect.getPlanTime()); dmsBillsInspectInstance.setPlanBeginTime(dmsPlanInspect.getPlanTime());
dmsBillsInspectInstance.setPlanEndTime(new Date(dmsPlanInspect.getPlanTime().getTime()+dmsPlanInspect.getTimeLimit()*1000l)); dmsBillsInspectInstance.setPlanEndTime(new Date(dmsPlanInspect.getPlanTime().getTime()+dmsPlanInspect.getTimeLimit()*1000l));
dmsBillsInspectInstance.setInspectRouteId(dmsPlanInspect.getInspectRouteId()); dmsBillsInspectInstance.setInspectRouteId(dmsPlanInspect.getInspectRouteId());
dmsBillsInspectInstance.setPerformer(dmsPlanInspect.getPerformer());//执行人 dmsBillsInspectInstance.setPerformer(dmsPlanInspect.getPerformer());//负责人员
dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);//待巡检 dmsBillsInspectInstance.setInspectStatus(DmsConstants.DMS_BILLS_INSPECT_INSTANCE_INSPECT_STATUS_TO_INSPECT);//待巡检
dmsBillsInspectInstance.setCreateBy(userId); dmsBillsInspectInstance.setCreateBy(userId);
dmsBillsInspectInstance.setTenantId(tenantId); dmsBillsInspectInstance.setTenantId(tenantId);

Loading…
Cancel
Save