Commit 671e0daa authored by mengbali153's avatar mengbali153

非标产值:考核公值

parent 1c6b308e
...@@ -76,9 +76,9 @@ public class NonStandardApprovalController { ...@@ -76,9 +76,9 @@ public class NonStandardApprovalController {
@ApiOperation(value = "获取考核公值") @ApiOperation(value = "获取考核公值")
@GetMapping("/getAppraisalValues") @GetMapping("/getAppraisalValues")
public Object getAppraisalValues() { public BaseResponse getAppraisalValues() {
try { try {
return appraisalValueMapper.getAppraisalValue(); return iNonStandardApprovalService.getAppraisalValue();
} catch (Exception e) { } catch (Exception e) {
log.debug("获取所有的非标产值审批{}", e); log.debug("获取所有的非标产值审批{}", e);
} }
...@@ -98,7 +98,7 @@ public class NonStandardApprovalController { ...@@ -98,7 +98,7 @@ public class NonStandardApprovalController {
@ApiOperation(value = "改变考核公值") @ApiOperation(value = "改变考核公值")
@PostMapping("/updateAppraisal") @PostMapping("/updateAppraisal")
public BaseResponse update(@RequestBody Double appraisalValue) { public BaseResponse update(Double appraisalValue) {
try { try {
return iNonStandardApprovalService.updateAppraisal(appraisalValue); return iNonStandardApprovalService.updateAppraisal(appraisalValue);
} catch (Exception e) { } catch (Exception e) {
......
...@@ -2,9 +2,13 @@ package cn.wise.sc.cement.business.mapper; ...@@ -2,9 +2,13 @@ package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.AppraisalValue; import cn.wise.sc.cement.business.entity.AppraisalValue;
import cn.wise.sc.cement.business.entity.NonStandardApproval; import cn.wise.sc.cement.business.entity.NonStandardApproval;
import cn.wise.sc.cement.business.model.vo.NonStandardApplyVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
* Mapper 接口 * Mapper 接口
......
package cn.wise.sc.cement.business.service; package cn.wise.sc.cement.business.service;
import cn.wise.sc.cement.business.entity.AppraisalValue;
import cn.wise.sc.cement.business.entity.NonStandardApproval; import cn.wise.sc.cement.business.entity.NonStandardApproval;
import cn.wise.sc.cement.business.model.BaseResponse; import cn.wise.sc.cement.business.model.BaseResponse;
import cn.wise.sc.cement.business.model.PageQuery; import cn.wise.sc.cement.business.model.PageQuery;
...@@ -55,10 +56,18 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova ...@@ -55,10 +56,18 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova
* 修改考核公值 * 修改考核公值
* *
* *
* @return NoneStandardApprovalVo * @return AppraisalValue
*/ */
BaseResponse<Double> updateAppraisal(Double appraisalValue); BaseResponse<Double> updateAppraisal(Double appraisalValue);
/**
* 获取考核公值
*
*
* @return AppraisalValue
*/
BaseResponse<Double> getAppraisalValue();
/** /**
* 通过id删除指定审批信息 * 通过id删除指定审批信息
......
package cn.wise.sc.cement.business.service.impl; package cn.wise.sc.cement.business.service.impl;
import cn.wise.sc.cement.business.entity.AppraisalValue;
import cn.wise.sc.cement.business.entity.NonStandardApproval; import cn.wise.sc.cement.business.entity.NonStandardApproval;
import cn.wise.sc.cement.business.mapper.AppraisalValueMapper; import cn.wise.sc.cement.business.mapper.AppraisalValueMapper;
import cn.wise.sc.cement.business.mapper.NonStandardApprovalMapper; import cn.wise.sc.cement.business.mapper.NonStandardApprovalMapper;
...@@ -41,6 +42,7 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro ...@@ -41,6 +42,7 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
@Resource @Resource
private AppraisalValueMapper appraisalValueMapper; private AppraisalValueMapper appraisalValueMapper;
@Override @Override
public BaseResponse<IPage<NonStandardApprovalVo>> getPage(PageQuery pageQuery, String name, Integer status) { public BaseResponse<IPage<NonStandardApprovalVo>> getPage(PageQuery pageQuery, String name, Integer status) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
...@@ -101,6 +103,12 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro ...@@ -101,6 +103,12 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
return BaseResponse.okData(appraisalValue); return BaseResponse.okData(appraisalValue);
} }
@Override
public BaseResponse<Double> getAppraisalValue() {
Double appraisalValue = appraisalValueMapper.getAppraisalValue();
return BaseResponse.okData(appraisalValue);
}
@Override @Override
@Transactional @Transactional
public BaseResponse<String> status(Integer status, Integer id) { public BaseResponse<String> status(Integer status, Integer id) {
......
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