Merge remote-tracking branch 'origin/dev_bugfix_ljj'

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java

@@ -21,6 +21,11 @@ public class ServiceRecordV2DetailResultDTO implements Serializable {
 
     private String serviceName;
     private String policyId;
+    /**
+     * 政策标题
+     * 详情接口返回
+     */
+    private String policyTitle;
 
     /**
      * 服务组织类型

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java

@@ -31,4 +31,6 @@ public interface IcPolicyDao extends BaseDao<IcPolicyEntity> {
                                  @Param("title")String title,
                                  @Param("content")String content,
                                  @Param("expiredFlag")String expiredFlag);
+
+    String selectTitle(String policyId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -16,10 +17,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.dao.IcServiceFeedbackV2Dao;
-import com.epmet.dao.IcServiceRecordV2Dao;
-import com.epmet.dao.IcServiceScopeDao;
-import com.epmet.dao.IcServiceScopeV2Dao;
+import com.epmet.dao.*;
 import com.epmet.dto.IcServiceFeedbackV2DTO;
 import com.epmet.dto.IcServiceRecordV2DTO;
 import com.epmet.dto.IcServiceScopeV2DTO;
@@ -72,6 +70,9 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
     private IcServiceScopeV2Dao icServiceScopeV2Dao;
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
+    @Autowired
+    private IcPolicyDao icPolicyDao;
+
 
     @Override
     public PageData<IcServiceRecordV2DTO> page(Map<String, Object> params) {
@@ -271,6 +272,7 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
         result.setGridIdList(scopeV2DTOS);
         IcServiceFeedbackV2DTO feedbackV2 = serviceFeedbackV2Dao.getFeedbackV2(formDTO.getServiceRecordId());
         result.setFeedback(feedbackV2);
+        result.setPolicyTitle(StringUtils.isNotBlank(result.getPolicyId()) ? icPolicyDao.selectTitle(result.getPolicyId()) : StrConstant.EPMETY_STR);
         return result;
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml

@@ -80,4 +80,13 @@
         </if>
         order by ip.CREATED_TIME desc
      </select>
+
+    <select id="selectTitle" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            p.TITLE
+        FROM
+            ic_policy p
+        WHERE
+            p.id = #{policyId}
+    </select>
 </mapper>

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1846,6 +1846,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		articleEntity.setOrgId(staffInfo.getAgencyId());
 		articleEntity.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) || agencyInfo.getPids().equals(NumConstant.ZERO_STR) ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId()));
 		articleEntity.setRichTextFlag(NumConstant.ONE_STR);
+		articleEntity.setIsTop(formDTO.getIsTop());
 		baseDao.updateById(articleEntity);
 		// 2.内容
 		ArticleContentEntity articleContent = articleContentDao.selectByArticleId(formDTO.getArticleId());