Commit e61acaa90e5038db76de806a744e565bacf15622
1 parent
731362139c
Exists in
master
and in
1 other branch
添加了两个敞亮
Showing 19 changed files with 1224 additions and 0 deletions
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/BCInventoryDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/BCTransferInHistoryDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BCInventoryDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BCTransferInHistoryDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BCInventoryService.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BCTransferInHistoryService.java
- platform-common/src/main/java/com/lyms/platform/common/enums/BCEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BCInventoryModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BCTransferInHistoryModel.java
- platform-dal/src/main/java/com/lyms/platform/query/BCTransferInHistoryQuery.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInCancelResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInHistoryQueryModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInQueryResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInSaveResult.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/BCInventoryDao.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.dal; | |
2 | + | |
3 | +import com.lyms.platform.pojo.BCInventoryModel; | |
4 | + | |
5 | +import java.util.List; | |
6 | + | |
7 | +/** | |
8 | + * @auther HuJiaqi | |
9 | + * @createTime 2016年11月18日 16时20分 | |
10 | + * @discription | |
11 | + */ | |
12 | +public interface BCInventoryDao { | |
13 | + void batchSave(List<BCInventoryModel> bcInventoryModelList); | |
14 | + | |
15 | + void batchDelete(BCInventoryModel bcInventoryModel, List<Long> codeList); | |
16 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/BCTransferInHistoryDao.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.dal; | |
2 | + | |
3 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
4 | +import com.lyms.platform.pojo.BCTransferInHistoryModel; | |
5 | + | |
6 | +import java.util.List; | |
7 | + | |
8 | +/** | |
9 | + * @auther HuJiaqi | |
10 | + * @createTime 2016年11月18日 17时37分 | |
11 | + * @discription | |
12 | + */ | |
13 | +public interface BCTransferInHistoryDao { | |
14 | + BCTransferInHistoryModel save(BCTransferInHistoryModel bcTransferInHistoryModel); | |
15 | + | |
16 | + BCTransferInHistoryModel findById(String id); | |
17 | + | |
18 | + void cancel(BCTransferInHistoryModel bcTransferInHistoryModel); | |
19 | + | |
20 | + List<BCTransferInHistoryModel> query(MongoQuery mongoQuery); | |
21 | + | |
22 | + Integer count(MongoQuery mongoQuery); | |
23 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BCInventoryDaoImpl.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.dal.impl; | |
2 | + | |
3 | +import com.lyms.platform.biz.dal.BCInventoryDao; | |
4 | +import com.lyms.platform.common.dao.BaseMongoDAOImpl; | |
5 | +import com.lyms.platform.common.dao.operator.MongoCondition; | |
6 | +import com.lyms.platform.common.dao.operator.MongoOper; | |
7 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
8 | +import com.lyms.platform.pojo.BCInventoryModel; | |
9 | +import org.springframework.stereotype.Repository; | |
10 | + | |
11 | +import java.util.List; | |
12 | + | |
13 | +/** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月18日 16时20分 | |
16 | + * @discription | |
17 | + */ | |
18 | +@Repository | |
19 | +public class BCInventoryDaoImpl extends BaseMongoDAOImpl<BCInventoryModel> implements BCInventoryDao { | |
20 | + @Override | |
21 | + public void batchSave(List<BCInventoryModel> bcInventoryModelList) { | |
22 | + super.batchSave(bcInventoryModelList); | |
23 | + } | |
24 | + | |
25 | + @Override | |
26 | + public void batchDelete(BCInventoryModel bcInventoryModel, List<Long> codeList) { | |
27 | + super.delete(new MongoQuery(new MongoCondition("code",codeList, MongoOper.IN).and("enCode",bcInventoryModel.getEnCode(),MongoOper.IS)).convertToMongoQuery()); | |
28 | + } | |
29 | + | |
30 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BCTransferInHistoryDaoImpl.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.dal.impl; | |
2 | + | |
3 | +import com.lyms.platform.biz.dal.BCTransferInHistoryDao; | |
4 | +import com.lyms.platform.common.dao.BaseMongoDAOImpl; | |
5 | +import com.lyms.platform.common.dao.operator.MongoCondition; | |
6 | +import com.lyms.platform.common.dao.operator.MongoOper; | |
7 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
8 | +import com.lyms.platform.pojo.BCTransferInHistoryModel; | |
9 | +import org.springframework.stereotype.Repository; | |
10 | + | |
11 | +import java.util.List; | |
12 | + | |
13 | +/** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月18日 17时38分 | |
16 | + * @discription | |
17 | + */ | |
18 | +@Repository | |
19 | +public class BCTransferInHistoryDaoImpl extends BaseMongoDAOImpl<BCTransferInHistoryModel> implements BCTransferInHistoryDao { | |
20 | + @Override | |
21 | + public void cancel(BCTransferInHistoryModel bcTransferInHistoryModel) { | |
22 | + super.update(new MongoQuery(new MongoCondition("id", bcTransferInHistoryModel.getId(), MongoOper.IS)).convertToMongoQuery(), bcTransferInHistoryModel); | |
23 | + } | |
24 | + | |
25 | + @Override | |
26 | + public List<BCTransferInHistoryModel> query(MongoQuery mongoQuery) { | |
27 | + return super.find(mongoQuery.convertToMongoQuery()); | |
28 | + } | |
29 | + | |
30 | + @Override | |
31 | + public Integer count(MongoQuery mongoQuery) { | |
32 | + return (int) count(mongoQuery.convertToMongoQuery()); | |
33 | + } | |
34 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BCInventoryService.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.service; | |
2 | + | |
3 | +import com.lyms.platform.biz.dal.BCInventoryDao; | |
4 | +import com.lyms.platform.pojo.BCInventoryModel; | |
5 | +import org.springframework.beans.factory.annotation.Autowired; | |
6 | +import org.springframework.stereotype.Service; | |
7 | + | |
8 | +import java.util.List; | |
9 | + | |
10 | +/** | |
11 | + * @auther HuJiaqi | |
12 | + * @createTime 2016年11月18日 16时22分 | |
13 | + * @discription | |
14 | + */ | |
15 | +@Service | |
16 | +public class BCInventoryService { | |
17 | + | |
18 | + @Autowired | |
19 | + private BCInventoryDao bcInventoryDao; | |
20 | + | |
21 | + public void batchSave(List<BCInventoryModel> bcInventoryModelList) { | |
22 | + bcInventoryDao.batchSave(bcInventoryModelList); | |
23 | + } | |
24 | + | |
25 | + public void batchDelete(BCInventoryModel bcInventoryModel, List<Long> codeList) { | |
26 | + bcInventoryDao.batchDelete(bcInventoryModel,codeList); | |
27 | + } | |
28 | +} |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BCTransferInHistoryService.java
View file @
e61acaa
1 | +package com.lyms.platform.biz.service; | |
2 | + | |
3 | +import com.lyms.platform.biz.dal.BCTransferInHistoryDao; | |
4 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
5 | +import com.lyms.platform.pojo.BCTransferInHistoryModel; | |
6 | +import com.lyms.platform.query.BCTransferInHistoryQuery; | |
7 | +import org.springframework.beans.factory.annotation.Autowired; | |
8 | +import org.springframework.data.domain.Sort; | |
9 | +import org.springframework.stereotype.Service; | |
10 | + | |
11 | +import java.util.List; | |
12 | + | |
13 | +/** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月18日 15时03分 | |
16 | + * @discription | |
17 | + */ | |
18 | +@Service | |
19 | +public class BCTransferInHistoryService { | |
20 | + | |
21 | + @Autowired | |
22 | + private BCTransferInHistoryDao bcTransferInHistoryDao; | |
23 | + | |
24 | + public BCTransferInHistoryModel save(BCTransferInHistoryModel bcTransferInHistoryModel) { | |
25 | + return bcTransferInHistoryDao.save(bcTransferInHistoryModel); | |
26 | + } | |
27 | + | |
28 | + public void cancel(BCTransferInHistoryModel bcTransferInHistoryModel) { | |
29 | + bcTransferInHistoryDao.cancel(bcTransferInHistoryModel); | |
30 | + } | |
31 | + | |
32 | + public BCTransferInHistoryModel findById(String id) { | |
33 | + return bcTransferInHistoryDao.findById(id); | |
34 | + } | |
35 | + | |
36 | + | |
37 | + public List<BCTransferInHistoryModel> query(BCTransferInHistoryQuery bcTransferInHistoryQuery) { | |
38 | + MongoQuery mongoQuery = bcTransferInHistoryQuery.convertToQuery(); | |
39 | + bcTransferInHistoryQuery.mysqlBuild(bcTransferInHistoryDao.count(bcTransferInHistoryQuery.convertToQuery())); | |
40 | + mongoQuery.start(bcTransferInHistoryQuery.getOffset()).end(bcTransferInHistoryQuery.getLimit()); | |
41 | + return bcTransferInHistoryDao.query(mongoQuery.addOrder(Sort.Direction.DESC, "inDate")); | |
42 | + } | |
43 | + | |
44 | + public Integer count(BCTransferInHistoryQuery bcTransferInHistoryQuery) { | |
45 | + return bcTransferInHistoryDao.count(bcTransferInHistoryQuery.convertToQuery()); | |
46 | + } | |
47 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/BCEnums.java
View file @
e61acaa
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +/** | |
4 | + * @auther HuJiaqi | |
5 | + * @createTime 2016年11月22日 10时31分 | |
6 | + * @discription | |
7 | + */ | |
8 | +public enum BCEnums { | |
9 | + | |
10 | + /** | |
11 | + * @auther HuJiaqi | |
12 | + * @createTime 2016年11月22日 10时40分 | |
13 | + * @discription BCInventoryModel | |
14 | + */ | |
15 | + INVENTORY_1("1", "刚入库未下发或已召回"), | |
16 | + | |
17 | + INVENTORY_2("2", "下发到了2级单位或已召回"), | |
18 | + | |
19 | + INVENTORY_3("3", "下发到了3级单位"), | |
20 | + | |
21 | + INVENTORY_CANCELING("4", "作废中待审核"), | |
22 | + | |
23 | + INVENTORY_CANCELLED("5", "已作废"), | |
24 | + | |
25 | + /** | |
26 | + * @auther HuJiaqi | |
27 | + * @createTime 2016年11月22日 10时40分 | |
28 | + * @discription BCTransferInHistoryModel,123状态都不能撤销了 | |
29 | + */ | |
30 | + TRANSFER_IN_HISTORY_EXIST("0", "存在"), | |
31 | + | |
32 | + TRANSFER_IN_HISTORY_CANCEL("1", "已撤销(相当于删除)"), | |
33 | + | |
34 | + TRANSFER_IN_HISTORY_OUT("2", "已下发"), | |
35 | + | |
36 | + TRANSFER_IN_HISTORY_NOT_EXIST("3", "已作废"), | |
37 | + | |
38 | + /** | |
39 | + * @auther HuJiaqi | |
40 | + * @createTime 2016年11月22日 13时57分 | |
41 | + * @discription BCTransferInHistoryQueryModel | |
42 | + */ | |
43 | + TRANSFER_IN_HISTORY_QUERY_YES("0", "可以撤销"), | |
44 | + TRANSFER_IN_HISTORY_QUERY_NO("1", "不能撤销"), | |
45 | + | |
46 | + TEMP("", ""); | |
47 | + | |
48 | + public String code; | |
49 | + | |
50 | + public String name; | |
51 | + | |
52 | + BCEnums(String code, String name) { | |
53 | + this.code = code; | |
54 | + this.name = name; | |
55 | + } | |
56 | + | |
57 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/BCInventoryModel.java
View file @
e61acaa
1 | +package com.lyms.platform.pojo; | |
2 | + | |
3 | +import com.lyms.platform.common.result.BaseModel; | |
4 | +import org.springframework.data.mongodb.core.mapping.Document; | |
5 | + | |
6 | +/** | |
7 | + * @auther HuJiaqi | |
8 | + * @createTime 2016年11月18日 10时17分 | |
9 | + * @discription | |
10 | + */ | |
11 | +@Document(collection = "lyms_bc_inventory") | |
12 | +public class BCInventoryModel extends BaseModel { | |
13 | + | |
14 | + private String id; | |
15 | + | |
16 | + /** | |
17 | + * @auther HuJiaqi | |
18 | + * @createTime 2016年11月18日 11时02分 | |
19 | + * @discription 操作员id | |
20 | + */ | |
21 | + private Integer operatorId; | |
22 | + | |
23 | + /** | |
24 | + * @auther HuJiaqi | |
25 | + * @createTime 2016年11月18日 10时27分 | |
26 | + * @discription 英文编号 | |
27 | + */ | |
28 | + private String enCode; | |
29 | + | |
30 | + /** | |
31 | + * @auther HuJiaqi | |
32 | + * @createTime 2016年11月18日 11时25分 | |
33 | + * @discription 编号 | |
34 | + */ | |
35 | + private Long code; | |
36 | + | |
37 | + /** | |
38 | + * @auther HuJiaqi | |
39 | + * @createTime 2016年11月18日 11时38分 | |
40 | + * @discription 库存状态 | |
41 | + */ | |
42 | + private String status; | |
43 | + | |
44 | + public String getId() { | |
45 | + return id; | |
46 | + } | |
47 | + | |
48 | + public void setId(String id) { | |
49 | + this.id = id; | |
50 | + } | |
51 | + | |
52 | + public Integer getOperatorId() { | |
53 | + return operatorId; | |
54 | + } | |
55 | + | |
56 | + public void setOperatorId(Integer operatorId) { | |
57 | + this.operatorId = operatorId; | |
58 | + } | |
59 | + | |
60 | + public String getEnCode() { | |
61 | + return enCode; | |
62 | + } | |
63 | + | |
64 | + public void setEnCode(String enCode) { | |
65 | + this.enCode = enCode; | |
66 | + } | |
67 | + | |
68 | + public Long getCode() { | |
69 | + return code; | |
70 | + } | |
71 | + | |
72 | + public void setCode(Long code) { | |
73 | + this.code = code; | |
74 | + } | |
75 | + | |
76 | + public String getStatus() { | |
77 | + return status; | |
78 | + } | |
79 | + | |
80 | + public void setStatus(String status) { | |
81 | + this.status = status; | |
82 | + } | |
83 | + | |
84 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/BCTransferInHistoryModel.java
View file @
e61acaa
1 | +package com.lyms.platform.pojo; | |
2 | + | |
3 | +import com.lyms.platform.common.result.BaseModel; | |
4 | +import org.springframework.data.mongodb.core.mapping.Document; | |
5 | + | |
6 | +import java.util.Date; | |
7 | + | |
8 | +/** | |
9 | + * @auther HuJiaqi | |
10 | + * @createTime 2016年11月18日 13时47分 | |
11 | + * @discription | |
12 | + */ | |
13 | +@Document(collection = "lyms_bc_transferInHistory") | |
14 | +public class BCTransferInHistoryModel extends BaseModel { | |
15 | + | |
16 | + private String id; | |
17 | + | |
18 | + /** | |
19 | + * @auther HuJiaqi | |
20 | + * @createTime 2016年11月18日 13时51分 | |
21 | + * @discription 入库日期 | |
22 | + */ | |
23 | + private Date inDate; | |
24 | + | |
25 | + /** | |
26 | + * @auther HuJiaqi | |
27 | + * @createTime 2016年11月21日 15时25分 | |
28 | + * @discription 撤销日期 | |
29 | + */ | |
30 | + private Date cancelDate; | |
31 | + | |
32 | + /** | |
33 | + * @auther HuJiaqi | |
34 | + * @createTime 2016年11月18日 13时52分 | |
35 | + * @discription 英文编号 | |
36 | + */ | |
37 | + private String enCode; | |
38 | + | |
39 | + /** | |
40 | + * @auther HuJiaqi | |
41 | + * @createTime 2016年11月18日 13时52分 | |
42 | + * @discription 起始编号 | |
43 | + */ | |
44 | + private Long startCode; | |
45 | + | |
46 | + /** | |
47 | + * @auther HuJiaqi | |
48 | + * @createTime 2016年11月18日 13时52分 | |
49 | + * @discription 结束编号 | |
50 | + */ | |
51 | + private Long endCode; | |
52 | + | |
53 | + /** | |
54 | + * @auther HuJiaqi | |
55 | + * @createTime 2016年11月18日 13时52分 | |
56 | + * @discription 数量 | |
57 | + */ | |
58 | + private Integer total; | |
59 | + | |
60 | + /** | |
61 | + * @auther HuJiaqi | |
62 | + * @createTime 2016年11月18日 13时54分 | |
63 | + * @discription 入库操作员id | |
64 | + */ | |
65 | + private Integer inOperatorId; | |
66 | + | |
67 | + /** | |
68 | + * @auther HuJiaqi | |
69 | + * @createTime 2016年11月18日 13时55分 | |
70 | + * @discription 入库操作员名称 | |
71 | + */ | |
72 | + private String inOperatorName; | |
73 | + | |
74 | + /** | |
75 | + * @auther HuJiaqi | |
76 | + * @createTime 2016年11月21日 15时20分 | |
77 | + * @discription 取消操作员id | |
78 | + */ | |
79 | + private Integer cancelOperatorId; | |
80 | + | |
81 | + /** | |
82 | + * @auther HuJiaqi | |
83 | + * @createTime 2016年11月21日 15时19分 | |
84 | + * @discription 取消操作员名称 | |
85 | + */ | |
86 | + private String cancelOperatorName; | |
87 | + | |
88 | + /** | |
89 | + * @auther HuJiaqi | |
90 | + * @createTime 2016年11月18日 14时08分 | |
91 | + * @discription 状态 | |
92 | + */ | |
93 | + private String status; | |
94 | + | |
95 | + public String getId() { | |
96 | + return id; | |
97 | + } | |
98 | + | |
99 | + public void setId(String id) { | |
100 | + this.id = id; | |
101 | + } | |
102 | + | |
103 | + public Date getInDate() { | |
104 | + return inDate; | |
105 | + } | |
106 | + | |
107 | + public void setInDate(Date inDate) { | |
108 | + this.inDate = inDate; | |
109 | + } | |
110 | + | |
111 | + public Date getCancelDate() { | |
112 | + return cancelDate; | |
113 | + } | |
114 | + | |
115 | + public void setCancelDate(Date cancelDate) { | |
116 | + this.cancelDate = cancelDate; | |
117 | + } | |
118 | + | |
119 | + public String getEnCode() { | |
120 | + return enCode; | |
121 | + } | |
122 | + | |
123 | + public void setEnCode(String enCode) { | |
124 | + this.enCode = enCode; | |
125 | + } | |
126 | + | |
127 | + public Long getStartCode() { | |
128 | + return startCode; | |
129 | + } | |
130 | + | |
131 | + public void setStartCode(Long startCode) { | |
132 | + this.startCode = startCode; | |
133 | + } | |
134 | + | |
135 | + public Long getEndCode() { | |
136 | + return endCode; | |
137 | + } | |
138 | + | |
139 | + public void setEndCode(Long endCode) { | |
140 | + this.endCode = endCode; | |
141 | + } | |
142 | + | |
143 | + public Integer getTotal() { | |
144 | + return total; | |
145 | + } | |
146 | + | |
147 | + public void setTotal(Integer total) { | |
148 | + this.total = total; | |
149 | + } | |
150 | + | |
151 | + public Integer getInOperatorId() { | |
152 | + return inOperatorId; | |
153 | + } | |
154 | + | |
155 | + public void setInOperatorId(Integer inOperatorId) { | |
156 | + this.inOperatorId = inOperatorId; | |
157 | + } | |
158 | + | |
159 | + public String getInOperatorName() { | |
160 | + return inOperatorName; | |
161 | + } | |
162 | + | |
163 | + public void setInOperatorName(String inOperatorName) { | |
164 | + this.inOperatorName = inOperatorName; | |
165 | + } | |
166 | + | |
167 | + public Integer getCancelOperatorId() { | |
168 | + return cancelOperatorId; | |
169 | + } | |
170 | + | |
171 | + public void setCancelOperatorId(Integer cancelOperatorId) { | |
172 | + this.cancelOperatorId = cancelOperatorId; | |
173 | + } | |
174 | + | |
175 | + public String getCancelOperatorName() { | |
176 | + return cancelOperatorName; | |
177 | + } | |
178 | + | |
179 | + public void setCancelOperatorName(String cancelOperatorName) { | |
180 | + this.cancelOperatorName = cancelOperatorName; | |
181 | + } | |
182 | + | |
183 | + public String getStatus() { | |
184 | + return status; | |
185 | + } | |
186 | + | |
187 | + public void setStatus(String status) { | |
188 | + this.status = status; | |
189 | + } | |
190 | +} |
platform-dal/src/main/java/com/lyms/platform/query/BCTransferInHistoryQuery.java
View file @
e61acaa
1 | +package com.lyms.platform.query; | |
2 | + | |
3 | +import com.lyms.platform.common.base.IConvertToNativeQuery; | |
4 | +import com.lyms.platform.common.dao.BaseQuery; | |
5 | +import com.lyms.platform.common.dao.operator.MongoCondition; | |
6 | +import com.lyms.platform.common.dao.operator.MongoQuery; | |
7 | +import org.springframework.data.mongodb.core.query.Criteria; | |
8 | + | |
9 | +import java.util.Date; | |
10 | + | |
11 | +/** | |
12 | + * @auther HuJiaqi | |
13 | + * @createTime 2016年11月22日 10时56分 | |
14 | + * @discription | |
15 | + */ | |
16 | +public class BCTransferInHistoryQuery extends BaseQuery implements IConvertToNativeQuery { | |
17 | + | |
18 | + /** | |
19 | + * @auther HuJiaqi | |
20 | + * @createTime 2016年11月22日 11时01分 | |
21 | + * @discription 开始时间 | |
22 | + */ | |
23 | + private Date startDate; | |
24 | + | |
25 | + /** | |
26 | + * @auther HuJiaqi | |
27 | + * @createTime 2016年11月22日 11时01分 | |
28 | + * @discription 结束时间 | |
29 | + */ | |
30 | + private Date endDate; | |
31 | + | |
32 | + @Override | |
33 | + public MongoQuery convertToQuery() { | |
34 | + Criteria criteria = new Criteria(); | |
35 | + criteria.and("inDate").gte(startDate).lte(endDate); | |
36 | + return new MongoCondition(criteria).toMongoQuery(); | |
37 | + } | |
38 | + | |
39 | + public Date getStartDate() { | |
40 | + return startDate; | |
41 | + } | |
42 | + | |
43 | + public void setStartDate(Date startDate) { | |
44 | + this.startDate = startDate; | |
45 | + } | |
46 | + | |
47 | + public Date getEndDate() { | |
48 | + return endDate; | |
49 | + } | |
50 | + | |
51 | + public void setEndDate(Date endDate) { | |
52 | + this.endDate = endDate; | |
53 | + } | |
54 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.controller; | |
2 | + | |
3 | +import com.lyms.platform.common.base.BaseController; | |
4 | +import com.lyms.platform.common.constants.ErrorCodeConstants; | |
5 | +import com.lyms.platform.common.enums.BCEnums; | |
6 | +import com.lyms.platform.common.result.BaseListResponse; | |
7 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
8 | +import com.lyms.platform.common.utils.BeanUtils; | |
9 | +import com.lyms.platform.common.utils.DateUtil; | |
10 | +import com.lyms.platform.common.utils.ExcelUtil; | |
11 | +import com.lyms.platform.operate.web.facade.BCTransferInFacade; | |
12 | +import com.lyms.platform.operate.web.request.BCTransferInCancelRequest; | |
13 | +import com.lyms.platform.operate.web.request.BCTransferInQueryRequest; | |
14 | +import com.lyms.platform.operate.web.request.BCTransferInSaveRequest; | |
15 | +import com.lyms.platform.operate.web.result.BCTransferInCancelResult; | |
16 | +import com.lyms.platform.operate.web.result.BCTransferInHistoryQueryModel; | |
17 | +import com.lyms.platform.operate.web.result.BCTransferInQueryResult; | |
18 | +import com.lyms.platform.operate.web.result.BCTransferInSaveResult; | |
19 | +import org.apache.log4j.Logger; | |
20 | +import org.springframework.beans.factory.annotation.Autowired; | |
21 | +import org.springframework.stereotype.Controller; | |
22 | +import org.springframework.web.bind.annotation.RequestMapping; | |
23 | +import org.springframework.web.bind.annotation.RequestMethod; | |
24 | +import org.springframework.web.bind.annotation.RequestParam; | |
25 | +import org.springframework.web.bind.annotation.ResponseBody; | |
26 | + | |
27 | +import javax.servlet.http.HttpServletRequest; | |
28 | +import javax.servlet.http.HttpServletResponse; | |
29 | +import java.util.*; | |
30 | + | |
31 | +/** | |
32 | + * @auther HuJiaqi | |
33 | + * @createTime 2016年11月18日 09时59分 | |
34 | + * @discription 出生医学证明-证明流转-证明入库 | |
35 | + */ | |
36 | +@Controller | |
37 | +@RequestMapping("bc/transfer/in") | |
38 | +public class BCTransferInController extends BaseController { | |
39 | + | |
40 | + private Logger log = Logger.getLogger(this.getClass()); | |
41 | + | |
42 | + @Autowired | |
43 | + private BCTransferInFacade bcTransferInFacade; | |
44 | + | |
45 | + /** | |
46 | + * @auther HuJiaqi | |
47 | + * @createTime 2016年11月18日 15时02分 | |
48 | + * @discription 新增入库 | |
49 | + */ | |
50 | + @ResponseBody | |
51 | + @RequestMapping(value = "save", method = RequestMethod.POST) | |
52 | + public BaseObjectResponse save(HttpServletRequest httpServletRequest, | |
53 | + @RequestParam String enCode, | |
54 | + @RequestParam long startCode, | |
55 | + @RequestParam long endCode) { | |
56 | + BaseObjectResponse baseObjectResponse; | |
57 | + try { | |
58 | + BCTransferInSaveRequest bcTransferInSaveRequest = new BCTransferInSaveRequest(); | |
59 | + bcTransferInSaveRequest.setEnCode(enCode); | |
60 | + bcTransferInSaveRequest.setStartCode(startCode); | |
61 | + bcTransferInSaveRequest.setEndCode(endCode); | |
62 | + | |
63 | + // TODO HuJiaqi-这里是自测使用的调试需要修改 | |
64 | + // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
65 | + // Integer operatorId = loginContext.getId(); | |
66 | + Integer operatorId = 123456; | |
67 | + | |
68 | + BCTransferInSaveResult bcTransferInSaveResult = bcTransferInFacade.save(bcTransferInSaveRequest, operatorId); | |
69 | + if (bcTransferInSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { | |
70 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg()); | |
71 | + return baseObjectResponse; | |
72 | + } | |
73 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInSaveResult.getErrorcode()).setErrormsg(bcTransferInSaveResult.getErrormsg()).setData(bcTransferInSaveResult); | |
74 | + } catch (Exception e) { | |
75 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); | |
76 | + log.error("bc/transfer/in/save异常:" + e); | |
77 | + } | |
78 | + return baseObjectResponse; | |
79 | + } | |
80 | + | |
81 | + /** | |
82 | + * @auther HuJiaqi | |
83 | + * @createTime 2016年11月22日 11时24分 | |
84 | + * @discription 撤销 | |
85 | + */ | |
86 | + @ResponseBody | |
87 | + @RequestMapping(value = "cancel", method = RequestMethod.POST) | |
88 | + public BaseObjectResponse cancel(HttpServletRequest httpServletRequest, | |
89 | + @RequestParam String id) { | |
90 | + BaseObjectResponse baseObjectResponse; | |
91 | + try { | |
92 | + BCTransferInCancelRequest bcTransferInCancelRequest = new BCTransferInCancelRequest(); | |
93 | + bcTransferInCancelRequest.setId(id); | |
94 | + | |
95 | + // TODO HuJiaqi-这里是自测使用的调试需要修改 | |
96 | + // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
97 | + // Integer operatorId = loginContext.getId(); | |
98 | + Integer operatorId = 123456; | |
99 | + | |
100 | + BCTransferInCancelResult bcTransferInCancelResult = bcTransferInFacade.cancel(bcTransferInCancelRequest, operatorId); | |
101 | + if (bcTransferInCancelResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { | |
102 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg()); | |
103 | + return baseObjectResponse; | |
104 | + } | |
105 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(bcTransferInCancelResult.getErrorcode()).setErrormsg(bcTransferInCancelResult.getErrormsg()).setData(bcTransferInCancelResult); | |
106 | + } catch (Exception e) { | |
107 | + baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); | |
108 | + log.error("bc/transfer/in/cancel异常:" + e); | |
109 | + } | |
110 | + return baseObjectResponse; | |
111 | + } | |
112 | + | |
113 | + /** | |
114 | + * @auther HuJiaqi | |
115 | + * @createTime 2016年11月22日 11时24分 | |
116 | + * @discription 查询列表 | |
117 | + */ | |
118 | + @ResponseBody | |
119 | + @RequestMapping(value = "query", method = RequestMethod.POST) | |
120 | + public BaseListResponse query(HttpServletRequest httpServletRequest, | |
121 | + @RequestParam String startDate, | |
122 | + @RequestParam String endDate, | |
123 | + @RequestParam Integer page, | |
124 | + @RequestParam Integer limit) { | |
125 | + BaseListResponse baseListResponse; | |
126 | + try { | |
127 | + BCTransferInQueryRequest bcTransferInQueryRequest = new BCTransferInQueryRequest(); | |
128 | + try { | |
129 | + bcTransferInQueryRequest.setStartDate(DateUtil.parseYMDHMS(startDate)); | |
130 | + bcTransferInQueryRequest.setEndDate(DateUtil.parseYMDHMS(endDate)); | |
131 | + } catch (Exception e) { | |
132 | + baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg("时间格式传入错误"); | |
133 | + return baseListResponse; | |
134 | + } | |
135 | + bcTransferInQueryRequest.setPage(page); | |
136 | + bcTransferInQueryRequest.setLimit(limit); | |
137 | + | |
138 | + // TODO HuJiaqi-这里是自测使用的调试需要修改 | |
139 | + // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
140 | + // Integer operatorId = loginContext.getId(); | |
141 | + Integer operatorId = 123456; | |
142 | + | |
143 | + BCTransferInQueryResult bcTransferInQueryResult = bcTransferInFacade.query(bcTransferInQueryRequest, operatorId); | |
144 | + if (bcTransferInQueryResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { | |
145 | + baseListResponse = new BaseListResponse().setErrorcode(bcTransferInQueryResult.getErrorcode()).setErrormsg(bcTransferInQueryResult.getErrormsg()); | |
146 | + return baseListResponse; | |
147 | + } | |
148 | + baseListResponse = new BaseListResponse().setErrorcode(bcTransferInQueryResult.getErrorcode()).setErrormsg(bcTransferInQueryResult.getErrormsg()).setData(bcTransferInQueryResult.getData()).setPageInfo(bcTransferInQueryResult.getPageInfo()); | |
149 | + } catch (Exception e) { | |
150 | + baseListResponse = new BaseListResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); | |
151 | + log.error("bc/transfer/in/query异常:" + e); | |
152 | + } | |
153 | + return baseListResponse; | |
154 | + } | |
155 | + | |
156 | + @RequestMapping(value = "excel", method = RequestMethod.GET) | |
157 | + public void excel(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, | |
158 | + @RequestParam String startDate, | |
159 | + @RequestParam String endDate, | |
160 | + @RequestParam Integer page, | |
161 | + @RequestParam Integer limit) { | |
162 | + try { | |
163 | + httpServletResponse.setContentType("application/octet-stream"); | |
164 | + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "datas.xls"); | |
165 | + BCTransferInQueryRequest bcTransferInQueryRequest = new BCTransferInQueryRequest(); | |
166 | + bcTransferInQueryRequest.setStartDate(DateUtil.parseYMDHMS(startDate)); | |
167 | + bcTransferInQueryRequest.setEndDate(DateUtil.parseYMDHMS(endDate)); | |
168 | + bcTransferInQueryRequest.setPage(page); | |
169 | + bcTransferInQueryRequest.setLimit(limit); | |
170 | + | |
171 | + // TODO HuJiaqi-这里是自测使用的调试需要修改 | |
172 | + // LoginContext loginContext = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
173 | + // Integer operatorId = loginContext.getId(); | |
174 | + Integer operatorId = 123456; | |
175 | + | |
176 | + // 这里返回的结果必然是这个泛型,之所以query返回的结果集没有用泛型是为了更好的传递数据 | |
177 | + @SuppressWarnings("unchecked") | |
178 | + List<BCTransferInHistoryQueryModel> bcTransferInHistoryQueryModelList = bcTransferInFacade.query(bcTransferInQueryRequest, operatorId).getData(); | |
179 | + List<Map<String, Object>> list = new ArrayList<>(); | |
180 | + for (BCTransferInHistoryQueryModel bcTransferInHistoryQueryModel : bcTransferInHistoryQueryModelList) { | |
181 | + Map<String, Object> map = BeanUtils.objectToObjectMap(bcTransferInHistoryQueryModel); | |
182 | + map.put("inDate", DateUtil.getyyyy_MM_dd(bcTransferInHistoryQueryModel.getInDate())); | |
183 | + map.put("isCancel", bcTransferInHistoryQueryModel.getIsCancel().equals(BCEnums.TRANSFER_IN_HISTORY_QUERY_YES.code) ? "可" : "否"); | |
184 | + list.add(map); | |
185 | + } | |
186 | + Map<String, String> header = new HashMap<>(); | |
187 | + header.put("inDate", "入库日期"); | |
188 | + header.put("enCode", "英文编号"); | |
189 | + header.put("startCode", "起始编号"); | |
190 | + header.put("endCode", "截止编号"); | |
191 | + header.put("total", "数量"); | |
192 | + header.put("inOperatorName", "经办人"); | |
193 | + header.put("isCancel", "可否撤销"); | |
194 | + ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); | |
195 | + } catch (Exception e) { | |
196 | + log.error("bc/transfer/in/excel导出excel失败:" + e); | |
197 | + } | |
198 | + } | |
199 | + | |
200 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.facade; | |
2 | + | |
3 | +import com.lyms.platform.biz.service.BCInventoryService; | |
4 | +import com.lyms.platform.biz.service.BCTransferInHistoryService; | |
5 | +import com.lyms.platform.common.constants.ErrorCodeConstants; | |
6 | +import com.lyms.platform.common.enums.BCEnums; | |
7 | +import com.lyms.platform.common.utils.BeanUtils; | |
8 | +import com.lyms.platform.common.utils.StringUtils; | |
9 | +import com.lyms.platform.operate.web.request.BCTransferInCancelRequest; | |
10 | +import com.lyms.platform.operate.web.request.BCTransferInQueryRequest; | |
11 | +import com.lyms.platform.operate.web.request.BCTransferInSaveRequest; | |
12 | +import com.lyms.platform.operate.web.result.BCTransferInCancelResult; | |
13 | +import com.lyms.platform.operate.web.result.BCTransferInHistoryQueryModel; | |
14 | +import com.lyms.platform.operate.web.result.BCTransferInQueryResult; | |
15 | +import com.lyms.platform.operate.web.result.BCTransferInSaveResult; | |
16 | +import com.lyms.platform.permission.model.Users; | |
17 | +import com.lyms.platform.permission.service.UsersService; | |
18 | +import com.lyms.platform.pojo.BCInventoryModel; | |
19 | +import com.lyms.platform.pojo.BCTransferInHistoryModel; | |
20 | +import com.lyms.platform.query.BCTransferInHistoryQuery; | |
21 | +import org.springframework.beans.factory.annotation.Autowired; | |
22 | +import org.springframework.stereotype.Component; | |
23 | + | |
24 | +import java.util.ArrayList; | |
25 | +import java.util.Date; | |
26 | +import java.util.List; | |
27 | + | |
28 | +import static com.lyms.platform.common.enums.BCEnums.TRANSFER_IN_HISTORY_QUERY_NO; | |
29 | +import static com.lyms.platform.common.enums.BCEnums.TRANSFER_IN_HISTORY_QUERY_YES; | |
30 | + | |
31 | +/** | |
32 | + * @auther HuJiaqi | |
33 | + * @createTime 2016年11月18日 14时59分 | |
34 | + * @discription | |
35 | + */ | |
36 | +@Component | |
37 | +public class BCTransferInFacade { | |
38 | + | |
39 | + @Autowired | |
40 | + private UsersService usersService; | |
41 | + | |
42 | + @Autowired | |
43 | + private BCInventoryService bcInventoryService; | |
44 | + | |
45 | + @Autowired | |
46 | + private BCTransferInHistoryService bcTransferInHistoryService; | |
47 | + | |
48 | + /** | |
49 | + * @auther HuJiaqi | |
50 | + * @createTime 2016年11月18日 15时02分 | |
51 | + * @discription 新增入库 | |
52 | + */ | |
53 | + public BCTransferInSaveResult save(BCTransferInSaveRequest bcTransferInSaveRequest, Integer operatorId) { | |
54 | + | |
55 | + BCTransferInSaveResult bcTransferInSaveResult = new BCTransferInSaveResult(); | |
56 | + | |
57 | + // TODO HuJiaqi-是否需要判断用户级别 | |
58 | + // Users users = usersService.getUsers(operatorId); | |
59 | + // if (users == null) { | |
60 | + // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
61 | + // bcTransferInSaveResult.setErrormsg("用户信息异常"); | |
62 | + // return bcTransferInSaveResult; | |
63 | + // } | |
64 | + Users users = new Users(); | |
65 | + users.setName("HuJiaqi"); | |
66 | + | |
67 | + // 计算总量 | |
68 | + Integer total = (int) (bcTransferInSaveRequest.getEndCode() - bcTransferInSaveRequest.getStartCode() + 1); | |
69 | + | |
70 | + // 1、先插入历史列表 | |
71 | + BCTransferInHistoryModel bcTransferInHistoryModel = new BCTransferInHistoryModel(); | |
72 | + BeanUtils.copy(bcTransferInSaveRequest, bcTransferInHistoryModel); | |
73 | + bcTransferInHistoryModel.setInDate(new Date()); | |
74 | + bcTransferInHistoryModel.setTotal(total); | |
75 | + bcTransferInHistoryModel.setInOperatorId(operatorId); | |
76 | + bcTransferInHistoryModel.setInOperatorName(users.getName()); | |
77 | + bcTransferInHistoryModel.setStatus(BCEnums.TRANSFER_IN_HISTORY_EXIST.code); | |
78 | + bcTransferInHistoryModel = bcTransferInHistoryService.save(bcTransferInHistoryModel); | |
79 | + if (bcTransferInHistoryModel == null || StringUtils.isEmpty(bcTransferInHistoryModel.getId())) { | |
80 | + bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
81 | + bcTransferInSaveResult.setErrormsg("保存入库记录失败"); | |
82 | + } | |
83 | + | |
84 | + // 2、维护库存表 | |
85 | + List<BCInventoryModel> bcInventoryModelList = new ArrayList<>(); | |
86 | + for (Integer i = 0; i < total; i++) { | |
87 | + BCInventoryModel bcInventoryModel = new BCInventoryModel(); | |
88 | + bcInventoryModel.setOperatorId(operatorId); | |
89 | + bcInventoryModel.setStatus(BCEnums.INVENTORY_1.code); | |
90 | + BeanUtils.copy(bcTransferInSaveRequest, bcInventoryModel); | |
91 | + bcInventoryModel.setCode(bcTransferInSaveRequest.getStartCode() + i); | |
92 | + bcInventoryModelList.add(bcInventoryModel); | |
93 | + } | |
94 | + try { | |
95 | + bcInventoryService.batchSave(bcInventoryModelList); | |
96 | + } catch (Exception e) { | |
97 | + bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
98 | + bcTransferInSaveResult.setErrormsg("入库失败"); | |
99 | + } | |
100 | + | |
101 | + bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SUCCESS); | |
102 | + bcTransferInSaveResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); | |
103 | + | |
104 | + return bcTransferInSaveResult; | |
105 | + } | |
106 | + | |
107 | + public BCTransferInCancelResult cancel(BCTransferInCancelRequest bcTransferInCancelRequest, Integer operatorId) { | |
108 | + | |
109 | + BCTransferInCancelResult bcTransferInCancelResult = new BCTransferInCancelResult(); | |
110 | + | |
111 | + // TODO HuJiaqi-是否需要判断用户级别 | |
112 | + // Users users = usersService.getUsers(operatorId); | |
113 | + // if (users == null) { | |
114 | + // bcTransferInSaveResult.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); | |
115 | + // bcTransferInSaveResult.setErrormsg("用户信息异常"); | |
116 | + // return bcTransferInSaveResult; | |
117 | + // } | |
118 | + Users users = new Users(); | |
119 | + users.setName("HuJiaqi"); | |
120 | + | |
121 | + // 1、查询这条历史记录 | |
122 | + BCTransferInHistoryModel bcTransferInHistoryModel = bcTransferInHistoryService.findById(bcTransferInCancelRequest.getId()); | |
123 | + Integer total = bcTransferInHistoryModel.getTotal(); | |
124 | + BCInventoryModel bcInventoryModel = new BCInventoryModel(); | |
125 | + bcInventoryModel.setEnCode(bcTransferInHistoryModel.getEnCode()); | |
126 | + Long startCode = bcTransferInHistoryModel.getStartCode(); | |
127 | + | |
128 | + // 2、逻辑删除历史记录 | |
129 | + bcTransferInHistoryModel = new BCTransferInHistoryModel(); | |
130 | + bcTransferInHistoryModel.setId(bcTransferInCancelRequest.getId()); | |
131 | + bcTransferInHistoryModel.setCancelOperatorId(operatorId); | |
132 | + bcTransferInHistoryModel.setCancelOperatorName(users.getName()); | |
133 | + bcTransferInHistoryModel.setCancelDate(new Date()); | |
134 | + bcTransferInHistoryModel.setStatus(BCEnums.TRANSFER_IN_HISTORY_CANCEL.code); | |
135 | + bcTransferInHistoryService.cancel(bcTransferInHistoryModel); | |
136 | + | |
137 | + // 3、物理删除库存 | |
138 | + List<Long> codeList = new ArrayList<>(); | |
139 | + for (Integer i = 0; i < total; i++) { | |
140 | + codeList.add(startCode + i); | |
141 | + } | |
142 | + bcInventoryService.batchDelete(bcInventoryModel, codeList); | |
143 | + | |
144 | + bcTransferInCancelResult.setErrorcode(ErrorCodeConstants.SUCCESS); | |
145 | + bcTransferInCancelResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); | |
146 | + | |
147 | + return bcTransferInCancelResult; | |
148 | + } | |
149 | + | |
150 | + public BCTransferInQueryResult query(BCTransferInQueryRequest bcTransferInQueryRequest, Integer operatorId) { | |
151 | + | |
152 | + BCTransferInQueryResult bcTransferInQueryResult = new BCTransferInQueryResult(); | |
153 | + | |
154 | + BCTransferInHistoryQuery bcTransferInHistoryQuery = new BCTransferInHistoryQuery(); | |
155 | + BeanUtils.copy(bcTransferInQueryRequest,bcTransferInHistoryQuery); | |
156 | + | |
157 | + | |
158 | + // 查询 | |
159 | + List<BCTransferInHistoryModel> bcTransferInHistoryModelList = bcTransferInHistoryService.query(bcTransferInHistoryQuery); | |
160 | + bcTransferInQueryResult.setPageInfo(bcTransferInHistoryQuery.getPageInfo()); | |
161 | + | |
162 | + // 复制结果集 | |
163 | + List<BCTransferInHistoryQueryModel> bcTransferInHistoryQueryModelList = new ArrayList<>(); | |
164 | + if (bcTransferInHistoryModelList != null && bcTransferInHistoryModelList.size() > 0) { | |
165 | + for (BCTransferInHistoryModel bcTransferInHistoryModel : bcTransferInHistoryModelList) { | |
166 | + BCTransferInHistoryQueryModel bcTransferInHistoryQueryModel = new BCTransferInHistoryQueryModel(); | |
167 | + BeanUtils.copy(bcTransferInHistoryModel, bcTransferInHistoryQueryModel); | |
168 | + if(BCEnums.TRANSFER_IN_HISTORY_EXIST.code.equals(bcTransferInHistoryModel.getStatus())){ | |
169 | + bcTransferInHistoryQueryModel.setIsCancel(TRANSFER_IN_HISTORY_QUERY_YES.code); | |
170 | + }else{ | |
171 | + bcTransferInHistoryQueryModel.setIsCancel(TRANSFER_IN_HISTORY_QUERY_NO.code); | |
172 | + } | |
173 | + bcTransferInHistoryQueryModelList.add(bcTransferInHistoryQueryModel); | |
174 | + } | |
175 | + } | |
176 | + bcTransferInQueryResult.setData(bcTransferInHistoryQueryModelList); | |
177 | + | |
178 | + bcTransferInQueryResult.setErrorcode(ErrorCodeConstants.SUCCESS); | |
179 | + bcTransferInQueryResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); | |
180 | + | |
181 | + return bcTransferInQueryResult; | |
182 | + } | |
183 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInCancelRequest.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | +import com.lyms.platform.common.core.annotation.form.Form; | |
4 | + | |
5 | +/** | |
6 | + * @auther HuJiaqi | |
7 | + * @createTime 2016年11月21日 15时13分 | |
8 | + * @discription | |
9 | + */ | |
10 | +@Form | |
11 | +public class BCTransferInCancelRequest { | |
12 | + | |
13 | + /** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月21日 16时12分 | |
16 | + * @discription 入库历史id | |
17 | + */ | |
18 | + private String id; | |
19 | + | |
20 | + public String getId() { | |
21 | + return id; | |
22 | + } | |
23 | + | |
24 | + public void setId(String id) { | |
25 | + this.id = id; | |
26 | + } | |
27 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInQueryRequest.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * @auther HuJiaqi | |
7 | + * @createTime 2016年11月22日 11时16分 | |
8 | + * @discription | |
9 | + */ | |
10 | +public class BCTransferInQueryRequest extends BasePageQueryRequest { | |
11 | + | |
12 | + /** | |
13 | + * @auther HuJiaqi | |
14 | + * @createTime 2016年11月22日 11时22分 | |
15 | + * @discription 开始时间 | |
16 | + */ | |
17 | + private Date startDate; | |
18 | + | |
19 | + /** | |
20 | + * @auther HuJiaqi | |
21 | + * @createTime 2016年11月22日 11时22分 | |
22 | + * @discription 结束时间 | |
23 | + */ | |
24 | + private Date endDate; | |
25 | + | |
26 | + public Date getStartDate() { | |
27 | + return startDate; | |
28 | + } | |
29 | + | |
30 | + public void setStartDate(Date startDate) { | |
31 | + this.startDate = startDate; | |
32 | + } | |
33 | + | |
34 | + public Date getEndDate() { | |
35 | + return endDate; | |
36 | + } | |
37 | + | |
38 | + public void setEndDate(Date endDate) { | |
39 | + this.endDate = endDate; | |
40 | + } | |
41 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BCTransferInSaveRequest.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | +import com.lyms.platform.common.core.annotation.form.Form; | |
4 | + | |
5 | +/** | |
6 | + * @auther HuJiaqi | |
7 | + * @createTime 2016年11月18日 14时26分 | |
8 | + * @discription | |
9 | + */ | |
10 | +@Form | |
11 | +public class BCTransferInSaveRequest { | |
12 | + | |
13 | + /** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月18日 14时29分 | |
16 | + * @discription 英文字母编号 | |
17 | + */ | |
18 | + private String enCode; | |
19 | + | |
20 | + /** | |
21 | + * @auther HuJiaqi | |
22 | + * @createTime 2016年11月18日 14时29分 | |
23 | + * @discription 起始编号 | |
24 | + */ | |
25 | + private Long startCode; | |
26 | + | |
27 | + /** | |
28 | + * @auther HuJiaqi | |
29 | + * @createTime 2016年11月18日 14时31分 | |
30 | + * @discription 截止编号 | |
31 | + */ | |
32 | + private Long endCode; | |
33 | + | |
34 | + public String getEnCode() { | |
35 | + return enCode; | |
36 | + } | |
37 | + | |
38 | + public void setEnCode(String enCode) { | |
39 | + this.enCode = enCode; | |
40 | + } | |
41 | + | |
42 | + public Long getStartCode() { | |
43 | + return startCode; | |
44 | + } | |
45 | + | |
46 | + public void setStartCode(Long startCode) { | |
47 | + this.startCode = startCode; | |
48 | + } | |
49 | + | |
50 | + public Long getEndCode() { | |
51 | + return endCode; | |
52 | + } | |
53 | + | |
54 | + public void setEndCode(Long endCode) { | |
55 | + this.endCode = endCode; | |
56 | + } | |
57 | + | |
58 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInCancelResult.java
View file @
e61acaa
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInHistoryQueryModel.java
View file @
e61acaa
1 | +package com.lyms.platform.operate.web.result; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * @auther HuJiaqi | |
7 | + * @createTime 2016年11月22日 15时00分 | |
8 | + * @discription | |
9 | + */ | |
10 | +public class BCTransferInHistoryQueryModel { | |
11 | + | |
12 | + | |
13 | + /** | |
14 | + * @auther HuJiaqi | |
15 | + * @createTime 2016年11月22日 13时45分 | |
16 | + * @discription 入库日期 | |
17 | + */ | |
18 | + private Date inDate; | |
19 | + | |
20 | + /** | |
21 | + * @auther HuJiaqi | |
22 | + * @createTime 2016年11月22日 13时45分 | |
23 | + * @discription 英文编号 | |
24 | + */ | |
25 | + private String enCode; | |
26 | + | |
27 | + /** | |
28 | + * @auther HuJiaqi | |
29 | + * @createTime 2016年11月22日 13时45分 | |
30 | + * @discription 起始编号 | |
31 | + */ | |
32 | + private Long startCode; | |
33 | + | |
34 | + /** | |
35 | + * @auther HuJiaqi | |
36 | + * @createTime 2016年11月22日 13时54分 | |
37 | + * @discription 截止编号 | |
38 | + */ | |
39 | + private Long endCode; | |
40 | + | |
41 | + /** | |
42 | + * @auther HuJiaqi | |
43 | + * @createTime 2016年11月22日 13时54分 | |
44 | + * @discription 数量 | |
45 | + */ | |
46 | + private Integer total; | |
47 | + | |
48 | + /** | |
49 | + * @auther HuJiaqi | |
50 | + * @createTime 2016年11月22日 13时55分 | |
51 | + * @discription 经办人 | |
52 | + */ | |
53 | + private String inOperatorName; | |
54 | + | |
55 | + /** | |
56 | + * @auther HuJiaqi | |
57 | + * @createTime 2016年11月22日 13时56分 | |
58 | + * @discription 是否可以撤销 | |
59 | + */ | |
60 | + private String isCancel; | |
61 | + | |
62 | + public Date getInDate() { | |
63 | + return inDate; | |
64 | + } | |
65 | + | |
66 | + public void setInDate(Date inDate) { | |
67 | + this.inDate = inDate; | |
68 | + } | |
69 | + | |
70 | + public String getEnCode() { | |
71 | + return enCode; | |
72 | + } | |
73 | + | |
74 | + public void setEnCode(String enCode) { | |
75 | + this.enCode = enCode; | |
76 | + } | |
77 | + | |
78 | + public Long getStartCode() { | |
79 | + return startCode; | |
80 | + } | |
81 | + | |
82 | + public void setStartCode(Long startCode) { | |
83 | + this.startCode = startCode; | |
84 | + } | |
85 | + | |
86 | + public Long getEndCode() { | |
87 | + return endCode; | |
88 | + } | |
89 | + | |
90 | + public void setEndCode(Long endCode) { | |
91 | + this.endCode = endCode; | |
92 | + } | |
93 | + | |
94 | + public Integer getTotal() { | |
95 | + return total; | |
96 | + } | |
97 | + | |
98 | + public void setTotal(Integer total) { | |
99 | + this.total = total; | |
100 | + } | |
101 | + | |
102 | + public String getInOperatorName() { | |
103 | + return inOperatorName; | |
104 | + } | |
105 | + | |
106 | + public void setInOperatorName(String inOperatorName) { | |
107 | + this.inOperatorName = inOperatorName; | |
108 | + } | |
109 | + | |
110 | + public String getIsCancel() { | |
111 | + return isCancel; | |
112 | + } | |
113 | + | |
114 | + public void setIsCancel(String isCancel) { | |
115 | + this.isCancel = isCancel; | |
116 | + } | |
117 | + | |
118 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInQueryResult.java
View file @
e61acaa
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BCTransferInSaveResult.java
View file @
e61acaa