productDev/dmvisit.git

			@@ -99,8 +99,11 @@
			</el-table-column>
			<el-table-column label="在园状态" min-width="100px">
			<template slot-scope="{row}">
			<span v-if="row.status == 7 && row.retentionNum && row.retentionNum >0 ">是</span>
			<span v-else >否</span>
			<div v-if="row.status == 7">
			<span v-if="row.retentionNum && row.retentionNum >0 ">是</span>
			<span v-if="!row.retentionNum \|\| row.retentionNum ==0 " >否</span>
			</div>
			<div v-else >-</div>
			</template>
			</el-table-column>
			<el-table-column prop="remark" label="下发备注" min-width="100px"></el-table-column>

			@@ -27,6 +27,7 @@
			public static final int ONE = 1 ;
			public static final int TWO = 2 ;
			public static final String HK_PARAM ="HK_PARAM" ;
			public static final String HK_WEBSITE_DOMAIN_URL ="HK_WEBSITE_DOMAIN_URL" ;
			public static final String LED_CONTENT_SPEED ="LED_CONTENT_SPEED" ;
			public static final String HK_HOST ="HK_HOST" ;
			public static final String HK_APPKEY ="HK_APPKEY" ;

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
			import com.doumee.biz.system.SystemDictDataBiz;
			import com.doumee.core.constants.ResponseStatus;
			import com.doumee.core.exception.BusinessException;
			import com.doumee.core.haikang.model.HKConstants;
			@@ -34,6 +35,8 @@
			public class HkSyncNoticeServiceImpl extends HkSyncBaseServiceImpl {
			@Autowired
			private NoticesJoinMapper noticesJoinMapper;
			@Autowired
			private SystemDictDataBiz systemDictDataBiz;
			@Autowired
			private MemberMapper memberMapper;

			@@ -94,9 +97,8 @@
			}
			curPage++;
			}


			if(allHkList!=null && allHkList.size()>0){
			String gotoUrl = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.HK_WEBSITE_DOMAIN_URL).getCode();
			List<Notices> list = new ArrayList<>();
			for(GetTodoListResponse data :allHkList){
			Member u = getFromUserList(data.getUserId(),userList);
			@@ -130,6 +132,8 @@
			notices.setParam3(data.getMsgCreateTime());
			notices.setParam5(JSONObject.toJSONString(param));
			notices.setType(Constants.noticesObjectType.hknotice);
			notices.setRemark(gotoUrl+"dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index");
			notices.setRemark(gotoUrl+StringUtils.defaultString(data.getSegmentId(),"")+StringUtils.defaultString(data.getH5Url(),""));
			list.add(notices);
			}
			if(list.size()>0){

	admin/src/views/business/visits.vue	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/system_service/src/main/java/com/doumee/core/utils/Constants.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史