添加注释

icssman-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -44,6 +44,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      * @return
      */
     public Boolean addDeptInfo(AddDeptInfoVO addDeptInfoVO) {
+        //判断科室是否重名
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
         queryWrapper.eq("name",addDeptInfoVO.getName());
@@ -51,6 +52,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         if(ListUtil.isNotEmpty(deptInfoList)){
             throw new CommonException(CommonErrorCode.IS_EXISTS, "添加失败，科室已存在");
         }
+        //添加科室
         DeptInfo deptInfo = new DeptInfo();
         BeanUtil.copyProperties(addDeptInfoVO,deptInfo);
         Date now = DateUtil.now();
@@ -103,11 +105,13 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
         for (GetDeptInfoDTO getDeptInfoDTO:iPage.getRecords()) {
             ids.add(getDeptInfoDTO.getModifier());
         }
+        //获取用户信息
         RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
         if (respDTO == null || !"0".equals(respDTO.code)) {
             throw new CommonException(CommonErrorCode.RPC_ERROR,
                     "获取用户信息失败");
         }
+        //将用户信息放入实体
         for (GetDeptInfoDTO getDeptInfoDTO:iPage.getRecords()) {
             getDeptInfoDTO.setUserName(respDTO.data.get(getDeptInfoDTO.getModifier()));
         }

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -12,6 +12,7 @@ import com.diagbot.service.impl.QuestionUsualServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.QuestionUsualVO;
 import com.google.common.collect.Lists;
@@ -45,9 +46,10 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         List<QuestionUsual> addList = Lists.newArrayList();
         //判断该科室是否添加过常用标签
         QuestionUsual questionUsual = new QuestionUsual();
-        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        String userId = UserUtils.getCurrentPrincipleID();
         QuestionUsualWapper questionUsualWapper = new QuestionUsualWapper();
         List<QuestionUsual> questionUsualList = this.getQuestionUsualByQuestionId(questionUsualVO);
+        //如果添加过将原来的标签删除
         if(ListUtil.isNotEmpty(questionUsualList)){
             questionUsual = new QuestionUsual();
             BeanUtil.copyProperties(questionUsualVO,questionUsualWapper);
@@ -55,6 +57,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             questionUsualWapper.setGmtModified(DateUtil.now());
             this.updateQuestionUsualByQuestionId(questionUsualWapper);
         }
+        //重新添加标签
         for (int i = 0; i<questionUsualVO.getQuestionId().size(); i++ ) {
             questionUsual = new QuestionUsual();
             questionUsual.setCreator(userId);
@@ -81,7 +84,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public Boolean deleteQuestionUsualByDeptId(DeleteQuestionUsualVO deleteQuestionUsualVO){
-        String userId = "1"/*UserUtils.getCurrentPrincipleID()*/;
+        String userId = UserUtils.getCurrentPrincipleID();
         UpdateWrapper<QuestionUsual> queryWrapper = new UpdateWrapper<>();
         queryWrapper.eq("dept_id",deleteQuestionUsualVO.getDeptId()).set("is_deleted", IsDeleteEnum.Y.getKey())
                 .set("modifier", userId)