diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
index 7d752056..f7fc0302 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -1,177 +1,177 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
index 0f993131..57cee337 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -1,180 +1,184 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
index 98ac4fa5..99e89a76 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -39,6 +39,10 @@
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 6bc641cd..edce78c5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -207,9 +207,17 @@
title: "序号",
formatter: function (value, row, index) {
// var columnIndex = $.common.sprintf("", $.table.serialNumber(index));
- //var html = $.common.sprintf("", index, value);
var html = $.common.sprintf("", index, value);
- return html+$.table.serialNumber(index);
+ return $.table.serialNumber(index);
+ }
+ },
+ {
+ field: 'id',
+ align: 'center',
+ title: "id",
+ formatter: function (value, row, index) {
+ var html = $.common.sprintf("", index, value);
+ return html;
}
},
{
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
index 65968259..5d99107e 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/MaintenanceController.java
@@ -1,12 +1,19 @@
package com.ruoyi.sip.controller;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+import com.ruoyi.sip.service.IMaintenanceService;
import com.ruoyi.sip.service.IOrderDeliveryService;
+import com.ruoyi.sip.service.IOrderInfoService;
+import com.ruoyi.sip.service.IProductInfoService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
/**
* @author : ch
@@ -27,10 +34,41 @@ public class MaintenanceController {
private String prefix = "manage/service";
+ @Autowired
+ private IMaintenanceService service;
+ @Autowired
+ private IProductInfoService productInfoService;
+ @Autowired
+ private IOrderInfoService orderInfoService;
+ @Anonymous
@GetMapping()
public String service()
{
return prefix + "/service";
}
+
+
+ @GetMapping("/query")
+ @ResponseBody
+ @Anonymous
+ public AjaxResult query(MaintenanceRecordsDto dto)
+ {
+ return AjaxResult.success(service.query(dto));
+ }
+ @GetMapping("/product")
+ @ResponseBody
+ @Anonymous
+ public AjaxResult product(MaintenanceRecordsDto dto)
+ {
+ return AjaxResult.success(productInfoService.query(dto));
+ }
+ @GetMapping("/order")
+ @ResponseBody
+ @Anonymous
+ public AjaxResult order(MaintenanceRecordsDto dto)
+ {
+ return AjaxResult.success(orderInfoService.selectOrderInfoByMaintenance(dto));
+ }
+
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
new file mode 100644
index 00000000..ca6c49b5
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/MaintenanceRecord.java
@@ -0,0 +1,27 @@
+package com.ruoyi.sip.domain;
+
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : ch
+ * @version : 1.0
+ * @ClassName : MaintenanceRecordsDto
+ * @Description :
+ * @DATE : Created in 17:50 2025/4/22
+ * Copyright: Copyright(c) 2025
+ * Company : 紫光汇智信息技术有限公司
+ * Modification History:
+ * Date Author Version Discription
+ * --------------------------------------------------------------------------
+ * 2025/04/22 ch 1.0 Why & What is modified: <修改原因描述> *
+ */
+@Data
+public class MaintenanceRecord {
+ //开始时间
+ private Date startDate;
+
+
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
index e9b86544..77a1d04a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java
@@ -2,6 +2,8 @@ package com.ruoyi.sip.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,6 +15,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author mula
* @date 2025-04-11
*/
+@Data
+@EqualsAndHashCode(callSuper = false)
public class ProductInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -46,99 +50,6 @@ public class ProductInfo extends BaseEntity
/** 删除时间 */
private Date deletedAt;
+ private String serialNumber;
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setProductCode(String productCode)
- {
- this.productCode = productCode;
- }
-
- public String getProductCode()
- {
- return productCode;
- }
-
- public void setProductName(String productName)
- {
- this.productName = productName;
- }
-
- public String getProductName()
- {
- return productName;
- }
-
- public void setModel(String model)
- {
- this.model = model;
- }
-
- public String getModel()
- {
- return model;
- }
-
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setCreatedAt(Date createdAt)
- {
- this.createdAt = createdAt;
- }
-
- public Date getCreatedAt()
- {
- return createdAt;
- }
-
- public void setUpdatedAt(Date updatedAt)
- {
- this.updatedAt = updatedAt;
- }
-
- public Date getUpdatedAt()
- {
- return updatedAt;
- }
-
- public void setDeletedAt(Date deletedAt)
- {
- this.deletedAt = deletedAt;
- }
-
- public Date getDeletedAt()
- {
- return deletedAt;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("productCode", getProductCode())
- .append("productName", getProductName())
- .append("model", getModel())
- .append("description", getDescription())
- .append("remark", getRemark())
- .append("createdAt", getCreatedAt())
- .append("updatedAt", getUpdatedAt())
- .append("deletedAt", getDeletedAt())
- .toString();
- }
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java
new file mode 100644
index 00000000..a90a2b00
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/MaintenanceMapper.java
@@ -0,0 +1,8 @@
+package com.ruoyi.sip.mapper;
+
+import com.ruoyi.sip.domain.MaintenanceRecord;
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+
+public interface MaintenanceMapper {
+ MaintenanceRecord query(MaintenanceRecordsDto dto);
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java
new file mode 100644
index 00000000..b64d11c5
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IMaintenanceService.java
@@ -0,0 +1,8 @@
+package com.ruoyi.sip.service;
+
+import com.ruoyi.sip.domain.MaintenanceRecord;
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+
+public interface IMaintenanceService {
+ MaintenanceRecord query(MaintenanceRecordsDto dto);
+}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java
new file mode 100644
index 00000000..de7def6d
--- /dev/null
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/MaintenanceServiceImpl.java
@@ -0,0 +1,38 @@
+package com.ruoyi.sip.service.impl;
+
+
+import com.ruoyi.sip.domain.MaintenanceRecord;
+import com.ruoyi.sip.domain.MaintenanceRecordsDto;
+import com.ruoyi.sip.mapper.MaintenanceMapper;
+import com.ruoyi.sip.service.IMaintenanceService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author : ch
+ * @version : 1.0
+ * @ClassName : MaintenanceServiceImpl
+ * @Description :
+ * @DATE : Created in 17:36 2025/4/23
+ * Copyright: Copyright(c) 2025
+ * Company : 紫光汇智信息技术有限公司
+ * Modification History:
+ * Date Author Version Discription
+ * --------------------------------------------------------------------------
+ * 2025/04/23 ch 1.0 Why & What is modified: <修改原因描述> *
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class MaintenanceServiceImpl implements IMaintenanceService {
+
+ @Resource
+ private MaintenanceMapper mapper;
+
+
+ @Override
+ public MaintenanceRecord query(MaintenanceRecordsDto dto) {
+ return mapper.query(dto);
+ }
+}
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
new file mode 100644
index 00000000..d7c5de73
--- /dev/null
+++ b/ruoyi-sip/src/main/resources/mapper/manage/MaintenanceMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index 8608c714..9703edc9 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -221,9 +221,9 @@
update order_list
- quantity = #{item.quantity},
+ quantity = #{item.quantity},
amount = #{item.amount},
- remark = #{item.remark},
+ remark = #{item.remark},
updated_at = NOW(),
where id = #{item.id}
diff --git a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
index 9bb15e4c..d248a4e0 100644
--- a/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/system/ProductInfoMapper.xml
@@ -43,13 +43,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"