diff --git a/src/main/java/com/lz/common/utils/StringUtil.java b/src/main/java/com/lz/common/utils/StringUtil.java index 99066767..d6d33ccc 100644 --- a/src/main/java/com/lz/common/utils/StringUtil.java +++ b/src/main/java/com/lz/common/utils/StringUtil.java @@ -2,6 +2,7 @@ package com.lz.common.utils; import org.apache.commons.lang.StringUtils; +import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.*; @@ -630,4 +631,13 @@ public class StringUtil extends StringUtils { cs[0]-=32; return String.valueOf(cs); } + + public static String decodeBase64(String res){ + try { + return new String(Base64.getDecoder().decode(res), "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } } 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 e0819530..239e8b48 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -3,6 +3,7 @@ package com.lz.modules.app.controller; import com.lz.common.utils.NumberUtil; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; +import com.lz.common.utils.StringUtil; import com.lz.modules.app.dto.DepartmentsDto; import com.lz.modules.app.dto.StaffDepartmentDto; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; @@ -27,10 +28,7 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -182,7 +180,40 @@ public class ResultRecordController { return R.ok().put("lzResultRecord", lzResultRecord); } + /** + * 信息 + */ + @RequestMapping("/detail/{id}") + public R detail(@PathVariable("id") Long id) { + ResultDetail detail = resultDetailService.selectResultDetailById(id); + return R.ok().put("detailInfo", detail); + } + + /** + * 信息 + */ + @RequestMapping("/recorddetailDelete/{id}") + public R recorddetailDelete(@PathVariable("id") Long id) { + resultDetailService.deleteResultDetailById(id); + return R.ok("删除成功"); + } + + + /** + * 信息 + */ + @RequestMapping("/detailAddOrUpdate") + public R detailAddOrUpdate(ResultDetail resultDetail) { + ResultDetail old = resultDetailService.selectResultDetailById(resultDetail.getId()); + if (old != null) { + BeanUtils.copyProperties(resultDetail, old); + resultDetail.setKeyResult(StringUtil.decodeBase64(resultDetail.getKeyResult())); + resultDetail.setCheckResult(StringUtil.decodeBase64(resultDetail.getCheckResult())); + resultDetailService.updateResultDetailById(resultDetail); + } + return R.ok("保存成功"); + } /** * 保存 */