diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java index 2d06b3625..15d33219a 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java @@ -10,15 +10,18 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; +import com.glxp.api.req.dev.DeviceChangeOrderGenerateOrderId; import com.glxp.api.req.dev.DeviceChangeOrderParam; import com.glxp.api.req.dev.DeviceChangeOrderQuery; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.dev.DeviceChangeOrderItemService; import com.glxp.api.service.dev.DeviceChangeOrderService; import com.glxp.api.vo.dev.DeviceChangeOrderVo; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Delete; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -32,6 +35,7 @@ import java.util.List; public class DeviceChangeOrderController extends BaseController { private final DeviceChangeOrderService deviceChangeOrderService; + private final DeviceChangeOrderItemService deviceChangeOrderItemService; /** * 变更单列表 @@ -66,6 +70,19 @@ public class DeviceChangeOrderController extends BaseController { return ResultVOUtils.successMsg("添加成功"); } + /** + * 生成订单号 + * + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udi/device/changeOrder/generateOrderId") + public BaseResponse generateOrderId(DeviceChangeOrderGenerateOrderId deviceChangeOrderGenerateOrderId) { + AuthAdmin user = super.getUser(); + String orderId = deviceChangeOrderService.generateOrderId(user,deviceChangeOrderGenerateOrderId); + return ResultVOUtils.success(orderId); + } + /** * 保存变更单 @@ -158,4 +175,54 @@ public class DeviceChangeOrderController extends BaseController { return ResultVOUtils.successMsg("取消成功"); } + /** + * 根据明细id进行删除 + * + * @return + */ + @AuthRuleAnnotation("") + @DeleteMapping("/udi/device/changeOrderItem/del/{deviceCode}") + public BaseResponse delOrderItem(@PathVariable String deviceCode) { + deviceChangeOrderItemService.delOrderItem(deviceCode); + return ResultVOUtils.successMsg("删除成功！"); + } + + + /** + * 录入明细-设备入库 + * + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/changeOrderItem/entry") + public BaseResponse entryOrderItem(@RequestBody @Valid List entitys) { + deviceChangeOrderItemService.entryOrderItem(entitys); + return ResultVOUtils.successMsg("录入成功！"); + } + + + /** + * 录入明细-设备变更 + * + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/changeOrderItem/entryChange") + public BaseResponse entryOrderItemChange(@RequestBody @Valid List entitys) { + deviceChangeOrderItemService.entryOrderItemChange(entitys); + return ResultVOUtils.successMsg("录入成功！"); + } + + /** + * 更新明细 + * + * @return + */ + @AuthRuleAnnotation("") + @PostMapping("/udi/device/changeOrderItem/update") + public BaseResponse updateOrderItem(@RequestBody DeviceChangeOrderItemEntity entity) { + deviceChangeOrderItemService.updateOrderItem(entity); + return ResultVOUtils.successMsg("保存成功！"); + } + } diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java index c9f577353..12526fe40 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceChangeOrderItemEntity.java @@ -2,6 +2,7 @@ package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -318,11 +319,13 @@ public class DeviceChangeOrderItemEntity implements Serializable { * 购置日期 */ @TableField(value = "purchaseDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date purchaseDate; /** * 添加日期 */ @TableField(value = "addDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date addDate; /** @@ -334,12 +337,12 @@ public class DeviceChangeOrderItemEntity implements Serializable { * 是否强检 */ @TableField(value = "isImperative") - private Integer isImperative; + private Boolean isImperative; /** * 是否保养 */ @TableField(value = "isMaintain") - private Integer isMaintain; + private Boolean isMaintain; /** * 检定周期(月） @@ -355,11 +358,13 @@ public class DeviceChangeOrderItemEntity implements Serializable { * 开始检定日期 */ @TableField(value = "startImperativeDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startImperativeDate; /** * 开始保养日期 */ @TableField(value = "startMaintainDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startMaintainDate; /** @@ -423,12 +428,14 @@ public class DeviceChangeOrderItemEntity implements Serializable { * 维保开始日期 */ @TableField(value = "startMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startMaintenancDate; /** * 维保结束日期 */ @TableField(value = "endMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date endMaintenancDate; /** @@ -439,18 +446,18 @@ public class DeviceChangeOrderItemEntity implements Serializable { /** * 使用角色 */ - @TableField(value = "UserRole") - private Integer UserRole; + @TableField(value = "userRole") + private Integer userRole; /** * 是否加域 */ @TableField(value = "isAddDomain") - private Integer isAddDomain; + private Boolean isAddDomain; /** * u盘是否禁用 */ @TableField(value = "isUDisc") - private Integer isUDisc; + private Boolean isUDisc; /** * 设备归类 */ diff --git a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java index 48d865b56..4a11b132d 100644 --- a/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.glxp.api.enums.dev.DeviceStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -432,14 +433,15 @@ public class DeviceInfoEntity implements Serializable { * 购置日期 */ @TableField(value = "purchaseDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date purchaseDate; /** * 添加日期 */ @TableField(value = "addDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date addDate; - /** * 资产品名 */ @@ -449,12 +451,12 @@ public class DeviceInfoEntity implements Serializable { * 是否强检 */ @TableField(value = "isImperative") - private Integer isImperative; + private Boolean isImperative; /** * 是否保养 */ @TableField(value = "isMaintain") - private Integer isMaintain; + private Boolean isMaintain; /** * 检定周期(月） @@ -470,11 +472,13 @@ public class DeviceInfoEntity implements Serializable { * 开始检定日期 */ @TableField(value = "startImperativeDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startImperativeDate; /** * 开始保养日期 */ @TableField(value = "startMaintainDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startMaintainDate; /** @@ -538,12 +542,14 @@ public class DeviceInfoEntity implements Serializable { * 维保开始日期 */ @TableField(value = "startMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date startMaintenancDate; /** * 维保结束日期 */ @TableField(value = "endMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date endMaintenancDate; /** @@ -554,18 +560,18 @@ public class DeviceInfoEntity implements Serializable { /** * 使用角色 */ - @TableField(value = "UserRole") - private Integer UserRole; + @TableField(value = "userRole") + private Integer userRole; /** * 是否加域 */ @TableField(value = "isAddDomain") - private Integer isAddDomain; + private Boolean isAddDomain; /** * u盘是否禁用 */ @TableField(value = "isUDisc") - private Integer isUDisc; + private Boolean isUDisc; /** * 设备归类 */ 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 930353784..6c0375c9d 100644 --- a/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java +++ b/src/main/java/com/glxp/api/enums/dev/DeviceChangeStatusEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum DeviceChangeStatusEnum { + TEMP("temp", "临时"), DRAFT("draft", "草稿"), WAIT_CONFIRM("wait_confirm", "待目标部门确认"), REJECT_CONFIRM("reject_confirm", "目标部门拒绝"), diff --git a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java new file mode 100644 index 000000000..65e81f33b --- /dev/null +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderGenerateOrderId.java @@ -0,0 +1,28 @@ +package com.glxp.api.req.dev; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.enums.dev.DeviceChangeTypeEnum; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +public class DeviceChangeOrderGenerateOrderId { + + /** + * 部门编码 + */ + @TableField(value = "deptCode") + @NotEmpty(message = "操作部门不能为空！") + private String deptCode; + + /** + * 部门编码 + */ + @TableField(value = "toDeptCode") + private String toDeptCode; + + @NotNull(message = "类型不能为空") + private DeviceChangeTypeEnum type; +} 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 7e383a4bd..c87b3e847 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceChangeOrderParam.java @@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; 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.entity.auth.AuthAdmin; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; @@ -362,13 +363,156 @@ public class DeviceChangeOrderParam { * 购置日期 */ @TableField(value = "purchaseDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date purchaseDate; /** * 添加日期 */ @TableField(value = "addDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date addDate; + /** + * 资产品名 + */ + @TableField(value = "assetName") + private String assetName; + /** + * 是否强检 + */ + @TableField(value = "isImperative") + private Boolean isImperative; + /** + * 是否保养 + */ + @TableField(value = "isMaintain") + private Boolean isMaintain; + + /** + * 检定周期(月） + */ + @TableField(value = "imperativeCycle") + private Integer imperativeCycle; + /** + * 保养周期(月） + */ + @TableField(value = "maintainCycle") + private Integer maintainCycle; + /** + * 开始检定日期 + */ + @TableField(value = "startImperativeDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startImperativeDate; + /** + * 开始保养日期 + */ + @TableField(value = "startMaintainDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintainDate; + + /** + * 维修组 + */ + @TableField(value = "serviceType") + private String serviceType; + /** + * 保养组 + */ + @TableField(value = "maintainType") + private String maintainType; + /** + * 管理人 + */ + @TableField(value = "managerUser") + private String managerUser; + /** + * 审核人 + */ + @TableField(value = "approveUser") + private String approveUser; + + /** + * 对应会计科目 + */ + @TableField(value = "ledgerAccount") + private String ledgerAccount; + + /** + * 减值准备 + */ + @TableField(value = "impairmentProvision") + private String impairmentProvision; + + /** + * 预计工作量 + */ + @TableField(value = "estimatedWorkload") + private String estimatedWorkload; + + /** + * 已完成工作量 + */ + @TableField(value = "completedWorkload") + private String completedWorkload; + + /** + * 维保类型 + */ + @TableField(value = "maintenanceType") + private String maintenanceType; + + /** + * 维保周期 + */ + @TableField(value = "maintenanceCycle") + private Integer maintenanceCycle; + + /** + * 维保开始日期 + */ + @TableField(value = "startMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date startMaintenancDate; + + /** + * 维保结束日期 + */ + @TableField(value = "endMaintenancDate") + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date endMaintenancDate; + + /** + * 内外网 + */ + @TableField(value = "networkType") + private Integer networkType; + /** + * 使用角色 + */ + @TableField(value = "userRole") + private Integer userRole; + /** + * 是否加域 + */ + @TableField(value = "isAddDomain") + private Boolean isAddDomain; + /** + * u盘是否禁用 + */ + @TableField(value = "isUDisc") + private Boolean isUDisc; + /** + * 设备归类 + */ + @TableField(value = "ascriptionType") + private Integer ascriptionType; + /** + * 资产备用类型 + */ + @TableField(value = "assetReserveType") + private String assetReserveType; + } public void valid(AuthAdmin user) { diff --git a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java index ac8eb932a..ee931d728 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderItemService.java @@ -13,4 +13,13 @@ public interface DeviceChangeOrderItemService extends IService ListByOrderId(Long orderId); boolean deleteByOrderId(Long orderId); + + boolean delOrderItem(String deviceCode); + + boolean entryOrderItem(List entitys); + + + boolean updateOrderItem(DeviceChangeOrderItemEntity entity); + + boolean entryOrderItemChange(List entitys); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java index 7bf8c4825..55135392f 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceChangeOrderService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.dev.DeviceChangeOrderEntity; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; +import com.glxp.api.req.dev.DeviceChangeOrderGenerateOrderId; import com.glxp.api.req.dev.DeviceChangeOrderParam; import com.glxp.api.req.dev.DeviceChangeOrderQuery; import com.glxp.api.req.system.DeleteRequest; @@ -53,4 +54,6 @@ public interface DeviceChangeOrderService extends IService detailByUser(AuthAdmin user, DeviceChangeOrderDetailQuery query); void cancel(AuthAdmin user, Long orderId, String remark); + + String generateOrderId(AuthAdmin user, DeviceChangeOrderGenerateOrderId deviceChangeOrderGenerateOrderId); } diff --git a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java index 012cb94e9..dffc22687 100644 --- a/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInfoService.java @@ -99,4 +99,6 @@ public interface DeviceInfoService extends IService { List listVoByCodes(List deviceCodes, String deptCode, DeviceStatusEnum status); boolean exitOrder(Long orderId, String deviceCode); + + String genDeviceCode(); } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java index 26e03bc5c..a3a15f5b1 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderItemServiceImpl.java @@ -1,22 +1,30 @@ package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.service.dev.DeviceChangeOrderItemService; import com.glxp.api.dao.dev.DeviceChangeOrderItemMapper; +import com.glxp.api.service.dev.DeviceInfoService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.List; /** * 针对表【device_change_order_item(设备变更单明细)】的数据库操作Service实现 */ @Service +@Transactional(rollbackFor = Exception.class) public class DeviceChangeOrderItemServiceImpl extends ServiceImpl implements DeviceChangeOrderItemService { + @Resource + private DeviceInfoService deviceInfoService; + @Override public List ListByOrderId(Long orderId) { return super.list(Wrappers.lambdaQuery(DeviceChangeOrderItemEntity.class) @@ -28,6 +36,33 @@ public class DeviceChangeOrderItemServiceImpl extends ServiceImpl().eq("orderId", orderId)); } + + @Override + public boolean delOrderItem(String deviceCode) { + return super.remove(new QueryWrapper().eq("deviceCode", deviceCode)); + } + + @Override + public boolean entryOrderItem(List entitys) { + entitys.forEach(i -> { + i.setDeviceCode(deviceInfoService.genDeviceCode()); + }); + return super.saveBatch(entitys); + } + + @Override + public boolean updateOrderItem(DeviceChangeOrderItemEntity entity) { + UpdateWrapper uw = new UpdateWrapper<>(); + uw.eq("deviceCode",entity.getDeviceCode()); + return super.update(entity,uw); + } + + @Override + public boolean entryOrderItemChange(List entitys) { + return super.saveBatch(entitys); + } + + } diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java index 4e0a2dce7..4dc5e86ad 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; +import com.glxp.api.req.dev.DeviceChangeOrderGenerateOrderId; import com.glxp.api.req.dev.DeviceChangeOrderParam; import com.glxp.api.req.dev.DeviceChangeOrderQuery; import com.glxp.api.req.system.DeleteRequest; @@ -33,6 +34,7 @@ import com.glxp.api.service.dev.DeviceChangeOrderService; import com.glxp.api.dao.dev.DeviceChangeOrderMapper; import com.glxp.api.service.dev.DeviceInfoService; import com.glxp.api.util.SnowflakeUtil; +import com.glxp.api.util.StringUtils; import com.glxp.api.vo.dev.DeviceChangeOrderVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -258,6 +260,35 @@ public class DeviceChangeOrderServiceImpl extends ServiceImpl().eq("deviceCode", deviceCode).ne("lastChangeOrderId", orderId)); } + + @Override + public String genDeviceCode() { + String deviceCode = ""; + DeviceInfoEntity deviceInfo = null; + do { + deviceCode = "S" + RandomUtil.randomNumbers(10); + deviceInfo = super.getById(deviceCode); + } while (deviceInfo != null); + return deviceCode; + } } diff --git a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml index d75d004db..2d7e06a0d 100644 --- a/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceChangeOrderMapper.xml @@ -34,6 +34,7 @@ (select name from auth_dept where code = o.toDeptCode) toDeptName from device_change_order o + and o.status != 'temp' and (o.deptCode = #{user.locDeptCode} or o.toDeptCode = #{user.locDeptCode}) and o.orderId like concat('%', #{param.changeOrderId},'%') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index fc72b2209..2856e1256 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2290,7 +2290,7 @@ CALL Pro_Temp_ColumnWork('device_change_order_item', 'addDate', CALL Pro_Temp_ColumnWork('device_change_order_item', 'assetName', ' varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''资产品名''', 1); -CALL Pro_Temp_ColumnWork('device_change_order_item', 'isMaintain', +CALL Pro_Temp_ColumnWork('device_change_order_item', 'isImperative', ' bigint DEFAULT NULL COMMENT ''是否强检''', 1); CALL Pro_Temp_ColumnWork('device_change_order_item', 'isMaintain', @@ -2347,8 +2347,8 @@ CALL Pro_Temp_ColumnWork('device_change_order_item', 'endMaintenancDate', CALL Pro_Temp_ColumnWork('device_change_order_item', 'networkType', ' bigint DEFAULT NULL COMMENT ''内外网''', 1); -CALL Pro_Temp_ColumnWork('device_change_order_item', 'UserRole', - ' bigint DEFAULT NULL COMMENT ''使用者''', +CALL Pro_Temp_ColumnWork('device_change_order_item', 'userRole', + ' bigint DEFAULT NULL COMMENT ''使用角色''', 1); CALL Pro_Temp_ColumnWork('device_change_order_item', 'isAddDomain', ' bigint DEFAULT NULL COMMENT ''是否加域''', @@ -2425,7 +2425,7 @@ CALL Pro_Temp_ColumnWork('device_info', 'endMaintenancDate', CALL Pro_Temp_ColumnWork('device_info', 'networkType', ' bigint DEFAULT NULL COMMENT ''内外网''', 1); -CALL Pro_Temp_ColumnWork('device_info', 'UserRole', +CALL Pro_Temp_ColumnWork('device_info', 'userRole', ' bigint DEFAULT NULL COMMENT ''使用角色''', 1); CALL Pro_Temp_ColumnWork('device_info', 'isAddDomain',