From b073520b3d245cf48a8bc0558e934baeb110c709 Mon Sep 17 00:00:00 2001
From: haotianmingyue <2421912570@qq.com>
Date: Tue, 24 Dec 2024 16:38:41 +0800
Subject: [PATCH] =?UTF-8?q?app=E5=90=8E=E5=8F=B0--=E6=88=91=E7=9A=84--?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90--=E6=9F=A5=E7=9C=8B=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppSystemController.java   | 42 +++++++++++++++++++
 .../ruoyi/system/domain/dto/OrderInfoDto.java | 11 +++++
 .../ruoyi/system/domain/dto/OrderListDto.java | 14 +++++++
 .../ruoyi/system/mapper/UserWorkMapper.java   |  4 ++
 .../system/service/IUserWorkService.java      |  6 +++
 .../service/impl/UserWorkServiceImpl.java     |  5 +++
 .../mapper/system/OrderInfoMapper.xml         |  3 +-
 .../mapper/system/SysOrderMapper.xml          |  3 +-
 .../mapper/system/UserWorkMapper.xml          |  7 ++++
 ruoyi-ui/vue.config.js                        |  2 +-
 10 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index e054302a..bdc24fe5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1105,6 +1105,48 @@ public class AppSystemController extends BaseController {
         return getDataTable(orderListDtoList);
     }
 
+    // 查看个人作品---所有不是草稿的作品
+    @GetMapping("/getUserPublishWorkList")
+    public TableDataInfo getUserPublishWorkList() {
+
+
+        // 获取所有 work_status != "0" 的作品
+        startPage();
+        List<UserWork> userWorkList = userWorkService.selectUserPublishWorkList(getUserId());
+        return getDataTable(userWorkList);
+
+    }
+
+    // 查看个人作品---草稿作品
+    @GetMapping("/getUserDraftWorkList")
+    public TableDataInfo getUserDraftWorkList() {
+
+        UserWork userWork = new UserWork();
+
+        userWork.setWorkStatus("0");
+        userWork.setUserId(getUserId());
+
+        // 获取所有 work_status = "0" 的作品
+        startPage();
+        List<UserWork> userWorkList = userWorkService.selectUserWorkList(userWork);
+
+        return getDataTable(userWorkList);
+
+    }
+
+    // 查看个人作品详情
+    @GetMapping("/getUserWork/{workId}")
+    public AjaxResult getUserWork(@PathVariable("workId") Long workId) {
+
+        UserWork userWork = userWorkService.selectUserWorkByWorkId(workId);
+
+
+
+
+        return AjaxResult.success(userWork);
+
+    }
+
 
     // 获取系统资源位列表, 附带搜索功能
     @GetMapping("/getAllSource")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
index c4e2527a..2a9409f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
@@ -25,6 +25,9 @@ public class OrderInfoDto {
 
     private String workDetail;
 
+    // 作品状态
+    private String workStatus;
+
     private String city;
     private String scenic;
     private String part;
@@ -202,5 +205,13 @@ public class OrderInfoDto {
 		this.orderId = orderId;
 	}
 
+    public String getWorkStatus() {
+		return workStatus;
+	}
+
+    public void setWorkStatus(String workStatus) {
+		this.workStatus = workStatus;
+	}
+
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
index 99e2234e..982077aa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderListDto.java
@@ -26,12 +26,18 @@ public class OrderListDto {
     private String way;
     private String orderDetail;
 
+    // 订单状态
     private String status;
 
+    // 作品状态
+    private String workStatus;
+
     private String avatar;
 
     private List<OrderInfoDto> orderInfoList;
 
+
+
     public Long getOrderId() {
         return orderId;
     }
@@ -153,6 +159,14 @@ public class OrderListDto {
 		this.avatar = avatar;
 	}
 
+    public String getWorkStatus() {
+		return workStatus;
+	}
+
+    public void setWorkStatus(String workStatus) {
+		this.workStatus = workStatus;
+	}
+
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java
index 084b9a63..1645eb96 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserWorkMapper.java
@@ -30,6 +30,10 @@ public interface UserWorkMapper
      */
     public List<UserWork> selectUserWorkList(UserWork userWork);
 
+
+    public List<UserWork> selectUserPublishWorkList(Long userId);
+
+
     /**
      * 新增用户作品
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java
index aca43b6b..55786464 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserWorkService.java
@@ -29,6 +29,12 @@ public interface IUserWorkService
      */
     public List<UserWork> selectUserWorkList(UserWork userWork);
 
+    /*
+    * 获取所有不是草稿的作品
+    * */
+    public List<UserWork> selectUserPublishWorkList(Long userId);
+
+
     /**
      * 新增用户作品
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java
index b457a3af..1cc94641 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserWorkServiceImpl.java
@@ -46,6 +46,11 @@ public class UserWorkServiceImpl implements IUserWorkService
         return userWorkMapper.selectUserWorkList(userWork);
     }
 
+    @Override
+    public List<UserWork> selectUserPublishWorkList(Long userId){
+        return userWorkMapper.selectUserPublishWorkList(userId);
+    }
+
     /**
      * 新增用户作品
      * 
diff --git a/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml
index 77273d9a..37415914 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OrderInfoMapper.xml
@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workDetail" column="detail"/>
         <result property="workName" column="work_name"/>
         <result property="workAddress" column="work_address"/>
+        <result property="workStatus" column="work_status" />
         <result property="userId" column="user_id" />
         <result property="coordinate" column="coordinate" />
         <result property="refundTime" column="refund_time"/>
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getOrderInfoDtoList" resultMap="OrderInfoDtoResult" >
 
-        select o.order_info_id, o.source_id, o.work_id, s.city, s.scenic, s.part,w.work_name ,w.detail, w.work_address, o.status, w.user_id, s.coordinate, o.refund_time, o.id
+        select o.order_info_id, o.source_id, o.work_id, s.city, s.scenic, s.part,w.work_name ,w.detail, w.work_address,w.work_status, o.status, w.user_id, s.coordinate, o.refund_time, o.id
         from order_info o
         left join sys_source s on o.source_id = s.source_id
         left join user_work w on o.work_id = w.work_id
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
index 68d66b9e..e6d3d4ce 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysOrderMapper.xml
@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workAddress" column="work_address"/>
         <result property="coordinate" column="coordinate" />
         <result property="refundTime" column="refund_time"/>
+<!--        <result property="workS"-->
         <result property="id" column="id"/>
 
     </resultMap>
@@ -96,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select count(*) from sys_order where  source_id = #{sourceId} and #{endTime} >= sys_order.start_time and sys_order.end_time >= #{startTime}
     </select>
     <select id="getOrderListDto" resultMap="OrderListDtoResult">
-           select o.order_id, o.user_id, o.source_id, o.create_time, o.start_time, o.end_time, o.order_info_id, o.money, o.way, o.detail, o.status, o.refund, u.nick_name, u.phonenumber, u.avatar
+           select o.order_id, o.user_id, o.source_id, o.create_time, o.start_time, o.end_time, o.order_info_id, o.money, o.way, o.detail, o.status , o.refund, u.nick_name, u.phonenumber, u.avatar
            from  sys_order o
            left join  sys_user u
            on o.user_id = u.user_id
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml
index 15013e47..cd90e949 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserWorkMapper.xml
@@ -176,5 +176,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
+    </select>
+    <select id="selectUserPublishWorkList" resultMap="UserWorkResult" parameterType="Long">
+
+        select *
+        from user_work
+        where work_status != "0" and user_id = #{userId}
+
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 33e9fee0..2bbfba43 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:8081`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''