From ea1a1dd86370c024d77d4a7f8a0295ca938391af Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Sep 2022 09:41:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/base/biz/basevehicle/BaseVehicleService.java | 6 ++---- .../base/biz/busvehicleorder/BusVehicleOrderService.java | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index e2f19b92cd..f5b18e7ec2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -28,8 +28,6 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -555,10 +553,11 @@ public class BaseVehicleService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list2 = new ArrayList<>(); list2.add(getConfigValueSpanSize("颜色", configVo.getCarColor())); - list2.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine())); + list2.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine())); list2.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror())); list2.add(getConfigValueSpanSize("轮胎", configVo.getTireSize())); list2.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification())); + list2.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue())); list2.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio())); list2.add(getConfigValueSpanSize("空调", configVo.getAirConditioner())); list2.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial())); @@ -573,7 +572,6 @@ public class BaseVehicleService extends MybatisBaseService> commonConfigInfoList = new ArrayList<>(); List list3 = new ArrayList<>(); list3.add(getConfigValueSpanSize("颜色", configVo.getCarColor(), 1)); - list3.add(getConfigValueSpanSize("缓冲器", configVo.getSlowMachine(), 1)); + list3.add(getConfigValueSpanSize("缓速器", configVo.getSlowMachine(), 1)); list3.add(getConfigValueSpanSize("后视镜", configVo.getRearViewMirror(), 1)); list3.add(getConfigValueSpanSize("轮胎", configVo.getTireSize(), 1)); list3.add(getConfigValueSpanSize("驾驶室", configVo.getSpecification(), 1)); - list3.add(getConfigValueSpanSize("后桥速比", configVo.getRearAxleRatio(), 1)); + list3.add(getConfigValueSpanSize("后桥", configVo.getRearAxleValue(),1)); + list3.add(getConfigValueSpanSize("速比", configVo.getRearAxleRatio(), 1)); list3.add(getConfigValueSpanSize("空调", configVo.getAirConditioner(), 1)); list3.add(getConfigValueSpanSize("轮毂材质", configVo.getHubMaterial(), 1)); list3.add(getConfigValueSpanSize("导流罩", configVo.getBaffleModel(), 1)); From b0635a62c77c946cb3846ba22308b9d7a299f5cd Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Sep 2022 10:05:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleGressionService.java | 61 +--- .../src/main/resources/临时出门证.docx | Bin 0 -> 12876 bytes .../{出门证.ftl => 出门证模板.ftl} | 267 ++++++++++++------ 3 files changed, 178 insertions(+), 150 deletions(-) create mode 100644 anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx rename anrui-scm/anrui-scm-biz/src/main/resources/{出门证.ftl => 出门证模板.ftl} (84%) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java index 663fcf967b..7799e34877 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java @@ -26,7 +26,6 @@ package com.yxt.anrui.scm.biz.scmvehiclegression; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -46,7 +45,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlFeign; -import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; @@ -77,8 +75,9 @@ import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; -import lombok.Data; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -1191,6 +1190,7 @@ public class ScmVehicleGressionService extends MybatisBaseService appMap, ScmVehicleGression - scmVehicleGression) { - //=====极光推送信息========================================参数组装 - String procId = scmVehicleGression.getProcInstId(); - ResultBean> resultBean = flowTaskFeign.getLatestTasks(procId); - String nextNodeUserSids = resultBean.getData().get(0).getASSIGNEE_(); - List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - //根据用户的sid查询用户的id - ResultBean stringList1 = sysUserFeign.selectIdBySid(receiveSidList); - List reveiveIdList = Arrays.asList(stringList1.getData().split(",")); - MessageFlowableDto messageFlowableDto = new MessageFlowableDto(); - MessageJsonDto messageJsonDto = new MessageJsonDto(); - BeanUtil.copyProperties(ufVo, messageJsonDto); - //查询流程审批的页面操作地址组装json的参数 - //根据taskDef和移动端标识 - ResultBean selectUrlByKey = sysProUrlFeign.selectUrlByKey(ProcDefEnum.SCMCARTRANSFER.getProDefId(), ufVo.getTaskDefKey(), "1", "2"); - SysProUrlVo sysProUrlVo = selectUrlByKey.getData(); - messageFlowableDto.setBusinessSid(scmVehicleGression.getSid()); - messageFlowableDto.setApp_type("2"); - if (sysProUrlVo.getUrl().contains("#")) { - messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0)); - List codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList()); - int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray(); - messageJsonDto.setButtons(ints); - } else { - messageFlowableDto.setModuleAction(sysProUrlVo.getUrl()); - } - messageFlowableDto.setModuleSid(Arrays.asList(sysProUrlVo.getModulePluginName().split("#")).get(0)); - messageJsonDto.setTaskName(ufVo.getNodeState()); - messageJsonDto.setProcInsId(ufVo.getProcInsId()); - messageJsonDto.setAppMap(appMap); - messageFlowableDto.setJson(messageJsonDto); - messageFlowableDto.setList(receiveSidList); - messageFlowableDto.setReceiveIdList(reveiveIdList); - messageFlowableDto.setModuleName("存放地点变更申请"); - messageFlowableDto.setMsgContent("存放地点变更申请"); - messageFlowableDto.setMsgTitle("存放地点变更申请"); - messageFlowableDto.setCreateName(scmVehicleGression.getApplicantName()); - messageFlowableDto.setTaskId(ufVo.getTaskId()); - ResultBean stringResultBean = messageFeign.getMessage(messageFlowableDto); - String msgSid = stringResultBean.getData(); - return msgSid; - - } - public ResultBean getErtraState(String sid, String userSid) { ResultBean rb = ResultBean.fireFail(); AppErtraStateVo vo = new AppErtraStateVo(); diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx b/anrui-scm/anrui-scm-biz/src/main/resources/临时出门证.docx new file mode 100644 index 0000000000000000000000000000000000000000..1350a8997e9bd3ff12f9887935729efc0dfc1055 GIT binary patch literal 12876 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 CQUARF literal 0 HcmV?d00001 diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl similarity index 84% rename from anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl rename to anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl index fcd4e192da..6e261d4fc3 100644 --- a/anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl +++ b/anrui-scm/anrui-scm-biz/src/main/resources/出门证模板.ftl @@ -31,18 +31,18 @@ 孟哲 2 1 - 2022-08-15T07:04:00Z - 2022-08-15T07:04:00Z + 2022-09-08T01:57:00Z + 2022-09-08T01:57:00Z 1 - 33 - 193 + 36 + 211 1 1 - 225 + 246 16 - 2052-11.1.0.12302 + 2052-11.1.0.12313 3B16B84811D744B6BD39F9CF2DD198E0 @@ -546,6 +546,7 @@ + @@ -570,16 +571,20 @@ - + + - + + + + @@ -588,15 +593,19 @@ + + + + @@ -606,6 +615,7 @@ + @@ -613,8 +623,12 @@ + + + + @@ -631,13 +645,16 @@ + + + @@ -647,7 +664,7 @@ - + @@ -665,7 +682,7 @@ - ${orgName!} + ${orgName!} @@ -698,7 +715,7 @@ - + @@ -713,8 +730,8 @@ - + @@ -725,7 +742,7 @@ - + @@ -749,8 +766,8 @@ - + @@ -760,7 +777,7 @@ - + @@ -782,8 +799,8 @@ - + @@ -794,7 +811,7 @@ - + @@ -803,7 +820,7 @@ - 合同编号： + 申请人： @@ -818,8 +835,8 @@ - + @@ -829,19 +846,19 @@ - + - ${contractNo!} + ${application!} - + @@ -856,8 +873,8 @@ - + @@ -868,7 +885,7 @@ - + @@ -883,8 +900,7 @@ - - + @@ -893,8 +909,8 @@ - + @@ -904,7 +920,7 @@ - + @@ -915,8 +931,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractNo!} + + + - + @@ -931,8 +1012,8 @@ - + @@ -943,7 +1024,7 @@ - + @@ -967,8 +1048,8 @@ - + @@ -978,14 +1059,14 @@ - + - ${modelName!} + ${modelName!} @@ -1000,8 +1081,8 @@ - + @@ -1012,7 +1093,7 @@ - + @@ -1036,8 +1117,8 @@ - + @@ -1047,7 +1128,7 @@ - + @@ -1059,7 +1140,7 @@ - + @@ -1071,8 +1152,8 @@ - + @@ -1083,7 +1164,7 @@ - + @@ -1108,8 +1189,8 @@ - + @@ -1119,19 +1200,19 @@ - + - ${vinNo!} + ${vinNo!} - + @@ -1143,8 +1224,8 @@ - + @@ -1155,7 +1236,7 @@ - + @@ -1180,8 +1261,8 @@ - + @@ -1191,7 +1272,7 @@ - + @@ -1203,7 +1284,7 @@ - + @@ -1215,8 +1296,8 @@ - + @@ -1227,7 +1308,7 @@ - + @@ -1251,8 +1332,8 @@ - + @@ -1262,7 +1343,7 @@ - + @@ -1284,8 +1365,8 @@ - + @@ -1296,7 +1377,7 @@ - + @@ -1320,8 +1401,8 @@ - + @@ -1331,19 +1412,19 @@ - + - ${finOperator!} + ${finOperator!} - + @@ -1355,8 +1436,8 @@ - + @@ -1367,7 +1448,7 @@ - + @@ -1391,8 +1472,8 @@ - + @@ -1402,14 +1483,14 @@ - + - ${carCollector!} + ${carCollector!} @@ -1424,8 +1505,8 @@ - + @@ -1436,7 +1517,7 @@ - + @@ -1460,8 +1541,8 @@ - + @@ -1471,7 +1552,7 @@ - + @@ -1484,14 +1565,14 @@ - + - + From 6cf9fbf195ab6351375cff6fce39b501be0bc192 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Sep 2022 10:37:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buscenter/biz/bussalesorder/BusSalesOrderService.java | 1 - .../biz/finbillapplication/FinBillApplicationService.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index c11b11481a..639111f6aa 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -1174,7 +1174,6 @@ public class BusSalesOrderService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); bv.setFormVariables(variables); if (bv.getTaskId().equals(finBillApplication.getTaskId())) { @@ -761,7 +761,7 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -885,7 +885,7 @@ public class FinBillApplicationService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("sid", businessSid); + appMap.put("contractSid", businessSid); variables.put("app", appMap); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); From dcff2643c606dc8699663abd082081b791c250ec Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 8 Sep 2022 10:42:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index b040ed2877..9dd7f64452 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -74,7 +74,7 @@ , '%') - order by bo.id + order by bo.id desc