Merge branch 'dev' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into dev
This commit is contained in:
commit
00a332cb9a
@ -50,10 +50,10 @@
|
||||
and info_category_name = #{infoCategoryName}
|
||||
</if>
|
||||
<if test="infoTitle != null and infoTitle != ''">
|
||||
and info_title = #{infoTitle}
|
||||
and info_title like concat('%', #{infoTitle}, '%')
|
||||
</if>
|
||||
<if test="infoCode != null and infoCode != ''">
|
||||
and info_code = #{infoCode}
|
||||
and info_code like concat('%', #{infoCode}, '%')
|
||||
</if>
|
||||
<if test="infoContent != null and infoContent != ''">
|
||||
and info_content = #{infoContent}
|
||||
|
||||
@ -15,14 +15,21 @@
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectInfoCategoryVo">
|
||||
select id, info_category_code, info_category_name, info_category_type, info_category_sort, info_category_creator, info_category_create_time from info_category
|
||||
select id,
|
||||
info_category_code,
|
||||
info_category_name,
|
||||
info_category_type,
|
||||
info_category_sort,
|
||||
info_category_creator,
|
||||
info_category_create_time
|
||||
from info_category
|
||||
</sql>
|
||||
|
||||
<select id="selectInfoCategoryList" parameterType="InfoCategory" resultMap="InfoCategoryResult">
|
||||
<include refid="selectInfoCategoryVo"/>
|
||||
<where>
|
||||
<if test="infoCategoryCode != null and infoCategoryCode != ''">
|
||||
and info_category_code = #{infoCategoryCode}
|
||||
and info_category_code like concat('%', #{infoCategoryCode}, '%')
|
||||
</if>
|
||||
<if test="infoCategoryName != null and infoCategoryName != ''">
|
||||
and info_category_name like concat('%', #{infoCategoryName}, '%')
|
||||
@ -112,7 +119,9 @@
|
||||
</update>
|
||||
|
||||
<delete id="deleteInfoCategoryById" parameterType="Long">
|
||||
delete from info_category where id = #{id}
|
||||
delete
|
||||
from info_category
|
||||
where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteInfoCategoryByIds" parameterType="String">
|
||||
@ -130,7 +139,6 @@
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<insert id="insertInfoCategoryList">
|
||||
insert into info_category(
|
||||
info_category_code,
|
||||
|
||||
@ -77,7 +77,7 @@
|
||||
#{fieldMark}
|
||||
</if>
|
||||
</where>
|
||||
order by create_time DESC
|
||||
order by content_sort, create_time DESC
|
||||
</select>
|
||||
|
||||
<select id="selectLabelFieldContentById" parameterType="Long"
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
#{fieldRemark}
|
||||
</if>
|
||||
</where>
|
||||
order by create_time DESC
|
||||
order by field_sort, create_time DESC
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
package com.xinelu.mobile.controller.info;
|
||||
|
||||
import com.xinelu.common.core.controller.BaseController;
|
||||
import com.xinelu.common.core.domain.AjaxResult;
|
||||
import com.xinelu.common.core.page.TableDataInfo;
|
||||
import com.xinelu.manage.domain.info.Info;
|
||||
import com.xinelu.manage.service.info.IInfoService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
import static com.xinelu.common.utils.PageUtils.startPage;
|
||||
|
||||
/**
|
||||
* 微信端获取资讯信息
|
||||
* 资讯信息Controller
|
||||
@ -36,4 +33,9 @@ public class MobileInfoController extends BaseController {
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@GetMapping("/getInfoById")
|
||||
public AjaxResult getInfoById(Long id) {
|
||||
return AjaxResult.success(infoService.selectInfoById(id));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user