Browse Source
			
			
			
			
				
		# Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.javamaster
				 38 changed files with 357 additions and 84 deletions
			
			
		@ -0,0 +1,39 @@ | 
				
			|||
package com.epmet.task.ic; | 
				
			|||
 | 
				
			|||
import com.alibaba.fastjson.JSON; | 
				
			|||
import com.alibaba.fastjson.TypeReference; | 
				
			|||
import com.epmet.commons.tools.utils.ConvertUtils; | 
				
			|||
import com.epmet.feign.EpmetUserOpenFeignClient; | 
				
			|||
import com.epmet.task.ITask; | 
				
			|||
import lombok.extern.slf4j.Slf4j; | 
				
			|||
import org.apache.commons.lang3.StringUtils; | 
				
			|||
import org.springframework.beans.factory.annotation.Autowired; | 
				
			|||
import org.springframework.stereotype.Component; | 
				
			|||
 | 
				
			|||
import java.util.HashMap; | 
				
			|||
import java.util.Map; | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * @ClassName IcNatClearTask | 
				
			|||
 * @Description 核酸检测定时清理 | 
				
			|||
 * @Author wangxianzhang | 
				
			|||
 * @Date 2022/11/29 13:41 | 
				
			|||
 */ | 
				
			|||
@Slf4j | 
				
			|||
@Component("icNatClearTask") | 
				
			|||
public class IcNatClearTask implements ITask { | 
				
			|||
 | 
				
			|||
    @Autowired | 
				
			|||
    private EpmetUserOpenFeignClient epmetUserOpenFeignClient; | 
				
			|||
 | 
				
			|||
    @Override | 
				
			|||
    public void run(String jsonParams) { | 
				
			|||
        Map<String, Object> paramMap; | 
				
			|||
        if (StringUtils.isNotBlank(jsonParams)) { | 
				
			|||
            paramMap = JSON.parseObject(jsonParams, new TypeReference<Map<String, Object>>(){}); | 
				
			|||
        } else { | 
				
			|||
            paramMap = new HashMap<>(); | 
				
			|||
        } | 
				
			|||
        epmetUserOpenFeignClient.clearNatRecords(paramMap); | 
				
			|||
    } | 
				
			|||
} | 
				
			|||
@ -0,0 +1,7 @@ | 
				
			|||
 | 
				
			|||
ALTER TABLE `ic_party_service_center_matter` | 
				
			|||
MODIFY COLUMN `APPOINTMENT_TYPE`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预约类型,每天:everyDay,工作日:workDay,周末:weekend , 自定义:custom' AFTER `MATTER_NAME`, | 
				
			|||
ADD COLUMN `CUSTOM_DAY`  varchar(32) NULL COMMENT '类型为自定义时选择的周一~周末的时间(1-7逗号分割)周日:1;周一2;周二3;周三4;周四5;周五6;周六7' AFTER `APPOINTMENT_TYPE`; | 
				
			|||
 | 
				
			|||
 | 
				
			|||
 | 
				
			|||
@ -0,0 +1,46 @@ | 
				
			|||
/** | 
				
			|||
 * Copyright 2018 人人开源 https://www.renren.io
 | 
				
			|||
 * <p> | 
				
			|||
 * This program is free software: you can redistribute it and/or modify | 
				
			|||
 * it under the terms of the GNU General Public License as published by | 
				
			|||
 * the Free Software Foundation, either version 3 of the License, or | 
				
			|||
 * (at your option) any later version. | 
				
			|||
 * <p> | 
				
			|||
 * This program is distributed in the hope that it will be useful, | 
				
			|||
 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
				
			|||
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
				
			|||
 * GNU General Public License for more details. | 
				
			|||
 * <p> | 
				
			|||
 * You should have received a copy of the GNU General Public License | 
				
			|||
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
				
			|||
 */ | 
				
			|||
 | 
				
			|||
package com.epmet.dto; | 
				
			|||
 | 
				
			|||
import lombok.Data; | 
				
			|||
 | 
				
			|||
import java.io.Serializable; | 
				
			|||
import java.util.Date; | 
				
			|||
 | 
				
			|||
 | 
				
			|||
/** | 
				
			|||
 * 疫苗接种记录 | 
				
			|||
 * | 
				
			|||
 * @author generator generator@elink-cn.com | 
				
			|||
 * @since v1.0.0 2021-10-26 | 
				
			|||
 */ | 
				
			|||
@Data | 
				
			|||
public class VaccineLogDetailDTO implements Serializable { | 
				
			|||
 | 
				
			|||
    private static final long serialVersionUID = 1L; | 
				
			|||
 | 
				
			|||
    /** | 
				
			|||
     * 接种时间 | 
				
			|||
     */ | 
				
			|||
    private String vacTime; | 
				
			|||
    /** | 
				
			|||
     * 接种地点 | 
				
			|||
     */ | 
				
			|||
    private String vacSite; | 
				
			|||
 | 
				
			|||
} | 
				
			|||
					Loading…
					
					
				
		Reference in new issue