1、更新用户指引的开启关闭设置

2、对账单日期筛选调整

src/main/java/com/uas/platform/b2b/dao/GuideSettingDao.java

@@ -21,7 +21,7 @@ public interface GuideSettingDao extends JpaRepository<GuideSetting, Long>, JpaS
      * @param status
      * @return
      */
-    Integer countByUseruuAndAndNameAndsAndStatus(Long useruu, String name, Short status);
+    Integer countByUseruuAndNameAndStatus(Long useruu, String name, Short status);
 
     /**
      * 通过用户uu,指引名称查询数量
@@ -30,5 +30,5 @@ public interface GuideSettingDao extends JpaRepository<GuideSetting, Long>, JpaS
      * @param name
      * @return
      */
-    List<GuideSetting> findByUseruuAndAndName(Long useruu, String name);
+    List<GuideSetting> findByUseruuAndName(Long useruu, String name);
 }

src/main/java/com/uas/platform/b2b/service/impl/ErpProdIODetailServiceImpl.java

@@ -107,12 +107,12 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 			}
 		}
 		if (fromDate != null) {
-			sql = sql + " and pi_date>=" + "to_date('" + new java.sql.Date(new Date(fromDate).getTime())
+			sql = sql + " and pi_date >= " + "to_date('" + new java.sql.Date(new Date(fromDate).getTime())
 					+ "','yyyy-mm-dd')";
 		}
 		if (endDate != null) {
-			sql = sql + " and pi_date<=" + "to_date('" + new java.sql.Date(new Date(endDate).getTime())
-					+ "','yyyy-mm-dd')";
+			sql = sql + " and pi_date < " + "to_date('" + new java.sql.Date(new Date(endDate).getTime())
+					+ "','yyyy-mm-dd') + 1";
 		}
 		Object[] args = new Object[] { enUu };
 		if (!CollectionUtils.isEmpty(filter)) {

src/main/java/com/uas/platform/b2b/service/impl/GuideSettingServiceImpl.java

@@ -24,13 +24,13 @@ public class GuideSettingServiceImpl implements GuideSettingService {
 
     @Override
     public boolean toggle(Long useruu, String guName, Short status) {
-        Integer count = settingDao.countByUseruuAndAndNameAndsAndStatus(useruu, guName, status);
+        Integer count = settingDao.countByUseruuAndNameAndStatus(useruu, guName, status);
         return count > 0 ? true : false;
     }
 
     @Override
     public void save(GuideSetting setting) {
-       List<GuideSetting> settings = settingDao.findByUseruuAndAndName(setting.getUseruu(), setting.getName());
+       List<GuideSetting> settings = settingDao.findByUseruuAndName(setting.getUseruu(), setting.getName());
        if(!CollectionUtils.isEmpty(settings))
            setting.setId(settings.get(0).getId());
         settingDao.save(setting);