From 4c54a673dd2be2358be5dcb8e72ad5019bec9939 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 9 Jul 2024 10:35:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B-=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/common/ActivitiCommon.java | 1 + ...cessStandardComplianceCheckController.java | 36 +++++----- .../ProcessStandardComplianceCheck.java | 18 +++++ ...ProcessStandardComplianceCheckService.java | 3 +- ...essStandardComplianceCheckServiceImpl.java | 72 +++++++++++++++---- .../modules/activiti/util/ExcelUtils.java | 5 +- 6 files changed, 98 insertions(+), 37 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java index 19ceab12..deebcaaf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java @@ -8,4 +8,5 @@ public class ActivitiCommon { public static final String PASS = "pass"; public static final String MAIN_INSTANCE_ID = "mainInstanceId"; public static final String PARENT_TASK_ID = "parentTaskId"; + public static final String DISTRIBUTE = "distribute"; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index ed2b1d6a..79f97225 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.standardComplianceCheck.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.common.system.base.controller.JeroController; @@ -29,7 +30,6 @@ import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; @@ -95,10 +95,9 @@ public class ProcessStandardComplianceCheckController extends JeroController transfer(@RequestBody TransferVO transferVO) { processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); @@ -107,10 +106,11 @@ public class ProcessStandardComplianceCheckController extends JeroController handle(@PathVariable("taskId") String taskId) { @@ -123,16 +123,14 @@ public class ProcessStandardComplianceCheckController extends JeroController generate(@RequestPart("scc") ProcessStandardComplianceCheck scc, - @RequestPart("modelFile") MultipartFile modelFile, - @RequestPart(name = "splitFile", required = false) MultipartFile splitFile) throws Exception { - return Result.OK(sccService.generate(scc, modelFile, splitFile)); + public Result generate(@RequestBody ProcessStandardComplianceCheck scc) throws Exception { + return Result.OK(ResultCommon.OK, sccService.generate(scc)); } /** @@ -146,12 +144,12 @@ public class ProcessStandardComplianceCheckController extends JeroController()); return mv; } @@ -169,10 +167,10 @@ public class ProcessStandardComplianceCheckController extends JeroController()); return mv; } @@ -180,9 +178,9 @@ public class ProcessStandardComplianceCheckController extends JeroController deleteBatch(@RequestBody Map map) { + public Result deleteBatch(@RequestBody Map map) { String var1 = map.get("ids"); - if(StringUtils.isBlank(var1)){ + if (StringUtils.isBlank(var1)) { return Result.error("参数不识别!"); } this.sccService.removeByIds(Arrays.asList(var1.split(","))); @@ -197,8 +195,8 @@ public class ProcessStandardComplianceCheckController extends JeroController> queryPageList(ProcessStandardComplianceCheckDetail processStandardComplianceCheckDetail, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java index 590fe498..ea8c4b72 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java @@ -94,12 +94,16 @@ public class ProcessStandardComplianceCheck implements Serializable { /** * 新生产车实施日期 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新生产车实施日期") private Date newProductImplDate; /** * 新认证车实施日期 */ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新认证车实施日期") private Date newAuthImplDate; @@ -121,6 +125,20 @@ public class ProcessStandardComplianceCheck implements Serializable { @ApiModelProperty(value = "是否与上一版相同") private String isSameLastVersion; + /** + * 车型上传文件Id + */ + @ApiModelProperty(value = "车型上传文件Id") + @TableField(exist = false) + private String modelFile; + + /** + * 拆解单上传文件Id + */ + @ApiModelProperty(value = "拆解单上传文件Id") + @TableField(exist = false) + private String splitFile; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java index cb8d95b1..94db7a8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java @@ -5,7 +5,6 @@ import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck; import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO; import org.activiti.engine.delegate.DelegateTask; -import org.springframework.web.multipart.MultipartFile; /** * @author ThinkBook @@ -24,5 +23,5 @@ public interface IProcessStandardComplianceCheckService extends IService processInfoVO); - String generate(ProcessStandardComplianceCheck scc, MultipartFile modelFile, MultipartFile splitFile) throws Exception; + String generate(ProcessStandardComplianceCheck scc) throws Exception; } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index c4838487..a9d3440a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.MinioUtil; import com.jero.modules.activiti.common.ActivitiCommon; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; @@ -31,23 +32,30 @@ import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.laws.enterprise.util.BeanCopyUtils; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.sys.utils.UserUtils; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; +import org.apache.http.entity.ContentType; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.jero.modules.activiti.common.ActivitiCommon.DISTRIBUTE; import static com.jero.modules.activiti.common.ActivitiCommon.PASS; import static com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants.*; @@ -84,6 +92,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInfoVO) { // 流程Key @@ -166,16 +177,31 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl userMap = new HashMap<>(); - Map flowUser; // 更新审批表为完成，填充数据 actFlowCommonService.updateApprovalInfo(processTask, taskId); - String curUserId; + String curUserId = UserUtils.getUserId(); switch (xmlNodeId) { - + case DEPT_USER_DISTRIBUTE: + break; + case MAIN_CHECK_USER_DISTRIBUTE: +// this.mainCheckUserDistribute() + runtimeService.setVariable(processInstanceId, DISTRIBUTE, true); + break; + case MAIN_CHECK_USER_REDISTRIBUTE: + runtimeService.setVariable(processInstanceId, DISTRIBUTE, true); + break; + case MAIN_CHECK_USER_COLLECT: + break; + case COUNTERSIGN: + break; + case MANAGER_APPROVAL: + break; + case SENIOR_MANAGER_APPROVAL: + break; + case DESIGNER_ENGINEER_EVALUATION: + break; + case MAIN_CHECK_USER_APPROVAL: + break; } // TODO 转办修改流程变量逻辑 switch (xmlNodeId) { @@ -184,7 +210,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl modelExcelVOList = this.getModelExcelData(modelFile); // 新增流程主表数据 @@ -206,6 +235,24 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl fileInfos = ossFileService.getFileInfos(fileId); + if (fileInfos == null || fileInfos.isEmpty()) { + return null; + } + OSSFile fileInfo = fileInfos.get(0); + String fileName = fileInfo.getFileName(); + String url = fileInfo.getUrl(); + try (InputStream originalInputStream = MinioUtil.getMinioFile(MinioUtil.getBucketName(), url)) { + if (originalInputStream == null) { + return null; + } + return new MockMultipartFile(fileName, fileName, ContentType.APPLICATION_OCTET_STREAM.toString(), originalInputStream); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + /** * 循环生成所有数据 * @@ -224,6 +271,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl splitExcelVOList; try { @@ -330,8 +377,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl modelExcelVOList; try { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java index 16a3d681..b25a836c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java @@ -19,7 +19,6 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -89,11 +88,11 @@ public class ExcelUtils { public static List getHeaderFromExcel(InputStream is) throws Exception { List headers = new ArrayList<>(); - Workbook workbook = new XSSFWorkbook(is); + Workbook workbook = new HSSFWorkbook(is); Sheet sheet = workbook.getSheetAt(0); // HeadRow在index 1 - for (int rowIndex = 1; rowIndex <= 1; rowIndex++) { + for (int rowIndex = 0; rowIndex <= 0; rowIndex++) { Row row = sheet.getRow(rowIndex); for (Cell cell : row) { headers.add(cell.getStringCellValue());