wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-14 11:31:03 +08:00
parent 3887b53239
commit 1dcf374478
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/lz/common/utils/StringUtil.java
View File

@ -2,6 +2,7 @@ package com.lz.common.utils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.*;
@ -630,4 +631,13 @@ public class StringUtil extends StringUtils {
cs[0]-=32; cs[0]-=32;
return String.valueOf(cs); 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;
}
} }

39
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -3,6 +3,7 @@ package com.lz.modules.app.controller;
import com.lz.common.utils.NumberUtil; import com.lz.common.utils.NumberUtil;
import com.lz.common.utils.PageUtils; import com.lz.common.utils.PageUtils;
import com.lz.common.utils.R; 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.DepartmentsDto;
import com.lz.modules.app.dto.StaffDepartmentDto; import com.lz.modules.app.dto.StaffDepartmentDto;
import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
@ -27,10 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -182,7 +180,40 @@ public class ResultRecordController {
return R.ok().put("lzResultRecord", lzResultRecord); 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("保存成功");
}
/** /**
* 保存 * 保存
*/ */