ycl-pojo/src/main/java/com/ycl/platform/base/AbsEntity.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -23,6 +24,7 @@ /** * 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(value = "create_time",fill = FieldFill.INSERT) private Date createTime;
@@ -22,9 +22,9 @@ private static final long serialVersionUID = 1L; @ApiModelProperty("工单ID") @TableField("work_order_id") private Integer workOrderId; @ApiModelProperty("工单号") @TableField("work_order_no") private String workOrderNo; @ApiModelProperty("审核人") @TableField("auditing_user") ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -69,16 +69,16 @@ return workOrderService.ywCondition(form); } @GetMapping("/yw-condition/{id}") @GetMapping("/yw-condition/{workOrderNo}") @ApiOperation(value = "运维情况", notes = "运维情况") public Result ywCondition(@PathVariable Integer id) { return workOrderService.selectYwConditionByYwId(id); public Result ywCondition(@PathVariable String workOrderNo) { return workOrderService.selectYwConditionByYwId(workOrderNo); } @GetMapping("/yw-auditing-list/{id}") @GetMapping("/yw-auditing-list/{workOrderNo}") @ApiOperation(value = "运维审核记录", notes = "运维审核记录") public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) { return workOrderService.selectYwAuditingListByYwId(id); public Result ywAuditingByYwId(@PathVariable String workOrderNo) { return workOrderService.selectYwAuditingListByYwId(workOrderNo); } @PutMapping("/yw-result") ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderYwConditionRecordMapper.java
@@ -20,10 +20,10 @@ /** * 根据工单ID查询运维记录 * * @param workOrderId * @param workOrderNo * @return */ List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderId") Integer workOrderId); List<WorkOrderYwConditionRecordVO> selectYwConditionByYwId(@Param("workOrderNo") String workOrderNo); /** * 批量插入 ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -129,17 +129,17 @@ /** * 获取工单运维情况 * @param id 工单id * @param workOrderNo 工单号 * @return 工单运维情况 */ Result selectYwConditionByYwId(Integer id); Result selectYwConditionByYwId(String workOrderNo); /** * 获取工单运维审核记录 * @param id 工单id * @param workOrderNo 工单号 * @return 工单运维审核记录 */ Result selectYwAuditingListByYwId(String id); Result selectYwAuditingListByYwId(String workOrderNo); /** * 批量下发 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -157,6 +157,7 @@ ywRecord.setCommitUser(1); ywRecord.setYwCondition("故障类型更新，工单状态调整为待处理"); ywRecord.setCreateTime(new Date()); ywRecord.setSysMsg(Boolean.TRUE); willAddMsg.add(ywRecord); } } else { @@ -300,7 +301,7 @@ baseMapper.updateById(workOrder); // 添加一条审核记录 WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord(); workOrderAuditingRecord.setWorkOrderId(workOrder.getId()); workOrderAuditingRecord.setWorkOrderNo(workOrder.getWorkOrderNo()); workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue()); workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc()); workOrderAuditingRecord.setRemark(form.getAuditingRemark()); @@ -331,18 +332,18 @@ if (list.isEmpty()) { return Result.error("没有工单可以审核"); } List<Integer> ids = list.stream().map(WorkOrder::getId).collect(Collectors.toList()); List<String> workOrderNoList = list.stream().map(WorkOrder::getWorkOrderNo).collect(Collectors.toList()); List<String> serialNumbers = list.stream().map(WorkOrder::getSerialNumber).toList(); // 工单状态 LambdaUpdateWrapper<WorkOrder> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); lambdaUpdateWrapper.in(WorkOrder::getId, ids); lambdaUpdateWrapper.in(WorkOrder::getWorkOrderNo, workOrderNoList); lambdaUpdateWrapper.set(WorkOrder::getStatus, form.getAuditingResult()); baseMapper.update(lambdaUpdateWrapper); // 添加多条审核记录 List<WorkOrderAuditingRecord> workOrderAuditingRecords = new ArrayList<>(); for (Integer id : ids) { for (String workOrderNo : workOrderNoList) { WorkOrderAuditingRecord workOrderAuditingRecord = new WorkOrderAuditingRecord(); workOrderAuditingRecord.setWorkOrderId(id); workOrderAuditingRecord.setWorkOrderNo(workOrderNo); workOrderAuditingRecord.setAuditingUser(SecurityUtils.getLoginUser().getUserId().intValue()); workOrderAuditingRecord.setResult(form.getAuditingResult().getDesc()); workOrderAuditingRecord.setRemark(form.getAuditingRemark()); @@ -390,8 +391,8 @@ } @Override public Result selectYwConditionByYwId(Integer id) { List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id); public Result selectYwConditionByYwId(String workOrderNo) { List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo); ywConditionList.stream().forEach(item -> { if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) { item.setCommitUserName("系统消息"); @@ -401,10 +402,10 @@ } @Override public Result selectYwAuditingListByYwId(String id) { public Result selectYwAuditingListByYwId(String workOrderNo) { return Result.ok().data( new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper) .eq(WorkOrderAuditingRecord::getWorkOrderId, id) .eq(WorkOrderAuditingRecord::getWorkOrderNo, workOrderNo) .orderByAsc(WorkOrderAuditingRecord::getCreateTime) .list()); } ycl-server/src/main/resources/application-dev.yml
@@ -36,7 +36,7 @@ spring: # 数据源配置 datasource: url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true url: jdbc:mysql://101.35.247.188/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root password: ycl@202466 type: com.alibaba.druid.pool.DruidDataSource @@ -76,10 +76,12 @@ spring.data: redis: # 地址 host: 42.193.1.25 #host: 42.193.1.25 host: 127.0.0.1 # 端口，默认为6379 port: 6379 password: ycl2018 #password: ycl2018 password: # 数据库索引 database: 0 # 密码(如没有密码请注释掉) ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -9,13 +9,14 @@ <result column="yw_condition" property="ywCondition"/> <result column="commit_user" property="commitUser"/> <result column="nick_name" property="commitUserName"/> <result column="sys_msg" property="sysMsg"/> <result column="yw_proofMaterials" property="ywProofMaterials"/> </resultMap> <select id="selectYwConditionByYwId" resultMap="BaseResultMap"> SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name FROM t_work_order_yw_condition_record yw INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderId} INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo} ORDER BY yw.create_time DESC </select>
