فهرست منبع

feat:"维护记录查询增加用户ID字段"

soobin 2 ماه پیش
والد
کامیت
019ad67935

+ 14 - 1
src/main/java/com/szwl/controller/MaintenanceRecordController.java

@@ -21,10 +21,12 @@ import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.MaintenanceRecord;
 import com.szwl.model.entity.ReturnCoinRecord;
 import com.szwl.model.entity.TAdmin;
+import com.szwl.model.entity.TEquipment;
 import com.szwl.model.param.MaintenanceRecordParm;
 import com.szwl.model.param.ReturnCoinParam;
 import com.szwl.service.MaintenanceRecordService;
 import com.szwl.service.TAdminService;
+import com.szwl.service.TEquipmentService;
 import com.szwl.util.IDGenerator;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +59,10 @@ public class MaintenanceRecordController {
     @Autowired
     private MaintenanceRecordService maintenanceRecordService;
 
+
+    @Autowired
+    private TEquipmentService equipmentService;
+
     @Autowired
     private TAdminService adminService;
 
@@ -74,8 +80,15 @@ public class MaintenanceRecordController {
             return R.fail(ResponseCodesEnum.A0001,  "工号不存在");
         }
         if (admin.getType() != 3) {
-            return R.fail(ResponseCodesEnum.A0002,"工号类型错误");
+            return R.fail(ResponseCodesEnum.A0001,"工号类型错误");
+        }
+        LambdaQueryWrapper<TEquipment> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(TEquipment::getClientId, maintenanceRecord.getClientId());
+        TEquipment equipment = equipmentService.getOne(queryWrapper);
+        if (equipment == null) {
+            return R.fail(ResponseCodesEnum.A0002, "设备不存在");
         }
+        maintenanceRecord.setAdminId(equipment.getAdminId());
         maintenanceRecordService.save(maintenanceRecord);
         return R.ok();
     }

+ 1 - 1
src/main/java/com/szwl/mapper/MaintenanceRecordMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2025-05-23
+ * @since 2025-06-03
  */
 public interface MaintenanceRecordMapper extends BaseMapper<MaintenanceRecord> {
 

+ 2 - 1
src/main/java/com/szwl/mapper/xml/MaintenanceRecordMapper.xml

@@ -7,6 +7,7 @@
         <id column="id" property="id" />
         <result column="create_date" property="createDate" />
         <result column="client_id" property="clientId" />
+        <result column="admin_id" property="adminId" />
         <result column="manager_id" property="managerId" />
         <result column="name" property="name" />
         <result column="type" property="type" />
@@ -20,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, client_id, manager_id, name, type, start_time, end_time, consumption, description, pic, status
+        id, create_date, client_id, admin_id, manager_id, name, type, start_time, end_time, consumption, description, pic, status
     </sql>
 
 </mapper>

+ 4 - 1
src/main/java/com/szwl/model/entity/MaintenanceRecord.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2025-05-23
+ * @since 2025-06-03
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -34,6 +34,9 @@ public class MaintenanceRecord implements Serializable {
     @ApiModelProperty(value = "设备编号")
     private String clientId;
 
+    @ApiModelProperty(value = "用户ID")
+    private Long adminId;
+
     @ApiModelProperty(value = "维护人员工号(系统ID)")
     private String managerId;
 

+ 1 - 1
src/main/java/com/szwl/service/MaintenanceRecordService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author wuhs
- * @since 2025-05-23
+ * @since 2025-06-03
  */
 public interface MaintenanceRecordService extends IService<MaintenanceRecord> {
 

+ 1 - 1
src/main/java/com/szwl/service/impl/MaintenanceRecordServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author wuhs
- * @since 2025-05-23
+ * @since 2025-06-03
  */
 @Service
 public class MaintenanceRecordServiceImpl extends ServiceImpl<MaintenanceRecordMapper, MaintenanceRecord> implements MaintenanceRecordService {