Răsfoiți Sursa

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

xt_xuhao 8 ani în urmă
părinte
comite
25816dbb42

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

@@ -1094,18 +1094,25 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		return createBusinessContext("save.success", true);
 	}
 
+	/**
+	 * 根据所属entity的id和附件的类型获得附件
+	 * @param entityid  ssid(所属id)
+	 * @param sslx      所属类型
+	 * @return
+	 */
 	public BusinessContext findFj(long entityid, long sslx) {
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		// 只检索非删除状态记录
-		addNotEmptyModel(filterList, "recordStatus",
-				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		addNotEmptyModel(filterList, "recordStatus",BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		// 根据ID检索
 		addNotEmptyModel(filterList, "entityId", entityid, Operator.EQ);
 		addNotEmptyModel(filterList, "entityType", sslx, Operator.EQ);
-		Specification<AccessoryEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
+		
+		Specification<AccessoryEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
+		
 		List<AccessoryEntity> fjlist = accessoryService.findAll(spec);
+		//attachment content bytes
 		ArrayList<byte[]> list = new ArrayList<byte[]>();
 		for (AccessoryEntity entity : fjlist) {
 			list.add(entity.getContent().getValue());

+ 4 - 0
gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -8611,3 +8611,7 @@ Alter TABLE T_YJPT_WXHWGKZYSBD ADD FR VARCHAR2(100);
 COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.SR IS '开工报填报人StartReport';
 COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.FR IS '完工报填报人FinishReport';
 </#if>
+<#if versionDate?date("yyyyMMdd") lt "20161110"?date("yyyyMMdd")>
+INSERT INTO T_YJPT_GGDM(ID,CODE,PX,MC,RECORD_STATUS,BZ) VALUES(10000510,'FJSSLX',34,'T_YJPT_FZSQ',1,'港口危险作业附证,一个作业地点一个证');
+</#if>
+

+ 3 - 3
gkaq/yjpt-java/trunk/yjpt/WEB-INF/web.xml

@@ -22,12 +22,12 @@
 	<context-param>
 		<description>是否使用地图资源系统(Y/N)</description>
 		<param-name>open_map</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>是否与权力阳光同步(Y/N)</description>
 		<param-name>qlyg_sync</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
@@ -101,7 +101,7 @@
 	<context-param>
 		<description>是否jax-ws同步(Y/N)</description>
 		<param-name>jaxws_sync</param-name>
-		<param-value>Y</param-value>
+		<param-value>N</param-value>
 	</context-param>
 	<context-param>
 		<description>同步UserId</description>