剧毒化学品和重大危险源备案

git-svn-id: https://192.168.57.71/svn/lyggkj@122 1a6f6e3a-4066-fe46-b609-79c204482ece

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjHxAudit.mxml

@@ -299,8 +299,8 @@
 							<s:Label id="JDHXPZDWXY_FJ3" name="{Constants.GGDM_ID_YJYABA_FJ3}" text="缺" color="#ff0000"/>
 						</s:HGroup>
 						<s:HGroup  width="100%" verticalAlign="middle" > 
-							<cus:QLabel text="{resourceManager.getString('bagl','zdwxyba.sqhxly')}" width="15%" textAlign="right"/>
-							<cus:QTextArea id="sqhxly" width="85%" height="80" textAlign="left" text="@{_gqnwxydjbabVo.sqhxly}" enabled="false"/>
+							<cus:QLabel text="{resourceManager.getString('bagl','zdwxyba.sqhxly')}" width="100" textAlign="right"/>
+							<cus:QTextArea id="sqhxly" width="450" height="80" textAlign="left" text="@{_gqnwxydjbabVo.sqhxly}" enabled="false"/>
 						</s:HGroup>
 					</s:VGroup>
 				</s:BorderContainer>

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/bagl/jdhxpandzdwxyba/JdhxpZdwxyBadjController.java

@@ -888,8 +888,8 @@ public class JdhxpZdwxyBadjController extends BaseController {
 	public BusinessContext doHxPass(Boolean ifPass, GqnwxydjbabEntity ba,
 			GqnwxydjbabFlowEntity baFlow, String shyj, Date shsj) {
 		if (djbaFlowService.getCandidateTaskByUserAndBusKey(Utils.getCurrentUser()
-				.getId().toString(), ba.getId().toString()) != null) {
-			djbaFlowService.claim(ba.getId().toString(), Utils.getCurrentUser()
+				.getId().toString(), baFlow.getId().toString()) != null) {
+			djbaFlowService.claim(baFlow.getId().toString(), Utils.getCurrentUser()
 					.getId().toString());
 		}
 		BusinessContext bc = createBusinessContext();
@@ -906,10 +906,22 @@ public class JdhxpZdwxyBadjController extends BaseController {
 			djbaFlowService.logicDelete(baFlow.getId());
 			if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)
 					&& Constants.YES.equals(GlobalData.JAXWS_SYNC)) {
-				JdwxphzdwxybaWebService webService = djbaService
-						.getWebService();
-				if (null != webService) {
-					webService.delete(ba.getId());
+				try {
+					JdwxphzdwxybaWebService webService = djbaService
+							.getWebService();
+					ba =  djbaService.findById(ba.getId());
+					if (null != webService) {
+						webService.delete(ba.getId());
+						ba.setTbzt(Constants.YES);
+						djbaService.save(ba);
+					} else {
+						ba.setTbzt(Constants.NO);
+						djbaService.save(ba);
+					}
+				} catch (Exception e) {
+					ba.setTbzt(Constants.NO);
+					djbaService.save(ba);
+					e.printStackTrace();
 				}
 			}
 		} else {