xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 保养工单工作流

Browse Source
master
yinq 1 month ago
parent 8c197350db
commit cd5cc3de15
6 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/controller/DmsBillsMaintInstanceController.java
Unescape Escape View File

@ -77,8 +77,8 @@ public class DmsBillsMaintInstanceController extends BaseController {
@Log(title = "保养工单", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody DmsBillsMaintInstanceBo bo) {
return toAjax(dmsBillsMaintInstanceService.insertByBo(bo));
public R<DmsBillsMaintInstanceVo> add(@Validated(AddGroup.class) @RequestBody DmsBillsMaintInstanceBo bo) {
return R.ok(dmsBillsMaintInstanceService.insertByBo(bo));
}
/**
@ -88,8 +88,8 @@ public class DmsBillsMaintInstanceController extends BaseController {
@Log(title = "保养工单", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody DmsBillsMaintInstanceBo bo) {
return toAjax(dmsBillsMaintInstanceService.updateByBo(bo));
public R<DmsBillsMaintInstanceVo> edit(@Validated(EditGroup.class) @RequestBody DmsBillsMaintInstanceBo bo) {
return R.ok(dmsBillsMaintInstanceService.updateByBo(bo));
}
/**

8
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/DmsBillsMaintInstance.java
Unescape Escape View File

@ -30,7 +30,8 @@ public class DmsBillsMaintInstance extends TenantEntity {
/**
* 主键标识
*/
@TableId(value = "maint_instance_id", type = IdType.AUTO)
// @TableId(value = "maint_instance_id", type = IdType.AUTO)
@TableId(value = "maint_instance_id")
private Long maintInstanceId;
/**
@ -99,6 +100,11 @@ public class DmsBillsMaintInstance extends TenantEntity {
*/
private String remark;
/**
* 流程状态
*/
private String status;
@TableField(exist = false)
private String maintStatusStr;

5
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/bo/DmsBillsMaintInstanceBo.java
Unescape Escape View File

@ -94,4 +94,9 @@ public class DmsBillsMaintInstanceBo extends BaseEntity {
private String maintStatusStr;
/**
* 流程状态
*/
private String status;
}

5
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/domain/vo/DmsBillsMaintInstanceVo.java
Unescape Escape View File

@ -118,5 +118,8 @@ public class DmsBillsMaintInstanceVo implements Serializable {
@ExcelProperty(value = "备注")
private String remark;
/**
* 流程状态
*/
private String status;
}

4
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/IDmsBillsMaintInstanceService.java
Unescape Escape View File

@ -49,7 +49,7 @@ public interface IDmsBillsMaintInstanceService {
* @param bo 保养工单
* @return 是否新增成功
*/
Boolean insertByBo(DmsBillsMaintInstanceBo bo);
DmsBillsMaintInstanceVo insertByBo(DmsBillsMaintInstanceBo bo);
/**
* 修改保养工单
@ -57,7 +57,7 @@ public interface IDmsBillsMaintInstanceService {
* @param bo 保养工单
* @return 是否修改成功
*/
Boolean updateByBo(DmsBillsMaintInstanceBo bo);
DmsBillsMaintInstanceVo updateByBo(DmsBillsMaintInstanceBo bo);
/**
* 校验并批量删除保养工单信息

54
ruoyi-modules/hwmom-dms/src/main/java/org/dromara/dms/service/impl/DmsBillsMaintInstanceServiceImpl.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
* @return 保养工单
*/
@Override
public DmsBillsMaintInstanceVo queryById(Long maintInstanceId){
public DmsBillsMaintInstanceVo queryById(Long maintInstanceId) {
return baseMapper.selectVoById(maintInstanceId);
}
@ -96,26 +96,24 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
private MPJLambdaWrapper<DmsBillsMaintInstance> buildQueryWrapper(DmsBillsMaintInstanceBo bo) {
Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<DmsBillsMaintInstance> lqw = JoinWrappers.lambda(DmsBillsMaintInstance.class)
.selectAll(DmsBillsMaintInstance.class)
.selectAll(DmsBillsMaintInstance.class)
.select(DmsPlanMaint::getMaintSupervisor)
.selectAs(DmsPlanMaint::getRemark,DmsBillsMaintInstance::getPlanRemark)
.leftJoin(DmsPlanMaint.class,DmsPlanMaint::getPlanMaintId,DmsBillsMaintInstance::getPlanMaintId)
.eq(bo.getMaintInstanceId() != null, DmsBillsMaintInstance::getMaintInstanceId, bo.getMaintInstanceId())
.eq(bo.getPlanMaintId() != null, DmsBillsMaintInstance::getPlanMaintId, bo.getPlanMaintId())
.eq(bo.getWfDefinitionId() != null, DmsBillsMaintInstance::getWfDefinitionId, bo.getWfDefinitionId())
.eq(StringUtils.isNotBlank(bo.getBillsMaintCode()), DmsBillsMaintInstance::getBillsMaintCode, bo.getBillsMaintCode())
.eq(StringUtils.isNotBlank(bo.getMaintGroup()), DmsBillsMaintInstance::getMaintGroup, bo.getMaintGroup())
.eq(StringUtils.isNotBlank(bo.getMaintSupervisor()), DmsBillsMaintInstance::getMaintSupervisor, bo.getMaintSupervisor())
.eq(bo.getMaintLevel() != null , DmsBillsMaintInstance::getMaintLevel, bo.getMaintLevel())
.eq(bo.getPlanBeginTime() != null, DmsBillsMaintInstance::getPlanBeginTime, bo.getPlanBeginTime())
.eq(bo.getRealBeginTime() != null, DmsBillsMaintInstance::getRealBeginTime, bo.getRealBeginTime())
.eq(bo.getPlanEndTime() != null, DmsBillsMaintInstance::getPlanEndTime, bo.getPlanEndTime())
.eq(bo.getRealEndTime() != null, DmsBillsMaintInstance::getRealEndTime, bo.getRealEndTime())
.eq(bo.getMaintStatus() != null, DmsBillsMaintInstance::getMaintStatus, bo.getMaintStatus())
.eq(bo.getMaintCompRate() != null, DmsBillsMaintInstance::getMaintCompRate, bo.getMaintCompRate())
.orderByDesc(DmsBillsMaintInstance::getCreateTime);
.selectAs(DmsPlanMaint::getRemark, DmsBillsMaintInstance::getPlanRemark)
.leftJoin(DmsPlanMaint.class, DmsPlanMaint::getPlanMaintId, DmsBillsMaintInstance::getPlanMaintId)
.eq(bo.getMaintInstanceId() != null, DmsBillsMaintInstance::getMaintInstanceId, bo.getMaintInstanceId())
.eq(bo.getPlanMaintId() != null, DmsBillsMaintInstance::getPlanMaintId, bo.getPlanMaintId())
.eq(bo.getWfDefinitionId() != null, DmsBillsMaintInstance::getWfDefinitionId, bo.getWfDefinitionId())
.eq(StringUtils.isNotBlank(bo.getBillsMaintCode()), DmsBillsMaintInstance::getBillsMaintCode, bo.getBillsMaintCode())
.eq(StringUtils.isNotBlank(bo.getMaintGroup()), DmsBillsMaintInstance::getMaintGroup, bo.getMaintGroup())
.eq(StringUtils.isNotBlank(bo.getMaintSupervisor()), DmsBillsMaintInstance::getMaintSupervisor, bo.getMaintSupervisor())
.eq(bo.getMaintLevel() != null, DmsBillsMaintInstance::getMaintLevel, bo.getMaintLevel())
.eq(bo.getPlanBeginTime() != null, DmsBillsMaintInstance::getPlanBeginTime, bo.getPlanBeginTime())
.eq(bo.getRealBeginTime() != null, DmsBillsMaintInstance::getRealBeginTime, bo.getRealBeginTime())
.eq(bo.getPlanEndTime() != null, DmsBillsMaintInstance::getPlanEndTime, bo.getPlanEndTime())
.eq(bo.getRealEndTime() != null, DmsBillsMaintInstance::getRealEndTime, bo.getRealEndTime())
.eq(bo.getMaintStatus() != null, DmsBillsMaintInstance::getMaintStatus, bo.getMaintStatus())
.eq(bo.getMaintCompRate() != null, DmsBillsMaintInstance::getMaintCompRate, bo.getMaintCompRate())
.orderByDesc(DmsBillsMaintInstance::getCreateTime);
return lqw;
}
@ -126,14 +124,14 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(DmsBillsMaintInstanceBo bo) {
public DmsBillsMaintInstanceVo insertByBo(DmsBillsMaintInstanceBo bo) {
DmsBillsMaintInstance add = MapstructUtils.convert(bo, DmsBillsMaintInstance.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setMaintInstanceId(add.getMaintInstanceId());
}
return flag;
return MapstructUtils.convert(add, DmsBillsMaintInstanceVo.class);
}
/**
@ -143,16 +141,16 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(DmsBillsMaintInstanceBo bo) {
public DmsBillsMaintInstanceVo updateByBo(DmsBillsMaintInstanceBo bo) {
DmsBillsMaintInstance update = MapstructUtils.convert(bo, DmsBillsMaintInstance.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
return MapstructUtils.convert(update, DmsBillsMaintInstanceVo.class);
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(DmsBillsMaintInstance entity){
private void validEntityBeforeSave(DmsBillsMaintInstance entity) {
//TODO 做一些数据校验,如唯一约束
}
@ -165,7 +163,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
@ -178,7 +176,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
* @return 结果
*/
@Override
@Transactional( rollbackFor= Exception.class)
@Transactional(rollbackFor = Exception.class)
public int insertDmsBillsMaintInstance(String planMaintCode) {
String planMaintCodeS = planMaintCode.replaceAll("\"", "");
DmsPlanMaint dmsPlanMaint = dmsPlanMaintMapper.selectDmsPlanMaintJoinByPlanMaintCode(planMaintCodeS);
@ -205,7 +203,7 @@ public class DmsBillsMaintInstanceServiceImpl implements IDmsBillsMaintInstanceS
dmsBillsMaintInstance.setPlanEndTime(new Date(lubeTime.getTime() + timeLimit * 1000l));
int insert = baseMapper.insert(dmsBillsMaintInstance);
/* DmsBillMaintInstanceActivity表弃用 */
/* DmsBillMaintInstanceActivity表弃用 */
/* DmsBillMaintInstanceActivity dmsMaintInstanceActivity = new DmsMaintInstanceActivity();
dmsMaintInstanceActivity.setMaintInstanceId(dmsBillsMaintInstance.getMaintInstanceId());
dmsMaintInstanceActivity.setProcessStepOrder(1L);

Write Preview
Loading…
Cancel
Save