lvzhikai лет назад: 5
Родитель
Сommit
57d3cf19f5

+ 3 - 9
src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -185,14 +185,9 @@ public class KcswController {
185
 	})
185
 	})
186
 	public PageInfo<DataKcglKcswDefault> getEmptyList(Integer pageNum, Integer pageSize, String kcswStr){
186
 	public PageInfo<DataKcglKcswDefault> getEmptyList(Integer pageNum, Integer pageSize, String kcswStr){
187
 		ObjectMapper mapper = new ObjectMapper();
187
 		ObjectMapper mapper = new ObjectMapper();
188
-		DataKcglKcswDefault kcsw = null;
189
 		PageInfo<DataKcglKcswDefault> pageInfo = null;
188
 		PageInfo<DataKcglKcswDefault> pageInfo = null;
190
 		try {
189
 		try {
191
-			if (null != kcsw && !"".equals(kcsw)) {
192
-				kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
193
-			} else {
194
-				kcsw = new DataKcglKcswDefault();
195
-			}
190
+			DataKcglKcswDefault kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
196
 			DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
191
 			DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
197
 			Criteria criteria = example.createCriteria();
192
 			Criteria criteria = example.createCriteria();
198
 			/* 仓房 */
193
 			/* 仓房 */
@@ -207,8 +202,7 @@ public class KcswController {
207
 			if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
202
 			if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
208
 				criteria.andUnitidEqualTo(kcsw.getUnitid());
203
 				criteria.andUnitidEqualTo(kcsw.getUnitid());
209
 			}
204
 			}
210
-			/* 判断是否是空仓 */
211
-			criteria.andKcslEqualTo(0.0);
205
+
212
 			if(null != pageNum && null != pageSize){
206
 			if(null != pageNum && null != pageSize){
213
 				PageHelper.startPage(pageNum, pageSize);
207
 				PageHelper.startPage(pageNum, pageSize);
214
 			}
208
 			}
@@ -357,7 +351,7 @@ public class KcswController {
357
         List<DataKcglKcswDefault> olist = new ArrayList<DataKcglKcswDefault>();
351
         List<DataKcglKcswDefault> olist = new ArrayList<DataKcglKcswDefault>();
358
        if(null != list){
352
        if(null != list){
359
     	   list = "["+list+"]";
353
     	   list = "["+list+"]";
360
-           List<Map<String,Object>> listQuality = new Gson().fromJson(list, new TypeToken<List<Map<String,Object>>>(){}.getType());  
354
+           List<Map<String,Object>> listQuality = new Gson().fromJson(list, new TypeToken<List<Map<String,Object>>>(){}.getType());
361
           
355
           
362
            for (int i = 0; i < listQuality.size(); i++) {
356
            for (int i = 0; i < listQuality.size(); i++) {
363
         	   DataKcglKcswDefault dataKcglKcswDefault=new DataKcglKcswDefault();
357
         	   DataKcglKcswDefault dataKcglKcswDefault=new DataKcglKcswDefault();

+ 0 - 1
src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

@@ -505,7 +505,6 @@
505
     <if test="_parameter != null">
505
     <if test="_parameter != null">
506
       <include refid="Example_Where_Clause" />
506
       <include refid="Example_Where_Clause" />
507
     </if>
507
     </if>
508
-    AND date_add(ModifyDate, INTERVAL 3 MONTH) &lt; curdate()
509
     <if test="orderByClause != null">
508
     <if test="orderByClause != null">
510
       order by ${orderByClause}
509
       order by ${orderByClause}
511
     </if>
510
     </if>