diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java index 5515dde..73e5a5a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBasicConfigDao.java @@ -26,4 +26,5 @@ public interface IBasicConfigDao { public BasicConfig getOneBasicConfigById(String id); public void batchSave(Collection list); + } \ No newline at end of file diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java index 3610e30..451c0e2 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BasicConfigDaoImpl.java @@ -29,10 +29,9 @@ public class BasicConfigDaoImpl extends BaseMongoDAOImpl implements } public void batchSave(Collection list) { - batchSave(list); + super.batchSave(list); } - public BasicConfig getBasicConfig(String id) { return findById(id); } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java index c1dd003..41e8806 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/TaskController.java @@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -80,13 +81,17 @@ public class TaskController extends BaseController { } List configList = basicConfigService.queryBasicConfig(new BasicConfigQuery()); BasicConfig u = new BasicConfig(); + u.setEnable(1); + u.setYn(1); for (BasicConfig config:configList) { + u.setId(config.getId()); String code = codeMap.get(config.getName()); if (StringUtils.isNotBlank(code)) { - u.setId(config.getId()); u.setCode(code); - basicConfigService.updateBasicConfig(u); + } else { + u.setCode(null); } + basicConfigService.updateBasicConfig(u); } } catch (IOException e) { e.printStackTrace();