diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 902d7c91d..57241b98d 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -32,6 +32,10 @@ public class Constant { public static final String DH_ORDER = "DH"; //到货 public static final String TH_ORDER = "TH"; //退货 + public static final String DEV_DDJ = "DDJ"; //设备登记 + public static final String DEV_DBG = "DBG"; //设备变更 + public static final String DEV_DYC = "DYC"; //设备移除 + /** * 盘点单据前缀 diff --git a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowConfigController.java b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowConfigController.java index a89338cd0..88fa95ac3 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowConfigController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowConfigController.java @@ -59,6 +59,20 @@ public class SysApprovalFlowConfigController { @ApiOperation(value = "新增配置详情") @PostMapping("/udiwms/sysApprovalFlowConfig/addConfigDetail") public BaseResponse addConfigDetail(@RequestBody @Valid SysApprovalFlowAddDetailRequest sysApprovalFlowAddDetailRequest) { + Integer approvalNodeType = sysApprovalFlowAddDetailRequest.getApprovalNodeType(); + if (approvalNodeType == 1){ + String approvalUserId = sysApprovalFlowAddDetailRequest.getApprovalUserId(); + String approvalUserName = sysApprovalFlowAddDetailRequest.getApprovalUserName(); + if (StringUtil.isEmpty(approvalUserId)) return ResultVOUtils.error("审批人主键不可以为空！"); + if (StringUtil.isEmpty(approvalUserName)) return ResultVOUtils.error("审批人名称不可以为空！"); + + }else if(approvalNodeType == 2){ + String approvalPostId = sysApprovalFlowAddDetailRequest.getApprovalPostId(); + String approvalPostName = sysApprovalFlowAddDetailRequest.getApprovalPostName(); + if (StringUtil.isEmpty(approvalPostId)) return ResultVOUtils.error("审批岗位序号不可以为空！"); + if (StringUtil.isEmpty(approvalPostName)) return ResultVOUtils.error("审批岗位名称不可以为空！"); + } + int i = sysApprovalFlowConfigService.addConfigDetail(sysApprovalFlowAddDetailRequest); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java index 50ccba404..7acc26386 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysApprovalFlowController.java @@ -1,17 +1,42 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.basic.SysApprovalFlow; +import com.glxp.api.entity.dev.DeviceChangeLogEntity; +import com.glxp.api.entity.dev.DeviceChangeOrderEntity; +import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; +import com.glxp.api.enums.ApprovalFlowEnum; +import com.glxp.api.enums.dev.DeviceChangeStatusEnum; +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import com.glxp.api.enums.dev.DeviceStatusEnum; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.SubmitApprovalFlowRequest; import com.glxp.api.res.basic.SysApprovalFlowDetailResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.basic.SysApprovalFlowService; +import com.glxp.api.service.dev.DeviceChangeLogService; +import com.glxp.api.service.dev.DeviceChangeOrderItemService; +import com.glxp.api.service.dev.DeviceChangeOrderService; +import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.vo.dev.DeviceChangeOrderVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -22,6 +47,18 @@ public class SysApprovalFlowController { private SysApprovalFlowService sysApprovalFlowService; @Resource private SystemParamConfigService systemParamConfigService; + @Resource + private DeviceChangeOrderService deviceChangeOrderService; + @Resource + private DeviceChangeOrderItemService deviceChangeOrderItemService; + @Resource + private DeviceInfoService deviceInfoService; + @Resource + private DeviceChangeLogService deviceChangeLogService; + @Resource + private DeptService deptService; + @Resource + private CustomerService customerService; @ApiOperation(value = "获取流程审批过程") @GetMapping("/udiwms/sysApprovalFlow/approvalFlowDetailList/{approvalFlowId}") @@ -44,4 +81,72 @@ public class SysApprovalFlowController { return ResultVOUtils.success(sys_approval_flow); } + @ApiOperation(value = "是否有节点审批权限") + @GetMapping("/sysApprovalFlow/nodePermissions/{id}") + public BaseResponse nodePermissions(@PathVariable String id) { + boolean b = sysApprovalFlowService.nodePermissions(id); + return ResultVOUtils.success(b); + } + + @ApiOperation(value = "提交节点审批-设备一处") + @PostMapping("/udiwms/sysApprovalFlow/submitApprovalFlow/sbyc") + @Transactional(rollbackFor = Exception.class) + public BaseResponse submitApprovalFlowSbyc(@RequestBody @Valid SubmitApprovalFlowRequest submitApprovalFlowRequest) { + String approvalFlowMxId = submitApprovalFlowRequest.getId(); + sysApprovalFlowService.submitApprovalFlow(submitApprovalFlowRequest); + + //判断是否是最终状态为 审核通过 是 调用 审核通过的后续方法 + SysApprovalFlow sysApprovalFlow = sysApprovalFlowService.getApprovalFlowByMxId(approvalFlowMxId); + Integer status = sysApprovalFlow.getStatus(); + if (status.equals(ApprovalFlowEnum.TG.getCode())){ + //后续方法 + String id = sysApprovalFlow.getId(); + DeviceChangeOrderEntity order = deviceChangeOrderService.getOne(Wrappers.lambdaQuery(DeviceChangeOrderEntity.class).eq(DeviceChangeOrderEntity::getApprovalFlowId, id)); + if (order == null){ + return ResultVOUtils.error("未找到对应的审批流程，请确认"); + } + LocalDateTime now = LocalDateTime.now(); + Long userId = customerService.getUserId(); + AuthAdmin authUserDto = customerService.getUserBean(); + //查询创建人名称 + String userName = authUserDto.getEmployeeName(); + + deviceChangeOrderService.update(Wrappers.lambdaUpdate(DeviceChangeOrderEntity.class) + .set(DeviceChangeOrderEntity::getStatus, DeviceChangeStatusEnum.FINISH) + .set(DeviceChangeOrderEntity::getConfirmTime, now) + .set(DeviceChangeOrderEntity::getConfirmUser, userId) + .set(DeviceChangeOrderEntity::getConfirmUserName, userName) + .eq(DeviceChangeOrderEntity::getApprovalFlowId, id) + .eq(DeviceChangeOrderEntity::getStatus, DeviceChangeStatusEnum.AUDITING)); + + List list = deviceChangeOrderItemService.list(Wrappers.lambdaQuery(DeviceChangeOrderItemEntity.class).eq(DeviceChangeOrderItemEntity::getOrderId, order.getOrderId())); + if (CollectionUtil.isEmpty(list)){ + return ResultVOUtils.error("单据里待移除设备不存在，请确认"); + } + List logs = new ArrayList<>(); + DeviceChangeOrderVo orderVo = BeanUtil.copyProperties(order, DeviceChangeOrderVo.class); + orderVo.setConfirmTime(now); + orderVo.setConfirmUser(userId); + orderVo.setConfirmUserName(userName); + DeptEntity dept = deptService.selectByCode(orderVo.getDeptCode()); + orderVo.setDeptName(dept.getName()); + if (orderVo.getToDeptCode().equals(orderVo.getDeptCode())) { + orderVo.setToDeptName(dept.getName()); + } else { + dept = deptService.selectByCode(orderVo.getToDeptCode()); + orderVo.setToDeptName(dept.getName()); + } + list.forEach( i ->{ + deviceInfoService.changeStatus(i.getDeviceCode(), order.getDeptCode(), DeviceStatusEnum.NORMAL, order.getType() == DeviceChangeTypeEnum.CHANGE ? DeviceStatusEnum.CHANGE : DeviceStatusEnum.DESTROY); + if (order.getType() == DeviceChangeTypeEnum.DESTROY) { + DeviceChangeLogEntity logEntity = DeviceChangeLogEntity.genEntity(i.getDeviceCode(), orderVo); + logs.add(logEntity); + } + }); + if (CollectionUtil.isNotEmpty(logs)) { + deviceChangeLogService.saveBatch(logs); + } + } + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java index 8a40970ba..c69606946 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java +++ b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlow.java @@ -76,4 +76,16 @@ public class SysApprovalFlow { @TableField(value = "updateTime") private Date updateTime; + /** + * 下一个节点名字 + */ + @TableField(value = "nextNodeName") + private String nextNodeName; + + /** + * 下一个节点审核类型 + */ + @TableField(value = "nextApprovalNodeType") + private Integer nextApprovalNodeType; + } diff --git a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfigMx.java b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfigMx.java index dbdb1d214..d0a0a17ef 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfigMx.java +++ b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowConfigMx.java @@ -65,4 +65,25 @@ public class SysApprovalFlowConfigMx { @TableField(value = "updateTime") private Date updateTime; + + /** + * 审批节点类型 + */ + @TableField(value = "approvalNodeType") + private Integer approvalNodeType; + + + /** + * 审批岗位序号 + */ + @TableField(value = "approvalPostId") + private String approvalPostId; + + + /** + * 审批岗位名称 + */ + @TableField(value = "approvalPostName") + private String approvalPostName; + } diff --git a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowMx.java b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowMx.java index 4134113c4..91f6584d8 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowMx.java +++ b/src/main/java/com/glxp/api/entity/basic/SysApprovalFlowMx.java @@ -84,4 +84,25 @@ public class SysApprovalFlowMx { @TableField(value = "updateTime") private Date updateTime; + + /** + * 审批节点类型 + */ + @TableField(value = "approvalNodeType") + private Integer approvalNodeType; + + + /** + * 审批岗位序号 + */ + @TableField(value = "approvalPostId") + private String approvalPostId; + + + /** + * 审批岗位名称 + */ + @TableField(value = "approvalPostName") + private String approvalPostName; + } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java index 7ec450165..169cfe362 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderEntity.java @@ -33,6 +33,12 @@ public class DeviceChangeOrderEntity implements Serializable { @TableId(value = "orderId") private Long orderId; + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + /** * add:新增入库，change:变更归属 */ @@ -113,4 +119,10 @@ public class DeviceChangeOrderEntity implements Serializable { */ @TableField(value = "destroyType") private Integer destroyType; + + /** + * 审批表主键 + */ + @TableField(value = "approvalFlowId") + private String approvalFlowId; } diff --git a/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java b/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java index 6c0375c9d..3c25bcde2 100644 --- a/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java +++ b/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java @@ -14,6 +14,7 @@ public enum DeviceChangeStatusEnum { DRAFT("draft", "草稿"), WAIT_CONFIRM("wait_confirm", "待目标部门确认"), REJECT_CONFIRM("reject_confirm", "目标部门拒绝"), + AUDITING("Auditing", "审核中"), FINISH("finish", "已完成"), // 只有type为change才可以取消 CANCEL("cancel", "已取消"), diff --git a/src/main/java/com/glxp/api/req/basic/SysApprovalFlowAddDetailRequest.java b/src/main/java/com/glxp/api/req/basic/SysApprovalFlowAddDetailRequest.java index 653b90983..646019af8 100644 --- a/src/main/java/com/glxp/api/req/basic/SysApprovalFlowAddDetailRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysApprovalFlowAddDetailRequest.java @@ -20,13 +20,13 @@ public class SysApprovalFlowAddDetailRequest { * 审批人主键 */ @TableField(value = "approvalUserId") - @NotEmpty(message = "审批人主键不可以为空！") +// @NotEmpty(message = "审批人主键不可以为空！") private String approvalUserId; /** * 审批人名称 */ @TableField(value = "approvalUserName") - @NotEmpty(message = "审批人名称不可以为空！") +// @NotEmpty(message = "审批人名称不可以为空！") private String approvalUserName; /** @@ -36,4 +36,25 @@ public class SysApprovalFlowAddDetailRequest { @NotNull(message = "排序不可以为空！") private Integer approvalSort; + /** + * 审批节点类型 + */ + @TableField(value = "approvalNodeType") + @NotNull(message = "审批节点类型不可以为空！") + private Integer approvalNodeType; + + /** + * 审批岗位序号 + */ + @TableField(value = "approvalPostId") +// @NotNull(message = "审批岗位序号不可以为空！") + private String approvalPostId; + + /** + * 审批岗位名称 + */ + @TableField(value = "approvalPostName") +// @NotNull(message = "审批岗位名称不可以为空！") + private String approvalPostName; + } diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java index 5aade9ce7..fb430b653 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -5,12 +5,15 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.glxp.api.constant.Constant; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.enums.dev.DeviceChangeStatusEnum; import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import com.glxp.api.exception.JsonException; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.SnowflakeUtil; import lombok.Data; import org.hibernate.validator.constraints.Length; @@ -40,6 +43,12 @@ public class DeviceChangeOrderParam { @NotNull(message = "类型不能为空") DeviceChangeTypeEnum type; + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + /** * 目标部门 */ @@ -548,7 +557,7 @@ public class DeviceChangeOrderParam { public DeviceChangeOrderEntity getOrderEntity(AuthAdmin user) { - if (createUser != null) { + if (billNo != null) { DeviceChangeOrderEntity deviceChangeOrderEntity = new DeviceChangeOrderEntity(); BeanUtil.copyProperties(this, deviceChangeOrderEntity); return deviceChangeOrderEntity; @@ -561,6 +570,7 @@ public class DeviceChangeOrderParam { .deptCode(deptCode) .toDeptCode(toDeptCode) .remark(remark) + .destroyType(destroyType) .createUser(user.getId()) .createUserName(user.getEmployeeName()) .createTime(LocalDateTime.now()) diff --git a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java index fab9d2132..f22c4abee 100644 --- a/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java +++ b/src/main/java/com/glxp/api/service/basic/SysApprovalFlowService.java @@ -16,4 +16,8 @@ public interface SysApprovalFlowService extends IService { List getDetailList(String approvalFlowId); void submitApprovalFlow(SubmitApprovalFlowRequest submitApprovalFlowRequest); + + SysApprovalFlow getApprovalFlowByMxId(String approvalFlowMxId); + + boolean nodePermissions(String id); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java index 6ee8c4074..bb281c673 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/SysApprovalFlowServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.basic.SysApprovalFlowMapper; import com.glxp.api.dao.basic.SysApprovalFlowMxMapper; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.SysApprovalFlow; import com.glxp.api.entity.basic.SysApprovalFlowConfigMx; import com.glxp.api.entity.basic.SysApprovalFlowMx; @@ -64,7 +65,7 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl mxs = new ArrayList<>(); - generateFlowMx(type,approvalFlowId,userId,date,mxs); + generateFlowMx(type,approvalFlowId,userId,date,mxs,sysApprovalFlow); sysApprovalFlowMapper.insert(sysApprovalFlow); sysApprovalFlowMxMapper.insertBatch(mxs); @@ -151,6 +152,43 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); @@ -191,6 +229,7 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl mxs) { + private void generateFlowMx(String type,String approvalFlowId, Long userId, Date date, ArrayList mxs,SysApprovalFlow sysApprovalFlow) { List list = sysApprovalFlowConfigService.getDetailList(type); if (CollectionUtil.isNotEmpty(list)){ + SysApprovalFlowConfigMx sysApprovalFlowConfigMx = list.get(0); + if (sysApprovalFlowConfigMx.getApprovalNodeType() == 1 ){ + sysApprovalFlow.setNextNodeName(sysApprovalFlowConfigMx.getApprovalUserName()); + sysApprovalFlow.setNextApprovalNodeType(1); + }else if (sysApprovalFlowConfigMx.getApprovalNodeType() == 2 ){ + sysApprovalFlow.setNextNodeName(sysApprovalFlowConfigMx.getApprovalPostName()); + sysApprovalFlow.setNextApprovalNodeType(2); + } + list.forEach( item -> { SysApprovalFlowMx sysApprovalFlowMx = new SysApprovalFlowMx(); sysApprovalFlowMx.setId(UUID.randomUUID().toString().replace("-", "")); sysApprovalFlowMx.setApprovalFlowId(approvalFlowId); sysApprovalFlowMx.setApprovalUserId(item.getApprovalUserId()); sysApprovalFlowMx.setApprovalUserName(item.getApprovalUserName()); + sysApprovalFlowMx.setApprovalNodeType(item.getApprovalNodeType()); + sysApprovalFlowMx.setApprovalPostId(item.getApprovalPostId()); + sysApprovalFlowMx.setApprovalPostName(item.getApprovalPostName()); sysApprovalFlowMx.setApprovalStatus(ApprovalStatusEnum.DWSH.getCode()); sysApprovalFlowMx.setApprovalSort(item.getApprovalSort()); @@ -218,6 +269,9 @@ public class SysApprovalFlowServiceImpl extends ServiceImpl listByVo(DeviceChangeOrderQuery query, AuthAdmin user) { @@ -71,6 +88,15 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl orderItems = param.getDraftOrderItemList(order.getOrderId(), user); @@ -83,6 +109,16 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl orderItems = param.getOrderItemList(order.getOrderId(), user); List logs = new ArrayList<>(); + Boolean sys_approval_flow = "1".equals(systemParamConfigService.selectValueByParamKey("sys_approval_flow")); orderItems.forEach(i -> { if (order.getType() == DeviceChangeTypeEnum.ADD) { // UdiRelevanceResponse productInfo = udiRelevanceService.selectByRelId(i.getProductId().toString()); @@ -131,7 +168,7 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl - - - - - - - - - - - - - - - - id, `type`, approvalUserId,approvalUserName, approvalSort, `createUser`, createTime, updateUser, updateTime - - - - - delete from sys_approval_flow_config_mx - where id = #{id,jdbcType=VARCHAR} - - - - insert into sys_approval_flow_config_mx (id, `type`, approvalUserId,approvalUserName, - approvalSort, `createUser`, createTime, - updateUser, updateTime) - values (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR}, #{approvalUserName,jdbcType=VARCHAR}, - #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}) - - - - insert into sys_approval_flow_config_mx - - - id, - - - `type`, - - - approvalUserId, - - - approvalUserName, - - - approvalSort, - - - `createUser`, - - - createTime, - - - updateUser, - - - updateTime, - - - - - #{id,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{approvalUserId,jdbcType=VARCHAR}, - - - #{approvalUserName,jdbcType=VARCHAR}, - - - #{approvalSort,jdbcType=INTEGER}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateUser,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - update sys_approval_flow_config_mx - - - `type` = #{type,jdbcType=VARCHAR}, - - - approvalUserId = #{approvalUserId,jdbcType=VARCHAR}, - - - approvalUserName = #{approvalUserName,jdbcType=VARCHAR}, - - - approvalSort = #{approvalSort,jdbcType=INTEGER}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - createTime = #{createTime,jdbcType=TIMESTAMP}, - - - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=VARCHAR} - - - - update sys_approval_flow_config_mx - set `type` = #{type,jdbcType=VARCHAR}, - approvalUserId = #{approvalUserId,jdbcType=VARCHAR}, - approvalUserName = #{approvalUserName,jdbcType=VARCHAR}, - approvalSort = #{approvalSort,jdbcType=INTEGER}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - updateTime = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=VARCHAR} - - - - update sys_approval_flow_config_mx - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.type,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserId,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalUserName,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.approvalSort,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.createUser,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.updateUser,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP} - - - - where id in - - #{item.id,jdbcType=VARCHAR} - - - - - insert into sys_approval_flow_config_mx - (id, `type`, approvalUserId, approvalUserName, approvalSort, `createUser`, createTime, updateUser, - updateTime) - values - - (#{item.id,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.approvalUserId,jdbcType=VARCHAR}, - #{item.approvalSort,jdbcType=INTEGER}, #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, - #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}) - - - - - insert into sys_approval_flow_config_mx - (id, `type`, approvalUserId,approvalUserName, approvalSort, `createUser`, createTime, updateUser, - updateTime) - values - (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{approvalUserId,jdbcType=VARCHAR},#{approvalUserName,jdbcType=VARCHAR}, - #{approvalSort,jdbcType=INTEGER}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}) - on duplicate key update - id = #{id,jdbcType=VARCHAR}, - `type` = #{type,jdbcType=VARCHAR}, - approvalUserId = #{approvalUserId,jdbcType=VARCHAR}, - approvalUserName = #{approvalUserName,jdbcType=VARCHAR}, - approvalSort = #{approvalSort,jdbcType=INTEGER}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - updateTime = #{updateTime,jdbcType=TIMESTAMP} - - - - insert into sys_approval_flow_config_mx - - - id, - - - `type`, - - - approvalUserId, - - - approvalUserName, - - - approvalSort, - - - `createUser`, - - - createTime, - - - updateUser, - - - updateTime, - - - values - - - #{id,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{approvalUserId,jdbcType=VARCHAR}, - - - #{approvalUserName,jdbcType=VARCHAR}, - - - #{approvalSort,jdbcType=INTEGER}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateUser,jdbcType=VARCHAR}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - on duplicate key update - - - id = #{id,jdbcType=VARCHAR}, - - - `type` = #{type,jdbcType=VARCHAR}, - - - approvalUserId = #{approvalUserId,jdbcType=VARCHAR}, - - - approvalUserName = #{approvalUserName,jdbcType=VARCHAR}, - - - approvalSort = #{approvalSort,jdbcType=INTEGER}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - createTime = #{createTime,jdbcType=TIMESTAMP}, - - - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - - - + diff --git a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml index 2d7e06a0d..e14ec8e35 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml @@ -29,10 +29,12 @@ createUser,createTime