修改bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -64,7 +64,7 @@
                 AND hbga.grid_status = #{map.gridStatus}
             </if>
             <if test="map.gridConnectionTime != null">
-                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT(map.gridConnectionTime, '%Y-%m-%d')
+                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT(#{map.gridConnectionTime}, '%Y-%m-%d')
             </if>
         </where>
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -141,7 +141,7 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
 																	@RequestParam(required = false,value = "ownersName") String ownersName,
 																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
-																	@RequestParam(required = false,value = "gridConnectionTime") Date gridConnectionTime) {
+																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
         UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 	    Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(userUnitInformationDto.getRegionalCompaniesSeq(),userUnitInformationDto.getAmosDealerId(),current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
@@ -164,7 +164,7 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
 																	@RequestParam(required = false,value = "ownersName") String ownersName,
 																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
-																	@RequestParam(required = false,value = "gridConnectionTime") Date gridConnectionTime) {
+																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
 
         Page<BasicGridAcceptanceDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,7 +18,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -51,14 +51,18 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     private final  String OK ="0";
     private final  String PASS ="5";
 
-    public Page<BasicGridAcceptanceDto> selectPage(Long  regionCompanyId  ,Long amosDealerId ,int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, Date gridConnectionTime, String formType) {
+    public Page<BasicGridAcceptanceDto> selectPage(Long  regionCompanyId  ,Long amosDealerId ,int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, String gridConnectionTime, String formType) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
+        Date date = null;
+        if (StringUtils.isNotEmpty(gridConnectionTime)) {
+            date = DateUtil.formatStringToDate(gridConnectionTime, "yyyy-MM-dd HH:mm:ss");
+        }
         map.put("projectAddress", projectAddress);
         map.put("powerStationCode", powerStationCode);
         map.put("ownersName", ownersName);
         map.put("gridStatus", gridStatus);
-        map.put("gridConnectionTime", gridConnectionTime);
+        map.put("gridConnectionTime", date);
         map.put("formType", formType);
         map.put("regionCompanyId", regionCompanyId);
         map.put("amosDealerId", amosDealerId);