服务指令-工单业务操作日志表
This commit is contained in:
parent
5223fe7b0b
commit
b7ac032377
|
|
@ -0,0 +1,34 @@
|
||||||
|
package com.nu.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 服务指令工单业务操作日志表
|
||||||
|
* @Author: jeecg-boot
|
||||||
|
* @Date: 2026-01-13
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class DirectiveOrderBizLogEntity implements Serializable {
|
||||||
|
/**id*/
|
||||||
|
@TableId(type = IdType.ASSIGN_ID)
|
||||||
|
private String id;
|
||||||
|
/**业务类型编码*/
|
||||||
|
private String bizTypeCode;
|
||||||
|
/**业务类型*/
|
||||||
|
private String bizType;
|
||||||
|
/**业务主表单号*/
|
||||||
|
private String bizNo;
|
||||||
|
/**操作类型*/
|
||||||
|
private String optType;
|
||||||
|
/**操作员工ID*/
|
||||||
|
private String optEmpId;
|
||||||
|
/**操作员工*/
|
||||||
|
private String optEmpName;
|
||||||
|
/**操作时间*/
|
||||||
|
private Date optTime;
|
||||||
|
}
|
||||||
|
|
@ -54,4 +54,6 @@ public interface IDirectiveOrderApi {
|
||||||
void transferOrder(DirectiveOrderSubEntity dto);
|
void transferOrder(DirectiveOrderSubEntity dto);
|
||||||
|
|
||||||
void assistOrder(DirectiveOrderSubEntity dto);
|
void assistOrder(DirectiveOrderSubEntity dto);
|
||||||
|
|
||||||
|
Map<String, Object> addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
package com.nu.modules.biz.order.entity;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
import java.io.Serializable;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 服务指令工单业务操作日志表
|
||||||
|
* @Author: caolei
|
||||||
|
* @Date: 2026-1-13
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@TableName("nu_biz_nu_directive_order_biz_log")
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@EqualsAndHashCode(callSuper = false)
|
||||||
|
@ApiModel(value="nu_biz_nu_directive_order_biz_log对象", description="服务指令工单业务操作日志表")
|
||||||
|
public class DirectiveOrderBizLog implements Serializable {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
/**id*/
|
||||||
|
@TableId(type = IdType.ASSIGN_ID)
|
||||||
|
private String id;
|
||||||
|
/**业务类型编码*/
|
||||||
|
private String bizTypeCode;
|
||||||
|
/**业务类型*/
|
||||||
|
private String bizType;
|
||||||
|
/**业务主表单号*/
|
||||||
|
private String bizNo;
|
||||||
|
/**操作类型*/
|
||||||
|
private String optType;
|
||||||
|
/**操作员工ID*/
|
||||||
|
private String optEmpId;
|
||||||
|
/**操作员工*/
|
||||||
|
private String optEmpName;
|
||||||
|
/**操作时间*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date optTime;
|
||||||
|
/**创建人*/
|
||||||
|
private String createBy;
|
||||||
|
/**创建时间*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date createTime;
|
||||||
|
/**更新人*/
|
||||||
|
private String updateBy;
|
||||||
|
/**更新日期*/
|
||||||
|
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date updateTime;
|
||||||
|
/**是否删除 0未删除 1删除*/
|
||||||
|
private String delFlag;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.nu.modules.biz.order.mapper;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
|
import com.nu.modules.biz.order.entity.DirectiveOrderBizLog;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description: 服务指令工单业务操作日志表
|
||||||
|
* @Author: caolei
|
||||||
|
* @Date: 2026-1-13
|
||||||
|
* @Version: V1.0
|
||||||
|
*/
|
||||||
|
public interface DirectiveOrderBizLogMapper extends BaseMapper<DirectiveOrderBizLog> {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
<mapper namespace="com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper">
|
||||||
|
|
||||||
|
</mapper>
|
||||||
|
|
@ -16,4 +16,5 @@ import java.util.Map;
|
||||||
public interface IDirectiveOrderService extends IService<DirectiveOrder> {
|
public interface IDirectiveOrderService extends IService<DirectiveOrder> {
|
||||||
Result<?> generateOrdersBatch();
|
Result<?> generateOrdersBatch();
|
||||||
Map<String, Object> generateOrdersInstant(DirectiveOrder directiveOrder);
|
Map<String, Object> generateOrdersInstant(DirectiveOrder directiveOrder);
|
||||||
|
String getEmployeeName(String employeeId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.nu.entity.CareDirectiveEntity;
|
import com.nu.entity.CareDirectiveEntity;
|
||||||
|
import com.nu.entity.DirectiveOrderBizLogEntity;
|
||||||
import com.nu.entity.DirectiveOrderEntity;
|
import com.nu.entity.DirectiveOrderEntity;
|
||||||
import com.nu.entity.DirectiveOrderSubEntity;
|
import com.nu.entity.DirectiveOrderSubEntity;
|
||||||
import com.nu.modules.biz.order.entity.DirectiveOrder;
|
import com.nu.modules.biz.order.entity.DirectiveOrder;
|
||||||
|
import com.nu.modules.biz.order.entity.DirectiveOrderBizLog;
|
||||||
import com.nu.modules.biz.order.entity.DirectiveOrderSub;
|
import com.nu.modules.biz.order.entity.DirectiveOrderSub;
|
||||||
|
import com.nu.modules.biz.order.mapper.DirectiveOrderBizLogMapper;
|
||||||
import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
|
import com.nu.modules.biz.order.mapper.DirectiveOrderMapper;
|
||||||
import com.nu.modules.biz.order.mapper.DirectiveOrderSubMapper;
|
import com.nu.modules.biz.order.mapper.DirectiveOrderSubMapper;
|
||||||
import com.nu.modules.biz.order.service.IDirectiveOrderService;
|
import com.nu.modules.biz.order.service.IDirectiveOrderService;
|
||||||
|
|
@ -42,6 +45,8 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
|
||||||
private IDirectiveOrderService directiveOrderService;
|
private IDirectiveOrderService directiveOrderService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private DirectiveOrderSubMapper directiveOrderSubMapper;
|
private DirectiveOrderSubMapper directiveOrderSubMapper;
|
||||||
|
@Autowired
|
||||||
|
private DirectiveOrderBizLogMapper directiveOrderBizLogMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<DirectiveOrderSubEntity> queryList(DirectiveOrderSubEntity dto) {
|
public List<DirectiveOrderSubEntity> queryList(DirectiveOrderSubEntity dto) {
|
||||||
|
|
@ -260,7 +265,6 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
|
||||||
directiveOrderSubMapper.update(sub,subUW);
|
directiveOrderSubMapper.update(sub,subUW);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void assistOrder(DirectiveOrderSubEntity dto) {
|
public void assistOrder(DirectiveOrderSubEntity dto) {
|
||||||
DirectiveOrder main = new DirectiveOrder();
|
DirectiveOrder main = new DirectiveOrder();
|
||||||
|
|
@ -285,4 +289,17 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
|
||||||
subUW.eq("main_id",dto.getMainId());
|
subUW.eq("main_id",dto.getMainId());
|
||||||
directiveOrderSubMapper.update(sub,subUW);
|
directiveOrderSubMapper.update(sub,subUW);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, Object> addBizLog(DirectiveOrderBizLogEntity directiveOrderBizLogEntity) {
|
||||||
|
DirectiveOrderBizLog directiveOrderBizLog = new DirectiveOrderBizLog();
|
||||||
|
BeanUtils.copyProperties(directiveOrderBizLogEntity, directiveOrderBizLog);
|
||||||
|
String optEmpName = directiveOrderService.getEmployeeName(directiveOrderBizLogEntity.getOptEmpId());
|
||||||
|
directiveOrderBizLog.setOptEmpName(optEmpName);
|
||||||
|
directiveOrderBizLogMapper.insert(directiveOrderBizLog);
|
||||||
|
Map<String, Object> map = new HashMap<>();
|
||||||
|
map.put("success", true);
|
||||||
|
map.put("message", "操作成功");
|
||||||
|
return map;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -893,7 +893,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
|
||||||
* 获取员工姓名
|
* 获取员工姓名
|
||||||
* @param employeeId
|
* @param employeeId
|
||||||
*/
|
*/
|
||||||
private String getEmployeeName(String employeeId){
|
@Override
|
||||||
|
public String getEmployeeName(String employeeId){
|
||||||
String employeeName = "";
|
String employeeName = "";
|
||||||
if(employeeId!=null&&!employeeId.equals("")){
|
if(employeeId!=null&&!employeeId.equals("")){
|
||||||
DirectiveOrder employeeInfo = baseMapper.getEmployeeById(employeeId);
|
DirectiveOrder employeeInfo = baseMapper.getEmployeeById(employeeId);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue