feat(标准解读流程): 完善导出

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/controller/StandardInterpretFlowController.java

@@ -18,7 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.activiti.engine.task.Task;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -26,7 +25,6 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @ClassName: 标准解读流程
@@ -193,27 +191,4 @@ public class StandardInterpretFlowController {
     public ModelAndView exportExcelByUnDistribute(HttpServletRequest request) {
         return standardInterpretFlowService.exportExcelByUnDistribute(request);
     }
-
-    /**
-     * 标准解读流程-生成项目id
-     * @return 项目id
-     */
-    @AutoLog(value = "标准解读流程-demo", operateType = CommonConstant.OPERATE_TYPE_1)
-    @ApiOperation(value="标准解读流程-demo", notes="标准解读流程-demo")
-    @PostMapping(value = "/demo")
-    public String  demo(@RequestBody Map<String, Object> map) {
-        standardInterpretFlowService.demo(map);
-        return "1";
-    }
-
-    /**
-     * 标准解读流程-getTaskId
-     * @return 项目id
-     */
-    @AutoLog(value = "标准解读流程-getTaskId", operateType = CommonConstant.OPERATE_TYPE_1)
-    @ApiOperation(value="标准解读流程-getTaskId", notes="标准解读流程-getTaskId")
-    @PostMapping(value = "/getTaskId")
-    public List<Task> demo(String processInstanceId) {
-        return standardInterpretFlowService.getTaskId(processInstanceId);
-    }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpret.java

@@ -29,6 +29,9 @@ public class ProcessStandardInterpret extends BaseEntity {
     /**标准id*/
     @ApiModelProperty(value = "标准id")
     private String standardId;
+    /**拆分infoId*/
+    @ApiModelProperty(value = "拆分infoId")
+    private String splitInfoId;
     /**标准编号*/
     @ApiModelProperty(value = "标准编号")
     @TableField(exist = false)

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClause.java

@@ -32,7 +32,7 @@ public class ProcessStandardInterpretClause extends BaseEntity {
     /**条款标题/标准名称*/
     @ApiModelProperty(value = "条款标题/标准名称")
     @TableField(exist = false)
-    @Excel(name = "标准名称/条款标题", width = 15)
+    @Excel(name = "标准名称/条款标题", width = 18)
     private String itemTitle;
     /**条款内容*/
     @ApiModelProperty(value = "条款内容")
@@ -41,7 +41,7 @@ public class ProcessStandardInterpretClause extends BaseEntity {
     private String itemContent;
     /**各涉及部门解读人*/
     @ApiModelProperty(value = "各涉及部门解读人")
-    @Excel(name = "各涉及部门解读人", width = 15)
+    @Excel(name = "各涉及部门解读人", width = 18)
     private String interpretPersonIds;
     /**分解单来源（字典）*/
     @ApiModelProperty(value = "分解单来源（字典）")

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/entity/ProcessStandardInterpretClauseSublist.java

@@ -32,11 +32,12 @@ public class ProcessStandardInterpretClauseSublist extends BaseEntity {
     /**条款标题/标准名称*/
     @ApiModelProperty(value = "条款标题/标准名称")
     @TableField(exist = false)
-    @Excel(name = "标准名称/条款标题", width = 15)
+    @Excel(name = "标准名称/条款标题", width = 18)
     private String itemTitle;
     /**条款内容*/
     @ApiModelProperty(value = "条款内容")
     @TableField(exist = false)
+    @Excel(name = "条款内容", width = 15)
     private String itemContent;
     /**解读人*/
     @ApiModelProperty(value = "解读人")

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/mapper/xml/ProcessStandardInterpretClauseMapper.xml

@@ -8,7 +8,8 @@
                               IF(lds.id is not null, lds.standard_number, lds2.item_num) itemNum,
                               IF(lds.id is not null, lds.standard_name, lds2.item_title) itemTitle,
                               IF(lds.id is not null, null, lds2.item_content) itemContent,
-                              standard_interpret_id
+                              standard_interpret_id,
+                              psic.clause_id
                        from laws_chery_dev.process_standard_interpret_clause psic
                                 left join laws_domestic_standard lds on psic.clause_id = lds.id and lds.del_flag = 0
                                 left join laws_document_split lds2 on psic.clause_id = lds2.id and lds2.del_flag = 0

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/StandardInterpretFlowService.java

@@ -10,13 +10,11 @@ import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandar
 import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpretClauseSublist;
 import com.jero.modules.activiti.process.standardinterpret.vo.StandardInterpretFlowVO;
 import org.activiti.engine.delegate.DelegateTask;
-import org.activiti.engine.task.Task;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @InterfaceName: StandardInterpretFlowServicce
@@ -80,10 +78,6 @@ public interface StandardInterpretFlowService {
 
     StandardInterpretDTO queryBusinessData(ProcessAll processAll, ProcessApprovalRecord processApprovalRecord);
 
-    void demo(Map<String, Object> map);
-
-    List<Task> getTaskId(String processInstanceId);
-
     /**
      * 查询条款列表
      * @param standardId

laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java

@@ -4,9 +4,11 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.common.constant.CommonConstant;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.base.controller.JeroController;
@@ -47,13 +49,14 @@ import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.laws.standard.service.ILawsPartNameService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
+import com.jero.modules.split.entity.SarFileSplitItemsValEO;
+import com.jero.modules.split.mapper.SarFileSplitItemsValEOMapper;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.service.ISysDepartService;
 import com.jero.modules.system.service.ISysDictService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.DelegateTask;
@@ -66,6 +69,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -114,6 +118,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
     private final ILawsPartNameService lawsPartNameService;
     private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
     private final LawsDocumentSplitMapper lawsDocumentSplitMapper;
+    private final SarFileSplitItemsValEOMapper sarFileSplitItemsValEOMapper;
 
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private final List<String> tempList = new ArrayList<>();
@@ -220,6 +225,9 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                 LawsDocumentSplit lawsDocumentSplit = new LawsDocumentSplit();
                 BeanUtils.copyProperties(standardInterpretClauseSublist, lawsDocumentSplit);
                 lawsDocumentSplit.setId(standardInterpretClauseSublist.getClauseId());
+                lawsDocumentSplit.setItemNum(null);
+                lawsDocumentSplit.setItemTitle(null);
+                lawsDocumentSplit.setItemContent(null);
                 lawsDocumentSplitMapper.updateById(lawsDocumentSplit);
             }
         }
@@ -511,21 +519,6 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         return standardInterpretDTO;
     }
 
-    @Override
-    public void demo(Map<String, Object> map) {
-        // 完成任务
-        taskService.complete((String) map.get("taskId"), map);
-    }
-
-    @Override
-    public List<Task> getTaskId(String processInstanceId) {
-
-        TaskService taskService = ProcessEngines.getDefaultProcessEngine().getTaskService();
-        return taskService.createTaskQuery()
-                .processInstanceId(processInstanceId)
-                .list();
-    }
-
     @Override
     public List<ProcessStandardInterpretClause> getClauseList(String standardId, String fileType) {
         List<ProcessStandardInterpretClause> list = new ArrayList<>();
@@ -573,6 +566,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         processAll.setProjectId(request.getParameter("projectId"));
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
         processApprovalRecord.setNodeId(request.getParameter("nodeId"));
+        processApprovalRecord.setTaskId(request.getParameter("taskId"));
         StandardInterpretDTO standardInterpretDTO = queryBusinessData(processAll, processApprovalRecord);
 
         // Step.2 获取导出数据
@@ -587,6 +581,21 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
                     .collect(Collectors.toList());
         }
 
+        for (ProcessStandardInterpretClause processStandardInterpretClause : exportList) {
+            List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
+                    new QueryWrapper<SarFileSplitItemsValEO>()
+                            .eq("item_id", processStandardInterpretClause.getClauseId())
+                            .eq("type", "TEXT")
+                            .eq("valid_flag", CommonConstant.DEL_FLAG_0)
+                            .orderByAsc("display_seq"));
+            if (!Objects.isNull(sarFileSplitItemsValEOS)){
+                String itemContents = sarFileSplitItemsValEOS.stream()
+                        .map(SarFileSplitItemsValEO::getItemContent)
+                        .collect(Collectors.joining("\n\r"));
+                processStandardInterpretClause.setItemContent(itemContents);
+            }
+        }
+
         // Step.3 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         try {
@@ -597,6 +606,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         mv.addObject(JeroController.CLASS, ProcessStandardInterpretClause.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
         ExportParams exportParams=new ExportParams(null, "标准主解读人分发");
+        exportParams.setType(ExcelType.XSSF);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(JeroController.PARAMS,exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
@@ -604,7 +614,9 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
     }
 
     @Override
-    public Result<List<ProcessStandardInterpretClauseSublist>> importExcelByUnDistribute(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public Result<List<ProcessStandardInterpretClauseSublist>> importExcelByUnDistribute(HttpServletRequest request,
+                                                                                         HttpServletResponse response)
+                                                                                                    throws Exception {
         MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
         Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -625,10 +637,13 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
             List<ProcessStandardInterpretClauseSublist> list = BeanCopyUtils.copyBeanList(lists,
                     ProcessStandardInterpretClauseSublist.class);
             StringBuilder errorMSG = new StringBuilder();
+            String standardId = request.getParameter("standardId");
+            String splitInfoId = request.getParameter("splitInfoId");
+            LawsDomesticStandard lawsDomesticStandard = lawsDomesticStandardService.getById(standardId);
             // 字段校验
             for (int i = 0; i < list.size(); i++) {
                 String head = "第" + (i + 2) + "行：";
-                List<String> firstVerify = firstVerify(list.get(i));
+                List<String> firstVerify = firstVerify(i, list.get(i), lawsDomesticStandard, splitInfoId);
                 List<String> secondVerify = secondVerify(list.get(i));
                 List<String> thirdVerify = thirdVerify(list.get(i));
                 List<String> fifthVerify = fifthVerify(list.get(i));
@@ -662,19 +677,67 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         processAll.setProjectId(request.getParameter("projectId"));
         ProcessApprovalRecord processApprovalRecord = new ProcessApprovalRecord();
         processApprovalRecord.setNodeId(request.getParameter("nodeId"));
+        processApprovalRecord.setTaskId(request.getParameter("taskId"));
         StandardInterpretDTO standardInterpretDTO = queryBusinessData(processAll, processApprovalRecord);
 
         // Step.2 获取导出数据
         List<ProcessStandardInterpretClauseSublist> exportList =
                 standardInterpretDTO.getProcessStandardInterpretClauseSublistList();
 
-        // 过滤选中数据
+        if (!exportList.isEmpty()){
-        String selections = request.getParameter("selections");
+            // 过滤选中数据
-        if (oConvertUtils.isNotEmpty(selections)) {
+            String selections = request.getParameter("selections");
-            List<String> selectionList = Arrays.asList(selections.split(","));
+            if (oConvertUtils.isNotEmpty(selections)) {
-            exportList = exportList.stream()
+                List<String> selectionList = Arrays.asList(selections.split(","));
-                    .filter(item -> selectionList.contains(item.getId()))
+                exportList = exportList.stream()
-                    .collect(Collectors.toList());
+                        .filter(item -> selectionList.contains(item.getId()))
+                        .collect(Collectors.toList());
+            }
+
+            for (ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist : exportList) {
+                List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
+                        new QueryWrapper<SarFileSplitItemsValEO>()
+                                .eq("item_id", processStandardInterpretClauseSublist.getClauseId())
+                                .eq("type", "TEXT")
+                                .eq("valid_flag", CommonConstant.DEL_FLAG_0)
+                                .orderByAsc("display_seq"));
+                if (!Objects.isNull(sarFileSplitItemsValEOS)){
+                    String itemContents = sarFileSplitItemsValEOS.stream()
+                            .map(SarFileSplitItemsValEO::getItemContent)
+                            .collect(Collectors.joining("\n\r"));
+                    processStandardInterpretClauseSublist.setItemContent(itemContents);
+                }
+            }
+        }else {
+            // Step.2 获取导出数据
+            List<ProcessStandardInterpretClause> exportList2 =
+                    standardInterpretDTO.getProcessStandardInterpretClauseList();
+
+            // 过滤选中数据
+            String selections = request.getParameter("selections");
+            if (oConvertUtils.isNotEmpty(selections)) {
+                List<String> selectionList = Arrays.asList(selections.split(","));
+                exportList2 = exportList2.stream()
+                        .filter(item -> selectionList.contains(item.getId()))
+                        .collect(Collectors.toList());
+            }
+
+            for (ProcessStandardInterpretClause processStandardInterpretClause : exportList2) {
+                List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
+                        new QueryWrapper<SarFileSplitItemsValEO>()
+                                .eq("item_id", processStandardInterpretClause.getClauseId())
+                                .eq("type", "TEXT")
+                                .eq("valid_flag", CommonConstant.DEL_FLAG_0)
+                                .orderByAsc("display_seq"));
+                if (!Objects.isNull(sarFileSplitItemsValEOS)){
+                    String itemContents = sarFileSplitItemsValEOS.stream()
+                            .map(SarFileSplitItemsValEO::getItemContent)
+                            .collect(Collectors.joining("\n\r"));
+                    processStandardInterpretClause.setItemContent(itemContents);
+                }
+            }
+
+            exportList = BeanCopyUtils.copyBeanList(exportList2, ProcessStandardInterpretClauseSublist.class);
         }
 
         // Step.3 AutoPoi 导出Excel
@@ -687,6 +750,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         mv.addObject(JeroController.CLASS, ProcessStandardInterpretClauseSublist.class);
         //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
         ExportParams exportParams=new ExportParams(null, "标准主解读人不分发");
+        exportParams.setType(ExcelType.XSSF);
         //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
         mv.addObject(JeroController.PARAMS,exportParams);
         mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
@@ -867,8 +931,44 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         return errorList;
     }
 
-    private List<String> firstVerify(ProcessStandardInterpretClauseSublist data) {
+    private List<String> firstVerify(int i, ProcessStandardInterpretClauseSublist data,
+                                     LawsDomesticStandard lawsDomesticStandard, String splitInfoId) {
         List<String> errorList = new ArrayList<>();
+        String itemNum = data.getItemNum();
+        String itemTitle = data.getItemTitle();
+        boolean exist = true;
+        if (StringUtils.isBlank(itemNum)){
+            errorList.add("标准编号/条款号不能为空！");
+            exist = false;
+        }
+        if (StringUtils.isBlank(itemTitle)){
+            errorList.add("标准名称/条款标题不能为空！");
+            exist = false;
+        }
+        if (i == 0 && exist){
+            // 第一行校验
+            String standardNumber = lawsDomesticStandard.getStandardNumber();
+            String standardName = lawsDomesticStandard.getStandardName();
+            if (!standardNumber.equals(itemNum) || !standardName.equals(itemTitle)){
+                errorList.add("标准编号应为：" + standardNumber + "，标准名称应为：" + standardName + "！");
+            }
+        }
+
+        if (exist){
+            // 条款校验
+            LawsDocumentSplit lawsDocumentSplits = documentSplitMapper.selectOne(
+                    new LambdaQueryWrapper<LawsDocumentSplit>()
+                            .eq(LawsDocumentSplit::getInfoId, splitInfoId)
+                            .eq(LawsDocumentSplit::getItemNum, itemNum)
+                            .eq(LawsDocumentSplit::getItemTitle, itemTitle));
+            if (Objects.isNull(lawsDocumentSplits)){
+                errorList.add("不存在条号为：" + itemNum + "，条款标题为：" + itemTitle + "的条款！");
+            }else {
+                data.setClauseId(lawsDocumentSplits.getId());
+                data.setItemContent(lawsDocumentSplits.getItemContent());
+            }
+        }
+
         String isSameAsPrevVersion = data.getIsSameAsPrevVersion();
         if (StringUtils.isNotBlank(isSameAsPrevVersion)){
             List<DictModel> dictItems = sysDictService.getDictItems("yn");
@@ -982,6 +1082,12 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe
         switch (node){
             // 法规工程师发起
             case StandardInterpretCommon.REGULATORY_ENGINEER_START:
+                SarFileSplitInfoEO sarFileSplitInfoEO =
+                        sarFileSplitInfoService.getOne(new LambdaQueryWrapper<SarFileSplitInfoEO>()
+                                .eq(SarFileSplitInfoEO::getStandardId, processStandardInterpret.getStandardId())
+                                .eq(SarFileSplitInfoEO::getFileType, processStandardInterpret.getDecompositionSource())
+                                .isNull(SarFileSplitInfoEO::getPublishBeforeId), false);
+                processStandardInterpret.setSplitInfoId(sarFileSplitInfoEO.getId());
                 processStandardInterpretService.saveOrUpdate(processStandardInterpret);
                 // 如果没选择条款
                 if (CollectionUtils.isEmpty(processStandardInterpretClauseList)){

laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/LawsDocumentSplit.java

@@ -18,123 +18,112 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="laws_document_split对象", description="文档拆分")
 public class LawsDocumentSplit extends BaseEntity {
-    /**
+    // 条文号
-     * 条文号
-     */
     @ApiModelProperty("条文号")
     private String itemNum;
-
+    // 条文标题
-    /**
-     * 条文标题
-     */
     @ApiModelProperty("条文标题")
     private String itemTitle;
-
+    // 条文内容
-    /**
-     * 条文内容
-     */
     @ApiModelProperty("条文内容")
     private String itemContent;
-
+    // 条文解读
-    /**
-     * 展示顺序
-     */
-    @ApiModelProperty("展示顺序")
-    private String sortNumber;
-
-    /**
-     * 拆分目录id
-     */
-    @ApiModelProperty("拆分目录id")
-    private String menuId;
-
-    /**
-     * 技术领域
-     */
-    @ApiModelProperty("技术领域")
-    private String technicalField;
-
-    /**
-     * 信息类别
-     */
-    @ApiModelProperty("信息类别")
-    private String infoType;
-
-    /**
-     * 法规要求类型
-     */
-    @ApiModelProperty("法规要求类型")
-    private String lawsRequireType;
-
-    /**
-     * 功能分类
-     */
-    @ApiModelProperty("功能分类")
-    private String functionClassification;
-
-    /**
-     * 功能专业
-     */
-    @ApiModelProperty("功能专业")
-    private String functionProfessional;
-
-    /**
-     * 功能分组编码
-     */
-    @ApiModelProperty("功能分组编码")
-    private String functionGroupCode;
-
-    /**
-     * 功能分组名称
-     */
-    @ApiModelProperty("功能分组名称")
-    private String functionGroupName;
-
-    /**
-     * 新认证实施时间
-     */
-    @ApiModelProperty("新认证实施时间")
-    private String newCerImplementDate;
-
-    /**
-     * 已认证实施时间
-     */
-    @ApiModelProperty("已认证实施时间")
-    private String cerImplementDate;
-
-    /**
-     * 新注册实施时间
-     */
-    @ApiModelProperty("新注册实施时间")
-    private String newRegisterImplementDate;
-
-    /**
-     * 适用车型
-     */
-    @ApiModelProperty("适用车型")
-    private String applications;
-
-    /**
-     * 动力类型
-     */
-    @ApiModelProperty("动力类型")
-    private String dynamicType;
-
-    /**
-     * 适用零部件
-     */
-    @ApiModelProperty("适用零部件")
-    private String applicableComponents;
-
-    /**
-     * 条文解读
-     */
     @ApiModelProperty("条文解读")
     private String interpretationArticles;
-
+    // 展示顺序
-    /**
+    @ApiModelProperty("展示顺序")
-     * 拆分信息记录id
+    private String sortNumber;
-     */
+    // 译文
+    @ApiModelProperty("译文")
+    private String translation;
+    // 是否与上一版相同（字典：1：是，0：否）
+    @ApiModelProperty("是否与上一版相同（字典：1：是，0：否）")
+    private String isSameAsPrevVersion;
+    // 变化点说明
+    @ApiModelProperty("变化点说明")
+    private String changeDescription;
+    // 法规注释
+    @ApiModelProperty("法规注释")
+    private String regulatoryNotes;
+    // 关键词（涉及系统/部件）
+    @ApiModelProperty("关键词（涉及系统/部件）")
+    private String keywords;
+    // 适用零部件
+    @ApiModelProperty("适用零部件")
+    private String applicableComponents;
+    // 责任部门
+    @ApiModelProperty("责任部门")
+    private String responsibleDepartment;
+    // 责任部门专业模块
+    @ApiModelProperty("责任部门专业模块")
+    private String responsibleModule;
+    // 关联部门
+    @ApiModelProperty("关联部门")
+    private String relatedDepartment;
+    // 关联部门专业模块
+    @ApiModelProperty("关联部门专业模块")
+    private String relatedModule;
+    // 适用车型
+    @ApiModelProperty("适用车型")
+    private String applications;
+    // 动力类型
+    @ApiModelProperty("动力类型")
+    private String powerType;
+    // 专业领域
+    @ApiModelProperty("专业领域")
+    private String domainArea;
+    // 配置需求
+    @ApiModelProperty("配置需求")
+    private String configurationRequirements;
+    // 新认证实施日期
+    @ApiModelProperty("新认证实施日期")
+    private String newCerImplementDate;
+    // 新生产车实施日期
+    @ApiModelProperty("新生产车实施日期")
+    private String newProductionImplementation;
+    // 注册日期
+    @ApiModelProperty("注册日期")
+    private String registrationDate;
+    // 企业标准
+    @ApiModelProperty("企业标准")
+    private String enterpriseStandard;
+    // 技术规范/设计指南
+    @ApiModelProperty("技术规范/设计指南")
+    private String technicalSpecificationDesignGuide;
+    // 图纸模板
+    @ApiModelProperty("图纸模板")
+    private String drawingTemplate;
+    // 技术协议模板
+    @ApiModelProperty("技术协议模板")
+    private String technicalAgreementTemplate;
+    // 校验报告模块/checklist
+    @ApiModelProperty("校验报告模块/checklist")
+    private String verificationReportTemplateChecklist;
+    // DVP模板
+    @ApiModelProperty("DVP模板")
+    private String dvpTemplate;
+    // DFEMA
+    @ApiModelProperty("DFEMA")
+    private String dfema;
+    // 关键技术分解表
+    @ApiModelProperty("关键技术分解表")
+    private String keyTechnologyDecompositionTable;
+    // 其他文件或模板
+    @ApiModelProperty("其他文件或模板")
+    private String otherDocumentsTemplates;
+    // 排查阶段
+    @ApiModelProperty("排查阶段")
+    private String investigationStage;
+    // p3
+    @ApiModelProperty("p3")
+    private String p3;
+    // p5
+    @ApiModelProperty("p5")
+    private String p5;
+    // 备注
+    @ApiModelProperty("备注")
+    private String remarkss;
+    // 拆分信息记录id
     @ApiModelProperty("拆分信息记录id")
     private String infoId;
 }

laws-modules/src/main/java/com/jero/modules/split/mapper/SarFileSplitItemsValEOMapper.java

@@ -1,8 +1,11 @@
 package com.jero.modules.split.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.jero.modules.split.entity.SarFileSplitItemsValEO;
 import com.jero.modules.split.page.SarFileSplitItemsValEOPage;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,6 +18,7 @@ import java.util.List;
  * <b>日期：</b> 2020-01-07 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Mapper
 public interface SarFileSplitItemsValEOMapper extends BaseMapper<SarFileSplitItemsValEO> {
 
     int deleteByIds(SarFileSplitItemsValEO sarFileSplitItemsValEO);
@@ -54,4 +58,5 @@ public interface SarFileSplitItemsValEOMapper extends BaseMapper<SarFileSplitIte
 
     List<SarFileSplitItemsValEO> queryByPage(SarFileSplitItemsValEOPage page);
 
+    List<SarFileSplitItemsValEO> findList(@Param(Constants.WRAPPER) QueryWrapper<SarFileSplitItemsValEO> queryWrapper);
 }

laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml

@@ -168,7 +168,7 @@
 
   <!-- 根据id查询 SAR_FILE_SPLIT_ITEMS_VAL -->
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-    select <include refid="Base_Column_List" /> 
+    select <include refid="Base_Column_List" />
       from SAR_FILE_SPLIT_ITEMS_VAL
      where id = #{value}
 
@@ -310,5 +310,21 @@
         </foreach>
     </select>
 
-
+  <select id="findList" resultMap="BaseResultMap">
+      select id,
+             sys_org_code,
+             item_id,
+             type,
+             item_content,
+             display_seq,
+             valid_flag,
+             img_name,
+             index_item,
+             creation_time,
+             modify_user,
+             modify_time,
+             creation_user
+      from SAR_FILE_SPLIT_ITEMS_VAL
+      ${ew.customSqlSegment}
+    </select>
 </mapper>