心愿管理和心愿互换，作品名改为全模糊查询

common/src/main/resources/mapper/base/WishInfoUserRecord.xml

@@ -190,7 +190,7 @@
 				and b.category_ = #{searchParams.category}
 			</if>
 			<if test="searchParams.wishInfoTitle != null">
-				and b.title_ = #{searchParams.wishInfoTitle}
+				and b.title_ like #{searchParams.wishInfoTitle}
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoController.java

@@ -37,11 +37,11 @@ public class WishInfoController {
 
     @Autowired
     private WishInfoUserRecordService wishInfoUserRecordService;
-	
-	
-	@ApiOperation(value="创建空记录")
+
+
+    @ApiOperation(value = "创建空记录")
     @GetMapping("create")
-    public MessageResult<WishInfo> create(){
+    public MessageResult<WishInfo> create() {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         WishInfo wishInfo = new WishInfo();
@@ -56,14 +56,14 @@ public class WishInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
+    @ApiOperation(value = "添加信息")
     @PostMapping("add")
-    public MessageResult<WishInfo> add(@RequestBody WishInfo wishInfo,@RequestAttribute String subject){
+    public MessageResult<WishInfo> add(@RequestBody WishInfo wishInfo, @RequestAttribute String subject) {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         try {
             wishInfo.setId(UUID.randomUUID().toString());
-			wishInfo.setDelFlag(false);
+            wishInfo.setDelFlag(false);
             wishInfo.setCreateBy(subject);
             wishInfo.setCreateTime(new Date());
             wishInfo.setStatus("1");
@@ -78,9 +78,8 @@ public class WishInfoController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -89,9 +88,9 @@ public class WishInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value = "获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<WishInfo> edit(@PathVariable("id") String id){
+    public MessageResult<WishInfo> edit(@PathVariable("id") String id) {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         try {
@@ -99,7 +98,7 @@ public class WishInfoController {
 
             if (wishInfo != null) {
                 List<StudentAspirations> studentAspirationsList = studentAspirationsService.listByWishInfo(wishInfo.getId());
-                if(studentAspirationsList!=null){
+                if (studentAspirationsList != null) {
                     wishInfo.setStudentAspirationsList(studentAspirationsList);
                 }
 
@@ -109,9 +108,8 @@ public class WishInfoController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -120,15 +118,15 @@ public class WishInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value = "更新用户")
     @PostMapping("update")
-    public MessageResult<WishInfo> update(@RequestBody WishInfo wishInfo,@RequestAttribute String subject){
+    public MessageResult<WishInfo> update(@RequestBody WishInfo wishInfo, @RequestAttribute String subject) {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         try {
-		    wishInfo.setUpdateBy(subject);
+            wishInfo.setUpdateBy(subject);
             wishInfo.setUpdateTime(new Date());
-		
+
             int affectCount = wishInfoService.updateAndAspirations(wishInfo);
 
             if (affectCount > 0) {
@@ -138,9 +136,8 @@ public class WishInfoController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库更新失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -149,19 +146,19 @@ public class WishInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+    @ApiOperation(value = "删除用户")
     @PostMapping("delete/{id}")
-    public MessageResult<WishInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<WishInfo> delete(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         try {
-			
-			WishInfo wishInfo = wishInfoService.get(id);
+
+            WishInfo wishInfo = wishInfoService.get(id);
             wishInfo.setDelFlag(true);
             wishInfo.setUpdateBy(subject);
             wishInfo.setUpdateTime(new Date());
-			
-			int affectCount = wishInfoService.update(wishInfo);
+
+            int affectCount = wishInfoService.update(wishInfo);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -169,9 +166,8 @@ public class WishInfoController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -181,9 +177,9 @@ public class WishInfoController {
     }
 
 
-    @ApiOperation(value="删除验证")
+    @ApiOperation(value = "删除验证")
     @PostMapping("deleteValidate/{id}")
-    public MessageResult<WishInfo> deleteValidate(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<WishInfo> deleteValidate(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<WishInfo> msgResult = new MessageResult<>();
 
         try {
@@ -195,9 +191,8 @@ public class WishInfoController {
             } else {
                 msgResult.setResult(false);
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -207,9 +202,9 @@ public class WishInfoController {
     }
 
 
-    @ApiOperation(value="批量删除")
+    @ApiOperation(value = "批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -231,9 +226,8 @@ public class WishInfoController {
                 msgResult.setResult(false);
                 msgResult.setMessage("删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -242,56 +236,55 @@ public class WishInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String title,String category,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            String title, String category,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("create_time", "desc"));
 
         if (StringUtils.isNotEmpty(title)) {
-            searchParams.put("title",title + "%");
+            searchParams.put("title", "%" + title + "%");
         }
 
         if (StringUtils.isNotEmpty(category)) {
-            searchParams.put("category",category);
+            searchParams.put("category", category);
         }
 
 
-        Page<WishInfo> page = wishInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<WishInfo> page = wishInfoService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
-        for (WishInfo wishInfo:page) {
-            String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型",wishInfo.getCategory());
-            if(StringUtils.isNotEmpty(categoryN)){
+        for (WishInfo wishInfo : page) {
+            String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型", wishInfo.getCategory());
+            if (StringUtils.isNotEmpty(categoryN)) {
                 wishInfo.setCategoryN(categoryN);
             }
 
-            if(StringUtils.isNotEmpty(wishInfo.getStatus())){
-                if(wishInfo.getStatus().equals("0")){
+            if (StringUtils.isNotEmpty(wishInfo.getStatus())) {
+                if (wishInfo.getStatus().equals("0")) {
                     wishInfo.setStatusN("下架");
-                }
-                else if(wishInfo.getStatus().equals("1")){
+                } else if (wishInfo.getStatus().equals("1")) {
                     wishInfo.setStatusN("上架");
                 }
             }
 
-            int wishInfoUserRecordNum = wishInfoUserRecordService.countByWishAndStatus(wishInfo.getId(),"1");
+            int wishInfoUserRecordNum = wishInfoUserRecordService.countByWishAndStatus(wishInfo.getId(), "1");
             wishInfo.setWishInfoUserRecordNum(wishInfoUserRecordNum);
 
-            if(StringUtils.isNotEmpty(wishInfo.getImage())){
-                String img = wishInfo.getImage()+"?x-oss-process=image/resize,m_lfit,h_300,w_300";
+            if (StringUtils.isNotEmpty(wishInfo.getImage())) {
+                String img = wishInfo.getImage() + "?x-oss-process=image/resize,m_lfit,h_300,w_300";
                 wishInfo.setImage(img);
             }
 

web/src/main/java/com/jpsoft/employment/modules/base/controller/WishInfoUserRecordController.java

@@ -44,11 +44,11 @@ public class WishInfoUserRecordController {
 
     @Autowired
     private DataDictionaryService dataDictionaryService;
-	
-	
-	@ApiOperation(value="创建空记录")
+
+
+    @ApiOperation(value = "创建空记录")
     @GetMapping("create")
-    public MessageResult<WishInfoUserRecord> create(){
+    public MessageResult<WishInfoUserRecord> create() {
         MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
 
         WishInfoUserRecord wishInfoUserRecord = new WishInfoUserRecord();
@@ -59,14 +59,14 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
+    @ApiOperation(value = "添加信息")
     @PostMapping("add")
-    public MessageResult<WishInfoUserRecord> add(@RequestBody WishInfoUserRecord wishInfoUserRecord,@RequestAttribute String subject){
+    public MessageResult<WishInfoUserRecord> add(@RequestBody WishInfoUserRecord wishInfoUserRecord, @RequestAttribute String subject) {
         MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
 
         try {
             wishInfoUserRecord.setId(UUID.randomUUID().toString());
-			wishInfoUserRecord.setDelFlag(false);
+            wishInfoUserRecord.setDelFlag(false);
             wishInfoUserRecord.setCreateBy(subject);
             wishInfoUserRecord.setCreateTime(new Date());
 
@@ -79,9 +79,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -90,9 +89,9 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value = "获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<WishInfoUserRecordDTO> edit(@PathVariable("id") String id){
+    public MessageResult<WishInfoUserRecordDTO> edit(@PathVariable("id") String id) {
         MessageResult<WishInfoUserRecordDTO> msgResult = new MessageResult<>();
 
         try {
@@ -101,11 +100,10 @@ public class WishInfoUserRecordController {
             WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
 
             if (wishInfoUserRecord != null) {
-                if(StringUtils.isNotEmpty(wishInfoUserRecord.getStatus())){
-                    if(wishInfoUserRecord.getStatus().equals("0")){
+                if (StringUtils.isNotEmpty(wishInfoUserRecord.getStatus())) {
+                    if (wishInfoUserRecord.getStatus().equals("0")) {
                         wishInfoUserRecord.setStatusN("互换中");
-                    }
-                    else if(wishInfoUserRecord.getStatus().equals("1")){
+                    } else if (wishInfoUserRecord.getStatus().equals("1")) {
                         wishInfoUserRecord.setStatusN("已完成");
                     }
                 }
@@ -115,14 +113,14 @@ public class WishInfoUserRecordController {
 
                 RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
 
-                if(regUser!=null){
+                if (regUser != null) {
                     wishInfoUserRecord.setRegUserName(regUser.getRealName());
                     wishInfoUserRecord.setRegUserPhone(regUser.getPhone());
                 }
 
-                if(StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())){
+                if (StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())) {
                     StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
-                    if(studentAspirations!=null){
+                    if (studentAspirations != null) {
                         wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
                         wishInfoUserRecord.setStudentName(studentAspirations.getStudentName());
                     }
@@ -136,9 +134,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -147,15 +144,15 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value = "更新用户")
     @PostMapping("update")
-    public MessageResult<WishInfoUserRecord> update(@RequestBody WishInfoUserRecord wishInfoUserRecord,@RequestAttribute String subject){
+    public MessageResult<WishInfoUserRecord> update(@RequestBody WishInfoUserRecord wishInfoUserRecord, @RequestAttribute String subject) {
         MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
 
         try {
-		    wishInfoUserRecord.setUpdateBy(subject);
+            wishInfoUserRecord.setUpdateBy(subject);
             wishInfoUserRecord.setUpdateTime(new Date());
-		
+
             int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
 
             if (affectCount > 0) {
@@ -165,9 +162,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库更新失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -176,19 +172,19 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+    @ApiOperation(value = "删除用户")
     @PostMapping("delete/{id}")
-    public MessageResult<WishInfoUserRecord> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<WishInfoUserRecord> delete(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
 
         try {
-			
-			WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
+
+            WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
             wishInfoUserRecord.setDelFlag(true);
             wishInfoUserRecord.setUpdateBy(subject);
             wishInfoUserRecord.setUpdateTime(new Date());
-			
-			int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
+
+            int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -196,9 +192,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -207,19 +202,18 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="更改状态")
+    @ApiOperation(value = "更改状态")
     @PostMapping("changeStatus")
-    public MessageResult<WishInfoUserRecord> changeStatus(String id,String status,@RequestAttribute String subject){
+    public MessageResult<WishInfoUserRecord> changeStatus(String id, String status, @RequestAttribute String subject) {
         MessageResult<WishInfoUserRecord> msgResult = new MessageResult<>();
 
         try {
             Date now = new Date();
             WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
             wishInfoUserRecord.setStatus(status);
-            if(status.equals("1")){
+            if (status.equals("1")) {
                 wishInfoUserRecord.setCompletionTime(now);
-            }
-            else{
+            } else {
                 wishInfoUserRecord.setCompletionTime(null);
             }
             wishInfoUserRecord.setUpdateBy(subject);
@@ -228,10 +222,10 @@ public class WishInfoUserRecordController {
             int affectCount = wishInfoUserRecordService.update(wishInfoUserRecord);
 
             if (affectCount > 0) {
-                if(status.equals("2")){
+                if (status.equals("2")) {
                     //如果更改为取消状态，需要修改心愿数量和已兑换数量
                     WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
-                    if(wishInfo!=null){
+                    if (wishInfo != null) {
                         int amount = wishInfo.getRemainingAmount() + 1;
                         wishInfo.setRemainingAmount(amount);
                         wishInfo.setUpdateBy(subject);
@@ -244,9 +238,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -256,10 +249,9 @@ public class WishInfoUserRecordController {
     }
 
 
-
-    @ApiOperation(value="批量删除")
+    @ApiOperation(value = "批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -281,9 +273,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -292,76 +283,76 @@ public class WishInfoUserRecordController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String wishInfoId,String status,String num,String wishInfoTitle,
-            String category,String phone,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            String wishInfoId, String status, String num, String wishInfoTitle,
+            String category, String phone,
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("a.create_time","desc"));
+        sortList.add(new Sort("a.create_time", "desc"));
 
         if (StringUtils.isNotEmpty(wishInfoId)) {
-            searchParams.put("wishInfoId",wishInfoId);
+            searchParams.put("wishInfoId", wishInfoId);
         }
 
         if (StringUtils.isNotEmpty(status)) {
-            searchParams.put("status",status);
+            searchParams.put("status", status);
         }
 
         if (StringUtils.isNotEmpty(num)) {
-            searchParams.put("num",num+"%");
+            searchParams.put("num", "%" + num + "%");
         }
 
         if (StringUtils.isNotEmpty(wishInfoTitle)) {
-            searchParams.put("wishInfoTitle",wishInfoTitle);
+            searchParams.put("wishInfoTitle", "%" + wishInfoTitle + "%");
         }
 
         if (StringUtils.isNotEmpty(category)) {
-            searchParams.put("category",category);
+            searchParams.put("category", category);
         }
 
         if (StringUtils.isNotEmpty(phone)) {
-            searchParams.put("phone",phone);
+            searchParams.put("phone", phone);
         }
 
 
-        Page<WishInfoUserRecord> page = wishInfoUserRecordService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<WishInfoUserRecord> page = wishInfoUserRecordService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
-        for (WishInfoUserRecord wishInfoUserRecord:page) {
+        for (WishInfoUserRecord wishInfoUserRecord : page) {
             RegUser regUser = regUserService.get(wishInfoUserRecord.getRegUserId());
-            if(regUser!=null){
+            if (regUser != null) {
                 wishInfoUserRecord.setRegUserName(regUser.getRealName());
                 wishInfoUserRecord.setRegUserPhone(regUser.getPhone());
             }
 
             WishInfo wishInfo = wishInfoService.get(wishInfoUserRecord.getWishInfoId());
-            if(wishInfo!=null){
+            if (wishInfo != null) {
 
                 wishInfoUserRecord.setStudentType(wishInfo.getStudentType());
                 wishInfoUserRecord.setWishInfoTitle(wishInfo.getTitle());
 
-                String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型",wishInfo.getCategory());
-                if(StringUtils.isNotEmpty(categoryN)){
+                String categoryN = dataDictionaryService.findNameByCatalogNameAndValue("心愿类型", wishInfo.getCategory());
+                if (StringUtils.isNotEmpty(categoryN)) {
                     wishInfoUserRecord.setCategoryN(categoryN);
                 }
 
             }
 
-            if(StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())){
+            if (StringUtils.isNotEmpty(wishInfoUserRecord.getStudentAspirationsId())) {
                 StudentAspirations studentAspirations = studentAspirationsService.get(wishInfoUserRecord.getStudentAspirationsId());
-                if(studentAspirations!=null){
+                if (studentAspirations != null) {
                     wishInfoUserRecord.setAspirationsName(studentAspirations.getName());
                     wishInfoUserRecord.setStudentName(studentAspirations.getStudentName());
                 }
@@ -377,11 +368,10 @@ public class WishInfoUserRecordController {
     }
 
 
-
-    @ApiOperation(value="保存发货时间")
-    @RequestMapping(value = "updateDeliveryTime",method = RequestMethod.POST)
-    public MessageResult<Map> updateDeliveryTime(String id,String deliveryTime, HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+    @ApiOperation(value = "保存发货时间")
+    @RequestMapping(value = "updateDeliveryTime", method = RequestMethod.POST)
+    public MessageResult<Map> updateDeliveryTime(String id, String deliveryTime, HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
@@ -392,8 +382,8 @@ public class WishInfoUserRecordController {
             Date now = new Date();
             WishInfoUserRecord wishInfoUserRecord = wishInfoUserRecordService.get(id);
 
-            if(StringUtils.isNotEmpty(deliveryTime)){
-                SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            if (StringUtils.isNotEmpty(deliveryTime)) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                 wishInfoUserRecord.setDeliveryTime(sdf.parse(deliveryTime));
                 wishInfoUserRecord.setUpdateBy(subject);
                 wishInfoUserRecord.setUpdateTime(new Date());
@@ -407,9 +397,8 @@ public class WishInfoUserRecordController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());