修改猪舍档案

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/DaZsdaServiceImpl.java

@@ -11,10 +11,7 @@ import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @DS("thired")
@@ -91,8 +88,41 @@ public class DaZsdaServiceImpl implements DaZsdaService {
 			List<DaZsda> all = rep.findAll(name,startPage,pageSize);
 			map.put("total",size);
 			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
-			map.put("data",all);
-			
+
+			List list = new ArrayList();
+			for (DaZsda daZsda : all) {
+				Map map1 = new HashMap();
+				Integer id = daZsda.getId();
+				map1.put("id",id);
+				map1.put("csq1",daZsda.getCsq1());
+				map1.put("csq2",daZsda.getCsq2());
+				map1.put("dqlq",daZsda.getDqlq());
+				map1.put("flq",daZsda.getFlq());
+				map1.put("gly",daZsda.getGly());
+				map1.put("glyxm",daZsda.getGlyxm());
+				map1.put("hkbz",daZsda.getHkbz());
+				map1.put("lcbz",daZsda.getLcbz());
+				map1.put("mcid",daZsda.getMcid());
+				map1.put("spjk",daZsda.getSpjk());
+				map1.put("xgr",daZsda.getXgr());
+				map1.put("xgsj",(daZsda.getXgsj()+"").substring(0,10));
+				map1.put("yzjd",daZsda.getYzjd());
+				map1.put("zdbz",daZsda.getZdbz());
+				map1.put("zfbz",daZsda.getZfbz());
+				map1.put("zsbz",daZsda.getZsbz());
+				map1.put("zsmc",daZsda.getZsmc());
+				map1.put("zsqy",daZsda.getZsqy());
+				map1.put("ssqy",daZsda.getSsqy());
+				List<DaJqda> allByZSID = jqdaRepo.findAllByZSID(id);
+				if (allByZSID != null && allByZSID.size()>0){
+					map1.put("jqid",allByZSID.get(0).getJQID());
+				}else {
+					map1.put("jqid",null);
+				}
+
+				list.add(map1);
+			}
+			map.put("data",list);
 			return new Result(ResultCode.SUCCESS,map);
 		}catch (Exception e){
 			return new Result(ResultCode.FAIL);