fix:保存任务信息

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java

@@ -88,5 +88,12 @@ public interface PendingTaskService {
      */
     public boolean updateFinish(String relationId);
 
+    /**
+     * 完成
+     * @param task
+     * @return
+     */
+    public boolean changeByRelationId(PendingTaskBO task);
+
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.notify.impl;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.commons.util.StringUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.manage.service.dao.mapper.PendingTaskMapper;
 import com.gic.haoban.manage.service.entity.TabPendingTask;
@@ -10,6 +11,7 @@ import com.gic.haoban.manage.service.pojo.bo.PendingTaskBO;
 import com.gic.haoban.manage.service.service.notify.PendingTaskService;
 import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -124,4 +126,20 @@ public class PendingTaskServiceImpl implements PendingTaskService {
         pendingTaskMapper.updateByPrimaryKeySelective(pendingTask);
         return true;
     }
+
+    @Override
+    public boolean changeByRelationId(PendingTaskBO task) {
+        if (StringUtils.isBlank(task.getRelationId())) {
+            return false;
+        }
+        TabPendingTask pendingTask = pendingTaskMapper.getByRelationId(task.getRelationId());
+        if (null == pendingTask) {
+            return true;
+        }
+        TabPendingTask tabPendingTask = EntityUtil.changeEntityByJSON(TabPendingTask.class, task);
+        tabPendingTask.setId(pendingTask.getId());
+        tabPendingTask.setUpdateTime(new Date());
+        pendingTaskMapper.updateByPrimaryKeySelective(tabPendingTask);
+        return true;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -137,7 +137,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         PendingTaskBO pendingTaskBO = new PendingTaskBO();
         pendingTaskBO.setRelationId(relationId);
         pendingTaskBO.setClerkId(newExeutiveClerkId);
-        boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
+        boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
         return ServiceResponse.success(b);
     }
 
@@ -147,7 +147,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         pendingTaskBO.setRelationId(relationId);
         pendingTaskBO.setClerkId(newExeutiveClerkId);
         pendingTaskBO.setFinishFlag(1);
-        boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
+        boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
         return ServiceResponse.success(b);
     }
 
@@ -179,7 +179,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
         PendingTaskBO pendingTaskBO = new PendingTaskBO();
         pendingTaskBO.setRelationId(relationId);
         pendingTaskBO.setInvalidTime(endTime);
-        boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
+        boolean b = pendingTaskService.changeByRelationId(pendingTaskBO);
         return ServiceResponse.success(b);
     }