代码提交

src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/InitiateEvaluateBean.java

@@ -68,6 +68,7 @@ public class InitiateEvaluateBean {
     private String endDate;
 
     private String proName;
+    private String proIdStr;
     private String subName;
 
    private List<SubBean> subList;

src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java

@@ -61,11 +61,20 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
         try {
             String subInfo = o.getSubInfo();
             JSONArray jsonArray = JSONArray.parseArray(subInfo);
-            int count = dao.checkIsExistEvaluate(o);
+            List<String> proIdList = new ArrayList<>();
-            if (count > 0) {
+            for (int i = 0; i < jsonArray.size(); i++) {
-                ar.setFailMsg("当前事业部在" + o.getEvaluateDate() + "已经发起过评价，请勿重复发起!!!");
+                JSONObject obj = jsonArray.getJSONObject(i);
-                return ar;
+                String proId = obj.getString("proId");
+                o.setProId(proId);
+                int count = dao.checkIsExistEvaluate(o);
+                if (count > 0) {
+                    ar.setFailMsg("当前" + obj.getString("proName") + "在" + o.getEvaluateDate() + "已经发起过评价，请勿重复发起!!!");
+                    return ar;
+                }
+                proIdList.add(proId);
             }
+            // 转换为逗号分隔的字符串
+            String proIdStr = String.join(",", proIdList);
             //判断是否已经发起过评价
             dao.deleteInitiateLink(o.getId());
             String json = dao.getTemplationJson(o.getTemplateId());
@@ -136,9 +145,11 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
             String formattedDate = outputFormat.format(inputFormat.parse(o.getEvaluateDate()));
             o.setTemplateTitle(formattedDate + "外包商对标考核统计表");
             if ("add".equals(o.getType())) {
+                o.setProIdStr(proIdStr);
                 dao.insertInitiateEvaluate(o);
                 dao.insertInitiateEvaluateLink(jsonArray, o.getId());
             } else {
+                o.setProIdStr(proIdStr);
                 dao.updateInitiateEvaluate(o);
                 dao.insertInitiateEvaluateLink(jsonArray, o.getId());
             }

src/main/resources/mappers/initiateEvaluate/InitiateEvaluateMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.bonus.gs.sub.evaluate.evaluate.dao.InitiateEvaluateDao">
     <insert id="insertInitiateEvaluate" useGeneratedKeys="true" keyProperty="id">
         insert into pj_evaluate_record
-        (dept_id, evaluate_name, template_id, version, year_and_month, task_status, is_active)
+        (dept_id, evaluate_name, template_id, version, year_and_month, task_status, is_active,pro_id)
-        values (#{orgId}, #{templateTitle}, #{templateId}, #{version}, #{evaluateDate}, 0, 1)
+        values (#{orgId}, #{templateTitle}, #{templateId}, #{version}, #{evaluateDate}, 0, 1, #{proIdStr})
     </insert>
     <insert id="insertInitiateEvaluateLink">
         insert into pj_evaluate_sub
@@ -25,6 +25,7 @@
                evaluate_name  = #{templateTitle},
                template_id    = #{templateId},
                year_and_month = #{evaluateDate},
+               pro_id         = #{proIdStr},
                version        = #{version}
          where evaluate_id = #{id}
     </update>
@@ -143,6 +144,7 @@
         from pj_evaluate_record per
         where per.dept_id = #{orgId}
         and per.year_and_month = #{evaluateDate} and is_active = '1'
+        and FIND_IN_SET(#{proId}, pro_id) > 0
         <if test="id!=null and id!=''">
             and evaluate_id !=#{id}
         </if>