项目联调

src/main/java/com/gyee/frame/controller/gen/GyeeorganController.java

@@ -1,27 +1,22 @@
 package com.gyee.frame.controller.gen;
 
-import java.util.List;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseController;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.model.auto.Gyeeorgan;
-import com.gyee.frame.model.auto.Gyeerole;
 import com.gyee.frame.model.custom.TableSplitResult;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.model.custom.TitleVo;
 import com.gyee.frame.service.GyeeorganService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @Controller
 @RequestMapping("GyeeorganController")
@@ -120,7 +115,6 @@ public class GyeeorganController extends BaseController{
 	
 	/**
 	 * 检查用户
-	 * @param tsysUser
 	 * @return
 	 */
 	@PostMapping("checkNameUnique")

src/main/java/com/gyee/frame/service/WindpowerinfodayService.java

@@ -69,9 +69,9 @@ public class WindpowerinfodayService extends SocketToolService implements BaseSe
 
 		if(recorddate!=null&&!"".equals(recorddate) && wpid!=null&&!"".equals(wpid)){
 
-
-			Date recodedatebegin =recorddate;
-			Date recodedateend = DateUtils.addDays(recodedatebegin,1);
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date recodedatebegin =sdf.parse(sdf.format(recorddate));
+			Date recodedateend = sdf.parse(sdf.format(DateUtils.addDays(recodedatebegin,1)));
 			WindpowerinfodayExample testExample=new WindpowerinfodayExample();
 			testExample.setOrderByClause("id ASC");
 			testExample.createCriteria().andForeignkeyidEqualTo(wpid).andRecorddateBetween(recodedatebegin,recodedateend);