git-svn-id: https://192.168.57.71/svn/jsgkj@607 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/Utils.java

@@ -564,7 +564,29 @@ public abstract class Utils {
 			Root<? extends BaseEntity<?>> root, String lcStatus) {
 		// 根据流程状态过滤
 		if (null != lcStatus && !"".equals(lcStatus)) {
-			if (String.valueOf(BaseEntity.RECORD_STATE_VALID).equals(lcStatus)
+			if(lcStatus.equals("default")){
+//				Subquery<TaskInfoEntity> subquery = query
+//						.subquery(TaskInfoEntity.class);
+//				Root<TaskInfoEntity> taskRoot = subquery
+//						.from(TaskInfoEntity.class);
+//				subquery.select(taskRoot);
+//				List<Predicate> subQueryPredicates = new ArrayList<Predicate>();
+//				subQueryPredicates.add(cb.equal(
+//						root.get("id").as(String.class), taskRoot.get("busId")
+//								.as(String.class)));
+//				subQueryPredicates.add(cb.notEqual(
+//						taskRoot.get("currName").as(String.class), "wf.tb"));
+////				subQueryPredicates.add(cb.notEqual(
+////						taskRoot.get("state").as(Long.class),
+////						BaseEntity.RECORD_STATE_COMPLETED));   
+//				subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+//				list.add(cb.exists(subquery)); 
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class),
+						BaseEntity.RECORD_STATE_REJECT));
+				list.add(cb.notEqual(root.get("recordStatus").as(String.class),
+						BaseEntity.RECORD_STATE_VALID));
+			} 
+			else if (String.valueOf(BaseEntity.RECORD_STATE_VALID).equals(lcStatus)
 					|| String.valueOf(BaseEntity.RECORD_STATE_COMPLETED)
 							.equals(lcStatus)) {
 				list.add(cb.equal(root.get("recordStatus").as(String.class),

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/ExportExcel.java

@@ -116,29 +116,29 @@ public class ExportExcel {
 		// 生成一个表格
 		HSSFSheet sheet = workbook.createSheet(title);
 		// 设置表格默认列宽度为15个字节
-		sheet.setDefaultColumnWidth(15);
+		sheet.setDefaultColumnWidth(15); 
 		int index = 0;
 		HSSFRow row;
 		CellStyle style = workbook.createCellStyle();// cell.getCellStyle();
 		Font font = workbook.createFont();		
 		font.setFontName("宋体");  
 		font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-		font.setFontHeightInPoints((short) 8);
+		font.setFontHeightInPoints((short) 10);//font.setFontHeightInPoints((short) 8);
 		style.setFont(font);
-		style.setAlignment(CellStyle.ALIGN_CENTER);
-		style.setBorderBottom((short) 1);//下边框      
-	    style.setBorderLeft((short) 1);//左边框      
-	    style.setBorderRight((short) 1);//右边框      
-	    style.setBorderTop((short) 1);//上边框 
+		style.setAlignment(CellStyle.ALIGN_LEFT);//style.setAlignment(CellStyle.ALIGN_CENTER);
+//		style.setBorderBottom((short) 1);//下边框      
+//	    style.setBorderLeft((short) 1);//左边框      
+//	    style.setBorderRight((short) 1);//右边框      
+//	    style.setBorderTop((short) 1);//上边框 
 		// 产生表格标题行
 		if (null != headers) {
 			row = sheet.createRow(index);
 			index++;
-			for (int i = 0; i < headers.length; i++) {
+			for (int i = 0; i < headers.length; i++) { 
 					HSSFCell cell = row.createCell(i);
 					HSSFRichTextString text = new HSSFRichTextString(headers[i]);		
 					cell.setCellValue(text);		
-					cell.setCellStyle(style);
+					cell.setCellStyle(style); 
 			}
 		}
 
@@ -146,15 +146,15 @@ public class ExportExcel {
 		Iterator<String[]> it = dataset.iterator();
 		CellStyle style2 = workbook.createCellStyle();// cell.getCellStyle();
 		Font font2 = workbook.createFont();		
-		font2.setFontName("宋体");  
+		font2.setFontName("Arial");//font2.setFontName("宋体");  
 		font2.setBoldweight(HSSFFont.BOLDWEIGHT_NORMAL);
-		font2.setFontHeightInPoints((short) 8);
+		font2.setFontHeightInPoints((short) 10);//font2.setFontHeightInPoints((short) 8);
 		style2.setFont(font2);
 		style2.setAlignment(CellStyle.ALIGN_LEFT);
-		style2.setBorderBottom((short) 1);//下边框      
-	    style2.setBorderLeft((short) 1);//左边框      
-	    style2.setBorderRight((short) 1);//右边框      
-	    style2.setBorderTop((short) 1);//上边框 
+//		style2.setBorderBottom((short) 1);//下边框      
+//	    style2.setBorderLeft((short) 1);//左边框      
+//	    style2.setBorderRight((short) 1);//右边框      
+//	    style2.setBorderTop((short) 1);//上边框 
 		style2.setFont(font2);
 		while (it.hasNext()) {
 			row = sheet.createRow(index);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/task/TaskController.java

@@ -87,20 +87,28 @@ public class TaskController extends BaseController {
 				public Predicate toPredicate(Root<Gztx> root,
 						CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
+					
+					//排除逻辑删除状态数据
 					list.add(cb.notEqual(
 							root.get("recordStatus").as(String.class),
 							BaseEntity.RECORD_STATE_DELETE));
+					//szd
 					if (null != szdId && !"".equals(szdId)
 							&& !szdId.equals("ol"))
 						list.add(cb.like(
 								root.get("szd").get("id").as(String.class),
 								szdId + "%"));
+					
+					//提醒时间 大于等于
 					if (txsj1 != null)
 						list.add(cb.greaterThanOrEqualTo(
 								root.get("txsj").as(Date.class), txsj1));
+					//提醒时间 小于					
 					if (txsj2 != null)
 						list.add(cb.lessThan(root.get("txsj").as(Date.class),
 								DateUtil.addDate(txsj2, 1)));
+					
+					//是否已读
 					if (null != sfyd && !"".equals(sfyd)) {
 						if ("Y".equals(sfyd)) {
 							list.add(cb.equal(root.get("byzd1")
@@ -114,6 +122,8 @@ public class TaskController extends BaseController {
 											"Y") }));
 						}
 					}
+					
+					//数据类型是：BUSTYPE_WXHWZYSQ（wxhwzysq）
 					if (null != type && !"".equals(type)) {
 						list.add(cb.equal(root.get("bustype").as(String.class),
 								type));

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzhz/GkwxhwzyfzhzController.java

@@ -418,6 +418,12 @@ public class GkwxhwzyfzhzController extends BaseController {
 	 */
 	public BusinessContext audit(String shyj, Date shsj,
 			GkwxhwzyfzhzEntity entity, boolean flag) {
+		
+		if(flag){
+			//save GkwxhwzyfzhzEntity  页面上只有：发证日期、有效期起止时间可以编辑 
+			gkwxhwzyfzhzService.save(entity);
+		}
+		
 		// 先签收
 		if (gkwxhwzyfzhzService
 				.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId()

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -70,6 +70,7 @@ import com.jtgh.yjpt.entity.ireport.aqsp.WxhwzysqVo;
 import com.jtgh.yjpt.entity.jlrxxgl.GlzdxxEntity;
 import com.jtgh.yjpt.entity.jyr.JyrEntity;
 import com.jtgh.yjpt.entity.jyrxxgl.RyjbxxEntity;
+import com.jtgh.yjpt.entity.task.Gztx;
 import com.jtgh.yjpt.entity.yjgl.YjyaEntity;
 import com.jtgh.yjpt.entity.yjzyxxgl.YjwzFlxxEntity;
 import com.jtgh.yjpt.entity.zyfzhz.GkwxhwzyfzhzEntity;
@@ -82,6 +83,7 @@ import com.jtgh.yjpt.service.common.CodeService;
 import com.jtgh.yjpt.service.jlrxxgl.GlzdxxService;
 import com.jtgh.yjpt.service.jyr.JyrService;
 import com.jtgh.yjpt.service.jyrxxgl.RyjbxxService;
+import com.jtgh.yjpt.service.task.TaskService;
 import com.jtgh.yjpt.service.yjgl.YjyaService;
 import com.jtgh.yjpt.service.yjzyxxgl.YjwzFlxxService;
 import com.jtgh.yjpt.service.zyfzndjy.GkfzzbService;
@@ -123,32 +125,74 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	private YjwzFlxxService wzService;
 	@Autowired
 	private AccessoryService accessoryService;
+	@Autowired
+	private TaskService taskService;
 
 	/**
 	 * 企业界面的查询
 	 */
 	@Log(Type.QUERY)
-	public BusinessContext listByQy(Long functionId, Pageable pageable,
-			String jyr, CodeEntity szd, GqEntity gq, CodeEntity whdj,
-			String lcStatus, String fddbr) {
+	public BusinessContext listByQy(final Long functionId, Pageable pageable,
+			final String jyr,final CodeEntity szd,final GqEntity gq,final CodeEntity whdj,
+			final String lcStatus,final String fddbr) {
 		try {
-			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
-			// 只检索非删除状态记录
-			addNotEmptyModel(filterList, "recordStatus",
-					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-			// 根据所在地过滤
-			if (szd != null)
-				addNotEmptyModel(filterList, "szd.id", szd.getId(),
-						Operator.LIKE_R);
-			// 根据港区过滤
-			addNotEmptyModel(filterList, "ssgq", gq, Operator.EQ);
-			addNotEmptyModel(filterList, "jyrVo.gkjyr", jyr, Operator.LIKE);
-			addNotEmptyModel(filterList, "whdj", whdj, Operator.EQ);
-			addNotEmptyModel(filterList, "fddbr", fddbr, Operator.LIKE);
-			addRecordCodeFilter(functionId, filterList, null, "jyrVo");
-
-			Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
-					.searchByPredicateModels(filterList);
+//			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
+//			// 只检索非删除状态记录
+//			addNotEmptyModel(filterList, "recordStatus",
+//					BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+//			// 根据所在地过滤
+//			if (szd != null)
+//				addNotEmptyModel(filterList, "szd.id", szd.getId(),
+//						Operator.LIKE_R);
+//			// 根据港区过滤
+//			addNotEmptyModel(filterList, "ssgq", gq, Operator.EQ);
+//			addNotEmptyModel(filterList, "jyrVo.gkjyr", jyr, Operator.LIKE);
+//			addNotEmptyModel(filterList, "whdj", whdj, Operator.EQ);
+//			addNotEmptyModel(filterList, "fddbr", fddbr, Operator.LIKE);
+//			addRecordCodeFilter(functionId, filterList, null, "jyrVo");
+//
+//			Specification<GkwxhwzyfzblhhzEntity> spec = SpecificationCreater
+//					.searchByPredicateModels(filterList);
+			
+			
+			Specification<GkwxhwzyfzblhhzEntity> spec = new Specification<GkwxhwzyfzblhhzEntity>() {
+				@Override
+				public Predicate toPredicate(Root<GkwxhwzyfzblhhzEntity> root,
+						CriteriaQuery<?> query, CriteriaBuilder cb) {
+					List<Predicate> list = new ArrayList<Predicate>();
+					addRecordCodeFilter(functionId, cb, root, list);
+					// 只检索非删除状态记录
+					list.add(cb.notEqual(
+							root.get("recordStatus").as(String.class),
+							BaseEntity.RECORD_STATE_DELETE));
+				  
+					//经营人
+					if (null != jyr && !"".equals(jyr)) {
+						list.add(cb
+								.like(root.get("jyrVo").get("gkjyr")
+										.as(String.class), "%" + jyr + "%"));
+					}
+					
+					// 危货等级
+					if (null != whdj) {
+						list.add(cb.equal(
+								root.get("whdj").as(CodeEntity.class), whdj));
+					}
+					// 法定代表人
+					if (null != fddbr && !"".equals(fddbr)) {
+						list.add(cb.like(root.get("fddbr").as(String.class),
+								"%" + fddbr + "%"));
+					}
+					
+					//“默认”状态，此状态企业查看全部
+					if(!lcStatus.equals("default")){ 
+						list = Utils.setWorkflowSpec(list, cb, query, root,
+								lcStatus);
+					}
+					return cb.and(list.toArray(new Predicate[] {}));
+				}
+			};
+			
 			Page<GkwxhwzyfzblhhzEntity> result = gkwxhwzyfzblhhzService
 					.findAll(spec, pageable);
 			for (GkwxhwzyfzblhhzEntity entity : result) {
@@ -737,6 +781,20 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		try {
 			BusinessContext bc = createBusinessContext();
 			gkwxhwzyfzblhhzService.logicDelete(entities);
+			
+			//判断附证申请实例是不是退回状态，如果是，除了删除附证申请数据还要将工作工作提醒中的对应提醒也删除掉：
+			//edit by xuhao 2016-09-06
+			for(GkwxhwzyfzblhhzEntity entity : entities){
+				if(entity.getRecordStatus()==4){ 
+						List<Gztx> gztxList = taskService.findGztxByBYZD2(entity.getId().toString());//更具BYZD2找到实例 
+						for(Gztx gztx : gztxList ){
+							gztx.setTxzt(Constants.NO);
+							taskService.saveGztx(gztx);//将工作提醒置关闭掉（即删除）
+						}
+				}
+			}
+			
+			
 			// 制度list删除
 			// for (int i = 0; i < entities.size(); i++) {
 			// glzdxxService.logicDelete(findGlzdxxList(entities.get(i)

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

@@ -1616,10 +1616,10 @@ public class ZysqbpController extends BaseController {
 						ZysqbpEntity.PROCESS_DEFINITION_KEY);
 		if (list == null || list.size() == 0) {
 			ZysqbpEntity entity2 = zysqbpService.findOne(entity.getId());
-			String tx = "提交的作业申请已作废";
+			String tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已作废";
 			if (auditflag) {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_REJECT);
-				tx = "提交的作业申请已退回";
+				tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已退回";
 			} else {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_CALEL);
 			}
@@ -1629,7 +1629,7 @@ public class ZysqbpController extends BaseController {
 			vo = zysqbpService.findOne(vo.getId());
 			if (vo.getTaskList() != null && vo.getTaskList().size() > 0) {
 				setGztx(entity.getId().toString(),
-						"你单位" + sdf.format(entity.getBgsj()) + tx, vo
+						"你单位" + sdf2.format(entity.getBgsj()) + tx, vo
 								.getTaskList().get(0).getStartUser());
 			}
 
@@ -1742,12 +1742,12 @@ public class ZysqbpController extends BaseController {
 						ZysqbpEntity.PROCESS_DEFINITION_KEY);
 		if (list == null || list.size() == 0) {
 			ZysqbpEntity entity2 = zysqbpService.findOne(entity.getId());
-			String tx = "提交的作业申请已审核通过";
+			String tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过";
 			if (auditflag) {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_COMPLETED);
 			} else {
 				entity2.setRecordStatus(YjyabaEntity.RECORD_STATE_CALEL);
-				tx = "提交的作业申请已审核未通过";
+				tx = "提交的作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过";
 			}
 			entity2.setBh(entity.getBh());
 			ZysqbpEntity vo = zysqbpService.save(entity2);
@@ -1756,7 +1756,7 @@ public class ZysqbpController extends BaseController {
 					.getId().toString(), ZysqbpEntity.PROCESS_DEFINITION_KEY);
 			if (list2 != null && list2.size() > 0) {
 				setGztx(entity.getId().toString(),
-						"你单位" + sdf.format(vo.getBgsj()) + tx, list2.get(0)
+						"你单位" + sdf2.format(vo.getBgsj()) + tx, list2.get(0)
 								.getStartUser());
 			}
 
@@ -2922,8 +2922,8 @@ public class ZysqbpController extends BaseController {
 			if (list != null && list.size() > 0) {
 				// 发工作提醒
 				setGztx(entity1.getId().toString(),
-						"你单位" + sdf.format(list.get(0).getStartTime())
-								+ "提交的取消作业申请已审核未通过", list.get(0).getStartUser());
+						"你单位" + sdf2.format(list.get(0).getStartTime())
+								+ "提交的取消作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过", list.get(0).getStartUser());
 			}
 
 			// 同步
@@ -2949,8 +2949,8 @@ public class ZysqbpController extends BaseController {
 			if (list2 != null && list2.size() > 0) {
 				// 发工作提醒
 				setGztx(entity2.getId().toString(),
-						"你单位" + sdf.format(list2.get(0).getStartTime())
-								+ "提交的取消作业申请已审核通过", list2.get(0).getStartUser());
+						"你单位" + sdf2.format(list2.get(0).getStartTime())
+								+ "提交的取消作业申请（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过", list2.get(0).getStartUser());
 			}
 			// 同步
 			final ZysqbpEntity entity2_f = entity2;
@@ -3007,8 +3007,8 @@ public class ZysqbpController extends BaseController {
 			// 发工作提醒
 			if (list1 != null && list1.size() > 0) {
 				setGztx(entity1.getId().toString(),
-						"你单位" + sdf.format(list1.get(0).getStartTime())
-								+ "申请的作业变更已审核未通过", list1.get(0).getStartUser());
+						"你单位" + sdf2.format(list1.get(0).getStartTime())
+								+ "申请的作业变更（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核未通过", list1.get(0).getStartUser());
 			}
 			// 同步
 			tb(entity1);
@@ -3028,8 +3028,8 @@ public class ZysqbpController extends BaseController {
 			// 发工作提醒
 			if (list2 != null && list2.size() > 0) {
 				setGztx(entity2.getId().toString(),
-						"你单位" + sdf.format(list2.get(0).getStartTime())
-								+ "申请的作业变更已审核通过", list2.get(0).getStartUser());
+						"你单位" + sdf2.format(list2.get(0).getStartTime())
+								+ "申请的作业变更（船名："+ entity.getCm() +"，申报单编号："+ entity.getBh() +"）已审核通过", list2.get(0).getStartUser());
 			}
 			// 同步
 			tb(entity2);

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/task/GztxDao.java

@@ -27,6 +27,14 @@ public interface GztxDao extends MyRepository<Gztx, Long> {
 	@Query("from Gztx where jsUser.id =?1 and txzt = '" + Constants.YES
 			+ "' order by id desc")
 	public List<Gztx> findByUser(Long userId);
+	
+	
+	/***
+	 * 根据byzd2查询工作提醒
+	 */
+	@Query("from Gztx where byzd2 =?1  and txzt = '"
+			+ Constants.YES + "' order by id desc")
+	public List<Gztx> findByBYZD2(String byzd2);
 
 	/***
 	 * 根据业务id查询该业务是否存在，且txzt是Yes的

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zyfzhz/GkwxhwzyfzhzEntity.java

@@ -109,6 +109,9 @@ public class GkwxhwzyfzhzEntity extends BaseEntity<Long> {
 
 	private GkwxhwzyfzblhhzEntity fzsq;
 	
+	
+	//使用byzd2作为是否延续表示字段 Y是 N否  edit by xuhao 2016-09-08 
+
 	/**
 	 * @return the fzsq
 	 */

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/task/TaskServiceImpl.java

@@ -61,6 +61,17 @@ public class TaskServiceImpl extends BaseService<Gztx, Long> implements
 	public Gztx findGztxById(Long gztxId) {
 		return gztxDao.findOne(gztxId);
 	}
+	
+	/**
+	 * 根据byzd2查询工作提醒
+	 * 
+	 * @param byzd2
+	 *             
+	 * @return
+	 */
+	public List<Gztx> findGztxByBYZD2(String byzd2) {
+		return gztxDao.findByBYZD2(byzd2);
+	}
 
 	/**
 	 * 分页查询工作提醒

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zyfzndjy/GkwxhwzyfzblhhzServiceImpl.java

@@ -110,7 +110,7 @@ public class GkwxhwzyfzblhhzServiceImpl extends
 	private JyrdcxxDao jyrdcxxDao;
 	@Autowired
 	private CgDao cgDao;
-
+//
 	@Override
 	protected MyRepository<GkwxhwzyfzblhhzEntity, Long> getDao() {
 		return gkwxhwzyfzblhhzDao;
@@ -622,6 +622,11 @@ public class GkwxhwzyfzblhhzServiceImpl extends
 			gztx.setFsUser(Utils.getCurrentUser());
 			gztx.setAddDate(new Date());
 			gztx.setJsUser(applyUser);
+			
+			//附证申请退回后发送 工作提醒 将附证申请的实例ID存入BYZD2字段，用于“附证申请记录退回给企业后允许填报人删除，同时删除待办”
+			//edit by xuhao 2016-09-07
+			gztx.setByzd2(entityId.toString());
+			
 			gztxDao.save(gztx);
 		} catch (IOException e) {
 			e.printStackTrace();

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/task/TaskService.java

@@ -46,6 +46,16 @@ public interface TaskService {
 	 * @return
 	 */
 	public List<Gztx> findTxByUser(Long userId);
+	
+	
+	/**
+	 * 根据byzd2查询工作提醒
+	 * 
+	 * @param byzd2
+	 *             
+	 * @return
+	 */
+	public List<Gztx> findGztxByBYZD2(String byzd2);
 
 	/**
 	 * 根据id查询工作提醒

gkaq/yjpt-java/trunk/locale/zh_CN/select.properties

@@ -938,6 +938,7 @@ wf.pz=\u5f85\u6279\u51c6
 wf.complete=\u5df2\u5b8c\u6210
 wf.zf=\u4f5c\u5e9f
 wf.hx=\u5f85\u6838\u9500
+wf.qb=\u5168\u90e8
 
 whzy.recordStatus2=\u901a\u8fc7
 whzy.recordStatus8=\u4e0d\u901a\u8fc7

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,6 +1,6 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc.url                      = jdbc:oracle:thin:@localhost:1521:orcl
 jdbc.username           = yjptzj
 jdbc.password            =yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
@@ -21,7 +21,7 @@ hibernate.hbm2ddl.auto=
 
 
 # local WebService
-web.service.url=192.168.57.40
+web.service.url=localhost
 web.service.port=8089
 
 # Province WebService 

gkaq/yjpt-java/trunk/yjpt/iSignature/js/iWebOffice2015.js

@@ -0,0 +1,36 @@
+var str = '';
+var copyright = "金格科技iWebOffice2015智能文档中间件[演示版];V5.0S0xGAAEAAAAAAAAAEAAAAG4BAABwAQAALAAAACRMjL8EEB30GKfgBdV5QBd174nAiygzmBLzZyLiwD5H5kNqbnEfine68UfE9xDiuc9xwFj2MV1e922BAyY1dtuo2ichZj/AKL/C6X8yUTMR4OavFt3zEb7JUyAmBmKEvwbFHIocqxFTYoyByK9jaXhX/hKM2RCCboOpAZBJCh6pdfkEqAiflhiaicLEMCl8UWDTXK0NJqShtyCsFrsk9UZs2BFv2rNeakzkDehf920LvJwUioAgjNTTuTqUH2PLphmqNrex0smvTg0xx0VTQkMQIcynMG61pd92BfwDBso+4OKq3Vt/1D3X2RVxZIuAhbnEHrGvzOG0lWgY9vWdgNXGn2wcOAw1sr3s98GxsGCuc5/5r5BYhUX5mp9tX73CtQ/CdB6AO8A7hHirG8sHNAvqfQatDLtpjauN/EWNemPFMVVm/aq78DbG1HtU+sY+saSAq0ldq9j9WdepJbUy9Tj/cF+n1hSpEQNUmsMATFyCjbQmDWLSJuEEViBAuZ7EOg==";
+str += '<object id="WebOffice2015" ';
+
+str += ' width="100%"';
+str += ' height="100%"';
+
+if ((window.ActiveXObject!=undefined) || (window.ActiveXObject!=null) ||"ActiveXObject" in window)
+{
+	str += ' CLASSID="CLSID:D89F482C-5045-4DB5-8C53-D2C9EE71D025"  codebase="iWebOffice2015.cab#version=12,2,0,374"';
+	str += '>';
+	str += '<param name="Copyright" value="' + copyright + '">';
+}
+else
+{
+	str += ' progid="Kinggrid.iWebOffice"';
+	str += ' type="application/iwebplugin"';
+	str += ' OnCommand="OnCommand"';
+	str += ' OnReady="OnReady"';
+	str += ' OnOLECommand="OnOLECommand"';
+	str += ' OnExecuteScripted="OnExecuteScripted"';
+	str += ' OnQuit="OnQuit"';
+	str += ' OnSendStart="OnSendStart"';
+	str += ' OnSending="OnSending"';
+	str += ' OnSendEnd="OnSendEnd"';
+	str += ' OnRecvStart="OnRecvStart"';
+	str += ' OnRecving="OnRecving"';
+	str += ' OnRecvEnd="OnRecvEnd"';
+	str += ' OnRightClickedWhenAnnotate="OnRightClickedWhenAnnotate"';
+	str += ' OnFullSizeBefore="OnFullSizeBefore"';
+	str += ' OnFullSizeAfter="OnFullSizeAfter"';	
+	str += ' Copyright="' + copyright + '"';
+	str += '>';
+}
+str += '</object>';
+document.write(str); 

gkaq/yjpt-java/trunk/yjpt/iSignature/view/ZysqbpPrintSignature.jsp

@@ -482,7 +482,12 @@ function StatusMsg(mString){
 }
 
 //×÷ÓãºÔØÈëiWebOffice
-function Load(){
+function Load(){ 
+	DocForm.SignatureControl.ShowSignature('<%=DocumentID%>'); 
+}
+
+//×÷ÓãºÔØÈëiWebOffice
+function Load2(){
 
 	DocForm.SignatureControl.ShowSignature('<%=DocumentID%>');
   try{
@@ -744,9 +749,9 @@ try{
  
 </script>
 </head>
-<body id="documentPrintID" class="Noprint" onLoad="Load();"
+<body id="documentPrintID"  onLoad="Load();"
 	onUnload="UnLoad();">  
-	<input type="button" onclick="WebSaveLocal();" class="inputOut" onMouseOver="this.className='inputOver'" onMouseOut="this.className='inputOut'"  /> 
+    <!-- <input type="button" onclick="WebSaveLocal();" class="inputOut" onMouseOver="this.className='inputOver'" onMouseOut="this.className='inputOut'"  /> --> 
 	<form name="DocForm">
 		<input type="hidden" name="DocumentID" value="<%=DocumentID%>">
 		<OBJECT id="SignatureControl"
@@ -759,7 +764,7 @@ try{
 		</OBJECT>
 		<div style="width: 100%; text-align: center;">
 			<table id="tab"
-				style="width: 595px; border-collapse: collapse; empty-cells: show; background-color: "
+				style="width:595px;border-collapse:collapse;empty-cells:show;" align="center"
 				border="0" cellspacing="0" cellpadding="0">
 				<thead>
 					<tr valign="top" style="height: 20px;">
@@ -1358,10 +1363,9 @@ try{
 			</table>
 		</div>
 	</form>
-	<form name="webform" style="display:'none';">
-
-		<table border="0" cellspacing="0" cellpadding="0" width="100%"
-			height="100%">
+	<!--
+	<form name="webform" style="display:'';"> 
+		<table border="0" cellspacing="0" cellpadding="0" width="100%" height="100%" >
 			<tr>
 				<td bgcolor="menu" height="98%" valign="top"><script
 						src="../js/iWebOffice2009.js"></script> <script src="../js/iSignatureHTML.js"></script>
@@ -1370,10 +1374,8 @@ try{
 						classid="clsid:79F9A6F8-7DBE-4098-A040-E6E0C3CF2001"
 						codebase="iSignatureAPI.ocx#version=9,0,0,316"> </object></td>
 			</tr>
-		</table>
-
-
-	</form>
+		</table> 
+	</form> -->
 
 </body>
 </html>