8d、生产问题导出部分字段和水印修改、去除

cx-question/cx-question-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ExportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.rongwei.bscommon.sys.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.aspose.cells.SaveFormat;
 import com.aspose.cells.Workbook;
 import com.aspose.cells.WorkbookDesigner;
@@ -22,6 +23,7 @@ import com.rongwei.bsentity.vo.HashMapDataTableVo;
 import com.rongwei.bsentity.vo.ProblemTrackingAndResolutionWordDataVo;
 import com.rongwei.rwadmincommon.system.domain.SysDictDo;
 import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.StringUtils;
@@ -64,6 +66,8 @@ public class ExportServiceImpl implements ExportService {
     private QQuestionFiveWhyDao qQuestionFiveWhyDao;
     @Autowired
     private SrmFiveWhyDao srmFiveWhyDao;
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
 
     private static final Map<String, Function<SrmIssuesListDo, Object>> PROBLEM_TRACKING_AND_RESOLUTION_WORD_MAP = new HashMap<String, Function<SrmIssuesListDo, Object>>() {{
         put("QUESTIONNO", SrmIssuesListDo::getQuestionno);
@@ -241,6 +245,12 @@ public class ExportServiceImpl implements ExportService {
         List<SysDictDo> sysDictDoList = questionCommonSqlDao.getDictValueByDictType(DICT_KEY.values().stream().collect(Collectors.toList()));
         // 主表信息
         SrmIssuesListDo srmIssuesListDo = srmIssuesListDao.selectById(id);
+        //根据主表的工厂ID重新赋值工厂名称
+        if(ObjectUtil.isNotEmpty(srmIssuesListDo.getFactory())){
+            //查询工厂ID对应的中文名称
+            SysOrganizationDo organizationDo = sysOrganizationService.getById(srmIssuesListDo.getFactory());
+            srmIssuesListDo.setFactory(organizationDo.getFullname());
+        }
         List<SysOrganizationDo> allOrg = questionCommonSqlDao.getAllOrg();
         PROBLEM_TRACKING_AND_RESOLUTION_WORD_MAP.forEach((k, v) -> {
             Object apply = v.apply(srmIssuesListDo);