diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index b19d6a1e..ef4b0e77 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -1,6 +1,5 @@ package cn.axzo.nanopart.visa.server.service.impl; -import cn.axzo.apollo.api.res.ConstructionAreaInfo; import cn.axzo.apollo.workspace.api.workspace.res.GetDetailRes; import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp; import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes; @@ -81,7 +80,6 @@ import cn.axzo.nanopart.visa.server.utils.Constants; import cn.axzo.orggateway.api.nodeuser.dto.OrgNodeUserDTO; import cn.axzo.orggateway.api.nodeuser.req.ListOrgNodeUserReq; import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq; -import cn.axzo.thor.client.model.DrawingMajorResp; import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum; import cn.axzo.workflow.common.model.dto.UploadFieldDTO; import cn.axzo.workflow.common.model.request.bpmn.process.BpmnProcessInstanceAbortDTO; @@ -92,7 +90,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Pair; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -111,6 +108,7 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -691,14 +689,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl formVariables = new HashMap<>(); - // 传递表单数据 TODO 传递给流程的表单项数据,还需要调整内容 + // 传递表单数据 formVariables.put(FORM_FIELD_NO, req.getNo()); - formVariables.put(FORM_FIELD_HAPPEN_TIME, req.getHappenTime()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + formVariables.put(FORM_FIELD_HAPPEN_TIME, sdf.format(req.getHappenTime())); formVariables.put(FORM_FIELD_TOPIC, req.getTopic()); formVariables.put(FORM_FIELD_RELATION_PROJECT, req.getRelationProject()); - formVariables.put(FORM_FIELD_RELATION_PROFESSIONAL, req.getRelationProfessional()); + formVariables.put(FORM_FIELD_RELATION_PROFESSIONAL, visaHelper.buildProfessionalName(req.getRelationProject(), req.getRelationProfessional())); formVariables.put(FORM_FIELD_REASON, req.getReason()); - formVariables.put(FORM_FIELD_RELATION_AREA, req.getRelationArea()); + formVariables.put(FORM_FIELD_RELATION_AREA, visaHelper.buildAreaName(req.getRelationArea())); formVariables.put(FORM_FIELD_CONTEXT_DESCRIPTION, req.getChangeContextAndDescriptionList()); String amountDesc = "不变"; if (req.getAmountChange().compareTo(BigDecimal.ZERO) > 0) {