Commit ac05c629 authored by 赵啸非's avatar 赵啸非

添加用户类型修改

parent b2d2303f
...@@ -218,11 +218,20 @@ export default { ...@@ -218,11 +218,20 @@ export default {
{ label: "异常结果", prop: "errorResult" }, { label: "异常结果", prop: "errorResult" },
/*
{ {
label: "图片凭证", label: "图片凭证",
prop: "snapPath", prop: "snapPath",
formatter: this.formatterPic, formatter: this.formatterPic,
}, },
*/
{
label: "图片凭证",
prop: "filePath",
formatter: this.formatterPic,
},
{ label: "绩效规则", prop: "ruleNme" }, { label: "绩效规则", prop: "ruleNme" },
......
...@@ -214,7 +214,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq> ...@@ -214,7 +214,7 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
recordEntity.setSubAddType(rule.getSubAddType()); recordEntity.setSubAddType(rule.getSubAddType());
recordEntity.setScore(rule.getScore()); recordEntity.setScore(rule.getScore());
recordEntity.setRuleId(rule.getId()); recordEntity.setRuleId(rule.getId());
recordEntity.setRuleNme(rule.getName()); recordEntity.setRuleName(rule.getName());
recordEntity.setCategoryId(rule.getCategoryId()); recordEntity.setCategoryId(rule.getCategoryId());
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setDeductPerson("admin"); recordEntity.setDeductPerson("admin");
......
...@@ -287,6 +287,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> { ...@@ -287,6 +287,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
recordEntity.setCategoryName(rule.getCategoryName()); recordEntity.setCategoryName(rule.getCategoryName());
recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue()); recordEntity.setSubMethod(SubMethodEnum.大厅巡查.getValue());
// if(ObjectUtils.isEmpty(req.getFilePaths())){
// //recordEntity.setSna
// }
recordEntity.setCreateUserId(context.getUser().getId()); recordEntity.setCreateUserId(context.getUser().getId());
recordEntity.setCreateTime(new Date()); recordEntity.setCreateTime(new Date());
PerformAttendRecordEntity save = attendRecordService.save(recordEntity); PerformAttendRecordEntity save = attendRecordService.save(recordEntity);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment