bug修改

src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java

@@ -161,7 +161,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
 
     @RequestMapping("exportExcelData")
     public void exportability(HttpServletRequest request, HttpServletResponse response, OutSourceBean o) {
-        String filename = "退场班组评价";
+        String filename = "外包商评价";
         // 导出所有人员基本信息
         try {
             o.setDeptId(UserUtil.getLoginUser().getDeptId());
@@ -172,7 +172,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
                 o.setIsBusinessDivision("0");
             }
             List<OutSourceBean> list = outsourcerEvaluateService.getEvaluateAuditList(o);
-            excelOut(response, list, filename, "退场班组评价");
+            excelOut(response, list, filename, "外包商评价");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -207,7 +207,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
         list.add("序号");
 
         switch (sheetname) {
-            case "退场班组评价":
+            case "外包商评价":
                 list.add("评价事业部");
                 list.add("评价标题");
                 list.add("评价年月");
@@ -227,7 +227,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
         Map<String, Object> maps = new LinkedHashMap<String, Object>();
         maps.put("id", i + 1);
         switch (sheetname) {
-            case "退场班组评价":
+            case "外包商评价":
                 maps.put("evaluateDept", bean.getEvaluateDept());
                 maps.put("evaluateTitle", bean.getEvaluateTitle());
                 maps.put("evaluateMonth", bean.getEvaluateMonth());
@@ -403,6 +403,14 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
     @ResponseBody
     public synchronized AjaxRes audit(EvaluateDataBean o) {
         AjaxRes ar = new AjaxRes();
+        String deptId = UserUtil.getLoginUser().getDeptId();
+        o.setDeptId(deptId);
+        // 查询该部门是否都已评分
+        Integer num =  outsourcerEvaluateDao.selectScore(o);
+        if (num > 0){
+            ar.setFailMsg("部门评价未完成，请先评价");
+            return ar;
+        }
         List<String> stringList = outsourcerEvaluateDao.getExaminePersonByDeptAndRoleName("7", "汇总审批人");
         if (StringUtils.isBlank(o.getEvaluateId())) {
             ar.setFailMsg("评价ID不能为空");

src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java

@@ -157,4 +157,6 @@ public interface OutsourcerEvaluateDao {
     List<String> getPjTaskEvaluatedPostId(EvaluateDataBean o);
 
     List<String> getOrgList();
+
+    Integer selectScore(EvaluateDataBean o);
 }

src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml

@@ -32,8 +32,8 @@
     <insert id="insertEvaluateChildData">
         insert into
             pj_evaluate_result(details_id,evaluate_id,sub_evaluate_id,sub_id,pro_id,dept_id,person_id,json,title_list,is_project,
-                            check_one,check_person_one,is_active)
-        values(#{parentId},#{evaluateId},#{templateId},#{subId},#{proId},#{deptId},#{userId},#{jsonData},#{titleFiled},#{isProject},'0','0','1')
+                            check_one,check_person_one,is_active,person_ids)
+        values(#{parentId},#{evaluateId},#{templateId},#{subId},#{proId},#{deptId},#{userId},#{jsonData},#{titleFiled},#{isProject},'0','0','1',#{userId})
     </insert>
     <update id="audit">
         <if test="evaluateType == 1 ">
@@ -560,7 +560,7 @@
             sub_evaluate_id as templateId,
             dept_id as deptId,
             json as jsonData,
-            GROUP_CONCAT(su.username ) as userName,
+            GROUP_CONCAT(DISTINCT su.username ) as userName,
             per.person_id as userId,
             ifnull(per.check_one,'0') as isApprove,
             ifnull(per.check_two,'0') as isTwoApprove,
@@ -826,6 +826,14 @@
          where
              org_type = '1'
     </select>
+    <select id="selectScore" resultType="java.lang.Integer">
+        select
+            count(*)
+          from
+              pj_evaluate_details_child
+         where
+              evaluate_id = #{evaluateId} and post_id = #{deptId} and details_id = #{detailsId} and (score is null or score = '')
+    </select>
 
     <update id="updateEvaluateRecordByEvaluateId">
         update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}

src/main/resources/static/js/filePreview.js

@@ -90,13 +90,16 @@ var Base64 = {
 }
 //
 // var filePreviewPath = "http://36.33.26.201:21624/GsSubEvaluate/statics/";
-var filePreviewPath = "http://192.168.0.14:1803/GsSubEvaluate/statics/";   // 测试环境
+// var filePreviewPath = "http://192.168.0.14:1803/GsSubEvaluate/statics/";   // 测试环境
+
+var filePreviewPath = "http://112.29.103.165:1618/GsSubEvaluate/statics/";   // 生产环境
 
 
 // var filePreviewPath = "http://127.0.0.1:1803/GsSubEvaluate/statics/";
 // var filePreviewPath = "http://192.168.0.2:1803/GsSubEvaluate/statics/";
 
-var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url=";
+// var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url=";  // 测试环境
+var filePreviewPathAll = "http://112.29.103.165:1618/onlinePreview?url=";  // 生产环境
 
 function filePreview(url) {
     let path;

src/main/resources/static/pages/evaluate/person/EvaluatePersonAdd.html

@@ -180,6 +180,7 @@
                     $('#deptId').attr('disabled', 'disabled');
                 } else {
                     $('#deptId').val("");
+                    $('#deptId').removeAttr('disabled');
                 }
                 layui.form.render('select'); // 刷新下拉框
             });