fix: 业务分派信息翻译

This commit is contained in:
2024-07-11 14:56:01 +08:00
parent a724e14da5
commit 46f52c9c91
3 changed files with 8 additions and 10 deletions
@@ -3,20 +3,19 @@ package com.jero.modules.activiti.process.standardComplianceCheck.controller;
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.DictPoint;
import com.jero.common.aspect.annotation.Translation;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.util.MessageUtils;
import com.jero.modules.activiti.enums.ProcessTypeEnum;
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
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.ProcessStandardComplianceCheckDetail;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ModelExcelVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO;
import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.SplitExcelVO;
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckDetailService;
import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,15 +51,9 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
@Resource
private IProcessStandardComplianceCheckService sccService;
@Resource
private IProcessHandleService processHandleService;
@Resource
private ActFlowCommonService actFlowCommonService;
@Resource
private IProcessStandardComplianceCheckDetailService sccDetailService;
@AutoLog(value = "法规符合性排查流程-发起流程")
@ApiOperation(value = "法规符合性排查流程-发起流程", notes = "法规符合性排查流程-发起流程")
@PostMapping(value = "/start")
@@ -118,6 +111,8 @@ public class ProcessStandardComplianceCheckController extends JeroController<Pro
@AutoLog(value = "法规符合性排查流程-生成")
@ApiOperation(value = "法规符合性排查流程-生成", notes = "法规符合性排查流程-生成")
@PostMapping("/generate")
@Translation
@DictPoint
public Result<List<ProcessStandardComplianceCheckDetail>> generate(@RequestBody ProcessStandardComplianceCheck scc) throws Exception {
return Result.OK(MessageUtils.getMessage(ResultCommon.OK), sccService.generate(scc));
}
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -91,6 +92,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
* 车型状态
*/
@ApiModelProperty(value = "车型状态")
@Dict(dicCode = "model_status")
private String modelState;
/**
@@ -163,6 +165,7 @@ public class ProcessStandardComplianceCheckDetail implements Serializable {
* 责任部门
*/
@ApiModelProperty(value = "责任部门")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
private String authDept;
/**
@@ -299,7 +299,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
detail.setModelState(modelExcelVO.getModelState());
detail.setTermNumber(detailInfo.getTermNumber());
detail.setTermTitle(detailInfo.getTermTitle());
detail.setTermContent(detail.getTermContent());
detail.setTermContent(detailInfo.getTermContent());
detail.setAuthDept(detailInfo.getAuthDept());
detail.setCheckId(detailInfo.getCheckId());
result.add(detail);
@@ -379,7 +379,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
ImportParams params = new ImportParams();
params.setHeadRows(0);
params.setNeedSave(true);
List<ModelExcelVO> splitExcelVOList;
List<SplitExcelVO> splitExcelVOList;
try {
splitExcelVOList = ExcelImportUtil.importExcel(splitFile.getInputStream(), SplitExcelVO.class, params);
if (splitExcelVOList.isEmpty()) {