git-svn-id: https://192.168.57.71/svn/hbghj@133 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/cjhs/dao/DtywCbsbDao.java

@@ -18,12 +18,27 @@ public interface DtywCbsbDao extends CjhsRepository<DtywCbsbEntity, String> {
 	@Query(value = " SELECT * FROM (SELECT * FROM DTYW_CBSB WHERE ZWCM=?1 ORDER BY MRUT DESC)WHERE  ROWNUM<2   ", nativeQuery = true)
 	public List<DtywCbsbEntity> findByZwcm(String zwcm);
 
+	/**
+	 * 固体货物表
+	 * @param sbdbh
+	 * @return
+	 */
 	@Query(value = " SELECT SBDBH,HWLX,WGBH,ZQYSMCZW,WXLB,ZZL,LZBZ,WXHWBZ,BSXH,XH FROM  DTYW_CBSBGT_HW H WHERE H.SBDBH=?1 ", nativeQuery = true)
 	public List<Object[]> findCbsbgtHwBySbdbh(String sbdbh);
 
+	/**
+	 * 散装货物表
+	 * @param sbdbh
+	 * @return
+	 */
 	@Query(value = " SELECT SBDBH,HWLX,WGBH,ZQYSMCZW,WXLB,ZZL,LZBZ,WXHWBZ,BSXH,XH FROM  DTYW_CBSBSZ_HW H WHERE H.SBDBH=?1", nativeQuery = true)
 	public List<Object[]> findCbsbszHwBySbdbh(String sbdbh);
 
+	/**
+	 * 液体货物表
+	 * @param sbdbh
+	 * @return
+	 */
 	@Query(value = " SELECT SBDBH,HWLX,WGBH,ZQYSMCZW,WXLB,SL,LZBZ,WXHWBZ,BSXH,XH FROM  DTYW_CBSBYT_HW H WHERE H.SBDBH=?1 ", nativeQuery = true)
 	public List<Object[]> findCbsbytHwBySbdbh(String sbdbh);
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/cjhs/service/impl/DtywCbsbServiceImpl.java

@@ -40,12 +40,11 @@ public class DtywCbsbServiceImpl extends
 
 	@Override
 	public List<DtywCbsbEntity> findByZwcm(String zwcm) {
-
 		return dtywCbsbDao.findByZwcm(zwcm);
 	}
 
 	/**
-	 * 获取固体货物信息
+	 * 从前置库中更具海事申报编号获取“固体”货物信息
 	 */
 	@Override
 	public List<DtywCbsbgtHwEntity> findCbsbgtHwBySbdbh(String sbdbh) {
@@ -71,7 +70,7 @@ public class DtywCbsbServiceImpl extends
 	}
 
 	/**
-	 * 获取散装货物信息
+	 * 从前置库中更具海事申报编号获取“散装”货物信息
 	 */
 	@Override
 	public List<DtywCbsbszHwEntity> findCbsbszHwBySbdbh(String sbdbh) {
@@ -97,7 +96,7 @@ public class DtywCbsbServiceImpl extends
 	}
 
 	/**
-	 * 获取液体货物信息
+	 * 从前置库中更具海事申报编号获取“液体”货物信息
 	 */
 	@Override
 	public List<DtywCbsbytHwEntity> findCbsbytHwBySbdbh(String sbdbh) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -2693,20 +2693,20 @@ public class ZysqbpController extends BaseController {
 		
 		if(cjhs!=null){
 			List<CjhsHwEntity> cjhsHwList = cjhs.getHshwList();
-			List<CjhsHwEntity> list = new ArrayList<CjhsHwEntity>();
+			//List<CjhsHwEntity> list = new ArrayList<CjhsHwEntity>();
 			//货物总重量取和
 			if (cjhsHwList != null && cjhsHwList.size() > 0) {
 				CjhsHwEntity cjhsHw = cjhsHwList.get(0);
 				double zzl=0;
 				for (CjhsHwEntity hw : cjhsHwList) {
 					if (hw.getZqysmczw() != null&& hw.getZqysmczw().trim().equals(cjhsHw.getZqysmczw().trim())) {
-					zzl = zzl+ hw.getZzl();
-				}
-			}
-			cjhsHw.setZzl(zzl);
-			list.add(cjhsHw);
-			}
-		}
+						zzl = zzl+ hw.getZzl();
+					}
+				}//end for
+				cjhsHw.setZzl(zzl);
+				//list.add(cjhsHw);//这个list干嘛的？
+			}//end if
+		}//end if
 		
 		bc.setResult(cjhs);
 		return bc;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cjhs/CjhsDbEntity.java

