|
|
@ -12,6 +12,7 @@ import com.yxt.anrui.terminal.api.app.flowable.*; |
|
|
|
import com.yxt.common.base.utils.StringUtils; |
|
|
|
import com.yxt.common.core.result.ResultBean; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.context.annotation.Bean; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.text.ParseException; |
|
|
@ -78,7 +79,8 @@ public class AppService { |
|
|
|
List<AppFlowableRecordVo> progressList = progressdata.getData(); |
|
|
|
progressList.forEach(f->{ |
|
|
|
AppFlowableRecordAndCommentVo a=new AppFlowableRecordAndCommentVo(); |
|
|
|
a.setTime(f.getCreateTime()); |
|
|
|
a.setTime(f.getFinishTime()==null?new Date():f.getFinishTime()); |
|
|
|
// a.setTime(f.getCreateTime());
|
|
|
|
a.setFlowableRecordVo(f); |
|
|
|
a.setState(0+""); |
|
|
|
list.add(a); |
|
|
|