diff --git a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java index 0bbeab8..7d064c5 100644 --- a/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java +++ b/secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java @@ -8,6 +8,7 @@ import com.weaver.common.hrm.util.Util; import com.weaver.common.i18n.tool.util.I18nContextUtil; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.context.impl.TenantRpcContext; +import com.weaver.mc.util.StringUtils; import com.weaver.seconddev.njwebservice.entity.ToDoCountReq; import com.weaver.seconddev.njwebservice.entity.ToDoRequestReq; import com.weaver.seconddev.njwebservice.entity.ToDoRequestRes; @@ -28,7 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.net.URLEncoder; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -109,12 +112,12 @@ public class OutToDoWorkflowService { for(int i = 0; i < info.length; ++i) { ToDoWorkFlow wftodo = new ToDoWorkFlow(); - wftodo.createTime = Util.null2String(info[i].getCreateTime()); + wftodo.createTime = formatDate(Util.null2String(info[i].getCreateTime())) ; wftodo.creatorName = Util.null2String(info[i].getCreatorName()); wftodo.currentNodeName = Util.null2String(info[i].getCurrentNodeName()); - wftodo.lastOperateTime = Util.null2String(info[i].getLastOperateTime()); + wftodo.lastOperateTime = formatDate(Util.null2String(info[i].getLastOperateTime())); wftodo.lastOperatorName = Util.null2String(info[i].getLastOperatorName()); - wftodo.receiveTime = Util.null2String(info[i].getReceiveTime()); + wftodo.receiveTime = formatDate(Util.null2String(info[i].getReceiveTime())); wftodo.requestId = Util.null2String(info[i].getRequestId()); wftodo.requestLevel = Util.null2String(info[i].getRequestLevel()); wftodo.requestName = Util.null2String(info[i].getRequestName()); @@ -122,8 +125,8 @@ public class OutToDoWorkflowService { wftodo.workflowName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowName()); wftodo.workflowTypeId = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeId()); wftodo.workflowTypeName = Util.null2String(info[i].getWorkflowBaseInfo().getWorkflowTypeName()); - wftodo.mobileurl = mobile_url + URLEncoder.encode("/spa/workflow/static4mobileform/index.html#/req?requestid=" + wftodo.requestId); - wftodo.pcurl = pc_url + URLEncoder.encode("/spa/workflow/static4form/index.html#/main/workflow/req?requestid=" + wftodo.requestId); + wftodo.mobileurl = mobile_url + URLEncoder.encode("http://oateste10.hengtonggroup.com.cn:20600/papi/secondev/sso/custom/login?target=jt&redirectUrl= /sp/workflow/flowpage/fullView/" + wftodo.requestId); + wftodo.pcurl = pc_url + URLEncoder.encode("http://oateste10.hengtonggroup.com.cn:20600/papi/secondev/sso/custom/login?target=jt&redirectUrl= /sp/workflow/flowpage/fullView/" + wftodo.requestId); todo[i] = wftodo; } res.setWorkFlow(todo); @@ -226,4 +229,23 @@ public class OutToDoWorkflowService { } + private String formatDate (String timeStr){ + + log.error("outToDoWorkflowCount formatDate :"+ timeStr); + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String output = ""; + try { + // 将输入字符串解析为 Date 对象 + if(StringUtils.isNotEmpty(timeStr)){ + Date date = inputFormat.parse(timeStr); + // 将 Date 对象格式化为目标字符串 + output = outputFormat.format(date); + } + } catch (Exception e) { + e.printStackTrace(); + } + log.error("output :"+ output); + return output; + } }