钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 2dd829e4f519d57bb4ef8402bb6d00d042ec974f 1 个父辈 34bf7ea8

问卷调查添加手机号

内嵌 并排对比
正在显示 3 个修改的文件 包含 8 行增加 和 7 行删除
@@ -66,7 +66,6 @@ public class ContentGroupManagementController extends BaseController @@ -66,7 +66,6 @@ public class ContentGroupManagementController extends BaseController
66 * 新增分组内容管理 66 * 新增分组内容管理
67 */ 67 */
68 @ApiOperation("新增分组内容管理") 68 @ApiOperation("新增分组内容管理")
69 - @Log(title = "分组内容管理", businessType = BusinessType.INSERT)  
70 @PostMapping 69 @PostMapping
71 public AjaxResult add(@RequestBody ContentGroupManagement contentGroupManagement, HttpServletRequest httpServletRequest) 70 public AjaxResult add(@RequestBody ContentGroupManagement contentGroupManagement, HttpServletRequest httpServletRequest)
72 { 71 {
@@ -105,7 +104,6 @@ public class ContentGroupManagementController extends BaseController @@ -105,7 +104,6 @@ public class ContentGroupManagementController extends BaseController
105 * 修改分组内容管理 104 * 修改分组内容管理
106 */ 105 */
107 @ApiOperation("修改分组内容管理") 106 @ApiOperation("修改分组内容管理")
108 - @Log(title = "分组内容管理", businessType = BusinessType.UPDATE)  
109 @PutMapping 107 @PutMapping
110 public AjaxResult edit(@RequestBody ContentGroupManagement contentGroupManagement) 108 public AjaxResult edit(@RequestBody ContentGroupManagement contentGroupManagement)
111 { 109 {
@@ -117,7 +115,6 @@ public class ContentGroupManagementController extends BaseController @@ -117,7 +115,6 @@ public class ContentGroupManagementController extends BaseController
117 * 删除分组内容管理 115 * 删除分组内容管理
118 */ 116 */
119 @ApiOperation("删除分组内容管理") 117 @ApiOperation("删除分组内容管理")
120 - @Log(title = "分组内容管理", businessType = BusinessType.DELETE)  
121 @DeleteMapping("/{ids}") 118 @DeleteMapping("/{ids}")
122 public AjaxResult remove(@PathVariable Integer[] ids) 119 public AjaxResult remove(@PathVariable Integer[] ids)
123 { 120 {
@@ -64,7 +64,6 @@ public class ContentGroupManagementDescribeController extends BaseController @@ -64,7 +64,6 @@ public class ContentGroupManagementDescribeController extends BaseController
64 * 新增分组内容管理描述表 64 * 新增分组内容管理描述表
65 */ 65 */
66 @ApiOperation("新增分组内容管理描述表") 66 @ApiOperation("新增分组内容管理描述表")
67 - @Log(title = "分组内容管理描述表", businessType = BusinessType.INSERT)  
68 @PostMapping 67 @PostMapping
69 public AjaxResult add(@RequestBody ContentGroupManagementDescribe contentGroupManagementDescribe) 68 public AjaxResult add(@RequestBody ContentGroupManagementDescribe contentGroupManagementDescribe)
70 { 69 {
@@ -77,7 +76,6 @@ public class ContentGroupManagementDescribeController extends BaseController @@ -77,7 +76,6 @@ public class ContentGroupManagementDescribeController extends BaseController
77 * 修改分组内容管理描述表 76 * 修改分组内容管理描述表
78 */ 77 */
79 @ApiOperation("修改分组内容管理描述表") 78 @ApiOperation("修改分组内容管理描述表")
80 - @Log(title = "分组内容管理描述表", businessType = BusinessType.UPDATE)  
81 @PutMapping 79 @PutMapping
82 public AjaxResult edit(@RequestBody ContentGroupManagementDescribe contentGroupManagementDescribe) 80 public AjaxResult edit(@RequestBody ContentGroupManagementDescribe contentGroupManagementDescribe)
83 { 81 {
@@ -89,7 +87,6 @@ public class ContentGroupManagementDescribeController extends BaseController @@ -89,7 +87,6 @@ public class ContentGroupManagementDescribeController extends BaseController
89 * 删除分组内容管理描述表 87 * 删除分组内容管理描述表
90 */ 88 */
91 @ApiOperation("删除分组内容管理描述表") 89 @ApiOperation("删除分组内容管理描述表")
92 - @Log(title = "分组内容管理描述表", businessType = BusinessType.DELETE)  
93 @DeleteMapping("/{ids}") 90 @DeleteMapping("/{ids}")
94 public AjaxResult remove(@PathVariable Integer[] ids) 91 public AjaxResult remove(@PathVariable Integer[] ids)
95 { 92 {
@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
11 <result property="id" column="id" /> 11 <result property="id" column="id" />
12 <result property="sort" column="sort" /> 12 <result property="sort" column="sort" />
13 <result property="update_time" column="update_time" /> 13 <result property="update_time" column="update_time" />
  14 + <result property="phone" column="phone" />
14 </resultMap> 15 </resultMap>
15 16
16 <sql id="selectContentGroupManagementVo"> 17 <sql id="selectContentGroupManagementVo">
17 - select `content`, `create_time`, `group_name`, `id`, `sort`,`update_time` from content_group_management 18 + select `content`, `create_time`, `group_name`, `id`, `sort`,`update_time`,`phone` from content_group_management
18 </sql> 19 </sql>
19 20
20 <select id="selectContentGroupManagementList" parameterType="ContentGroupManagement" resultMap="ContentGroupManagementResult"> 21 <select id="selectContentGroupManagementList" parameterType="ContentGroupManagement" resultMap="ContentGroupManagementResult">
@@ -23,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -23,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
23 <if test="params.beginCreate_time != null and params.beginCreate_time != '' and params.endCreate_time != null and params.endCreate_time != ''"> and create_time between #{params.beginCreate_time} and #{params.endCreate_time}</if> 24 <if test="params.beginCreate_time != null and params.beginCreate_time != '' and params.endCreate_time != null and params.endCreate_time != ''"> and create_time between #{params.beginCreate_time} and #{params.endCreate_time}</if>
24 <if test="group_name != null and group_name != ''"> and group_name like concat('%', #{group_name}, '%')</if> 25 <if test="group_name != null and group_name != ''"> and group_name like concat('%', #{group_name}, '%')</if>
25 <if test="id != null "> and id = #{id}</if> 26 <if test="id != null "> and id = #{id}</if>
  27 + <if test="phone != null and phone != ''">
  28 + AND phone like concat('%', #{phone}, '%')
  29 + </if>
26 </where> 30 </where>
27 order by `sort` desc 31 order by `sort` desc
28 </select> 32 </select>
@@ -39,12 +43,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -39,12 +43,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
39 <if test="create_time != null">create_time,</if> 43 <if test="create_time != null">create_time,</if>
40 <if test="group_name != null and group_name != ''">group_name,</if> 44 <if test="group_name != null and group_name != ''">group_name,</if>
41 <if test="sort != null">sort,</if> 45 <if test="sort != null">sort,</if>
  46 + <if test="phone != null">phone,</if>
42 </trim> 47 </trim>
43 <trim prefix="values (" suffix=")" suffixOverrides=","> 48 <trim prefix="values (" suffix=")" suffixOverrides=",">
44 <if test="content != null and content != ''">#{content},</if> 49 <if test="content != null and content != ''">#{content},</if>
45 <if test="create_time != null">#{create_time},</if> 50 <if test="create_time != null">#{create_time},</if>
46 <if test="group_name != null and group_name != ''">#{group_name},</if> 51 <if test="group_name != null and group_name != ''">#{group_name},</if>
47 <if test="sort != null">#{sort},</if> 52 <if test="sort != null">#{sort},</if>
  53 + <if test="phone != null">#{phone},</if>
48 </trim> 54 </trim>
49 </insert> 55 </insert>
50 56
@@ -56,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -56,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
56 <if test="group_name != null and group_name != ''">group_name = #{group_name},</if> 62 <if test="group_name != null and group_name != ''">group_name = #{group_name},</if>
57 <if test="sort != null">sort = #{sort},</if> 63 <if test="sort != null">sort = #{sort},</if>
58 <if test="update_time != null">update_time = #{update_time},</if> 64 <if test="update_time != null">update_time = #{update_time},</if>
  65 + <if test="phone != null">phone = #{phone},</if>
59 </trim> 66 </trim>
60 where id = #{id} 67 where id = #{id}
61 </update> 68 </update>