feats

src/main/java/com/yunzhi/demo/controller/TaPersonController.java

@@ -70,6 +70,7 @@ public class TaPersonController extends BaseController {
 
 		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+                    .gt("student_id", "")
                     .gt("status", Constants.STATUS_DELETED)
                     .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
                     .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
@@ -78,40 +79,10 @@ public class TaPersonController extends BaseController {
                     .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%")
                     .orderByDesc("create_date");
 
-            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
+            IPage<TaPerson> result = iTaPersonService.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentId);
             return ResponseBean.success(result);
     }
 
-//    /**
-//     * 保存对象
-//     * @param taPerson 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
-//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-//    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
-//
-//        if (iTaPersonService.save(taPerson)){
-//            return ResponseBean.success(taPerson);
-//        }else {
-//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-
-//    /**
-//     * 根据id删除对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
-//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-//    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        if(iTaPersonService.removeById(id)){
-//            return ResponseBean.success("success");
-//        }else {
-//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
-
     /**
      * 小程序完善信息
      * @param taPerson 实体对象

src/main/java/com/yunzhi/demo/controller/TaPostController.java

@@ -118,8 +118,15 @@ public class TaPostController extends BaseController {
      */
     @RequestMapping(value="/admin/post/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPostDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPostService.removeById(id)){
+    public ResponseBean taPostDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        TaPost taPost = iTaPostService.getById(id);
+        if (null == taPost || Constants.STATUS_DELETED.equals(taPost.getStatus())) {
+            return ResponseBean.success("success");
+        }
+
+        taPost.setStatus(Constants.STATUS_DELETED);
+
+        if(iTaPostService.updateById(taPost)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/demo/controller/TdPostTypeController.java

@@ -47,14 +47,17 @@ public class TdPostTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/post-type",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/post-type",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tdPostTypeList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean tdPostTypeList(@ApiParam("客户端") @PathVariable String client,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("状态") @RequestParam(value = "status", required = false) Integer status) throws Exception{
 
 		    IPage<TdPostType> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPostType> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("status", Constants.STATUS_NORMAL);
+            queryWrapper.eq(null != status, "status", status);
+            queryWrapper.gt("status", Constants.STATUS_DELETED);
             queryWrapper.orderByDesc("sort_no");
             queryWrapper.orderByDesc("create_date");
 

src/main/java/com/yunzhi/demo/mapper/TaPersonMapper.java

@@ -24,4 +24,11 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
                                         @Param("specialtyId") String specialtyId,
                                         @Param("asc") String asc,
                                         @Param("desc") String desc);
+
+    IPage<TaPerson> getStudentInfoPagedBy(IPage<TaPerson> pg,
+                                          @Param("name") String name,
+                                          @Param("schoolId") String schoolId,
+                                          @Param("specialtyId") String specialtyId,
+                                          @Param("phone") String phone,
+                                          @Param("studentId") String studentId);
 }

src/main/java/com/yunzhi/demo/service/ITaPersonService.java

@@ -22,4 +22,6 @@ public interface ITaPersonService extends IService<TaPerson> {
     int countStudent();
 
     IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc);
+
+    IPage<TaPerson> getStudentInfoPagedBy(IPage<TaPerson> pg, String name, String schoolId, String specialtyId, String phone, String studentId);
 }

src/main/java/com/yunzhi/demo/service/impl/TaPersonServiceImpl.java

@@ -50,6 +50,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getStudentStatis(pg, name, schoolId, specialtyId, getDBFieldBy(asc), getDBFieldBy(desc));
     }
 
+    @Override
+    public IPage<TaPerson> getStudentInfoPagedBy(IPage<TaPerson> pg, String name, String schoolId, String specialtyId, String phone, String studentId) {
+        return taPersonMapper.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentId);
+    }
+
     private String getDBFieldBy(String name) {
         if (StringUtils.isEmpty(name)) {
             return null;

src/main/resources/mapper/TaPersonMapper.xml

@@ -32,4 +32,33 @@
             ${desc} DESC
         </if>
     </select>
+    <select id="getStudentInfoPagedBy" resultType="com.yunzhi.demo.entity.TaPerson">
+        SELECT
+            t.*,
+            s.`name` AS school_name,
+            m.`name` AS specialty_name
+        FROM
+            ta_person t
+                INNER JOIN td_school s ON t.school_id = s.school_id
+                INNER JOIN td_specialty m ON t.specialty_id = m.specialty_id
+        WHERE
+            t.`status` > - 1
+        <if test="name != null and name != ''">
+          AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+        </if>
+        <if test="phone != null and phone != ''">
+          AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+        </if>
+        <if test="studentId != null and studentId != ''">
+          AND t.student_id = LIKE CONCAT( '%', #{studentId}, '%' )
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+          AND t.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+          AND t.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>