@@ -505,7 +505,6 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
select count(*)
from public_release a left join admin c on a.aid =c.id
where 1=1
- where 1=1
<if test="type==0">
and a.aid= #{aid}
</if>
@@ -124,8 +124,9 @@ public class OrderDunTask {
Thread.sleep(2000);
}
+ System.out.println(o.getId()+"\n"+o.getCustomizeTime()+"\n"+o.getDunType());
if (o.getDunType()==0) {
- System.out.println(o.getId()+"---/n"+o.getCustomizeTime()+"---/n"+o.getDunType());
+ System.out.println("======================================");
calendar2.setTime(o.getCustomizeTime());
CalendarTimeCleared(calendar);
if (calendar.equals(calendar2)) {
@@ -1207,7 +1207,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
- @Async
+
public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String orderNo,String adminId,Integer approval) {
AdminListBo a = adminMapper.getDeptNameByAid(adminId);
String approvalType="";
@@ -1,13 +1,13 @@
#Driver
jdbc.driverClassName=com.mysql.jdbc.Driver
#本地
-jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=123456
-#测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.url=jdbc\:mysql://localhost:3306/aft20210528?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
#jdbc.username=root
-#jdbc.password=aftdev
+#jdbc.password=123456
+#测试
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
#\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
jdbc.validationQuery=SELECT 'x'
#\u521d\u59cb\u8fde\u63a5\u6570