git-svn-id: https://192.168.57.71/svn/lyggkj@34 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyrxxgl/JyrdcxxEntity.java

@@ -81,7 +81,7 @@ public class JyrdcxxEntity extends BaseEntity<Long> implements Cloneable {
 	 * 
 	 * @pdOid 9272a549-6090-4675-93ca-6b839f62963c
 	 */
-	private Integer dczmj;
+	private Double dczmj;
 	/**
 	 * 堆场总容量（吨）
 	 * 
@@ -214,11 +214,11 @@ public class JyrdcxxEntity extends BaseEntity<Long> implements Cloneable {
 		this.scydcyt = scydcyt;
 	}
 
-	public Integer getDczmj() {
+	public Double getDczmj() {
 		return dczmj;
 	}
 
-	public void setDczmj(Integer dczmj) {
+	public void setDczmj(Double dczmj) {
 		this.dczmj = dczmj;
 	}
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/yjzyxxgl/YjzyxxglWebService.java

@@ -281,7 +281,7 @@ public class YjzyxxglWebService extends BaseController {
 	@SuppressWarnings("unchecked")
 	public List<ZyyjjydwryhzEntity> zyrylist(Long zyyjjydwId) {
 		return (List<ZyyjjydwryhzEntity>) zyyjjydwController.zyrylist(
-				zyyjjydwId).getAttribute("list");
+				zyyjjydwId).getResult();
 	}
 
 	/**
@@ -290,7 +290,7 @@ public class YjzyxxglWebService extends BaseController {
 	@SuppressWarnings("unchecked")
 	public List<JzyjjydwryhzEntity> jzrylist(Long jzyjjydwId) {
 		return (List<JzyjjydwryhzEntity>) zyyjjydwController.jzrylist(
-				jzyjjydwId).getAttribute("list");
+				jzyjjydwId).getResult();
 	}
 
 	/**

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zcdc/dc/JdjcWebService.java

@@ -163,16 +163,26 @@ public class JdjcWebService extends BaseController {
 			dcService.claim(entity.getId().toString(), Utils.getCurrentUser()
 					.getId().toString());
 		}
+		DcEntity dcEntity = new DcEntity();
 		if (null == entity.getId()) {
 			entity.setAddUser(Utils.getCurrentUser());
 			entity.setAddDate(new Date());
 			entity.setRecordCode("100100100100");
+			dcEntity=entity;
 		} else {
-			entity.setUpdateUser(Utils.getCurrentUser());
-			entity.setUpdateDate(new Date());
+			dcEntity=dcService.findOne(entity.getId());
+			dcEntity.setUpdateUser(Utils.getCurrentUser());
+			dcEntity.setUpdateDate(new Date());
+			dcEntity.setMqzt(entity.getMqzt());
+			dcEntity.setByzd2(entity.getByzd2());
+			dcEntity.setJdjcqk(entity.getJdjcqk());
+			dcEntity.setYzgbz(entity.getYzgbz());
+			dcEntity.setZgtrzj(entity.getZgtrzj());
+			dcEntity.setYqzgqx(entity.getYqzgqx());
+			dcEntity.setYqzgyy(entity.getYqzgyy());			
 		}
-		entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
-		DcEntity dcEntity = dcService.save(entity);
+		dcEntity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
+		dcEntity = dcService.save(dcEntity);
 		if (null != accessoryList) {
 			for (AccessoryEntity acc : accessoryList) {
 				acc = accessoryService.findOne(acc.getId());

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/webService/zcdc/zc/ZczbWebService.java

@@ -245,7 +245,7 @@ public class ZczbWebService extends BaseController {
 			// 经营人只能查自己的
 			if (Constants.YES.equals(user.getSfjyr())
 					&& user.getJyrjcxx() != null) {
-				addNotEmptyModel(filterList, "dwmc", user.getJyrjcxx(),
+				addNotEmptyModel(filterList, "qymc", user.getJyrjcxx(),
 						Operator.EQ);
 			} else {
 				// 行政人员根据权限过滤(自查列表菜单ID=41)