ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -2543,7 +2543,9 @@ wrapper1.groupBy(TjProject::getProId); List<TjProject> tjProjectList = projectService.list(wrapper1); if(null != tjProjectList && !tjProjectList.isEmpty()){ Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType)); Map<String, List<TjProject>> listMap = tjProjectList.stream() .collect(Collectors.groupingBy(p->p.getSpecimenType()+"_"+p.getYb())); log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap)); boolean save = lisApiMethod.save(listMap, tjOrder, customer); if (!save) { ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -103,7 +103,8 @@ allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId()); } lisSaveSqdxxDto.setFyje(allPrice.toString()); lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode()); // lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode()); lisSaveSqdxxDto.setYbbm(sampling.getYb()); if (sampling.getIsMerge() == 1){ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); @@ -257,7 +258,9 @@ BigDecimal allPrice = tbTransitionMapper.getLisPriceByTjNumAndInProId(tjOrder.getTjNumber(), entry.getValue().stream().map(TjProject::getProId).collect(Collectors.toList())); lisSaveSqdxxDto.setFyje(allPrice.toString()); lisSaveSqdxxDto.setYbbm(entry.getKey()); // lisSaveSqdxxDto.setYbbm(entry.getKey()); String s = entry.getKey(); lisSaveSqdxxDto.setYbbm(s.substring(s.indexOf("_") + 1)); for (TjProject tjProject : entry.getValue()) { ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -473,6 +473,7 @@ else sampling.setJyxmdm(String.valueOf(project.getProId())); sampling.setSpecimenTypeCode(project.getSpecimenType()); sampling.setSpecimenType(dictLabel); sampling.setYb(project.getYb()); // LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm()); // LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper); @@ -484,6 +485,7 @@ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); sampling.setSpecimenTypeCode(project1.getSpecimenType()); sampling.setSpecimenType(dictLabel); sampling.setYb(project.getYb()); if (config.equals("Y") && lisAndPacsRegister) sampling.setJyxmdm(project1.getLisXmbm()); else sampling.setJyxmdm(String.valueOf(project1.getProId())); @@ -2439,9 +2441,9 @@ String ysmc = configService.selectConfigByKey("request_default_ysmc"); String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix"); List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz); Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); // Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order); List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>(); if (useLisAndPacsRegister && isTuanTiPiao) { if (isTuanTiPiao) { // 检查申请 pacsReg(order, customer, jianChaProjects); LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>(); @@ -2450,7 +2452,10 @@ List<TjSampling> list = tjSamplingService.list(wrapper); log.info("采样数据 ->{}", JSONUtil.toJsonStr(list)); if (!list.isEmpty()) { Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); // Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode)); Map<String, List<TjSampling>> listMap = list.stream() .collect(Collectors.groupingBy(p->p.getSpecimenTypeCode()+"_"+p.getYb())); log.info("分组后 ->{}", JSONUtil.toJsonStr(listMap)); ArrayList<String> ids = new ArrayList<>(); for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java
@@ -64,7 +64,15 @@ // @PreAuthorize("@ss.hasPermi('system:notice:query')") @GetMapping(value = "/{noticeId}") public AjaxResult getInfo(@PathVariable Long noticeId) { return success(noticeService.selectNoticeById(noticeId)); SysNotice byId = noticeService.getById(noticeId); LambdaQueryWrapper<SysNoticeUser> wq = new LambdaQueryWrapper<>(); wq.eq(SysNoticeUser::getNoticeId, noticeId); List<SysNoticeUser> sysNoticeUsers = sysNoticeUserService.list(wq); if(null != sysNoticeUsers && !sysNoticeUsers.isEmpty()){ List<String> longList = sysNoticeUsers.stream().map(i -> i.getUserId().toString()).collect(Collectors.toList()); byId.setUserIds(longList); } return success(byId); } /** @@ -77,8 +85,8 @@ public AjaxResult add(@Validated @RequestBody SysNotice notice) { notice.setCreateBy(getUsername()); notice.setNoticeId(IdUtil.getSnowflake().nextId()); int insertNotice = noticeService.insertNotice(notice); if (insertNotice > 0){ boolean insertNotice = noticeService.save(notice); if (insertNotice){ if (notice.getUserIds() == null || notice.getUserIds().isEmpty()){ if (StrUtil.isBlank(notice.getDeptId())){ notice.setUserIds(userService.list().stream().map(i -> String.valueOf(i.getUserId())).collect(Collectors.toList())); @@ -107,7 +115,24 @@ @PutMapping public AjaxResult edit(@Validated @RequestBody SysNotice notice) { notice.setUpdateBy(getUsername()); return toAjax(noticeService.updateNotice(notice)); List<String> userIds = notice.getUserIds(); if (noticeService.updateById(notice)) { if(null !=userIds && !userIds.isEmpty()){ LambdaQueryWrapper<SysNoticeUser> wq = new LambdaQueryWrapper<>(); wq.eq(SysNoticeUser::getNoticeId, notice.getNoticeId()); sysNoticeUserService.remove(wq); for (String userId : userIds) { SysNoticeUser user = new SysNoticeUser(); user.setId(IdUtil.getSnowflake().nextId()); user.setNoticeId(notice.getNoticeId()); user.setUserId(Long.valueOf(userId)); sysNoticeUserService.save(user); } } return AjaxResult.success(); } return AjaxResult.error(); } /** ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysUserController.java
@@ -20,6 +20,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import jodd.util.StringUtil; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -135,10 +136,13 @@ } @GetMapping("/userListByDeptId") public AjaxResult userListByDeptId(@RequestParam("deptId") String deptId){ List<Long> deptIds = deptService.getDeptTreeById(deptId); public AjaxResult userListByDeptId(@RequestParam(required = false) String deptId){ LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>(); wrapper.in(SysUser::getDeptId,deptIds); if(StringUtil.isNotBlank(deptId)){ List<Long> deptIds = deptService.getDeptTreeById(deptId); wrapper.in(SysUser::getDeptId,deptIds); } return AjaxResult.success(userService.list(wrapper)); } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -290,4 +290,29 @@ List<TjProject> tjProjectList = projectService.list(wq); return success(tjProjectList); } @GetMapping("/huoqutuantitaocanxiangmuList") @ApiOperation(value = "获取所有单位团体套餐项目") public AjaxResult huoqutuantitaocanxiangmuList(@RequestParam(required = false) String dwId) { List<TjPackage> list= tjDwGroupingService.huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(dwId); if (null !=list && !list.isEmpty()){ for (TjPackage tjPackage : list) { List<TjProject> res=new ArrayList<>(); LambdaQueryWrapper<TjGroupingPro> wqq=new LambdaQueryWrapper<>(); wqq.eq(TjGroupingPro::getGroupingId,tjPackage.getPacId()); final List<TjGroupingPro> groupingProList = groupingProService.list(wqq); if (null !=groupingProList && !groupingProList.isEmpty()){ for (TjGroupingPro pro : groupingProList) { final TjProject byId = projectService.getById(pro.getProId()); if(null !=byId){ res.add(byId); } } tjPackage.setTjProjectList(res); } } } return AjaxResult.success(list); } } ltkj-admin/src/test/java/zjhTest.java
@@ -72,8 +72,10 @@ public static void main(String[] args) throws Exception { String s = "620821201106110016"; System.out.println(String.valueOf(MatchUtils.getSexByIdCard(s))); String s = "610124199809053678"; String s1 = "610622199805230627"; System.out.println(String.valueOf(MatchUtils.getAgeByIdCard(s))); System.out.println(String.valueOf(MatchUtils.getAgeByIdCard(s1))); } ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -274,6 +274,10 @@ @ApiModelProperty(value = "是否参与异常") private Integer sfcyyc; @ApiModelProperty(value = "样本") private String yb; /** * 子项目 */ ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java
@@ -126,6 +126,11 @@ private String specimenTypeCode; /** * 样本 */ private String yb; /** * 是否为合并项目 1是 0否 */ private Integer isMerge; ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -110,4 +110,11 @@ @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" + "WHERE a.deleted=0 and a.dw_id=#{dwId} AND (a.sex=#{sex} or a.sex=2) GROUP BY b.grouping_id") List<TjPackage> huoqutuantitaocanxiangmu(@Param("dwId") String dwId,@Param("sex") Long sex); // @Select("SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM " + // " tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id \n" + // "WHERE a.deleted=0 and if(#{dwId}!=null,a.dw_id=#{dwId},1=1) GROUP BY b.grouping_id") List<TjPackage> huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(@Param("dwId") String dwId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
@@ -69,4 +69,7 @@ public int selectTjDwGroupingByDwId(String dwId); List<TjPackage> huoqutuantitaocanxiangmu(String dwId, Long sex); List<TjPackage> huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(String dwId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
@@ -111,4 +111,9 @@ public List<TjPackage> huoqutuantitaocanxiangmu(String dwId, Long sex) { return tjDwGroupingMapper.huoqutuantitaocanxiangmu(dwId,sex); } @Override public List<TjPackage> huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(String dwId) { return tjDwGroupingMapper.huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList(dwId); } } ltkj-hosp/src/main/resources/mapper/hosp/TjDwGroupingMapper.xml
@@ -5,204 +5,233 @@ <mapper namespace="com.ltkj.hosp.mapper.TjDwGroupingMapper"> <resultMap type="TjDwGrouping" id="TjDwGroupingResult"> <result property="id" column="id"/> <result property="dwId" column="dw_id"/> <result property="dwName" column="dw_name"/> <result property="dwDeptId" column="dw_dept_id"/> <result property="dwDeptName" column="dw_dept_name"/> <result property="groupingName" column="grouping_name"/> <result property="limit" column="limit"/> <result property="pacName" column="pac_name"/> <result property="payType" column="pay_type"/> <result property="sex" column="sex"/> <result property="gtAge" column="gt_age"/> <result property="ltAge" column="lt_age"/> <result property="createBy" column="create_by"/> <result property="updateTime" column="update_time"/> <result property="updateBy" column="update_by"/> <result property="deleted" column="deleted"/> <result property="id" column="id"/> <result property="dwId" column="dw_id"/> <result property="dwName" column="dw_name"/> <result property="dwDeptId" column="dw_dept_id"/> <result property="dwDeptName" column="dw_dept_name"/> <result property="groupingName" column="grouping_name"/> <result property="limit" column="limit"/> <result property="pacName" column="pac_name"/> <result property="payType" column="pay_type"/> <result property="sex" column="sex"/> <result property="gtAge" column="gt_age"/> <result property="ltAge" column="lt_age"/> <result property="createBy" column="create_by"/> <result property="updateTime" column="update_time"/> <result property="updateBy" column="update_by"/> <result property="deleted" column="deleted"/> </resultMap> <sql id="selectTjDwGroupingVo"> select id, dw_id, dw_name, dw_dept_id, dw_dept_name, grouping_name, limit, pac_name, pay_type, sex, gt_age, lt_age, create_by, update_time, update_by, deleted select id, dw_id, dw_name, dw_dept_id, dw_dept_name, grouping_name, limit, pac_name, pay_type, sex, gt_age, lt_age, create_by, update_time, update_by, deleted from tj_dw_grouping </sql> <select id="selectTjDwGroupingList" parameterType="TjDwGrouping" resultMap="TjDwGroupingResult"> <include refid="selectTjDwGroupingVo"/> <where> <if test="dwId != null and dwId != ''"> and dw_id = #{dwId} </if> <if test="dwName != null and dwName != ''"> and dw_name like concat('%', #{dwName}, '%') </if> <if test="dwDeptId != null and dwDeptId != ''"> and dw_dept_id = #{dwDeptId} </if> <if test="dwDeptName != null and dwDeptName != ''"> and dw_dept_name like concat('%', #{dwDeptName}, '%') </if> <if test="groupingName != null and groupingName != ''"> and grouping_name like concat('%', #{groupingName}, '%') </if> <if test="limit != null "> and limit = #{limit} </if> <if test="pacName != null and pacName != ''"> and pac_name like concat('%', #{pacName}, '%') </if> <if test="payType != null and payType != ''"> and pay_type = #{payType} </if> <if test="sex != null and sex != ''"> and sex = #{sex} </if> <if test="gtAge != null and gtAge != ''"> and gt_age = #{gtAge} </if> <if test="ltAge != null and ltAge != ''"> and lt_age = #{ltAge} </if> <if test="deleted != null "> and deleted = #{deleted} </if> <if test="dwId != null and dwId != ''"> and dw_id = #{dwId} </if> <if test="dwName != null and dwName != ''"> and dw_name like concat('%', #{dwName}, '%') </if> <if test="dwDeptId != null and dwDeptId != ''"> and dw_dept_id = #{dwDeptId} </if> <if test="dwDeptName != null and dwDeptName != ''"> and dw_dept_name like concat('%', #{dwDeptName}, '%') </if> <if test="groupingName != null and groupingName != ''"> and grouping_name like concat('%', #{groupingName}, '%') </if> <if test="limit != null "> and limit = #{limit} </if> <if test="pacName != null and pacName != ''"> and pac_name like concat('%', #{pacName}, '%') </if> <if test="payType != null and payType != ''"> and pay_type = #{payType} </if> <if test="sex != null and sex != ''"> and sex = #{sex} </if> <if test="gtAge != null and gtAge != ''"> and gt_age = #{gtAge} </if> <if test="ltAge != null and ltAge != ''"> and lt_age = #{ltAge} </if> <if test="deleted != null "> and deleted = #{deleted} </if> </where> </select> <select id="selectTjDwGroupingById" parameterType="String" resultMap="TjDwGroupingResult"> <include refid="selectTjDwGroupingVo"/> where id = #{id} <include refid="selectTjDwGroupingVo"/> where id = #{id} </select> <select id="huoqutuantitaocanxiangmuhuoqutuantitaocanxiangmuList" parameterType="string" resultType="com.ltkj.hosp.domain.TjPackage"> SELECT a.id pac_id,grouping_name pac_name,a.ys_price price , GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) allProName FROM tj_dw_grouping a JOIN tj_grouping_pro b ON b.grouping_id=a.id <where> <if test="dwId != null" > and a.dw_id = #{dwId} </if> and a.deleted=0 GROUP BY b.grouping_id </where> </select> <insert id="insertTjDwGrouping" parameterType="TjDwGrouping"> insert into tj_dw_grouping <trim prefix="(" suffix=")" suffixOverrides=","> <if test="id != null">id, </if> <if test="dwId != null">dw_id, </if> <if test="dwName != null">dw_name, </if> <if test="dwDeptId != null">dw_dept_id, </if> <if test="dwDeptName != null">dw_dept_name, </if> <if test="groupingName != null">grouping_name, </if> <if test="limit != null">limit, </if> <if test="pacName != null">pac_name, </if> <if test="payType != null">pay_type, </if> <if test="sex != null">sex, </if> <if test="gtAge != null">gt_age, </if> <if test="ltAge != null">lt_age, </if> <if test="createBy != null">create_by, </if> <if test="updateTime != null">update_time, </if> <if test="updateBy != null">update_by, </if> <if test="deleted != null">deleted, </if> <if test="id != null">id, </if> <if test="dwId != null">dw_id, </if> <if test="dwName != null">dw_name, </if> <if test="dwDeptId != null">dw_dept_id, </if> <if test="dwDeptName != null">dw_dept_name, </if> <if test="groupingName != null">grouping_name, </if> <if test="limit != null">limit, </if> <if test="pacName != null">pac_name, </if> <if test="payType != null">pay_type, </if> <if test="sex != null">sex, </if> <if test="gtAge != null">gt_age, </if> <if test="ltAge != null">lt_age, </if> <if test="createBy != null">create_by, </if> <if test="updateTime != null">update_time, </if> <if test="updateBy != null">update_by, </if> <if test="deleted != null">deleted, </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id}, </if> <if test="dwId != null">#{dwId}, </if> <if test="dwName != null">#{dwName}, </if> <if test="dwDeptId != null">#{dwDeptId}, </if> <if test="dwDeptName != null">#{dwDeptName}, </if> <if test="groupingName != null">#{groupingName}, </if> <if test="limit != null">#{limit}, </if> <if test="pacName != null">#{pacName}, </if> <if test="payType != null">#{payType}, </if> <if test="sex != null">#{sex}, </if> <if test="gtAge != null">#{gtAge}, </if> <if test="ltAge != null">#{ltAge}, </if> <if test="createBy != null">#{createBy}, </if> <if test="updateTime != null">#{updateTime}, </if> <if test="updateBy != null">#{updateBy}, </if> <if test="deleted != null">#{deleted}, </if> <if test="id != null">#{id}, </if> <if test="dwId != null">#{dwId}, </if> <if test="dwName != null">#{dwName}, </if> <if test="dwDeptId != null">#{dwDeptId}, </if> <if test="dwDeptName != null">#{dwDeptName}, </if> <if test="groupingName != null">#{groupingName}, </if> <if test="limit != null">#{limit}, </if> <if test="pacName != null">#{pacName}, </if> <if test="payType != null">#{payType}, </if> <if test="sex != null">#{sex}, </if> <if test="gtAge != null">#{gtAge}, </if> <if test="ltAge != null">#{ltAge}, </if> <if test="createBy != null">#{createBy}, </if> <if test="updateTime != null">#{updateTime}, </if> <if test="updateBy != null">#{updateBy}, </if> <if test="deleted != null">#{deleted}, </if> </trim> </insert> <update id="updateTjDwGrouping" parameterType="TjDwGrouping"> update tj_dw_grouping <trim prefix="SET" suffixOverrides=","> <if test="dwId != null">dw_id = #{dwId}, </if> <if test="dwName != null">dw_name = #{dwName}, </if> <if test="dwDeptId != null">dw_dept_id = #{dwDeptId}, </if> <if test="dwDeptName != null">dw_dept_name = #{dwDeptName}, </if> <if test="groupingName != null">grouping_name = #{groupingName}, </if> <if test="limit != null">limit = #{limit}, </if> <if test="pacName != null">pac_name = #{pacName}, </if> <if test="payType != null">pay_type = #{payType}, </if> <if test="sex != null">sex = #{sex}, </if> <if test="gtAge != null">gt_age = #{gtAge}, </if> <if test="ltAge != null">lt_age = #{ltAge}, </if> <if test="createBy != null">create_by = #{createBy}, </if> <if test="updateTime != null">update_time = #{updateTime}, </if> <if test="updateBy != null">update_by = #{updateBy}, </if> <if test="deleted != null">deleted = #{deleted}, </if> <if test="dwId != null">dw_id = #{dwId}, </if> <if test="dwName != null">dw_name = #{dwName}, </if> <if test="dwDeptId != null">dw_dept_id = #{dwDeptId}, </if> <if test="dwDeptName != null">dw_dept_name = #{dwDeptName}, </if> <if test="groupingName != null">grouping_name = #{groupingName}, </if> <if test="limit != null">limit = #{limit}, </if> <if test="pacName != null">pac_name = #{pacName}, </if> <if test="payType != null">pay_type = #{payType}, </if> <if test="sex != null">sex = #{sex}, </if> <if test="gtAge != null">gt_age = #{gtAge}, </if> <if test="ltAge != null">lt_age = #{ltAge}, </if> <if test="createBy != null">create_by = #{createBy}, </if> <if test="updateTime != null">update_time = #{updateTime}, </if> <if test="updateBy != null">update_by = #{updateBy}, </if> <if test="deleted != null">deleted = #{deleted}, </if> </trim> where id = #{id} </update> <delete id="deleteTjDwGroupingById" parameterType="String"> delete from tj_dw_grouping where id = #{id} from tj_dw_grouping where id = #{id} </delete> <delete id="deleteTjDwGroupingByIds" parameterType="String"> @@ -211,4 +240,4 @@ #{id} </foreach> </delete> </mapper> </mapper> ltkj-system/src/main/java/com/ltkj/system/domain/SysNotice.java
@@ -3,7 +3,11 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.ltkj.tduck.handler.LongToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ltkj.common.core.domain.BaseEntity; @@ -22,6 +26,8 @@ /** * 公告ID */ @TableId @JsonSerialize(using = LongToStringSerializer.class) private Long noticeId; /** @@ -44,7 +50,7 @@ */ private String status; @TableField(exist = false) // @TableField(exist = false) private String deptId; @TableField(exist = false) ltkj-system/src/main/java/com/ltkj/system/mapper/SysNoticeMapper.java
@@ -2,6 +2,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ltkj.system.domain.SysNotice; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -11,7 +12,7 @@ * * @author ltkj */ public interface SysNoticeMapper { public interface SysNoticeMapper extends BaseMapper<SysNotice> { /** * 查询公告信息 * ltkj-system/src/main/java/com/ltkj/system/service/ISysNoticeService.java
@@ -2,6 +2,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.system.domain.SysNotice; @@ -10,7 +11,7 @@ * * @author ltkj */ public interface ISysNoticeService { public interface ISysNoticeService extends IService<SysNotice> { /** * 查询公告信息 * ltkj-system/src/main/java/com/ltkj/system/service/impl/SysNoticeServiceImpl.java
@@ -2,6 +2,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ltkj.common.core.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,7 +16,7 @@ * @author ltkj */ @Service public class SysNoticeServiceImpl implements ISysNoticeService { public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper,SysNotice> implements ISysNoticeService { @Autowired private SysNoticeMapper noticeMapper;