diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmexitpermit/ScmExitPermit.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmexitpermit/ScmExitPermit.java new file mode 100644 index 0000000000..48fb1e6a69 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmexitpermit/ScmExitPermit.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.scm.api.scmexitpermit; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/2 16:08 + * @Description + */ +@Data +public class ScmExitPermit extends BaseEntity { + private static final long serialVersionUID = -7334329732636532160L; + @ApiModelProperty("关联sid") + private String linkSid; + @ApiModelProperty("出门证地址") + private String url; + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.java new file mode 100644 index 0000000000..285b50a9f5 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.java @@ -0,0 +1,15 @@ +package com.yxt.anrui.scm.biz.scmexitpermit; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit; +import org.apache.ibatis.annotations.Mapper; + +/** + * @Author dimengzhe + * @Date 2022/8/2 16:12 + * @Description + */ +@Mapper +public interface ScmExitPermitMapper extends BaseMapper { + ScmExitPermit selectByLinkSid(String sid); +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.xml new file mode 100644 index 0000000000..912beb0475 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitService.java new file mode 100644 index 0000000000..a6aae737db --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmexitpermit/ScmExitPermitService.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.scm.biz.scmexitpermit; + +import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +/** + * @Author dimengzhe + * @Date 2022/8/2 16:11 + * @Description + */ +@Service +public class ScmExitPermitService extends MybatisBaseService { + public ScmExitPermit selectByLinkSid(String sid) { + return baseMapper.selectByLinkSid(sid); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml index e281de2545..f47a875b6a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml @@ -53,7 +53,6 @@ svg.applicantName as applyName, svg.applicantDate as applyDate, svg.applicantFunds as applyPrice, - svg.temporaryCard as downloadUrl, svg.taskId, svg.procInstId FROM scm_vehicle_gression svg 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 3a12ccea92..bfe832d212 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,6 +26,7 @@ package com.yxt.anrui.scm.biz.scmvehiclegression; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -53,16 +54,19 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit; import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehiclegression.*; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeQuery; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.ScmCarTransferTaskQuery; import com.yxt.anrui.scm.api.scmvehiclegression.flowable.SubmitCarTransferDto; +import com.yxt.anrui.scm.biz.scmexitpermit.ScmExitPermitService; import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; +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; @@ -120,6 +124,8 @@ public class ScmVehicleGressionService extends MybatisBaseService createQueryWrapper(ScmVehicleGressionQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -243,6 +249,11 @@ public class ScmVehicleGressionService extends MybatisBaseService list = scmFileService.getByLinkSidAndType(record.getSid(), type); if (list.size() > 0) { record.setShowUploadBtn(false); @@ -691,6 +702,12 @@ public class ScmVehicleGressionService extends MybatisBaseService dataMap = new HashMap(); + dataMap.put("date", DateUtil.today()); +// dataMap.put("contractNo", "-"); + dataMap.put("orgName", sysOrganization.getName()); +// dataMap.put("name", "-"); + dataMap.put("modelName", exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor()); + dataMap.put("number", 1); + dataMap.put("vinNo", scmVehicleGression.getVinNo()); + dataMap.put("reason", "存放地点变更"); + dataMap.put("operator", scmVehicleGression.getOperator()); +// dataMap.put("finOperator", "-"); +// dataMap.put("carCollector", "-"); +// dataMap.put("signature", "-"); + // 模板名 + String typeName = "出门证模板"; + // 模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + // 生成的word文件名 + String fileName = "出门证.doc"; + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + // 生成文件路径 + String targetPath = sourcePath + dateStr; + // 调用生成word方法 + WordUtils.creatWord(dataMap, typeName, sourcePath, targetPath, fileName); + // 新生成的word路径； + String wordPath = targetPath + "\\" + fileName; + // 生成pdf的文件名 + String pdfName = "出门证_" + fileUploadComponent.dateFileName() + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName); + return "template" + "/" + dateStr + "/" + pdfName; + + + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl new file mode 100644 index 0000000000..5c359294e9 --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/resources/出门证.ftl @@ -0,0 +1,1467 @@ + + + + + hp + 孟哲 + 2 + 1 + 2022-08-02T05:43:00Z + 2022-08-02T05:43:00Z + 1 + 33 + 193 + 1 + 1 + 225 + 16 + + + 2052-11.1.0.11875 + 3B16B84811D744B6BD39F9CF2DD198E0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + （ + + + + + + + + ${orgName!} + + + + + + + ）出门证 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${date!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${contractNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车型名称： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${modelName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 台数： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${number!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 出门原因： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${reason!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 业务经办人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${operator!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 财务经办人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${finOperator!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提车人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${carCollector!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 出门签章： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${signature!} + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index dc5cad4d8e..b12a80a68a 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -889,4 +889,23 @@ CREATE TABLE `scm_vehinspect_itemDetail` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='验车检查项目内容'; +DROP TABLE IF EXISTS `scm_exit_permit`; +CREATE TABLE `scm_exit_permit` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `linkSid` varchar(64) DEFAULT NULL COMMENT '关联sid', + `url` varchar(64) DEFAULT NULL COMMENT '出门证地址', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='出门证'; +