Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java

@@ -16,8 +16,10 @@
 */
package org.springblade.modules.place.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.constant.CommonConstant;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.mapper.PlacePractitionerMapper;
@@ -26,6 +28,7 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.Date;
import java.util.HashMap;
import java.util.Map;

@@ -46,6 +49,7 @@

   /**
    * 统计少数民族和未成年数量
    *
    * @return
    */
   @Override
@@ -57,8 +61,22 @@
      placePractitioner.setType(CommonConstant.NUMBER_TWO);
      Integer nationalMinority = baseMapper.selectPlaceCountByType(placePractitioner);
      Map<String, Integer> resultMap = new HashMap<>();
      resultMap.put("minors",minors);
      resultMap.put("nationalMinority",nationalMinority);
      resultMap.put("minors", minors);
      resultMap.put("nationalMinority", nationalMinority);
      return resultMap;
   }

   @Override
   public Boolean auditing(PlacePractitionerEntity placePractitioner) {
      placePractitioner.setConfirmUserId(AuthUtil.getUserId());
      placePractitioner.setConfirmTime(new Date());
      boolean update = update(Wrappers.<PlacePractitionerEntity>lambdaUpdate()
         .set(PlacePractitionerEntity::getConfirmFlag, placePractitioner.getConfirmFlag())
         .set(PlacePractitionerEntity::getConfirmNotion, placePractitioner.getConfirmNotion())
         .set(PlacePractitionerEntity::getConfirmUserId, placePractitioner.getConfirmUserId())
         .eq(PlacePractitionerEntity::getPlaceId, placePractitioner.getPlaceId())
         .eq(PlacePractitionerEntity::getResignationFlag, 1)
         .eq(PlacePractitionerEntity::getIsDeleted,0));
      return update;
   }
}