Merge remote-tracking branch 'origin/developer' into developer

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/service/impl/BasicGridAcceptanceServiceImpl.java

@@ -50,14 +50,14 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         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");
-        }
+//        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", date);
+        map.put("gridConnectionTime", gridConnectionTime);
         map.put("formType", formType);
         map.put("regionCompanyId", regionCompanyId);
         map.put("amosDealerId", amosDealerId);