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

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

@@ -8,15 +8,15 @@ public class Constants {
 	/** 每级角色长度 */
 	public static final int ROLE_LENGTH = 3;
 	/** 超级管理员用户id */
-	public static final Long ADMIN_ID = 1l;
+	public static final Long ADMIN_ID = 1L;
 	/** 超级管理员角色ID */
-	public static final Long ROLE_ID_ADMIN = 1l;
+	public static final Long ROLE_ID_ADMIN = 1L;
 	/** 经营人管理员角色ID */
-	public static final Long ROLE_ID_JYR = 2l;
+	public static final Long ROLE_ID_JYR = 2L;
 	/** 评价机构管理员角色ID */
-	public static final Long ROLE_ID_PJJG = 3l;
+	public static final Long ROLE_ID_PJJG = 3L;
 	/** 建设单位管理员角色ID */
-	public static final Long ROLE_ID_JSDW = 4l;
+	public static final Long ROLE_ID_JSDW = 4L;
 	/** 经营人角色code */
 	public static final String RECORD_CODE_JYR = "9";
 	/** 评价机构角色code */
@@ -28,7 +28,7 @@ public class Constants {
 	/** 省级行政人员角色code */
 	public static final String ROLE_CODE_PROVINCE_XZRY = "800800800800800";
 	/** 省级所在地code */
-	public static final Long SZD_ID_PROVINCE = 900l;
+	public static final Long SZD_ID_PROVINCE = 900L;
 
 	/** 附证二维码地址 */
 	public static String FZ_QRCODE = "";
@@ -315,6 +315,8 @@ public class Constants {
 	public final static String TASK_ASSIGN = "1";
 	/** 未签收任务 */
 	public final static String TASK_CANDIDATE = "0";
+	/** 补签章 */
+	public final static String TASK_SIGNATURE = "2";
 
 	/** 注册提示信息 */
 	public final static Long GGDM_ID_REGIST_TIP = 11200014l;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -23,6 +23,11 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.flex.remoting.RemotingDestination;
 import org.springframework.flex.remoting.RemotingExclude;
@@ -117,11 +122,15 @@ public class DcController extends BaseController {
 				Operator.LIKE);
 		addNotEmptyModel(filterList, "recordStatus",
 				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
-		Specification<DcEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
-		pageRequest = new SinglePageRequest(pageRequest.getPageNumber(),pageRequest.getPageSize(), 
-				"desc", "sj");
-		Page<DcEntity> page = dcService.findAll(spec, pageRequest);
+		Specification<DcEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
+		
+		List<Order> orders = new ArrayList<Order>();
+		orders.add(new Order(Direction.DESC,"sj"));
+		orders.add(new Order(Direction.DESC,"id"));
+		Pageable pageAble = new PageRequest(pageRequest.getPageNumber(),pageRequest.getPageSize(),new Sort(orders));
+		//pageRequest = new SinglePageRequest(pageRequest.getPageNumber(),pageRequest.getPageSize(), "desc", "sj");
+		
+		Page<DcEntity> page = dcService.findAll(spec, pageAble);
 		for (DcEntity ba : page) {
 			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId()
 					.toString(), ba.getId().toString()) != null) {

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

@@ -75,6 +75,7 @@ import com.jtgh.yjpt.controller.sgalgl.PoiUtils;
 import com.jtgh.yjpt.dao.task.GztxDao;
 import com.jtgh.yjpt.dao.zysqbp.ZysqbpBgDao;
 import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.RoleEntity;
 import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.bagl.yjyaba.YjyabaEntity;
 import com.jtgh.yjpt.entity.common.AccessoryEntity;
@@ -251,79 +252,60 @@ public class ZysqbpController extends BaseController {
 			Specification<ZysqbpEntity> spec = new Specification<ZysqbpEntity>() {
 
 				@Override
-				public Predicate toPredicate(Root<ZysqbpEntity> root,
-						CriteriaQuery<?> query, CriteriaBuilder cb) {
+				public Predicate toPredicate(Root<ZysqbpEntity> root,CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
-					addRecordCodeFilter(functionId, cb, root, list, null,
-							"zydw");
-					list.add(cb.notEqual(
-							root.get("recordStatus").as(String.class),
+					addRecordCodeFilter(functionId, cb, root, list, null,"zydw");
+					list.add(cb.notEqual(root.get("recordStatus").as(String.class),
 							BaseEntity.RECORD_STATE_DELETE));
-					if (BaseEntity.RECORD_STATE_DELETE != entity
-							.getRecordStatus()) {
-						list.add(cb.equal(
-								root.get("recordStatus").as(String.class),
+					if (BaseEntity.RECORD_STATE_DELETE != entity.getRecordStatus()) {
+						list.add(cb.equal(root.get("recordStatus").as(String.class),
 								String.valueOf(entity.getRecordStatus())));
 					}
 					if (null != entity.getBh() && !"".equals(entity.getBh()))
-						list.add(cb.like(root.get("bh").as(String.class), "%"
-								+ entity.getBh() + "%"));
+						list.add(cb.like(root.get("bh").as(String.class), "%" + entity.getBh() + "%"));
 					if (null != entity.getCm() && !"".equals(entity.getCm()))
-						list.add(cb.like(root.get("cm").as(String.class), "%"
-								+ entity.getCm() + "%"));
-					if (null != entity.getWxwpmc()
-							&& !"".equals(entity.getWxwpmc()))
-						list.add(cb.like(root.get("wpbh").as(String.class), "%"
-								+ entity.getWxwpmc() + "%"));
-					if (null != entity.getWxhwmcbh()
-							&& !"".equals(entity.getWxhwmcbh()))
-						list.add(cb.like(root.get("wxhwmcbh").as(String.class),
-								"%" + entity.getWxhwmcbh() + "%"));
+						list.add(cb.like(root.get("cm").as(String.class), "%" + entity.getCm() + "%"));
+					if (null != entity.getWxwpmc() && !"".equals(entity.getWxwpmc()))
+						list.add(cb.like(root.get("wpbh").as(String.class), "%" + entity.getWxwpmc() + "%"));
+					if (null != entity.getWxhwmcbh() && !"".equals(entity.getWxhwmcbh()))
+						list.add(cb.like(root.get("wxhwmcbh").as(String.class), "%" + entity.getWxhwmcbh() + "%"));
 					if (null != entity.getZydw()) {
-						list.add(cb.equal(
-								root.get("zydw").get("id").as(String.class),
+						list.add(cb.equal(root.get("zydw").get("id").as(String.class),
 								entity.getZydw().getId()));
 					}
 					if (null != gkdw && !"".equals(gkdw))
-						list.add(cb.like(
-								root.get("zydw").get("gkjyr").as(String.class),
+						list.add(cb.like(root.get("zydw").get("gkjyr").as(String.class),
 								"%" + gkdw + "%"));
 					if (entity.getMao() != null && !entity.getMao().equals("")) {
 						list.add(cb.equal(root.get("mao").as(String.class),
 								entity.getMao()));
 					}
 					if (null != entity.getSzd())
-						list.add(cb.like(
-								root.get("szd").get("id").as(String.class),
+						list.add(cb.like(root.get("szd").get("id").as(String.class),
 								entity.getSzd().getId() + "%"));
 					if (null != entity.getSzgq())
 						list.add(cb.equal(root.get("szgq").as(GqEntity.class),
 								entity.getSzgq()));
 					if (bgsj1 != null)
-						list.add(cb.greaterThanOrEqualTo(
-								root.get("bgsj").as(Date.class), bgsj1));
+						list.add(cb.greaterThanOrEqualTo(root.get("bgsj").as(Date.class), bgsj1));
 					if (bgsj2 != null)
 						list.add(cb.lessThan(root.get("bgsj").as(Date.class),
 								DateUtil.addDate(bgsj2, 1)));
 					if (kgsj1 != null)
-						list.add(cb.greaterThanOrEqualTo(
-								root.get("kgsj").as(Date.class), kgsj1));
+						list.add(cb.greaterThanOrEqualTo(root.get("kgsj").as(Date.class), kgsj1));
 					if (kgsj2 != null)
 						list.add(cb.lessThan(root.get("kgsj").as(Date.class),
 								DateUtil.addDate(kgsj2, 1)));
 					if (wgsj1 != null)
-						list.add(cb.greaterThanOrEqualTo(
-								root.get("wgsj").as(Date.class), wgsj1));
+						list.add(cb.greaterThanOrEqualTo(root.get("wgsj").as(Date.class), wgsj1));
 					if (wgsj2 != null)
 						list.add(cb.lessThan(root.get("wgsj").as(Date.class),
 								DateUtil.addDate(wgsj2, 1)));
 					if (Constants.YES.equals(Utils.getCurrentUser().getSfcd())) {
-						list.add(cb.equal(
-								root.get("addUser").as(UserEntity.class),
+						list.add(cb.equal(root.get("addUser").as(UserEntity.class),
 								Utils.getCurrentUser()));
 					}
-					list = Utils.setAuditNameSpec(list, cb, query, root,
-							lcStatus, name);
+					list = Utils.setAuditNameSpec(list, cb, query, root,lcStatus, name);
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -331,49 +313,66 @@ public class ZysqbpController extends BaseController {
 			long cost = System.currentTimeMillis() - startTime;
 			// System.err.println(url + ",cost:"+cost);
 			LOGGER.info(url + "<SUCCESS> (findAll()) cost:" + cost);
-			//
-			List<Boolean> sfsbList = new ArrayList<Boolean>();
+			
+			List<Boolean> sfsbList = new ArrayList<Boolean>();//用于集装箱企业申报信息颜色显示用
+			
 			for (ZysqbpEntity ba : pageList) {
-				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw()
-						.getId(), ba.getWxwpmc()));
-				if (ba.getRecordStatus() == BaseEntity.RECORD_STATE_QXSUBMIT) {// 取消作业对应的流程
-					if (zysqqxService.getTaskByUserAndBusKey(Utils
-							.getCurrentUser().getId().toString(), ba.getId()
-							.toString()) != null) {
+				sfsbList.add(zysqbpService.doCheckJyrAndWxp(ba.getZydw().getId(), ba.getWxwpmc()));
+				
+				// 取消作业对应的流程
+				if (ba.getRecordStatus() == BaseEntity.RECORD_STATE_QXSUBMIT) {
+					if (zysqqxService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(),
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_ASSIGN);
-					} else if (zysqqxService.getCandidateTaskByUserAndBusKey(
-							Utils.getCurrentUser().getId().toString(), ba
-									.getId().toString()) != null) {
+					} 
+					else if (zysqqxService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(),
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_CANDIDATE);
 					}
-				} else if (ba.getRecordStatus() == BaseEntity.RECORD_STATE_BGSUBMIT) {// 变更作业对应的流程
-					if (zysqbgService.getTaskByUserAndBusKey(Utils
-							.getCurrentUser().getId().toString(), ba.getId()
-							.toString()) != null) {
+				}
+				// 变更作业对应的流程
+				else if (ba.getRecordStatus() == BaseEntity.RECORD_STATE_BGSUBMIT) {
+					if (zysqbgService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(),
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_ASSIGN);
-					} else if (zysqbgService.getCandidateTaskByUserAndBusKey(
-							Utils.getCurrentUser().getId().toString(), ba
-									.getId().toString()) != null) {
+					} else if (zysqbgService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(),
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_CANDIDATE);
 					}
-				} else {
-					if (zysqbpService.getTaskByUserAndBusKey(Utils
-							.getCurrentUser().getId().toString(), ba.getId()
-							.toString()) != null) {
+				}
+				//如何系统启用了签章功能
+				//如果申报已审批完成，判断当前登录账号角色（所在地的限制在列表展现数据的是有已经进行了筛选）是否有审批处理权限，
+				//如果有权限，则审批完成后也具有补签章的权限。
+				else if(GlobalData.iSignature.equals("Y") &&
+						(ba.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED || 
+						 ba.getRecordStatus() == BaseEntity.RECORD_STATE_BGCOMPLETED )){
+					List<RoleEntity> curUserOwnRoles = Utils.getCurrentUser().getRoles();
+					for(RoleEntity roleEntity : curUserOwnRoles){
+						if(roleEntity.getName().equals("形式审查")){
+							ba.setTaskState(Constants.TASK_SIGNATURE);
+							break;
+						}
+					}
+				}
+				//RECORD_STATUS=3 待处理状态
+				else {
+					if (zysqbpService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), 
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_ASSIGN);
-					} else if (zysqbpService.getCandidateTaskByUserAndBusKey(
-							Utils.getCurrentUser().getId().toString(), ba
-									.getId().toString()) != null) {
+					} else if(zysqbpService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser().getId().toString(), 
+							ba.getId().toString()) != null) {
 						ba.setTaskState(Constants.TASK_CANDIDATE);
 					}
 				}
+				
 				if (ba.getTaskList() != null && ba.getTaskList().size() > 0) {
 					ba.getTaskList().get(0);
 				}
 				if (ba.getZdtaskList() != null && ba.getZdtaskList().size() > 0) {
 					ba.getZdtaskList().get(0);
 				}
-			}
+			}//end for 设置taskState用于列表最后的操作按钮
+			
 			for (ZysqbpEntity vo : pageList) {
 				// 检索附件
 				filterList = new ArrayList<PredicateModel>();

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/dao/check/ZcDao.java

@@ -24,8 +24,8 @@ public interface ZcDao extends MyRepository<ZcEntity, Long> {
 	@Query(value = "SELECT G.GQMC,"
 			+ " SUM(Z.CCYHS)/(CASE WHEN COUNT(Z.ID)=0 THEN 1 ELSE COUNT(Z.ID)/COUNT(DISTINCT(Z.ID)) END),"
 			+ " COUNT(DISTINCT(D.ID)) " + " FROM T_YJPT_GQ G "
-			+ " LEFT JOIN T_YJPT_ZC Z ON G.ID=Z.SZGQ AND Z.RECORD_STATUS!=9 AND ?1<=Z.ADD_DATE AND Z.ADD_DATE<=?3 "
-			+ " LEFT JOIN T_YJPT_DC D ON G.ID=D.SZGQ AND D.RECORD_STATUS!=9 AND ?1<=D.ADD_DATE AND D.ADD_DATE<=?3 "
+			+ " LEFT JOIN T_YJPT_ZC Z ON G.ID=Z.SZGQ AND Z.RECORD_STATUS!=9 AND ?2<=Z.ADD_DATE AND Z.ADD_DATE<=?3 "
+			+ " LEFT JOIN T_YJPT_DC D ON G.ID=D.SZGQ AND D.RECORD_STATUS!=9 AND ?2<=D.ADD_DATE AND D.ADD_DATE<=?3 "
 			+ " WHERE G.SZD like ?1 AND G.RECORD_STATUS!=9 GROUP BY G.GQMC ORDER BY G.GQMC", nativeQuery = true)
 	public List<Object[]> countZcdc(String szd,Date ks,Date js);
 

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

@@ -42,6 +42,7 @@ wf.qytj=\u4f01\u4e1a\u63d0\u4ea4
 
 task.complete=\u529e\u7406
 task.assign=\u7b7e\u6536
+task.signature=\u8865\u7b7e\u7ae0
 
 whzyfzsq-city=\u5371\u9669\u8d27\u7269\u4f5c\u4e1a\u9644\u8bc1\u7533\u8bf7
 whzyfzsq.name=\u5371\u9669\u8d27\u7269\u4f5c\u4e1a\u9644\u8bc1\u7533\u8bf7

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

@@ -32,7 +32,7 @@
 	<context-param>
 		<description>是否在危险品审批中启用签章功能(Y/N)</description>
 		<param-name>iSignature</param-name>
-		<param-value>N</param-value>
+		<param-value>Y</param-value>
 	</context-param>
 	<context-param>
 		<description>是否关闭经营人：码头、泊位、储罐、堆场的可编辑功能（增、删、改、复制）(Y/N)</description>
@@ -78,7 +78,7 @@
 	<context-param>
 		<description>默认密码</description>
 		<param-name>default_password</param-name>
-		<param-value>yjpt.123</param-value>
+		<param-value>123456</param-value>
 	</context-param>
 	<context-param>
 		<description>上传文件大小(M)</description>