feat: 0517优化

src/main/java/com/glxp/api/entity/dev/DeviceRepairEntity.java

@@ -73,6 +73,13 @@ public class DeviceRepairEntity {
      */
     @TableField(value = "repairUserName")
     private String repairUserName;
+
+    /**
+     * 维修人姓名
+     */
+    @TableField(value = "repairUserId")
+    private Long repairUserId;
+
     /**
      * 维修部门
      */

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java

@@ -26,6 +26,8 @@ public class DeviceRepairApplyDetailDiagnosisParam {
 
     Boolean innerFlag;
 
+    Long repairUserId;
+
     String repairUserName;
 
     String repairDeptCode;

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairApplyDetailServiceImpl.java

@@ -98,7 +98,10 @@ public class DeviceRepairApplyDetailServiceImpl extends ServiceImpl<DeviceRepair
                     .setCreateUserId(user.getId()).setCreateUserName(user.getEmployeeName())
                     .setCreateDeptCode(user.getLocDeptCode()).setCreateDeptName(user.getDeptName())
                     .setCreateTime(now).setDiagnosisInfo(param.getDiagnosisInfo()).setInnerFlag(param.getInnerFlag())
-                    .setRepairUserName(param.getRepairUserName()).setRepairUserPhone(param.getRepairUserPhone()).setRepairDeptCode(param.getRepairDeptCode())
+                    .setRepairUserName(param.getRepairUserName())
+                    .setRepairUserId(param.getRepairUserId())
+                    .setRepairUserPhone(param.getRepairUserPhone()).
+                    setRepairDeptCode(param.getRepairDeptCode())
                     .setDiagnosisLivePath(param.getDiagnosisLivePath())
             ;
             deviceRepairService.createRepair(repairEntity);

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java

@@ -42,7 +42,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
             PageHelper.startPage(query.getPage(), query.getLimit());
         }
         List<DeviceRepairEntity> list = super.list(Wrappers.lambdaQuery(DeviceRepairEntity.class)
-                .eq(DeviceRepairEntity::getCreateUserId, query.getCreateUserId())
+                .eq(DeviceRepairEntity::getRepairUserId, query.getCreateUserId())
                 .eq(query.getIsFinish() != null, DeviceRepairEntity::getFinishFlag, query.getIsFinish())
                 .eq(StrUtil.isNotBlank(query.getDeviceCode()), DeviceRepairEntity::getDeviceCode, query.getDeviceCode())
                 .orderByAsc(DeviceRepairEntity::getFinishFlag)

src/main/resources/schemas/schema_v2.4.sql

@@ -3389,3 +3389,7 @@ CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'diagnosisLivePath',
 INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394116, 'DECPSG', '设备产品申购', NULL, 2, 1, NULL, '1', NULL, '2023-11-14 18:14:44', NULL, 2, 3, 'DECGJH', NULL, NULL);
 INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, '1', NULL, '2023-11-14 18:14:34', NULL, 2, 1, 'DECGDD', NULL, NULL);
 INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`, `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`, `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`) VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL, NULL, NULL);
+
+CALL Pro_Temp_ColumnWork('device_repair', 'repairUserId', 'bigint DEFAULT NULL COMMENT''报修人id''', 1);
+
+