企业信息追加

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealDetailResultDTO.java

@@ -131,5 +131,14 @@ public class ItemAppealDetailResultDTO implements Serializable {
      */
     private List<ItemHandleProgressResultDTO> handleProgressResultDTOS;
 
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String uniformSocialCreditCode;
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@@ -144,4 +144,14 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String isTypical;
 
+    /**
+     * 企业名称
+     */
+    private String enterpriseName;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String uniformSocialCreditCode;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -81,7 +81,10 @@ import com.elink.esua.epdc.modules.events.dao.ImgDao;
 import com.elink.esua.epdc.modules.events.entity.ImgEntity;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import com.elink.esua.epdc.modules.events.service.ImgService;
-import com.elink.esua.epdc.modules.feign.*;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
+import com.elink.esua.epdc.modules.feign.OssFeignClient;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity;
 import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogErrorEntity;
 import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogErrorService;
@@ -223,8 +226,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     private ItemCommentFeedbackDao itemCommentFeedbackDao;
     @Autowired
     private ItemAutoProcessRedis itemAutoProcessRedis;
-    @Autowired
-    private MessageFeignClient messageFeignClient;
 
     @Autowired
     private ItemProcessModifyProducer itemProcessModifyProducer;
@@ -3686,6 +3687,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
             result.setLawDetail(ConvertUtils.sourceToTarget(itemLaw, ItemAppealLawDetailResultDTO.class));
         }
+        //获取发展诉求公司信息
+        if (StringUtils.isNotBlank(result.getPeopleFlag()) && "1".equals(result.getPeopleFlag())) {
+            QueryWrapper<ItemEnterpriseEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq("item_id", result.getId());
+            wrapper.eq("del_flag", "0");
+            ItemEnterpriseEntity itemEnterprise = itemEnterpriseDao.selectOne(wrapper);
+            result.setEnterpriseName(itemEnterprise.getEnterpriseName());
+            result.setUniformSocialCreditCode(itemEnterprise.getUniformSocialCreditCode());
+        }
         // 满意度评价部门
 //        List<ItemEvaluateDeptDTO> evaluateDeptDTOS = itemDeptService.listOfEvaluateDepts(result.getId(), deptId);
 //        result.setEvaluateDeptDTOS(evaluateDeptDTOS);

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -2159,8 +2159,11 @@
                 i.IS_DIFFICULTY,
                 i.IS_TYPICAL,
                 i.EVALUATION_CONTENT,
-                i.EVALUATION_TIME
+                i.EVALUATION_TIME,
+                en.ENTERPRISE_NAME,
+                en.UNIFORM_SOCIAL_CREDIT_CODE
         FROM epdc_item i
+        LEFT JOIN epdc_item_enterprise en ON en.ITEM_ID = i.id
         left join (
                 select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state
                 from epdc_item_handle_process b
@@ -2273,8 +2276,11 @@
         else ''
         end as evaluationScoreName,
         i.EVALUATION_CONTENT,
-        i.EVALUATION_TIME
+        i.EVALUATION_TIME,
+        en.ENTERPRISE_NAME,
+        en.UNIFORM_SOCIAL_CREDIT_CODE
         FROM epdc_item i
+        LEFT JOIN epdc_item_enterprise en ON en.ITEM_ID = i.id
         left join (
             select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state
             from epdc_item_handle_process b