youxiw2000 / trash · Commits

Commit 262ada9702838350f5fb7e63d75b980b30e04d15

Authored by youxiw2000
1 parent fb390ddb

m

Inline Side-by-side
Showing 4 changed files with 25 additions and 5 deletions
trash-admin/src/main/resources/application.yml
  View file @262ada9
... ... @@ -8,7 +8,7 @@ logging:
8 8 spring:
9 9 #kafka配置
10 10 kafka:
11   - bootstrap-servers: 183.66.242.6:14605
  11 + bootstrap-servers: 175.178.228.30:9010
12 12 listener:
13 13 ack-mode: manual_immediate
14 14 missing-topics-fatal: false
... ...
trash-ui/src/utils/trash.js
  View file @262ada9
... ... @@ -153,9 +153,9 @@ export function handleTree(data, id, parentId, children, rootId) {
153 153 * @returns {string}
154 154 */
155 155 export function parseStatus(status) {
156   - if(status==='1'){
  156 + if(status==1){
157 157 return "审批通过";
158   - }else if(status==='2'){
  158 + }else if(status==2){
159 159 return "审批驳回";
160 160 }else{
161 161 return "审批中";
... ...
trash-unit/src/main/java/com/trash/dropPointInfo/domain/DropPointInfo.java
  View file @262ada9
... ... @@ -87,7 +87,26 @@ public class DropPointInfo extends BaseEntity
87 87 @Excel(name = "坐标点")
88 88 private String coordinatePoint;
89 89  
90   - private List<String> sList;
  90 + private int status;
  91 +
  92 +
  93 + public int getStatus() {
  94 + return status;
  95 + }
  96 +
  97 + public void setStatus(int status) {
  98 + this.status = status;
  99 + }
  100 +
  101 + public List<String> getsList() {
  102 + return sList;
  103 + }
  104 +
  105 + public void setsList(List<String> sList) {
  106 + this.sList = sList;
  107 + }
  108 +
  109 + private List<String> sList;
91 110  
92 111 public List<String> getSList() {
93 112 return sList;
... ...
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
  View file @262ada9
... ... @@ -26,12 +26,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
26 26 <result property="createBy" column="create_by" />
27 27 <result property="updateTime" column="update_time" />
28 28 <result property="updateBy" column="update_by" />
  29 + <result property="status" column="status" />
29 30 </resultMap>
30 31  
31 32 <sql id="selectDropPointInfoVo">
32 33 select id, drop_point_name, district, street, community, address, type,
33 34 area, capacity, management_unit, custodian, custodian_phone,
34   - drop_time, drop_point_no, operating_unit,
  35 + drop_time, drop_point_no, operating_unit,status,
35 36 transport_unit,coordinate_point, create_time, create_by, update_time,
36 37 update_by from drop_point_info
37 38 </sql>
... ...