|
@@ -27,8 +27,10 @@ import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description:
|
|
* @Description:
|
|
@@ -63,15 +65,17 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
|
|
//判断该科室是否添加过常用标签
|
|
//判断该科室是否添加过常用标签
|
|
QuestionUsual questionUsual = new QuestionUsual();
|
|
QuestionUsual questionUsual = new QuestionUsual();
|
|
String userId = UserUtils.getCurrentPrincipleID();
|
|
String userId = UserUtils.getCurrentPrincipleID();
|
|
|
|
+ Date now = DateUtil.now();
|
|
List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
|
|
List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
|
|
|
|
+ List<Long> questionIdList = questionUsualList.stream().map(questionUsual1 -> questionUsual1.getQuestionId()).collect(Collectors.toList());
|
|
//如果添加过将原来的标签删除
|
|
//如果添加过将原来的标签删除
|
|
if (ListUtil.isNotEmpty(questionUsualList)) {
|
|
if (ListUtil.isNotEmpty(questionUsualList)) {
|
|
UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper();
|
|
UpdateWrapper<QuestionUsual> updateWrapper = new UpdateWrapper();
|
|
updateWrapper.eq("dept_id", questionUsualVO.getDeptId())
|
|
updateWrapper.eq("dept_id", questionUsualVO.getDeptId())
|
|
- .in("question_id",questionUsualList)
|
|
|
|
|
|
+ .in("question_id",questionIdList)
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
.set("is_deleted", IsDeleteEnum.Y.getKey())
|
|
.set("modifier", userId)
|
|
.set("modifier", userId)
|
|
- .set("gmt_modified", DateUtil.now());
|
|
|
|
|
|
+ .set("gmt_modified", now);
|
|
this.update(new QuestionUsual(), updateWrapper);
|
|
this.update(new QuestionUsual(), updateWrapper);
|
|
}
|
|
}
|
|
//重新添加标签
|
|
//重新添加标签
|
|
@@ -79,8 +83,8 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
|
|
questionUsual = new QuestionUsual();
|
|
questionUsual = new QuestionUsual();
|
|
questionUsual.setCreator(userId);
|
|
questionUsual.setCreator(userId);
|
|
questionUsual.setModifier(userId);
|
|
questionUsual.setModifier(userId);
|
|
- questionUsual.setGmtCreate(DateUtil.now());
|
|
|
|
- questionUsual.setGmtModified(DateUtil.now());
|
|
|
|
|
|
+ questionUsual.setGmtCreate(now);
|
|
|
|
+ questionUsual.setGmtModified(now );
|
|
questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
|
|
questionUsual.setQuestionId(questionUsualVO.getQuestionId().get(i));
|
|
questionUsual.setDeptId(questionUsualVO.getDeptId());
|
|
questionUsual.setDeptId(questionUsualVO.getDeptId());
|
|
questionUsual.setOrderNo(Long.parseLong(String.valueOf(i + 1)));
|
|
questionUsual.setOrderNo(Long.parseLong(String.valueOf(i + 1)));
|