From 9d1f09e1ddd4ed39cf5dfa4d7c63fb6e0aadaa7f Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 23 Aug 2017 21:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/PlantformConfigModel.java | 14 ++++++++++++-- .../web/service/impl/PlantformConfigServiceImpl.java | 17 ++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PlantformConfigModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PlantformConfigModel.java index 10f5f90..74a62ab 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PlantformConfigModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PlantformConfigModel.java @@ -21,7 +21,9 @@ public class PlantformConfigModel extends BaseModel { */ @Id private ObjectId id; - + + private String yn; + /** * key名称 */ @@ -50,7 +52,15 @@ public class PlantformConfigModel extends BaseModel { * 备注 */ private String remark; - + + public String getYn() { + return yn; + } + + public void setYn(String yn) { + this.yn = yn; + } + /** * mongo的inr操作不支持 字符串 * 用于记录每次自增之后的值 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java index 55f1fca..2235394 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java @@ -43,6 +43,7 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant public BaseResponse listCustomType(String key, Integer page, Integer limit, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = new Query(); + query.addCriteria(Criteria.where("yn").ne("0")); if(StringUtils.isNotEmpty(key)) { query.addCriteria(Criteria.where("value").regex(key)); } @@ -65,8 +66,8 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant @Override public BaseResponse delCustomType(String id, Integer userId) { - mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PlantformConfigModel.class); - mongoTemplate.remove(Query.query(Criteria.where("parentId").is(id)), PlantformConfigModel.class); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("yn", "0"), PlantformConfigModel.class); + mongoTemplate.updateMulti(Query.query(Criteria.where("parentId").is(id)), Update.update("yn", "0"), PlantformConfigModel.class); return RespBuilder.buildSuccess(); } @@ -92,6 +93,7 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant plantformConfigModel.setKey(hospitalId); plantformConfigModel.setValue(name); plantformConfigModel.setType(SequenceConstant.CUSTOM_TYPE); + plantformConfigModel.setYn("1"); plantformConfigModel.setRemark("产检处理意见自定义类型"); mongoTemplate.save(plantformConfigModel); } else { @@ -100,15 +102,17 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant return RespBuilder.buildSuccess(); } - - @Override public BaseResponse customContentList(String parentId, Date startDate, Date endDate, Integer page, Integer limit, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = new Query(); + query.addCriteria(Criteria.where("yn").ne("0")); if(StringUtils.isNotEmpty(parentId)) { query.addCriteria(Criteria.where("parentId").is(parentId)); } + if(startDate != null && endDate != null) { + query.addCriteria(Criteria.where("createDate").gte(startDate).lt(DateUtil.addDay(endDate, 1))); + } query.addCriteria(Criteria.where("key").is(hospitalId).and("type").is(SequenceConstant.CUSTOM_CONTENT)).with(new Sort(Sort.Direction.DESC,"createDate")); PageResult pageResult = findMongoPage(PlantformConfigModel.class, query, page, limit); @@ -124,11 +128,9 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant restList.add(map); } pageResult.setGrid(restList); - return RespBuilder.buildSuccess(pageResult); } - @Override public BaseResponse addCustomContent(String parentId, String id, String content, String key, Integer userId) { PlantformConfigModel plantformConfigModel = new PlantformConfigModel(); @@ -139,6 +141,7 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant plantformConfigModel.setKey(hospitalId); plantformConfigModel.setValue(content); plantformConfigModel.setSerchKey(key); + plantformConfigModel.setYn("1"); plantformConfigModel.setType(SequenceConstant.CUSTOM_CONTENT); plantformConfigModel.setRemark("产检处理意见自定义内容"); mongoTemplate.save(plantformConfigModel); @@ -156,7 +159,7 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant @Override public BaseResponse delCustomContent(String id, Integer userId) { - mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PlantformConfigModel.class); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("yn", "0"), PlantformConfigModel.class); return RespBuilder.buildSuccess(); } } -- 1.8.3.1