Merge branch 'master' into feature-hejq-201844

db/ddl.sql

@@ -0,0 +1,8 @@
+-- 项目ddl SQL语句统一放在这里记录，包括表结构、关联关系、索引、函数、存储过程等
+
+-- 每段sql语句必须要按规范注释，注释规范如下：
+-- date: 2018-12-11
+-- author: suntg
+-- content: 内容备注xxx
+
+

src/main/java/com/uas/platform/b2b/controller/SaleApCheckController.java

@@ -507,9 +507,9 @@ public class SaleApCheckController {
 		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日");
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.addObject("dateFormat", dateFormat);
-		modelAndView.addObject("state", "未确认");
+		modelAndView.addObject("state", "待确认");
 		modelAndView.addObject("data", getTodoApChecks(params, searchFilter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_未对账"));
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_待确认"));
 		logger.log("应收对账单", "导出Excel列表", "导出未对账Excel列表");
 		return modelAndView;
 	}
@@ -529,7 +529,7 @@ public class SaleApCheckController {
 		modelAndView.addObject("dateFormat", dateFormat);
 		modelAndView.addObject("state", "已作废");
 		modelAndView.addObject("data", getEndApChecks(params, searchFilter).getContent());
-		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_已做废"));
+		modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/fa/saleApCheck", "应收对账单列表_已作废"));
 		logger.log("应收对账单", "导出Excel列表", "导出已做废Excel列表");
 		return modelAndView;
 	}

src/main/java/com/uas/platform/b2b/erp/listen/model/Listen.java

@@ -29,6 +29,17 @@ public class Listen {
     @Column(name = "description")
     private String description;
 
+    @Column(name = "status")
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
     public String getDescription() {
         return description;
     }

src/main/java/com/uas/platform/b2b/erp/listen/service/impl/ListenServiceImpl.java

@@ -35,9 +35,19 @@ public class ListenServiceImpl implements ListenService {
                     }
                     exitListen.setDate(new Date());
                     exitListen.setDescription(listen.getDescription());
+                    if (StringUtils.isEmpty(listen.getDescription()) || "所有账套都未启用轮询".equals(listen.getDescription())) {
+                        exitListen.setStatus("正常");
+                    } else {
+                        exitListen.setStatus("异常");
+                    }
                     listenDao.save(exitListen);
                 } else {
                     listen.setDate(new Date());
+                    if (StringUtils.isEmpty(listen.getDescription()) || "所有账套都未启用轮询".equals(listen.getDescription())) {
+                        listen.setStatus("正常");
+                    } else {
+                        listen.setStatus("异常");
+                    }
                     listenDao.save(listen);
                 }
             });

src/main/resources/META-INF/persistence.xml

@@ -16,7 +16,7 @@
 				to modify an existing database; value="create-drop" means the same as "create" 
 				but also drops tables when Hibernate closes; value="validate" makes no changes 
 				to the database -->
-			<property name="hibernate.hbm2ddl.auto" value="update" />
+			<property name="hibernate.hbm2ddl.auto" value="none" />
 			<property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy" />
 			<property name="hibernate.connection.charSet" value="UTF-8" />
 			<!-- Uncomment the following two properties for JBoss only -->