Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/attendancenote/service/AttendanceNoteServiceImpl.java

@@ -18,6 +18,7 @@ import com.zjugis.business.flow.attendancenote.entity.AttendanceNoteTimeDO;
 import com.zjugis.business.flow.leave.entity.LeaveDO;
 import com.zjugis.business.flow.leave.entity.LeaveTimeDO;
 import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -88,7 +89,10 @@ public class AttendanceNoteServiceImpl implements AttendanceNoteService {
             });
             attendanceNoteTimeDao.insertBatch(attendanceNoteTimeDOS);
         }
-
+        AttendanceNoteDO entity = findByInstanceId(updateObj.getInstanceId());
+        String applyTime = LocalDateTimeUtils.format(entity.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, entity.getAttendanceNoteReason()), "/");
+        workflowClient.saveFlowDescribe(updateObj.getInstanceId(),flowDesc);
     }
 
     @Override

zjugis-business/src/main/java/com/zjugis/business/flow/businesstravel/service/TravelServiceImpl.java

@@ -14,6 +14,7 @@ import com.zjugis.business.flow.businesstravel.entity.TravelDO;
 import com.zjugis.business.flow.businesstravel.entity.TravelTimeDO;
 import com.zjugis.business.service.ProjectService;
 import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -117,6 +118,10 @@ public class TravelServiceImpl implements TravelService {
             });
             travelTimeDao.insertBatch(travelTimeDOS);
         }
+        TravelDO entity = findByInstanceId(updateObj.getInstanceId());
+        String applyTime = LocalDateTimeUtils.format(entity.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, entity.getTravelReason()), "/");
+        workflowClient.saveFlowDescribe(updateObj.getInstanceId(), flowDesc);
     }
 
     @Override

zjugis-business/src/main/java/com/zjugis/business/flow/leave/service/LeaveServiceImpl.java

@@ -17,6 +17,7 @@ import com.zjugis.business.flow.leave.dao.LeaveTimeDao;
 import com.zjugis.business.flow.leave.entity.LeaveDO;
 import com.zjugis.business.flow.leave.entity.LeaveTimeDO;
 import com.zjugis.framework.common.pojo.CommonResult;
+import com.zjugis.framework.common.util.date.LocalDateTimeUtils;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
 import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
@@ -39,6 +40,7 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
+import static com.zjugis.business.constants.FlowStatusConstants.FLOW_PROCESS;
 import static com.zjugis.business.enums.ErrorCodeConstants.LEAVE_NOT_EXISTS;
 import static com.zjugis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zjugis.framework.common.util.collection.CollectionUtils.convertSet;
@@ -102,6 +104,10 @@ public class LeaveServiceImpl implements LeaveService {
             });
             leaveTimeDao.insertBatch(leaveTimeDOS);
         }
+        LeaveDO entity = findByInstanceId(updateObj.getInstanceId());
+        String applyTime = LocalDateTimeUtils.format(entity.getCreateTime(), null);
+        String flowDesc = StringUtils.join(Arrays.asList(entity.getUserNickname(), applyTime, entity.getLeaveReason(), entity.getLeaveDays()), "/");
+        workflowClient.saveFlowDescribe(updateObj.getInstanceId(),flowDesc);
     }
 
     @Override