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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -115,7 +115,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
-				if(isJyr()){
+				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
 				}
 
@@ -192,7 +192,7 @@ public class LhbgCtl extends BaseWebCtl {
 		model.addAttribute("flag", flag);
 		LhbgEntity lhbg = lhbgService.findOne(id);
 		model.addAttribute("record", lhbg);
-		
+
 		List<LhbgfjEntity> list = lhbgfjService.findByBgid(lhbg.getId());
 		if (list != null && list.size() > 0) {
 			model.addAttribute("fjlist", list);
@@ -285,8 +285,7 @@ public class LhbgCtl extends BaseWebCtl {
 				}
 			}
 			// rtx提醒
-			// rtxSend(lhbgEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -321,8 +320,7 @@ public class LhbgCtl extends BaseWebCtl {
 			}
 			lhbgService.changeAudit(null, lhbgEntity, true);
 			// rtx提醒
-			// rtxSend(lhbgEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -340,7 +338,7 @@ public class LhbgCtl extends BaseWebCtl {
 		try {
 			// 逻辑删除
 			lhbgService.logicDelete(id);
-			
+
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -416,14 +414,17 @@ public class LhbgCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
 		WebJsonResult wr = success();
 		LhbgEntity entity = new LhbgEntity();
+		String role = "";
 		try {
 			entity = lhbgService.findOne(id);
-			Date today = new Date();
 			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, LhbgEntity.PROCESS_DEFINITION_KEY);
 			if (list != null & list.size() > 0) {
 				TaskInfoEntity taskinfo = list.get(0);
-
-				lhbgService.save(entity);
+				if ("kssc".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_FGLD;
+				} else if ("fgldsp".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_LD;
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);
@@ -439,8 +440,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 			} else {
 				// rtx提醒
-				// rtxSend(entity.getSzgq().getId(), role,
-				// "你有一条许可证变更待办事务，请及时处理！");
+				rtxSend("", role, "你有一条理货变更待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/service/impl/LhbgServiceImpl.java

@@ -49,8 +49,8 @@ public class LhbgServiceImpl extends BaseWorkFlowServiceImpl<LhbgEntity, String>
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			Map<String, Object> variables = new HashMap<String, Object>();
-			variables.put("role_ks", Constants.ROLE_LD);
-			variables.put("role_fgld", Constants.ROLE_LD);
+			variables.put("role_ks", Constants.ROLE_KS);
+			variables.put("role_fgld", Constants.ROLE_FGLD);
 			variables.put("role_ld", Constants.ROLE_LD);
 			WorkFlowParam param = new WorkFlowParam();
 			param.put(WorkFlowParam.DESCRIPTION, entity.getJyrmc() + "的理货变更");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -422,8 +422,7 @@ public class LhsqCtl extends BaseWebCtl {
 				}
 			}
 			// rtx提醒
-			// rtxSend(lhsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -474,8 +473,7 @@ public class LhsqCtl extends BaseWebCtl {
 			}
 			lhsqService.changeAudit(null, lhsqEntity, true);
 			// rtx提醒
-			// rtxSend(lhsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -489,13 +487,17 @@ public class LhsqCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
 		WebJsonResult wr = success();
 		LhsqEntity entity = new LhsqEntity();
+		String role = "";
 		try {
 			entity = lhsqService.findOne(id);
 			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, LhsqEntity.PROCESS_DEFINITION_KEY);
 			if (list != null & list.size() > 0) {
 				TaskInfoEntity taskinfo = list.get(0);
-
-				lhsqService.save(entity);
+				if ("kssc".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_FGLD;
+				} else if ("fgldsp".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_LD;
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);
@@ -511,8 +513,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 			} else {
 				// rtx提醒
-				// rtxSend(entity.getSzgq().getId(), role,
-				// "你有一条许可证变更待办事务，请及时处理！");
+				rtxSend("", role, "你有一条理货申请待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/impl/LhsqServiceImpl.java

@@ -49,8 +49,8 @@ public class LhsqServiceImpl extends BaseWorkFlowServiceImpl<LhsqEntity, String>
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			Map<String, Object> variables = new HashMap<String, Object>();
-			variables.put("role_ks", Constants.ROLE_LD);
-			variables.put("role_fgld", Constants.ROLE_LD);
+			variables.put("role_ks", Constants.ROLE_KS);
+			variables.put("role_fgld", Constants.ROLE_FGLD);
 			variables.put("role_ld", Constants.ROLE_LD);
 			WorkFlowParam param = new WorkFlowParam();
 			param.put(WorkFlowParam.DESCRIPTION, entity.getJyrmc() + "的理货申请");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -117,7 +117,7 @@ public class LhyxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("zcdz").as(String.class), "%" + bgdd + "%"));
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
-				if(isJyr()){
+				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
@@ -158,8 +158,6 @@ public class LhyxCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhyx/lhyxmain";
 	}
 
-	
-
 	// 新增
 	@RequestMapping(value = "/add")
 	public String add(Model model) {
@@ -309,8 +307,7 @@ public class LhyxCtl extends BaseWebCtl {
 				}
 			}
 			// rtx提醒
-			// rtxSend(lhyxEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货延续待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -321,7 +318,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(LhyxEntity code,  String accid) {
+	public WebJsonResult submitAudit(LhyxEntity code, String accid) {
 		WebJsonResult wr = success();
 		LhyxEntity lhyxEntity = new LhyxEntity();
 		try {
@@ -350,8 +347,7 @@ public class LhyxCtl extends BaseWebCtl {
 			}
 			lhyxService.changeAudit(null, lhyxEntity, true);
 			// rtx提醒
-			// rtxSend(lhyxEntity.getSzgq().getId(), Constants.ROLE_CLSC,
-			// "你有一条许可证变更待办事务，请及时处理！");
+			rtxSend("", Constants.ROLE_KS, "你有一条理货延续待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -443,13 +439,17 @@ public class LhyxCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
 		WebJsonResult wr = success();
 		LhyxEntity entity = new LhyxEntity();
+		String role = "";
 		try {
 			entity = lhyxService.findOne(id);
 			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, LhyxEntity.PROCESS_DEFINITION_KEY);
 			if (list != null & list.size() > 0) {
 				TaskInfoEntity taskinfo = list.get(0);
-
-				lhyxService.save(entity);
+				if ("kssc".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_FGLD;
+				} else if ("fgldsp".equals(taskinfo.getTaskKey())) {
+					role = Constants.ROLE_LD;
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);
@@ -465,8 +465,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 			} else {
 				// rtx提醒
-				// rtxSend(entity.getSzgq().getId(), role,
-				// "你有一条许可证变更待办事务，请及时处理！");
+				rtxSend("", role, "你有一条理货延续待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/service/impl/LhyxServiceImpl.java

@@ -49,9 +49,9 @@ public class LhyxServiceImpl extends BaseWorkFlowServiceImpl<LhyxEntity, String>
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			Map<String, Object> variables = new HashMap<String, Object>();
-			variables.put("role_ks", Constants.ROLE_LD);
-			variables.put("role_fgld", Constants.ROLE_HC);
-			variables.put("role_ld", Constants.ROLE_FH);
+			variables.put("role_ks", Constants.ROLE_KS);
+			variables.put("role_fgld", Constants.ROLE_FGLD);
+			variables.put("role_ld", Constants.ROLE_LD);
 			WorkFlowParam param = new WorkFlowParam();
 			param.put(WorkFlowParam.DESCRIPTION, entity.getJyrmc() + "的理货延续");