m

youxiw2000
1 parent fb390ddb
Showing 4 changed files with 25 additions and 5 deletions
trash-admin/src/main/resources/application.yml
trash-ui/src/utils/trash.js
trash-unit/src/main/java/com/trash/dropPointInfo/domain/DropPointInfo.java
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
@@ -8,7 +8,7 @@ logging:
 spring:
   #kafka配置
   kafka:
-    bootstrap-servers: 183.66.242.6:14605
+    bootstrap-servers: 175.178.228.30:9010
     listener:
       ack-mode: manual_immediate
       missing-topics-fatal: false
@@ -153,9 +153,9 @@ export function handleTree(data, id, parentId, children, rootId) {
  * @returns {string}
  */
 export function parseStatus(status) {
-  if(status==='1'){
+  if(status==1){
     return "审批通过";
-  }else if(status==='2'){
+  }else if(status==2){
     return "审批驳回";
   }else{
     return "审批中";
@@ -87,7 +87,26 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "坐标点")
     private String coordinatePoint;
-    private List<String> sList;
+    private int status;
+    
+    
+    public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	public List<String> getsList() {
+		return sList;
+	}
+
+	public void setsList(List<String> sList) {
+		this.sList = sList;
+	}
+
+	private List<String> sList;
     public List<String> getSList() {
 		return sList;
@@ -26,12 +26,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<result property="createBy" column="create_by" />
 		<result property="updateTime" column="update_time" />
 		<result property="updateBy" column="update_by" />
+		<result property="status" column="status" />
 	</resultMap>
 	<sql id="selectDropPointInfoVo">
 		select id, drop_point_name, district, street, community, address, type,
 		area, capacity, management_unit, custodian, custodian_phone,
-		drop_time, drop_point_no, operating_unit,
+		drop_time, drop_point_no, operating_unit,status,
 		transport_unit,coordinate_point, create_time, create_by, update_time,
 		update_by from drop_point_info
 	</sql>