五项分

pcbms/src/main/java/com/hssx/pcbms/controller/PersonScoreController.java

@@ -1,15 +1,21 @@
 package com.hssx.pcbms.controller;
 
 
+import com.hssx.pcbms.entity.PersonScore;
+import com.hssx.pcbms.entity.Score;
+import com.hssx.pcbms.service.PersonScoreService;
+import com.hssx.pcbms.service.ScoreService;
+import com.hssx.pcbms.util.HttpRespMsg;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-12-10
  */
@@ -17,5 +23,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/personscore")
 public class PersonScoreController {
 
+    @Autowired
+    private PersonScoreService personScoreService;
+
+    /**
+     * 打个人分/修改个人打分
+     * 参数：
+     * 被打分人的id：uid，德：virtue，能：can，勤：diligence，绩：performance,廉：lian
+     * 时间字符串:timeStr，打分主键：scoreId
+     * 注：修改时传 id:个人分id
+     * @return
+     */
+    @ApiOperation(value = "打个人分/修改个人打分", notes = "打个人分/修改个人打分")
+    @RequestMapping("/addOrUpdate")
+    public HttpRespMsg addOrUpdate(PersonScore personScore) {
+        return personScoreService.addOrUpdate(personScore);
+    }
+
+    /**
+     * 获取五项打分的最高打分数据
+     * @return
+     */
+    @ApiOperation(value = "获取五项打分的最高打分数据", notes = "获取五项打分的最高打分数据")
+    @RequestMapping("/fiveList")
+    public HttpRespMsg fiveList() {
+        return personScoreService.fiveList();
+    }
+
 }
 

pcbms/src/main/java/com/hssx/pcbms/entity/PersonScore.java

@@ -41,31 +41,31 @@ public class PersonScore extends Model<PersonScore> {
      * 德
      */
     @TableField("virtue")
-    private Double virtue;
+    private Double virtue=0.0;
 
     /**
      * 能
      */
     @TableField("can")
-    private Double can;
+    private Double can=0.0;
 
     /**
      * 勤
      */
     @TableField("diligence")
-    private Double diligence;
+    private Double diligence=0.0;
 
     /**
      * 绩
      */
     @TableField("performance")
-    private Double performance;
+    private Double performance=0.0;
 
     /**
      * 廉
      */
     @TableField("lian")
-    private Double lian;
+    private Double lian=0.0;
 
     /**
      * 创建时间

pcbms/src/main/java/com/hssx/pcbms/service/PersonScoreService.java

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.PersonScore;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PersonScoreService extends IService<PersonScore> {
 
+    HttpRespMsg addOrUpdate(PersonScore personScore);
+
+    HttpRespMsg fiveList();
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/PersonScoreServiceImpl.java

@@ -1,11 +1,20 @@
 package com.hssx.pcbms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.pcbms.entity.PersonScore;
+import com.hssx.pcbms.entity.Score;
+import com.hssx.pcbms.entity.ScoreSetting;
 import com.hssx.pcbms.mapper.PersonScoreMapper;
+import com.hssx.pcbms.mapper.ScoreMapper;
+import com.hssx.pcbms.mapper.ScoreSettingMapper;
 import com.hssx.pcbms.service.PersonScoreService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.pcbms.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -16,5 +25,33 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PersonScoreServiceImpl extends ServiceImpl<PersonScoreMapper, PersonScore> implements PersonScoreService {
+    @Resource
+    private PersonScoreMapper personScoreMapper;
+    @Resource
+    private ScoreSettingMapper scoreSettingMapper;
+    @Resource
+    private ScoreMapper scoreMapper;
+    @Override
+    public HttpRespMsg addOrUpdate(PersonScore personScore) {
+        HttpRespMsg msg = new HttpRespMsg();
+        if (personScore.getId() == null) {
+            //添加操作
+            personScoreMapper.insert(personScore);
+        }else{
+            Integer personScoreInit = 0;
+            personScoreMapper.updateById(personScore);
+            Score score = new Score();
+            score.setScoreId(personScore.getScoreId());
+            score.setPersonalScore(personScoreInit+personScore.getCan()+personScore.getDiligence()+personScore.getVirtue()+personScore.getPerformance());
+            scoreMapper.update(score,new QueryWrapper<Score>().eq("score_id",personScore.getScoreId()));
+        }
+        return msg;
+    }
 
+    @Override
+    public HttpRespMsg fiveList() {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = scoreSettingMapper.selectList(new QueryWrapper<>());
+        return msg;
+    }
 }

pcbms/src/main/resources/mapper/IdeaMapper.xml

@@ -106,7 +106,7 @@
                 and date_format(i.indate,'%Y-%m') = #{ideaVO.time}
             </if>
         </where>
-        order by i.indate,i.id desc
+        order by i.indate desc
     </select>
 
 </mapper>