岗位说明书-非发布状态的不显示

com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/report2/Report2Gener.java

@@ -205,12 +205,13 @@ public class Report2Gener {
 		List<String> lists = new LinkedList<>();
 		List<RowMap> nodeRowMaps = DBSql.getMaps(
 				"SELECT NODEID,NODENAME,ITSYSVAL,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
-						+  UserContext.fromUID(userId).getUserModel().getPositionName()+ "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%'");
+						+  UserContext.fromUID(userId).getUserModel().getPositionName()+ "%'");
 		for (RowMap rowMap:
 				nodeRowMaps) {
 			String plid = rowMap.getString("PLID");
 			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plid);
-			if (!lists.contains(plid)&&!palRepositoryModel.isStop()){
+			RowMap plid_s= DBSql.getMap("select * from app_act_coe_pal_repository where ID = '" + rowMap.getString("PLID") + "'");
+			if (!lists.contains(plid)&&palRepositoryModel.isPublish()&&plid_s.getString("ISSTOP").equals("0")){
 				lists.add(plid);
 			}
 		}
@@ -219,6 +220,22 @@ public class Report2Gener {
 		orReportComment.getCommentContent(dataMap, shapesMap, shapeId,userId);	//获取一些公共的数据(手册首页的手册岗位名称、部门、公司、时间、岗位职责等)
 		System.out.println("size>>>>>>>>"+lists.size());
 		JSONArray positionTable 		= new JSONArray();	//列表数据
+		if (lists.size()==0){
+
+			JSONArray repositoryTable 		= new JSONArray();	//相关流程
+			JSONArray repositoryShapeTable 	= new JSONArray();	//流程步骤
+			JSONArray institutionTable 		= new JSONArray();	//相关制度
+			JSONArray formTable 			= new JSONArray();	//相关表单
+			JSONArray itsystemTable 		= new JSONArray();	//相关IT系统
+			JSONArray KPITable 				= new JSONArray();	//相关绩效考核
+
+
+
+			//这个代码是为了解决  岗位参与执行的流程存储
+			JSONObject _tr = new JSONObject(new LinkedHashMap<>());
+			_tr.put("nums",  1);
+
+		}
 		for (int q =0;q< lists.size();q++){
 
 
@@ -251,7 +268,7 @@ public class Report2Gener {
 
 			List<RowMap> nodeRowMaps_shape = DBSql.getMaps(
 					"SELECT * FROM (SELECT NODEID,NODENAME,ITSYSVAL,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
-							+ UserContext.fromUID(userId).getUserModel().getPositionName() + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%') WHERE PLID = '" + lists.get(q) + "'");
+							+ UserContext.fromUID(userId).getUserModel().getPositionName() + "%') WHERE PLID = '" + lists.get(q) + "'");
 			int m = 1;
 			for (RowMap rowMap :
 					nodeRowMaps_shape) {
@@ -576,7 +593,6 @@ public class Report2Gener {
 			if (relationFileId.equals("")) {
 				continue;
 			}
-
 			List<DesignerShapeRelationModel> relationModelList = dao.getModelListByRelationShapeId(relationFileId, "00000000-0000-0000-0000-000000000000"); // 关联信息
 			if (relationModelList != null && relationModelList.size() > 0) {
 				PALRepositoryModel relationModel = (PALRepositoryModel) CoeProcessLevelDaoFacotory.createCoeProcessLevel().getInstance(relationFileId);

com.actionsoft.apps.coe.pal.output.or/src/com/actionsoft/apps/coe/pal/output/or/util/OrReportComment.java

@@ -11,7 +11,9 @@ import java.util.Set;
 
 import com.actionsoft.apps.coe.pal.pal.output.util.OutputWordUtil;
 import com.actionsoft.apps.coe.pal.pal.repository.PALRepositoryQueryAPIManager;
+import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
 import com.actionsoft.apps.coe.pal.pal.repository.designer.util.ShapeUtil;
+import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.bpms.commons.database.RowMap;
 import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.bpms.util.DBSql;
@@ -63,19 +65,29 @@ public class OrReportComment {
 		String positionName = userContext.getUserModel().getPositionName();
 		List<RowMap> nodeRowMaps = DBSql.getMaps(
 				"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
-						+  positionName+ "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%'");
+						+  positionName+ "%' ");
 		List<RowMap> nodeRowMap_process = DBSql.getMaps(
 				"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
-						+  positionName+ "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%'");
+						+  positionName+ "%'");
 		List<String> list = new ArrayList<>();
 		for (RowMap rowMap:
 				nodeRowMap_process) {
 			String plid = rowMap.getString("PLID");
-			if (!list.contains(plid)){
+			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(rowMap.getString("PLID"));
+			if (!list.contains(plid)&&palRepositoryModel.isPublish()&&!palRepositoryModel.isStop()){
 				list.add(plid);
 			}
 		}
-		dataMap.put("activity_nums", nodeRowMaps.size());// 参数的活动数
+		List<RowMap> list1 = new ArrayList<>();
+		for (RowMap rowMap:
+		nodeRowMaps) {
+			String plid = rowMap.getString("PLID");
+			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(rowMap.getString("PLID"));
+			if (palRepositoryModel.isPublish()){
+				list1.add(rowMap);
+			}
+		}
+		dataMap.put("activity_nums", list1.size());// 参数的活动数
 		dataMap.put("process_nums", list.size());// 参与的流程数
 		dataMap.put(OutputWordUtil.COMPANY, "公司");	//所属公司
 		//创建日期