评价移动端新增了记录提交

src/main/java/com/xjrsoft/module/evaluate/dto/EvaluateManageScoreDto.java

@@ -28,7 +28,7 @@ public class EvaluateManageScoreDto implements Serializable {
      * 被评对象编号
      */
     @ApiModelProperty("被评对象编号")
-    private List<Long> submitRecordIdList;
+    private List<String> submitRecordIdList;
 
     /**
      * 当前登录用户id

src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateResult.java

@@ -99,5 +99,5 @@ public class EvaluateResult implements Serializable {
      * 提交记录主键编号
      */
     @ApiModelProperty("提交记录主键编号")
-    private Long submitRecordId;
+    private String submitRecordId;
 }

src/main/java/com/xjrsoft/module/evaluate/entity/EvaluateSubmitRecord.java

@@ -30,7 +30,7 @@ public class EvaluateSubmitRecord implements Serializable {
     */
     @ApiModelProperty("")
     @TableId
-    private Long id;
+    private String id;
     /**
     * 评价管理编号
     */

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateManageServiceImpl.java

@@ -132,10 +132,10 @@ public class EvaluateManageServiceImpl extends MPJBaseServiceImpl<EvaluateManage
         if(mobileResultPage.getRecords() != null){
             //获取已经评价记录的评价总分
             //评价提交记录的id集合
-            List<Long> submitRecordIdList = new ArrayList<>();
+            List<String> submitRecordIdList = new ArrayList<>();
             for (MobileResultPageVo mobileResultPageVo : mobileResultPage.getRecords()) {
                 if(mobileResultPageVo.getEvaluateStatus() == 1){
-                    submitRecordIdList.add(Long.parseLong(mobileResultPageVo.getEvaluateSubmitRecordId()));
+                    submitRecordIdList.add(mobileResultPageVo.getEvaluateSubmitRecordId());
                 }
             }
             if(submitRecordIdList.size() > 0){

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -263,11 +263,12 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
         //获取当前评价管理的相关信息
         MPJLambdaWrapper<EvaluateSubmitRecord> evaluateSubmitRecordMPJLambdaWrapper = new MPJLambdaWrapper<>();
         evaluateSubmitRecordMPJLambdaWrapper
+                .selectAs(EvaluateSubmitRecord::getId, MobileResultPageVo::getEvaluateSubmitRecordId)
                 .selectAs(EvaluateSubmitRecord::getEvaluateManageId, MobileResultPageVo::getEvaluateManageId)
                 .selectAs(EvaluateSubmitRecord::getEvaluatedObjectId, MobileResultPageVo::getEvaluateObjectId)
                 .selectAs(EvaluateSubmitRecord::getEvaluateExecuterId, MobileResultPageVo::getEvaluateUserId)
                 .selectAs(EvaluateSubmitRecord::getStatus, MobileResultPageVo::getEvaluateStatus)
-                .selectAs(EvaluateTemplate::getEvaluateType, MobileResultPageVo::getEvaluateType)
+                .selectAs(EvaluateSubmitRecord::getEvaluatedObject, MobileResultPageVo::getEvaluateType)
                 .eq(EvaluateSubmitRecord::getId, dto.getEvaluateSubmitRecordId());
         MobileResultPageVo mobileResultPageVo = evaluateSubmitRecordMapper.selectJoinOne(MobileResultPageVo.class, evaluateSubmitRecordMPJLambdaWrapper);
 
@@ -289,7 +290,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             evaluateResult.setDeleteMark(DeleteMark.NODELETE.getCode());
             evaluateResult.setEnabledMark(EnabledMark.ENABLED.getCode());
             evaluateResult.setCreateDate(createDate);
-            evaluateResult.setSubmitRecordId(Long.parseLong(mobileResultPageVo.getEvaluateSubmitRecordId()));
+            evaluateResult.setSubmitRecordId(mobileResultPageVo.getEvaluateSubmitRecordId());
             evaluateResultMapper.insert(evaluateResult);
         }
 
@@ -301,7 +302,7 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
 
         //修改提交记录状态
         evaluateSubmitRecordMapper.updateById(new EvaluateSubmitRecord(){{
-            setId(Long.parseLong(mobileResultPageVo.getEvaluateSubmitRecordId()));
+            setId(mobileResultPageVo.getEvaluateSubmitRecordId());
             setStatus(1);
         }});
 

src/main/java/com/xjrsoft/module/workflow/controller/WorkflowApproveRecordController.java

@@ -3,18 +3,20 @@ package com.xjrsoft.module.workflow.controller;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.xjrsoft.common.constant.GlobalConstant;
-import com.xjrsoft.common.model.result.R;
+import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.system.entity.Stamp;
 import com.xjrsoft.module.workflow.dto.ApproveRecordListDto;
 import com.xjrsoft.module.workflow.entity.WorkflowApproveRecord;
 import com.xjrsoft.module.workflow.service.IWorkflowApproveRecordService;
+import com.xjrsoft.module.workflow.vo.WorkflowApproveRecordListVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 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.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -27,26 +29,27 @@ import java.util.List;
  * @author tzx
  * @since 2023-02-10
  */
-@Controller
+@RestController
 @RequestMapping(GlobalConstant.WORKFLOW_MODULE_PREFIX + "/workflowApproveRecord")
+@Api(value = "/workflow"  + "/workflowApproveRecord",tags = "前端控制器")
 public class WorkflowApproveRecordController {
     @Autowired
     private IWorkflowApproveRecordService approveRecordService;
 
     @GetMapping("/approve-record-list")
     @ApiOperation(value = "重构后发起流程")
-    public R approveRecordList(@Valid ApproveRecordListDto dto) {
+    public RT<List<WorkflowApproveRecordListVo>> approveRecordList(@Valid ApproveRecordListDto dto) {
         MPJLambdaWrapper<WorkflowApproveRecord> workflowApproveRecordMPJLambdaWrapper = MPJWrappers.<WorkflowApproveRecord>lambdaJoin()
                 .disableSubLogicDel()
                 .eq(WorkflowApproveRecord::getProcessId, dto.getProcessId())
                 .select(WorkflowApproveRecord::getId)
-                .select(WorkflowApproveRecord.class, x -> VoToColumnUtil.fieldsToColumns(WorkflowApproveRecord.class).contains(x.getProperty()))
+                .select(WorkflowApproveRecord.class, x -> VoToColumnUtil.fieldsToColumns(WorkflowApproveRecordListVo.class).contains(x.getProperty()))
                 .selectAs(User::getName, WorkflowApproveRecord::getApproveUserName)
                 .leftJoin(User.class, User::getId, WorkflowApproveRecord::getApproveUserId)
                 .selectAs(Stamp::getFileUrl, WorkflowApproveRecord::getApproveStampUrl)
                 .leftJoin(Stamp.class, Stamp::getId, WorkflowApproveRecord::getApproveStamp);
 
-        List<WorkflowApproveRecord> approveRecords = approveRecordService.selectJoinList(WorkflowApproveRecord.class, workflowApproveRecordMPJLambdaWrapper);
-        return R.ok(approveRecords);
+        List<WorkflowApproveRecordListVo> approveRecords = approveRecordService.selectJoinList(WorkflowApproveRecordListVo.class, workflowApproveRecordMPJLambdaWrapper);
+        return RT.ok(approveRecords);
     }
 }

src/main/java/com/xjrsoft/module/workflow/vo/WorkflowApproveRecordListVo.java

@@ -0,0 +1,66 @@
+package com.xjrsoft.module.workflow.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class WorkflowApproveRecordListVo {
+    @ApiModelProperty("主键")
+    private Long id;
+
+    @ApiModelProperty("模板Id")
+    private Long schemaId;
+
+    @ApiModelProperty("流程id")
+    private String processId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("任务节点的定义key")
+    private String taskDefinitionKey;
+
+    @ApiModelProperty("任务名")
+    private String taskName;
+
+    @ApiModelProperty("审批类型")
+    private Integer approveType;
+
+    @ApiModelProperty("审批结果按钮值")
+    private String approveResult;
+
+    @ApiModelProperty("审批内容")
+    private String approveComment;
+
+    @ApiModelProperty("审批人id")
+    private Long approveUserId;
+
+    @ApiModelProperty("审批人审批时所使用岗位")
+    private Long approveUserPostId;
+
+    @ApiModelProperty("审批人姓名")
+    @TableField(exist = false)
+    private String approveUserName;
+
+    @ApiModelProperty("审批时间")
+    private LocalDateTime approveTime;
+
+    @ApiModelProperty("签章id")
+    private Long approveStamp;
+
+    @ApiModelProperty("签章图片url")
+    @TableField(exist = false)
+    private String approveStampUrl;
+
+    @ApiModelProperty("流水号")
+    private Long serialNumber;
+
+    @ApiModelProperty("当前进度")
+    private Integer currentProgress;
+
+    @ApiModelProperty("发起人id")
+    private Long startUserId;
+}

src/main/resources/sqlScript/20240125_sql.sql

@@ -311,7 +311,7 @@ DELIMITER ;
 CALL createCom;
 DROP PROCEDURE createCom;
 
-
+ALTER TABLE evaluate_result MODIFY submit_record_id varchar(64);
 
 ALTER TABLE evaluate_submit_record MODIFY id varchar(64);
 -- -------------------------------------------------------------------评价-----------------------------------------------------------------
@@ -339,5 +339,5 @@ CREATE TABLE base_label
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '基础标签表';
 
-ALTER TABLE `tl`.`base_course_subject`   
-  CHANGE `org_id` `base_label_id` BIGINT NULL   COMMENT '标签id(base_label)';
+# ALTER TABLE `tl`.`base_course_subject`
+#   CHANGE `org_id` `base_label_id` BIGINT NULL   COMMENT '标签id(base_label)';