Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java

@@ -10,6 +10,7 @@
import cn.gistack.sm.sjztmd.vo.ManagePersonVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.HashMap;
@@ -21,6 +22,8 @@
 *
 * @author Chill
 */

@Mapper
public interface AttResBaseMapper extends BaseMapper<AttResBase> {


@@ -28,7 +31,7 @@

   List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase")  AttResBaseGeneralInvestigationVO attResBase);

    List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj);
    List<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,@Param("obj") Map<String, Object> obj);

   AttResBase getDetailByCode(@Param("code") String code);

@@ -91,5 +94,12 @@

   Boolean updateRsvr(@Param("attResBase") AttResBase attResBase);

   /**
    * 获取操作记录
    * @param guid
    * @return
    */
   String getUpdateLog(@Param("resGuid") String guid);

   int updateRelResUpdateLoc(@Param("resGuid") String guid,@Param("updateLog") String updateLog);
}