修改删除接口走通

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Common.java

@@ -1,5 +1,5 @@
 package com.siwei.apply.common;
 
 public class Common {
-    public static String UserId = "userId"; // 用户ID
+    public static String UserId = "123456789"; // 用户ID
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ProjectController.java

@@ -2,6 +2,7 @@ package com.siwei.apply.controller;
 
 import com.siwei.apply.domain.Project;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
+import com.siwei.apply.domain.vo.ProjectUpdateVo;
 import com.siwei.apply.domain.vo.ProjectVo;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
@@ -72,4 +73,36 @@ public class ProjectController extends BaseController {
             return R.fail(e.getMessage());
         }
     }
+
+    /**
+     * 更新项目
+     *
+     * @param projectUpdateVo
+     * @return
+     */
+    @PutMapping("")
+    public R<Map> UpdateProject(@RequestBody ProjectUpdateVo projectUpdateVo) {
+        try {
+            projectService.updateProject(projectUpdateVo);
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
+
+    /**
+     * 删除项目
+     *
+     * @param projectId
+     * @return
+     */
+    @DeleteMapping("/{projectId}")
+    public R<Map> DeleteProject(@PathVariable String projectId) {
+        try {
+            projectService.deleteProject(projectId);
+            return R.ok();
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+    }
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Project.java

@@ -1,5 +1,6 @@
 package com.siwei.apply.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.siwei.common.core.web.domain.BaseSridEntity;
 import lombok.Data;
 
@@ -18,7 +19,10 @@ public class Project {
     private String name;
     private String code;
     private String company;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createAt;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateAt;
     private String projectType;
     private String creatorId;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/ProjectService.java

@@ -43,7 +43,7 @@ public interface ProjectService {
      * @param projectUpdateVo
      * @return
      */
-    String updateProject(ProjectUpdateVo projectUpdateVo);
+    void updateProject(ProjectUpdateVo projectUpdateVo);
 
     /**
      * 删除项目
@@ -51,5 +51,5 @@ public interface ProjectService {
      * @param projectId
      * @return
      */
-    String deleteProject(String projectId);
+    void deleteProject(String projectId);
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -52,12 +52,15 @@ public class ProjectImpl implements ProjectService {
 
 
     @Override
-    public String updateProject(ProjectUpdateVo projectUpdateVo) {
-        return "";
+    public void updateProject(ProjectUpdateVo projectUpdateVo) {
+        projectMapper.updateProject(projectUpdateVo);
     }
 
     @Override
-    public String deleteProject(String projectId) {
-        return "";
+    public void deleteProject(String projectId) {
+        if (projectId == null || projectId.isEmpty()) {
+            throw new IllegalArgumentException("Project ID cannot be null or empty");
+        }
+        projectMapper.deleteProject(projectId);
     }
 }

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -27,7 +27,7 @@
         where t_project.id = #{projectId}
     </select>
 
-    <select id="getProjectList" parameterType="com.siwei.apply.domain.Project">
+    <select id="getProjectList" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo" resultMap="projectMap">
         SELECT *
         FROM t_project
         <where>
@@ -41,10 +41,10 @@
                 AND project_type = #{projectType}
             </if>
         </where>
-        ORDER BY created_at DESC
+        ORDER BY updated_at DESC
         LIMIT #{pageSize} offset #{offset}
     </select>
-    <select id="getProjectCount" parameterType="com.siwei.apply.domain.Project">
+    <select id="getProjectCount" parameterType="com.siwei.apply.domain.vo.ProjectFilterVo">
         SELECT COUNT(*)
         FROM t_project
         <where>
@@ -59,4 +59,14 @@
             </if>
         </where>
     </select>
+    <update id="updateProject" parameterType="com.siwei.apply.domain.vo.ProjectUpdateVo">
+        UPDATE t_project
+        SET name = #{name}, code = #{code}, company = #{company},
+            updated_at = now(), project_type = #{projectType}
+        WHERE id = #{id}
+    </update>
+    <delete id="deleteProject" parameterType="String">
+        DELETE FROM t_project
+        WHERE id = #{projectId}
+    </delete>
 </mapper>