diff --git a/src/main/java/com/lz/common/utils/StringUtil.java b/src/main/java/com/lz/common/utils/StringUtil.java index d6d33ccc..97a9da1d 100644 --- a/src/main/java/com/lz/common/utils/StringUtil.java +++ b/src/main/java/com/lz/common/utils/StringUtil.java @@ -640,4 +640,8 @@ public class StringUtil extends StringUtils { } return null; } + + public static String removeHtml(String html) { + return html.replaceAll("\\<.*?>",""); + } } diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 48ce37bb..b3eb5d70 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -16,8 +16,10 @@ import com.lz.modules.flow.req.ResultDetailReq; import com.lz.modules.flow.service.RecordAuthService; import com.lz.modules.sys.controller.AbstractController; import com.lz.modules.sys.entity.SysUserEntity; +import com.lz.modules.sys.entity.app.ResultComment; import com.lz.modules.sys.entity.app.ResultDetail; import com.lz.modules.sys.entity.app.ResultRecord; +import com.lz.modules.sys.service.app.ResultCommentService; import com.lz.modules.sys.service.app.ResultDetailService; import com.lz.modules.sys.service.app.ResultRecordService; import org.apache.commons.collections.CollectionUtils; @@ -59,6 +61,8 @@ public class ResultRecordController extends AbstractController { private DepartmentsStaffRelateService departmentsStaffRelateService; @Autowired private RecordAuthService recordAuthService; + @Autowired + private ResultCommentService resultCommentService; /** @@ -216,12 +220,19 @@ public class ResultRecordController extends AbstractController { .put("recordResultId", recordResultId); } - @RequestMapping("/commitApproval") public R commitApproval(ResultRecordReq req) { - if (req.getType() == 1) { + if (req.getStatus() == 2) { + String resultComment = StringUtil.decodeBase64(req.getResultComment()); + resultComment = StringUtil.removeHtml(resultComment); + if (StringUtil.isNotBlank(resultComment)) { + ResultComment comment = new ResultComment(); + comment.setCommentUserId(getUserId()); + comment.setRecordId(req.getRecordResultId()); + resultCommentService.insertResultComment(comment); + } return resultRecordService.approval(req.getRecordResultId(), getUserId()); - } else { //侍提交 + } else if (req.getStatus() == 3) { //侍提交 ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId()); resultRecord.setStatus(Constant.STATUS_3); resultRecordService.updateResultRecordById(resultRecord); @@ -236,7 +247,6 @@ public class ResultRecordController extends AbstractController { @RequiresPermissions("user:lzresultrecord:info") public R info(@PathVariable("id") Long id) { ResultRecord lzResultRecord = lzResultRecordService.selectResultRecordById(id); - return R.ok().put("lzResultRecord", lzResultRecord); } diff --git a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java index ac69d78c..10eda703 100644 --- a/src/main/java/com/lz/modules/app/req/ResultRecordReq.java +++ b/src/main/java/com/lz/modules/app/req/ResultRecordReq.java @@ -32,4 +32,5 @@ public class ResultRecordReq { private Long staffId; private Integer recordType; private String departmentLevel ; + private String resultComment; } diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java index 9a307339..2a70f21b 100644 --- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java +++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java @@ -54,5 +54,5 @@ public interface ResultDetailService extends IService { void insertWenHuaJiaZhiGua(String s, Long id, Long userId); - String initRole(Long staffId, long l); + String initRole(Long staffId, Long l); } \ No newline at end of file