修改字段对比 和 当时的审批记录

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/constant/ProjectConstant.java

@@ -11,5 +11,9 @@ public interface ProjectConstant {
     class ProjectLib{
         public static final String PROJECT_BASIC = "basic";
         public static final String PROJECT_CONSTRUCT = "construct";
+
+        public static final String CHANGES_KEY = "changes";
+
+        public static final String PROCESS_KEY = "process";
     }
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java

@@ -54,7 +54,7 @@ public class ProjectLibController {
     }
 
     @GetMapping("/change-record/{id}")
-    @ApiOperation("查看项目变更记录-输入任一项目ID即可")
+    @ApiOperation("查看项目变更记录")
     public JSONObject changeRecord(@PathVariable Long id) {
         return projectLibManage.changeRecord(id);
     }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -60,6 +60,8 @@ import com.ningdatech.pmapi.projectlib.model.vo.ProjectApplicationVO;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectDetailVO;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import com.ningdatech.pmapi.projectlib.service.*;
+import com.ningdatech.pmapi.todocenter.manage.TodoCenterManage;
+import com.ningdatech.pmapi.todocenter.model.req.ProcessDetailReq;
 import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import com.wflow.exception.BusinessException;
@@ -111,6 +113,8 @@ public class ProjectLibManage {
 
     private final IPaymentPlanService paymentPlanService;
 
+    private final TodoCenterManage todoCenterManage;
+
     public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         query.eq(Project::getNewest,Boolean.TRUE);
@@ -1184,6 +1188,14 @@ public class ProjectLibManage {
             return res;
         }
 
-        return new CompareUtils<Project>().compareToJson(twoVersions.get(0), twoVersions.get(1),null);
+        Project lastProject = twoVersions.get(1);
+        Project thisProject = twoVersions.get(0);
+        res.put(ProjectConstant.ProjectLib.CHANGES_KEY,
+                new CompareUtils<Project>().compareToJson(thisProject, lastProject,null));
+        ProcessDetailReq req = new ProcessDetailReq();
+        req.setProjectId(lastProject.getId());
+        req.setInstanceId(lastProject.getInstCode());
+        res.put(ProjectConstant.ProjectLib.PROCESS_KEY,todoCenterManage.getProcessDetail(req));
+        return res;
     }
 }