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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpLayout.mxml

@@ -315,6 +315,16 @@
 									   headerText="开工时间" showDataTips="true" dataTipField="kgsjStr" width="80"/>
 					<ui:DataGridColumn dataField="wgsj" sortable="true" dateFormatString="YYYY-MM-DD JJ:NN:SS"
 									   headerText="完工时间" showDataTips="true" dataTipField="wgsjStr" width="80"/>
+					<ui:DataGridColumn visible="{Global.user.id==Global.adminId}" headerText="开工情况"
+									   linkButtonFunc="{thisModel.KgHandle}"
+									   linkEnableFunc="{thisModel.KgEnble}"
+									   linklabelFunc="{thisModel.showKgqkName}"
+									   type="{TypeBase.LINKBUTTON}"/>
+					<ui:DataGridColumn visible="{Global.user.id==Global.adminId}" headerText="完工情况"
+									   linkButtonFunc="{thisModel.WgHandle}"
+									   linkEnableFunc="{thisModel.WgEnble}"
+									   linklabelFunc="{thisModel.showWgqkName}"
+									   type="{TypeBase.LINKBUTTON}"/>			
 					<ui:DataGridColumn type="{TypeBase.LINKBUTTON}" linklabelFunc="{linkButtonLabel}"  id="cz"
 									   linkButtonFunc="{linkButtonFunc}" headerText="{resourceManager.getString('common','btn.cz')}"/>
 				</s:ArrayList>

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/vo/jyr/JyrVo.as

@@ -361,7 +361,7 @@ package com.jtgh.yjpt.vo.jyr
 				return "沿江港口企业";
 			}
 			if(qylx=="2"){
-				return "内海港口企业";
+				return "沿海港口企业";
 			}
 			if(qylx=="3"){
 				return "内河港口企业";

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

@@ -136,7 +136,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	@Log(Type.QUERY)
 	public BusinessContext listByQy(Long functionId, Pageable pageable,
 			JyrEntity jyr, CodeEntity szd, GqEntity gq, String blbh,
-			String lcStatus, String fddbr) {
+			String lcStatus, String fddbr, CodeEntity zs) {
 		try {
 			List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 			// 只检索非删除状态记录

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

@@ -65,6 +65,7 @@ import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblhhzEntity;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblhhzzbEntity;
 import com.jtgh.yjpt.service.common.WorkflowMangerService;
 import com.jtgh.yjpt.service.impl.BaseWorkFlowServiceImpl;
+import com.jtgh.yjpt.service.impl.common.WorkflowMangerServiceImpl;
 import com.jtgh.yjpt.service.task.TaskService;
 import com.jtgh.yjpt.service.zyfzndjy.GkwxhwzyfzblhhzService;
 import com.yjpt.util.DateUtil;
@@ -403,6 +404,14 @@ public class GkwxhwzyfzblhhzServiceImpl extends
 			variables.put("role_sc", Constants.ROLE_TYPE_CITY_SC);
 			variables.put("role_sh", Constants.ROLE_TYPE_CITY_SH);
 			variables.put("role_pz", Constants.ROLE_TYPE_CITY_PZ);
+			UserEntity user = Utils.getCurrentUser();
+			if (data.getJyrVo() != null && data.getJyrVo().getZs() != null) {
+				variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, data
+						.getJyrVo().getZs());
+			} else if (user != null && user.getZs() != null) {
+				variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, user
+						.getZs().getId());
+			}
 			WorkFlowParam param = new WorkFlowParam();
 			// 设置流程发起人
 			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zyfzns/GkzyfznsServiceImpl.java

@@ -22,12 +22,14 @@ import com.jtgh.yjpt.dao.jyr.JyrNsDao;
 import com.jtgh.yjpt.dao.zyfzndjy.GkwxhwzyfzblhhzbDao;
 import com.jtgh.yjpt.dao.zyfzns.GkzyfznsDao;
 import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.TaskInfoEntity;
 import com.jtgh.yjpt.entity.jyr.JyrNsEntity;
 import com.jtgh.yjpt.entity.zyfzndjy.GkwxhwzyfzblhhzEntity;
 import com.jtgh.yjpt.entity.zyfzns.Gkwxhwzyfzns;
 import com.jtgh.yjpt.service.common.WorkflowMangerService;
 import com.jtgh.yjpt.service.impl.BaseWorkFlowServiceImpl;
+import com.jtgh.yjpt.service.impl.common.WorkflowMangerServiceImpl;
 import com.jtgh.yjpt.service.task.TaskService;
 import com.jtgh.yjpt.service.zyfzndjy.GkwxhwzyfzblhhzService;
 import com.jtgh.yjpt.service.zyfzns.GkzyfznsService;
@@ -78,6 +80,14 @@ public class GkzyfznsServiceImpl extends
 			variables.put("role_sc", Constants.ROLE_TYPE_CITY_SC);
 			variables.put("role_sh", Constants.ROLE_TYPE_CITY_SH);
 			variables.put("role_pz", Constants.ROLE_TYPE_CITY_PZ);
+			UserEntity user = Utils.getCurrentUser();
+			if (data.getJyr() != null && data.getJyr().getZs() != null) {
+				variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, data
+						.getJyr().getZs());
+			} else if (user != null && user.getZs() != null) {
+				variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, user
+						.getZs().getId());
+			}		
 			WorkFlowParam param = new WorkFlowParam();
 			// 设置流程发起人
 			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/zysqbp/ZysqbpServiceImpl.java

@@ -54,6 +54,7 @@ import com.jtgh.yjpt.entity.zysqbp.ZysqbpEntity;
 import com.jtgh.yjpt.entity.zysqbp.ZysqbpGatherEntity;
 import com.jtgh.yjpt.service.common.WorkflowMangerService;
 import com.jtgh.yjpt.service.impl.BaseWorkFlowServiceImpl;
+import com.jtgh.yjpt.service.impl.common.WorkflowMangerServiceImpl;
 import com.jtgh.yjpt.service.zyfzndjy.AutoAuditService;
 import com.jtgh.yjpt.service.zysqbp.ZysqbpService;
 import com.yjpt.util.DateUtil;
@@ -332,6 +333,15 @@ public class ZysqbpServiceImpl extends
 			} else {
 				Map<String, Object> variables = new HashMap<String, Object>();
 				variables.put("role_xssc", Constants.ROLE_TYPE_CITY_XSSC);
+				//站所
+				UserEntity user = Utils.getCurrentUser();
+				if (data.getZydw() != null && data.getZydw().getZs() != null) {
+					variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, data
+							.getZydw().getZs());
+				} else if (user != null && user.getZs() != null) {
+					variables.put(WorkflowMangerServiceImpl.KEY_ZS_ID, user
+							.getZs().getId());
+				}
 				WorkFlowParam param = new WorkFlowParam();
 				// 设置流程发起人
 				if (StringUtils.isEmpty(param