@@ -7,6 +7,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "T_CJHS_GKBD")
 public class CjhsDbEntity {
+	
 	private Long gksbbh;
 	private String hssbbh;
 	private  Long  bsxh;
@@ -24,13 +25,22 @@ public class CjhsDbEntity {
 	public void setXh(Long xh) {
 		this.xh = xh;
 	}
+	
+	/**
+	 * yjpt whsb's ID
+	 */
 	@Id
 	public Long getGksbbh() {
 		return gksbbh;
 	}
+	
+	/**
+	 * yjpt whsb's ID
+	 */
 	public void setGksbbh(Long gksbbh) {
 		this.gksbbh = gksbbh;
 	}
+	
 	public String getHssbbh() {
 		return hssbbh;
 	}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cjhs/CjhsEntity.java

@@ -6,7 +6,7 @@ import javax.persistence.Transient;
 
 /**
  * 海事对接表
- * 
+ * 用于危货申报查看页面“海事审批记录”出的展示等，数据库中无具体table与其对应
  */
 
 public class CjhsEntity {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cjhs/CjhsDbServiceImpl.java

@@ -55,6 +55,8 @@ public class CjhsDbServiceImpl implements CjhsDbService {
 				return null;
 			}
 			params.put("gksbbh", gksbbh);
+			
+			//这么写是sb吗，不放dao了？
 			return query.nativeQuery(
 					" SELECT * FROM T_CJHS_GKBD WHERE GKSBBH=:gksbbh",
 					CjhsDbEntity.class, params);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/cjhs/CjhsServiceImpl.java

@@ -42,16 +42,23 @@ public class CjhsServiceImpl implements CjhsService {
 	@Override
 	public CjhsEntity findCjhsByGksbbh(Long gksbbh) {
 		CjhsEntity cjhs = null;
-		ZysqbpEntity vo = zysqbpService.findOne(gksbbh);
+		//yjpt 危货申报单  用于获取船名
+		ZysqbpEntity zysqbpEntity = zysqbpService.findOne(gksbbh);
 		// 获取比对数据
 		try {
+			//根据危货申报ID获得危货申报和海事比对的信息 此比对表位于yjpt库中
 			List<CjhsDbEntity> cjhsdbList = cjhsDbService.findByGksbbh(gksbbh);
+			
 			if (cjhsdbList == null || cjhsdbList.size() <= 0) {
-				List<DtywCbsbEntity> dtywCbsbEntityList = dtywCbsbService.findByZwcm(vo.getCm());
+				/***************比对库中根据危货申报ID没有找到匹配数据*****************/
+				List<DtywCbsbEntity> dtywCbsbEntityList = dtywCbsbService.findByZwcm(zysqbpEntity.getCm());//根据船名获得“更新时间”最新的一条数据
 				if (dtywCbsbEntityList != null && dtywCbsbEntityList.size() > 0) {
+					//yjpt比对库中没有匹配数据，从前置库海事申报table中根据船名拿到一个申报数据
 					DtywCbsbEntity dtywCbsbEntity = dtywCbsbEntityList.get(0);
 					cjhs = changeFromDtywCbsb(dtywCbsbEntity);
 				}
+				
+				//讲匹配到的第一条输入存入yjpt库比对表，不管匹配是否准确（匹配规则：根据船名获得“更新时间”最新的一条数据）
 				if (cjhs != null && cjhs.getHshwList() != null) {
 					CjhsHwEntity cjhsHw = cjhs.getHshwList().get(0);
 					CjhsDbEntity db = new CjhsDbEntity();
@@ -60,27 +67,32 @@ public class CjhsServiceImpl implements CjhsService {
 					db.setXh(cjhsHw.getXh());
 					db.setBsxh(cjhsHw.getBsxh());
 					cjhsDbService.save(db);
-				}
-			} else {
-				CjhsDbEntity cjhsdbEntity = cjhsdbList.get(0);
+				}//end if not null , save into  yjpt.T_CJHS_GKBD
+			}//end if 
+			else {
+				CjhsDbEntity cjhsdbEntity = cjhsdbList.get(0);//比对库中根据危货申报ID找到匹配数据（不管几条，拿第一条，理论上也只有一条）
+				//用比对库中拿到的海事申报编号到前置库：危险品申报信息表（DTYW_CBSB）拿到海事申报的详细信息
 				DtywCbsbEntity dtywCbsbEntity = dtywCbsbService.findBySbdbh(cjhsdbEntity.getHssbbh());
+				//将拿到的海事申报的entity转化处理下，映射成CjhsEntity
 				cjhs = changeFromDtywCbsb(dtywCbsbEntity);
-			}
-		} catch (Exception e) {
+			}//end if else
+		}//end try
+		catch (Exception e) {
 			e.printStackTrace();
-		}
+		}//end catch
 		return cjhs;
 	}
 
 	/**
 	 * 从海事实体转成本地实体
-	 * 
+	 * DtywCbsbEntity --》 CjhsEntity
 	 * @param entity
 	 * @return
 	 */
 	public CjhsEntity changeFromDtywCbsb(DtywCbsbEntity entity) {
-		// 转换船舶申报
+		// 转换船舶申报  不含货物
 		CjhsEntity cjhs = changeFromDtywCbsbNoHw(entity);
+		//处理货物
 		List<CjhsHwEntity> cjhsHwList = findCjhsHwListByCbsb(entity);
 		if (cjhsHwList != null && cjhsHwList.size() > 0) {
 			cjhs.setHshwList(cjhsHwList);
@@ -98,17 +110,20 @@ public class CjhsServiceImpl implements CjhsService {
 	public List<CjhsHwEntity> findCjhsHwListByCbsb(DtywCbsbEntity entity) {
 		List<CjhsHwEntity> cjhsHwList = null;
 		if (entity.getSbdlb().trim().equals("CS")) {
+			/********船舶申报“散装”货物*********/
 			List<DtywCbsbszHwEntity> cbsbszList = dtywCbsbService.findCbsbszHwBySbdbh(entity.getId());
 			cjhsHwList = changeFromCbsbszHw(cbsbszList);
-		} else if (entity.getSbdlb().trim().equals("CB")) {
-			List<DtywCbsbgtHwEntity> cbsbgtList = dtywCbsbService
-					.findCbsbgtHwBySbdbh(entity.getId());
+		}//end if
+		else if (entity.getSbdlb().trim().equals("CB")) {
+			/********船舶申报“固体”货物*********/
+			List<DtywCbsbgtHwEntity> cbsbgtList = dtywCbsbService.findCbsbgtHwBySbdbh(entity.getId());
 			cjhsHwList = changeFromCbsbgtHw(cbsbgtList);
-		} else if (entity.getSbdlb().trim().equals("CY")) {
-			List<DtywCbsbytHwEntity> cbsbytList = dtywCbsbService
-					.findCbsbytHwBySbdbh(entity.getId());
+		} //end else if
+		else if (entity.getSbdlb().trim().equals("CY")) {
+			/********船舶申报“液体”货物*********/
+			List<DtywCbsbytHwEntity> cbsbytList = dtywCbsbService.findCbsbytHwBySbdbh(entity.getId());
 			cjhsHwList = changeFromCbsbytHw(cbsbytList);
-		}
+		}//end
 		return cjhsHwList;
 	}