云南最新bug修改

src/main/java/com/chinaitop/agile/controller/KcswController.java

@@ -185,14 +185,9 @@ public class KcswController {
 	})
 	public PageInfo<DataKcglKcswDefault> getEmptyList(Integer pageNum, Integer pageSize, String kcswStr){
 		ObjectMapper mapper = new ObjectMapper();
-		DataKcglKcswDefault kcsw = null;
 		PageInfo<DataKcglKcswDefault> pageInfo = null;
 		try {
-			if (null != kcsw && !"".equals(kcsw)) {
-				kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
-			} else {
-				kcsw = new DataKcglKcswDefault();
-			}
+			DataKcglKcswDefault kcsw = mapper.readValue(kcswStr, DataKcglKcswDefault.class);
 			DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
 			Criteria criteria = example.createCriteria();
 			/* 仓房 */
@@ -207,8 +202,7 @@ public class KcswController {
 			if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
 				criteria.andUnitidEqualTo(kcsw.getUnitid());
 			}
-			/* 判断是否是空仓 */
-			criteria.andKcslEqualTo(0.0);
+
 			if(null != pageNum && null != pageSize){
 				PageHelper.startPage(pageNum, pageSize);
 			}
@@ -357,7 +351,7 @@ public class KcswController {
         List<DataKcglKcswDefault> olist = new ArrayList<DataKcglKcswDefault>();
        if(null != list){
     	   list = "["+list+"]";
-           List<Map<String,Object>> listQuality = new Gson().fromJson(list, new TypeToken<List<Map<String,Object>>>(){}.getType());  
+           List<Map<String,Object>> listQuality = new Gson().fromJson(list, new TypeToken<List<Map<String,Object>>>(){}.getType());
           
            for (int i = 0; i < listQuality.size(); i++) {
         	   DataKcglKcswDefault dataKcglKcswDefault=new DataKcglKcswDefault();

src/main/java/com/chinaitop/agile/mapper/DataKcglKcswDefaultMapper.xml

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