修改系统消息，论证终止或论证成功仍然显示

resources/mapper/modules/notify/NotifyDao.xml

@@ -33,8 +33,8 @@
   			status,
   			s.create_by,
   			s.create_date,
-  			update_by,
-  			update_date,
+      s.update_by,
+      s.update_date,
   			s.remarks,
   			url,
   			is_complete,
@@ -43,9 +43,11 @@
   			foc_notify s
   		LEFT JOIN foc_verify_record r 
   		ON s.verif_id=r.verif_id  AND ((r.record_type='01' AND r.record_status='00') or r.verif_id is null)
+      LEFT JOIN foc_airline_verify a ON s.verif_id=a.id
   		WHERE
   			s.del_flag =#{DEL_FLAG_NORMAL}
-  	
+      AND a.verif_status!= '01'
+      AND a.verif_status!= '02'
   			AND s.depart_id = #{departId}
   				AND (s.type 
   				IN (

src/com/ejweb/modules/route/service/RouteVerifyService.java

@@ -154,11 +154,18 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
         if ("0".equals(bean.getStatus()) && "1".equals(fullRouteVerifyEntity.getStatus())) {
             return false;
         }
+        boolean remarkModify = false;
         //判断备注是否修改，如果有修改，则添加操作履历
-        boolean remarkModify = bean.getRemarks() != null && !bean.getRemarks().equals(fullRouteVerifyEntity.getRemarks());
+        if (StringUtils.isNotEmpty(bean.getRemarks())) {
+            if (!bean.getRemarks().equals(fullRouteVerifyEntity.getRemarks())) {
+                remarkModify = true;
+            }
+        }
+        LOG.info("备注修改结果：" + remarkModify + ",请求remarks为：" + bean.getRemarks() + ",数据库remarks为：" + fullRouteVerifyEntity.getRemarks());
         RecordAddBean recordAddBean = null;
         //记录初始反馈时间
         if (fullRouteVerifyEntity.getStartTime() == null) {
+            LOG.info("初始反馈时间为null；第一次反馈不增加修改记录");
             fullRouteVerifyEntity.setStartTime(new Date());
             // 完成初始反馈通知置灰
             NotifyAddBean addbean = new NotifyAddBean();
@@ -167,8 +174,13 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
             addbean.setUserCode(bean.getUserCode());
             notifyDao.NotifyComplete(addbean);
         } else {
+            boolean formTextModify = false;
             // 增加自定义表单修改操作履历
-            boolean formTextModify = fullRouteVerifyEntity.getFormText() != null && !bean.getFormText().equals(fullRouteVerifyEntity.getFormText());
+            if (StringUtils.isNotEmpty(fullRouteVerifyEntity.getFormText())) {
+                if (!bean.getFormText().equals(fullRouteVerifyEntity.getFormText())) {
+                    formTextModify = true;
+                }
+            }
             LOG.info("是否修改表单：" + formTextModify + ";是否修改备注：" + remarkModify);
             //如果修改了自定义表单或者备注，创建修改论证内容操作履历
             if (formTextModify || remarkModify) {
@@ -181,6 +193,7 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
                 if (remarkModify) {
                     recordAddBean.setRemarks(bean.getRemarks());
                 }
+                LOG.info("step1中recordAddBean：" + recordAddBean.toString());
             }
         }
         //结束上一循环
@@ -217,7 +230,10 @@ public class RouteVerifyService extends BaseService<RouteVerifyDao> {
                 recordAddBean.setRemarks(bean.getRemarks());
             }
         }
-        recordDao.insert(recordAddBean);
+        if (recordAddBean != null) {
+            LOG.info("记录为：" + recordAddBean.toString());
+            recordDao.insert(recordAddBean);
+        }
         if ("1".equals(bean.getStatus())) {
             fullRouteVerifyEntity.setEndTime(new Date());
             // 完成截止反馈通知置灰