From 46f52c9c91ab0ee10970207a263ae530f781d6af Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 11 Jul 2024 14:56:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=9A=E5=8A=A1=E5=88=86=E6=B4=BE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessStandardComplianceCheckController.java     | 11 +++--------
 .../entity/ProcessStandardComplianceCheckDetail.java  |  3 +++
 .../ProcessStandardComplianceCheckServiceImpl.java    |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

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 129b5ca3..cdb5b11a 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
@@ -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));
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
index 35021028..32b0b540 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheckDetail.java
@@ -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;
 
     /**
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 1948f1fe..8696ec76 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
@@ -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()) {