提交测试

src/main/java/com/lz/modules/app/controller/ResultRecordController.java

@@ -815,33 +815,34 @@ public class ResultRecordController extends AbstractController {
                 if(dto.getCommentId() != null && dto.getCommentId().intValue() > 0 && resultDetail1 != null){
                     //有评论id
                     if(resultDetail1.getIsDelete().intValue() == 1){
-                        commandValue += (commandIndex + "(删除)" + resultDetail1.getTarget() + "\r\n");
+                        commandValue += (commandIndex + "：(删除)" + resultDetail1.getTarget() + "\r\n");
                         commandIndex++;
                         resultDetail1.setIsBack(1);
                     }else{
                         boolean isUp = false;
                         if(!resultDetail.getTarget().equals(resultDetail1.getTarget())){
                             //打上标识
-                            commandValue += (commandIndex + "(修改) 名称：" +
+                            commandValue += ("(修改) 名称：" +
                                     resultDetail1.getTarget()+ " 为：" + resultDetail.getTarget() + "\r\n");
                             isUp = true;
 
                         }
                         if(!resultDetail.getKeyResult().equals(resultDetail1.getKeyResult())){
                             //打上标识
-                            commandValue += (commandIndex + "(修改) 考核标准：" +
+                            commandValue += ("(修改) 考核标准：" +
                                     resultDetail1.getKeyResult() + " 为：" + resultDetail.getTarget() + "\r\n");
                             isUp = true;
                         }
                         if(!resultDetail.getCheckWeight().equals(resultDetail1.getCheckWeight())){
                             //打上标识
-                            commandValue += (commandIndex + "(修改) 权重：" +
+                            commandValue += ("(修改) 权重：" +
                                     resultDetail1.getCheckWeight().multiply(new BigDecimal(100)).intValue() + "% 为："
                                     + resultDetail.getCheckWeight().multiply(new BigDecimal(100)).intValue() +
                                     "%\r\n");
                             isUp = true;
                         }
                         if(isUp){
+                            commandValue = commandValue + "：" + commandValue;
                             commandIndex++;
                             resultDetail1.setIsBack(1);
                         }

src/main/resources/mapper/app/ResultCommentMapper.xml

@@ -113,7 +113,7 @@
         update
             lz_result_comment
         set
-
+            opt_desc = '修改了目标',
             comment = #{commandValue}
                 ,gmt_modified = now()
         where id = #{commandId}

src/main/resources/mapper/app/ResultDetailMapper.xml

@@ -147,7 +147,7 @@
 
 
     <select id="selectByRecordId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
-        select * from lz_result_detail  where record_id=#{recordResultId} and is_delete = 0 order by type asc ,priority desc
+        select * from lz_result_detail  where record_id=#{recordResultId} and is_delete = 0 and is_back=0 order by type asc ,priority desc
     </select>
 
     <select id="selectByRecordIdType" resultType="com.lz.modules.sys.entity.app.ResultDetail">
@@ -203,7 +203,7 @@
         update lz_result_detail set is_delete = 1, gmt_modified = now() where record_id=#{recordId} and is_delete = 0
     </update>
 
-    <select id="selectNotNoticeResultDetailByBackId" resultType="com.lz.modules.flow.model.ResultDetailDto">
+    <select id="selectNotNoticeResultDetailByBackId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
         select * from lz_result_detail  where  back_id = #{backId} and is_back = 2 order by priority asc
     </select>