修改提交审核表，获取前端传回的formId

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -1,6 +1,5 @@
 package com.ruoyi.web.controller.oa;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
@@ -8,14 +7,12 @@ import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SnowFlake;
 import com.ruoyi.oa.domain.CmcAssessContent;
 import com.ruoyi.oa.domain.CmcAssessContentWork;
 import com.ruoyi.oa.service.ICmcAssessContentService;
 import com.ruoyi.oa.service.ICmcAssessContentWorkService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
-import org.joda.time.DateTime;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -141,11 +138,10 @@ public class CmcAssessController extends BaseController
     public AjaxResult submit(@RequestParam("form")String formData)
     {
         JSONObject formDataJson = JSONObject.parse(formData);
-        SnowFlake snowFlake = new SnowFlake();
         CmcAssess cmcAssess = new CmcAssess();
         cmcAssess.setUserId(getLoginUser().getUserId());
         cmcAssess.setFillTime(DateUtils.getNowDate());
-        cmcAssess.setAssessId(snowFlake.generateId());
+        cmcAssess.setAssessId(formDataJson.getString("formId"));
         cmcAssessService.insertCmcAssess(cmcAssess);
         for (String key : formDataJson.keySet()) {
             if (key.equals("projectId"))
@@ -187,8 +183,8 @@ public class CmcAssessController extends BaseController
                 cmcAssessContent.setRemark(formDataJson.getString(key));
                 cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
-
         }
+        cmcAssessService.updateCmcAssess(cmcAssess);
         return AjaxResult.success("提交考核表成功");
     }
 
@@ -203,6 +199,87 @@ public class CmcAssessController extends BaseController
         return toAjax(cmcAssessService.updateCmcAssess(cmcAssess));
     }
 
+    /**
+     * 修改考核表
+     */
+    @Log(title = "考核表", businessType = BusinessType.UPDATE)
+    @PutMapping( "/modify")
+    public AjaxResult modify(@RequestParam("form")String formData)
+    {
+        JSONObject formDataJson = JSONObject.parse(formData);
+        CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formDataJson.getString("formId"));
+        cmcAssess.setProjectId(formDataJson.getLong("projectId"));
+        cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
+        cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
+        cmcAssess.setSelfAssess(formDataJson.getString("selfAssess"));
+        cmcAssess.setDeptAssesser(formDataJson.getString("deptAssesser"));
+        cmcAssess.setDeptAssessment(formDataJson.getString("deptAssessment"));
+        cmcAssess.setDeptAdvice(formDataJson.getString("deptAdvice"));
+        cmcAssess.setDeptTime(formDataJson.getDate("deptTime"));
+        cmcAssess.setManagerAssesser(formDataJson.getString("managerAssesser"));
+        cmcAssess.setManagerAssessment(formDataJson.getString("managerAssessment"));
+        cmcAssess.setManagerAdvice(formDataJson.getString("managerAdvice"));
+        cmcAssess.setManagerTime(formDataJson.getDate("managerTime"));
+        for (String key : formDataJson.keySet()) {
+            if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(4)).get(0);
+                StringBuilder roles = new StringBuilder();
+                for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
+                    String rolei = "";
+                    if (i == formDataJson.getJSONArray(key).size() - 1)
+                        rolei = formDataJson.getJSONArray(key).getString(i);
+                    else
+                        rolei = formDataJson.getJSONArray(key).getString(i) + ",";
+                    roles.append(rolei);
+                }
+                cmcAssessContent.setRole(roles.toString());
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
+                CmcAssessContentWork cmcAssessContentWork = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("formId") + key.substring(1)).get(0);
+                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
+                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+            }
+            if (key.startsWith("familiar")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(8)).get(0);
+                cmcAssessContent.setFamiliar(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("remark")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(6)).get(0);
+                cmcAssessContent.setRemark(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("workload")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(8)).get(0);
+                cmcAssessContent.setWorkload(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("skill")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(5)).get(0);
+                cmcAssessContent.setSkill(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("quality")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(7)).get(0);
+                cmcAssessContent.setQuality(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("assessment")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(10)).get(0);
+                cmcAssessContent.setAssessment(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+            if (key.startsWith("advice")) {
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("formId") + key.substring(6)).get(0);
+                cmcAssessContent.setAdvice(formDataJson.getString(key));
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+            }
+        }
+        cmcAssessService.updateCmcAssess(cmcAssess);
+        return AjaxResult.success("修改考核表成功");
+    }
+
     /**
      * 删除考核表
      */