Browse Source

批量审核工单

ops-management-platform-backend-dev
gjh 1 week ago
parent
commit
684f962a75
  1. 9
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WeChatController.java
  2. 5
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
  3. 4
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java
  4. 2
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java
  5. 9
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ContractInfoServiceImpl.java
  6. 9
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java
  7. 22
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

9
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WeChatController.java

@ -171,13 +171,12 @@ public class WeChatController {
request.setTouser(openid); request.setTouser(openid);
request.setTemplate_id(TEMPLATE_ID); request.setTemplate_id(TEMPLATE_ID);
request.setPage("pages/index/index"); request.setPage("pages/index/index");
Map<String, WeComSubscribeDataItem> dataMap = new HashMap<>(); Map<String, WeComSubscribeDataItem> dataMap = new HashMap<>();
dataMap.put("character_string5", new WeComSubscribeDataItem("工单编号:123456")); dataMap.put("character_string5", new WeComSubscribeDataItem("工单编号:123456"));
dataMap.put("thing2", new WeComSubscribeDataItem("空调内部故障")); dataMap.put("thing2", new WeComSubscribeDataItem("故障标题:空调内部故障"));
dataMap.put("time13", new WeComSubscribeDataItem("2025年6月20日")); dataMap.put("time13", new WeComSubscribeDataItem("发生时间:2025年6月20日"));
dataMap.put("thing10", new WeComSubscribeDataItem("宁波国研机房")); dataMap.put("thing10", new WeComSubscribeDataItem("发生位置:宁波国研机房"));
dataMap.put("thing8", new WeComSubscribeDataItem("2025年6月21日")); dataMap.put("thing8", new WeComSubscribeDataItem("计划完成时间:2025年6月21日"));
request.setData(dataMap); request.setData(dataMap);
// 序列化 JSON 并记录日志 // 序列化 JSON 并记录日志

5
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java

@ -182,6 +182,11 @@ public class WorkOrderInfoController extends BaseController {
return R.ok("终审工单成功!"); return R.ok("终审工单成功!");
} }
@PostMapping("/batchReviewOrder")
public R<Void> batchReviewOrder(@RequestBody WorkReviewInfoBo bo ) {
workOrderInfoService.batchReviewOrder(bo);
return R.ok("批量审核工单!");
}
//@SaCheckPermission("platform:workOrder:dealWithList") //@SaCheckPermission("platform:workOrder:dealWithList")
@GetMapping("/dealWithList") @GetMapping("/dealWithList")

4
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/WorkReviewInfoBo.java

@ -9,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
/** /**
@ -28,6 +30,8 @@ public class WorkReviewInfoBo extends BaseEntity {
//@NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class }) //@NotBlank(message = "唯一标识符不能为空", groups = { EditGroup.class })
private String id; private String id;
private List<String> ids;
/** /**
* 关联的工单ID * 关联的工单ID
*/ */

2
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IWorkOrderInfoService.java

@ -141,4 +141,6 @@ public interface IWorkOrderInfoService {
List<WorkOrderInfoVo> queryListForExport(WorkOrderInfoBo bo); List<WorkOrderInfoVo> queryListForExport(WorkOrderInfoBo bo);
WorkOrderInfoDto getOverTimeCost(String workOrderId); WorkOrderInfoDto getOverTimeCost(String workOrderId);
void batchReviewOrder(WorkReviewInfoBo bo);
} }

9
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ContractInfoServiceImpl.java

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.dromara.common.core.domain.dto.RoleDTO; import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -173,6 +174,14 @@ public class ContractInfoServiceImpl implements IContractInfoService {
*/ */
private void validEntityBeforeSave(ContractInfo entity){ private void validEntityBeforeSave(ContractInfo entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
String contractName = entity.getContractName();
// 避免重复添加相同的合同
if (contractName != null){
Long count = baseMapper.selectCount(new LambdaQueryWrapper<ContractInfo>().eq(ContractInfo::getContractName, contractName));
if (count > 0) {
throw new ServiceException("该合同已经存在,请勿重复新增!");
}
}
} }
/** /**

9
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ProjectInfoServiceImpl.java

@ -5,6 +5,7 @@ import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.dto.RoleDTO; import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
@ -170,6 +171,14 @@ public class ProjectInfoServiceImpl implements IProjectInfoService {
*/ */
private void validEntityBeforeSave(ProjectInfo entity){ private void validEntityBeforeSave(ProjectInfo entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
// 项目名称不能重复
String projectName = entity.getProjectName();
if (projectName != null) {
Long count = baseMapper.selectCount(new LambdaQueryWrapper<ProjectInfo>().eq(ProjectInfo::getProjectName, projectName));
if (count > 0) {
throw new ServiceException("该项目已经存在,请勿重复新增!");
}
}
} }
/** /**

22
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@ -1647,6 +1647,28 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
return workOrderInfoDto; return workOrderInfoDto;
} }
@Override
public void batchReviewOrder(WorkReviewInfoBo bo) {
List<String> ids = bo.getIds();
if (CollectionUtil.isNotEmpty(ids)){
List<WorkOrderInfo> workOrderInfos = baseMapper.selectByIds(ids);
for (WorkOrderInfo workOrderInfo : workOrderInfos) {
bo.setProjectName(workOrderInfo.getProjectName());
bo.setContractName(workOrderInfo.getContractName());
// 初审
if (workOrderInfo.getStatus() == 4){
this.initReviewOrder(bo);
}else if (workOrderInfo.getStatus() == 5){
// 终审默认结案
bo.setIsCloseCase("是");
this.initReviewOrder(bo);
}
}
}
}
/** /**
* 截取超时后面的部分 * 截取超时后面的部分
*/ */

Loading…
Cancel
Save