|
@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.hssx.pcbms.util.HttpRespMsg;
|
|
import com.hssx.pcbms.util.HttpRespMsg;
|
|
import com.hssx.pcbms.util.PageUtil;
|
|
import com.hssx.pcbms.util.PageUtil;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
|
|
+import org.springframework.expression.spel.ast.Operator;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
|
@@ -44,6 +45,8 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
private NewsNoticeMapper newsNoticeMapper;
|
|
private NewsNoticeMapper newsNoticeMapper;
|
|
@Resource
|
|
@Resource
|
|
private NewsNoticeUserMapper newsNoticeUserMapper;
|
|
private NewsNoticeUserMapper newsNoticeUserMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private ScoringOperateRecordMapper scoringOperateRecordMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public HttpRespMsg add(Score score) throws ParseException {
|
|
public HttpRespMsg add(Score score) throws ParseException {
|
|
@@ -53,10 +56,21 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
Parameter parameter = parameterMapper.selectOne(new QueryWrapper<Parameter>().eq("param_key", Constant.SCORING_DEADLINE_CODE));
|
|
Parameter parameter = parameterMapper.selectOne(new QueryWrapper<Parameter>().eq("param_key", Constant.SCORING_DEADLINE_CODE));
|
|
if (parameter != null) {
|
|
if (parameter != null) {
|
|
if (score.getScoreId() != null) {
|
|
if (score.getScoreId() != null) {
|
|
|
|
+ Score Oldscore = scoreMapper.selectOne(new QueryWrapper<Score>().eq("score_id", score.getScoreId()));
|
|
//修改打分
|
|
//修改打分
|
|
scoreMapper.update(score,new QueryWrapper<Score>().eq("score_id",score.getScoreId()));
|
|
scoreMapper.update(score,new QueryWrapper<Score>().eq("score_id",score.getScoreId()));
|
|
//添加修改记录
|
|
//添加修改记录
|
|
|
|
+ User uidUser = userMapper.selectById(Oldscore.getUid());
|
|
|
|
+ User operator = userMapper.selectById(Oldscore.getRaterId());
|
|
ScoringOperateRecord record = new ScoringOperateRecord();
|
|
ScoringOperateRecord record = new ScoringOperateRecord();
|
|
|
|
+ record.setContent(Constant.UPDATE_SCORE);
|
|
|
|
+ record.setDeptId(Oldscore.getDeptId());
|
|
|
|
+ record.setOperatorId(operator.getId());
|
|
|
|
+ record.setUid(uidUser.getId());
|
|
|
|
+ record.setUname(uidUser.getName());
|
|
|
|
+ record.setOperator(operator.getName());
|
|
|
|
+ record.setScoreId(Oldscore.getScoreId());
|
|
|
|
+ scoringOperateRecordMapper.insert(record);
|
|
} else {
|
|
} else {
|
|
User Rater = userMapper.selectById(score.getRaterId());
|
|
User Rater = userMapper.selectById(score.getRaterId());
|
|
score.setRater(Rater.getName());
|
|
score.setRater(Rater.getName());
|
|
@@ -167,6 +181,17 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
} else {
|
|
} else {
|
|
scoreMapper.insert(score);
|
|
scoreMapper.insert(score);
|
|
ideaMapper.updateListByTime(score);
|
|
ideaMapper.updateListByTime(score);
|
|
|
|
+ User uidUser = userMapper.selectById(score.getUid());
|
|
|
|
+ User operator = userMapper.selectById(score.getRaterId());
|
|
|
|
+ ScoringOperateRecord record = new ScoringOperateRecord();
|
|
|
|
+ record.setContent(Constant.ADD_SCORE);
|
|
|
|
+ record.setDeptId(score.getDeptId());
|
|
|
|
+ record.setOperatorId(operator.getId());
|
|
|
|
+ record.setUid(uidUser.getId());
|
|
|
|
+ record.setUname(uidUser.getName());
|
|
|
|
+ record.setOperator(operator.getName());
|
|
|
|
+ record.setScoreId(score.getScoreId());
|
|
|
|
+ scoringOperateRecordMapper.insert(record);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
msg.setError("评分日期不和法,请切换日期后重试");
|
|
msg.setError("评分日期不和法,请切换日期后重试");
|
|
@@ -180,6 +205,17 @@ public class ScoreServiceImpl extends ServiceImpl<ScoreMapper, Score> implements
|
|
} else {
|
|
} else {
|
|
scoreMapper.insert(score);
|
|
scoreMapper.insert(score);
|
|
ideaMapper.updateListByTime(score);
|
|
ideaMapper.updateListByTime(score);
|
|
|
|
+ User uidUser = userMapper.selectById(score.getUid());
|
|
|
|
+ User operator = userMapper.selectById(score.getRaterId());
|
|
|
|
+ ScoringOperateRecord record = new ScoringOperateRecord();
|
|
|
|
+ record.setContent(Constant.ADD_SCORE);
|
|
|
|
+ record.setDeptId(score.getDeptId());
|
|
|
|
+ record.setOperatorId(operator.getId());
|
|
|
|
+ record.setUid(uidUser.getId());
|
|
|
|
+ record.setUname(uidUser.getName());
|
|
|
|
+ record.setOperator(operator.getName());
|
|
|
|
+ record.setScoreId(score.getScoreId());
|
|
|
|
+ scoringOperateRecordMapper.insert(record);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
msg.setError("评分日期不和法,请切换日期后重试");
|
|
msg.setError("评分日期不和法,请切换日期后重试");
|