fix:修改开发订单备注接口

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/controller/DevelopmentOrderRemarkController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/development/order/remark")
+    @RequestMapping("/development/order/remark")
 @RequiredArgsConstructor
 public class DevelopmentOrderRemarkController extends BaseController {
 

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/domain/DevelopmentOrderRemark.java

@@ -8,18 +8,18 @@ import java.io.Serializable;
 import java.util.Date;
 
 @Data
-@TableName("fa_template_dev_order_remark")
+@TableName("fa_template_remark")
 public class DevelopmentOrderRemark implements Serializable {
 
-    private Long id;
+    private int id;
 
-    private String remark;
+    private int orderId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTextTime;
+    private int userId;
 
-    private String createTextName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createtime;
 
-    private Long devOrderId;
+    private String content;
 
 }

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/domain/bo/DevelopmentOrderRemarkBo.java

@@ -14,17 +14,17 @@ import java.util.Date;
 @AutoMapper(target = DevelopmentOrderRemark.class)
 public class DevelopmentOrderRemarkBo implements Serializable {
 
-    private Long id;
+    private int id;
 
-    @NotBlank(message = "备注内容不能为空")
-    private String remark;
+    @NotNull(message = "开发订单id不能为空")
+    private int orderId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTextTime;
+    private int userId;
 
-    private String createTextName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createtime;
 
-    @NotNull(message = "订单ID不能为空")
-    private Long devOrderId;
+    @NotBlank(message = "备注内容不能为空")
+    private String content;
 
-}
+}

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/domain/vo/DevelopmentOrderRemarkVo.java

@@ -12,14 +12,15 @@ import java.util.Date;
 @AutoMapper(target = DevelopmentOrderRemark.class)
 public class DevelopmentOrderRemarkVo implements Serializable {
 
-    private Long id;
+    private int id;
 
-    private String remark;
+    private int orderId;
+
+    private int userId;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTextTime;
+    private Date createtime;
 
-    private String createTextName;
+    private String content;
 
-    private Long devOrderId;
 }

ruoyi-modules/ruoyi-developmentManagement/src/main/java/org/dromara/management/service/impl/DevelopmentOrderServiceImpl.java

@@ -92,7 +92,7 @@ public class DevelopmentOrderServiceImpl extends ServiceImpl<DevelopmentOrderMap
         page.getRecords().forEach(item -> {
 //          查询备注
             QueryWrapper<DevelopmentOrderRemark> remarkQueryWrapper = new QueryWrapper<>();
-            remarkQueryWrapper.eq("dev_order_id", item.getId());
+            remarkQueryWrapper.eq("order_id", item.getId());
             List<DevelopmentOrderRemarkVo> developmentOrderRemarkVoList = developmentOrderRemarkMapper.selectVoList(remarkQueryWrapper);
             item.setDevelopmentOrderRemarkVoList(developmentOrderRemarkVoList);
 //          查询日志
@@ -202,9 +202,9 @@ public class DevelopmentOrderServiceImpl extends ServiceImpl<DevelopmentOrderMap
      */
     public int addRemark(DevelopmentOrderRemarkBo developmentOrderBo) {
         DevelopmentOrderRemark developmentOrderRemark = new DevelopmentOrderRemark();
-        developmentOrderRemark.setRemark(developmentOrderBo.getRemark());
-        developmentOrderRemark.setCreateTextName(LoginHelper.getUsername());
-        developmentOrderRemark.setCreateTextTime(new Date());
+        developmentOrderRemark.setContent(developmentOrderBo.getContent());
+        developmentOrderRemark.setUserId(Math.toIntExact(LoginHelper.getUserId()));
+        developmentOrderRemark.setCreatetime(new Date());
         return developmentOrderRemarkMapper.insert(developmentOrderRemark);
     }