优化员工考核功能

java110-bean/src/main/java/com/java110/po/userQuestionAnswerValue/UserQuestionAnswerValuePo.java

@@ -1,95 +1,117 @@
 package com.java110.po.userQuestionAnswerValue;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class UserQuestionAnswerValuePo implements Serializable {
 
     private String score;
-private String valueId;
-private String titleId;
-private String answerType;
-private String objId;
-private String userQaId;
-private String valueContent;
-private String personId;
-private String statusCd = "0";
-private String objType;
-private String userTitleId;
-private String qaId;
-public String getScore() {
+    private String valueId;
+    private String titleId;
+    private String answerType;
+    private String objId;
+    private String userQaId;
+    private String valueContent;
+    private String personId;
+    private String statusCd = "0";
+    private String objType;
+    private String userTitleId;
+    private String qaId;
+
+    public String getScore() {
         return score;
     }
-public void setScore(String score) {
+
+    public void setScore(String score) {
         this.score = score;
     }
-public String getValueId() {
+
+    public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getTitleId() {
+
+    public String getTitleId() {
         return titleId;
     }
-public void setTitleId(String titleId) {
+
+    public void setTitleId(String titleId) {
         this.titleId = titleId;
     }
-public String getAnswerType() {
+
+    public String getAnswerType() {
         return answerType;
     }
-public void setAnswerType(String answerType) {
+
+    public void setAnswerType(String answerType) {
         this.answerType = answerType;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getUserQaId() {
+
+    public String getUserQaId() {
         return userQaId;
     }
-public void setUserQaId(String userQaId) {
+
+    public void setUserQaId(String userQaId) {
         this.userQaId = userQaId;
     }
-public String getValueContent() {
+
+    public String getValueContent() {
         return valueContent;
     }
-public void setValueContent(String valueContent) {
+
+    public void setValueContent(String valueContent) {
         this.valueContent = valueContent;
     }
-public String getPersonId() {
+
+    public String getPersonId() {
         return personId;
     }
-public void setPersonId(String personId) {
+
+    public void setPersonId(String personId) {
         this.personId = personId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
-public String getUserTitleId() {
+
+    public String getUserTitleId() {
         return userTitleId;
     }
-public void setUserTitleId(String userTitleId) {
+
+    public void setUserTitleId(String userTitleId) {
         this.userTitleId = userTitleId;
     }
-public String getQaId() {
+
+    public String getQaId() {
         return qaId;
     }
-public void setQaId(String qaId) {
+
+    public void setQaId(String qaId) {
         this.qaId = qaId;
     }
 
 
-
 }

service-user/src/main/java/com/java110/user/bmo/userQuestionAnswerValue/impl/SaveUserQuestionAnswerValueBMOImpl.java

@@ -12,6 +12,7 @@ import com.java110.po.userQuestionAnswer.UserQuestionAnswerPo;
 import com.java110.po.userQuestionAnswerValue.UserQuestionAnswerValuePo;
 import com.java110.user.bmo.userQuestionAnswerValue.ISaveUserQuestionAnswerValueBMO;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -53,7 +54,11 @@ public class SaveUserQuestionAnswerValueBMOImpl implements ISaveUserQuestionAnsw
         UserQuestionAnswerValuePo tmpUserUserQuestionAnswerValue = null;
         List<UserQuestionAnswerValuePo> tmpUserUserQuestionAnswerValues = new ArrayList<>();
         UserQuestionAnswerPo userQuestionAnswerPo = new UserQuestionAnswerPo();
-        userQuestionAnswerPo.setUserQaId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userQaId));
+        if(StringUtil.isEmpty(userQuestionAnswerValuePo.getUserQaId()) || userQuestionAnswerValuePo.getUserQaId().startsWith("-")){
+            userQuestionAnswerPo.setUserQaId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userQaId));
+        }else{
+            userQuestionAnswerPo.setUserQaId(userQuestionAnswerValuePo.getUserQaId());
+        }
         for (int questionAnswerTitleIndex = 0; questionAnswerTitleIndex < questionAnswerTitles.size(); questionAnswerTitleIndex++) {
             titleObj = questionAnswerTitles.getJSONObject(questionAnswerTitleIndex);
             tmpUserUserQuestionAnswerValue = new UserQuestionAnswerValuePo();
@@ -85,6 +90,8 @@ public class SaveUserQuestionAnswerValueBMOImpl implements ISaveUserQuestionAnsw
         String answerType = userQuestionAnswerValuePo.getAnswerType();
 
         if("2003".equals(answerType)){
+            userQuestionAnswerPo.setState("1202");
+            userQuestionAnswerInnerServiceSMOImpl.updateUserQuestionAnswer(userQuestionAnswerPo);
             return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
         }