劇毒化學品核銷

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

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

@@ -104,8 +104,9 @@ public class JdhxpZdwxyBadjController extends BaseController {
 						CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					addRecordCodeFilter(functionId, cb, root, list);
-					//省局只检索已完成的数据
-					if(Constants.SZD_ID_PROVINCE.equals(Utils.getCurrentUserSzd())){
+					// 省局只检索已完成的数据
+					if (Constants.SZD_ID_PROVINCE.equals(Utils
+							.getCurrentUserSzd())) {
 						list.add(cb.equal(
 								root.get("recordStatus").as(String.class),
 								BaseEntity.RECORD_STATE_COMPLETED));
@@ -252,8 +253,9 @@ public class JdhxpZdwxyBadjController extends BaseController {
 					// root.get("addUser").as(UserEntity.class),
 					// Utils.getCurrentUser()));
 					// }
-					//省局只检索已完成的数据
-					if(Constants.SZD_ID_PROVINCE.equals(Utils.getCurrentUserSzd())){
+					// 省局只检索已完成的数据
+					if (Constants.SZD_ID_PROVINCE.equals(Utils
+							.getCurrentUserSzd())) {
 						list.add(cb.equal(
 								root.get("recordStatus").as(String.class),
 								BaseEntity.RECORD_STATE_COMPLETED));
@@ -373,7 +375,8 @@ public class JdhxpZdwxyBadjController extends BaseController {
 							wxysl + "",
 							null == entity.getGq() ? "" : entity.getGq()
 									.getGqmc(),
-							null == entity.getSzd() ? "" :entity.getSzd().getName() };
+							null == entity.getSzd() ? "" : entity.getSzd()
+									.getName() };
 				} else {
 					ss = new String[] {
 							i + "",
@@ -390,7 +393,8 @@ public class JdhxpZdwxyBadjController extends BaseController {
 							wxysl + "",
 							null == entity.getGq() ? "" : entity.getGq()
 									.getGqmc(),
-							null == entity.getSzd() ? "" : entity.getSzd().getName() };
+							null == entity.getSzd() ? "" : entity.getSzd()
+									.getName() };
 				}
 				strings.add(ss);
 				i++;
@@ -495,13 +499,12 @@ public class JdhxpZdwxyBadjController extends BaseController {
 			}
 			zlb.setDjbid(newDjba);
 			GqnwxyzlbEntity newZlb = zlbService.save(zlb);
-			
 
 			/* 保存剧毒化学品信息 */
 			jdhxpService.deleteByZlbid(newZlb.getId());
 			if (jdhxpList != null && jdhxpList.size() > 0) {
 				// 删除总览表下的数据
-				//jdhxpService.deleteByZlbid(newZlb.getId());
+				// jdhxpService.deleteByZlbid(newZlb.getId());
 				// String jdhxpIds="0";
 				for (ZlbzjdhxpxxEntity jdhxp : jdhxpList) {
 					if (null == jdhxp.getId() || jdhxp.getId() == 0) {
@@ -522,7 +525,7 @@ public class JdhxpZdwxyBadjController extends BaseController {
 			zdwxyService.deleteByZlbid(newZlb.getId());
 			if (zdwxyList != null && zdwxyList.size() > 0) {
 				// String zdwxyIds="0";
-				//zdwxyService.deleteByZlbid(newZlb.getId());
+				// zdwxyService.deleteByZlbid(newZlb.getId());
 				for (ZlbzzdwxyxxEntity zdwxy : zdwxyList) {
 					if (null == zdwxy.getId() || zdwxy.getId() == 0) {
 						zdwxy.setSzd(newZlb.getSzd());
@@ -656,7 +659,7 @@ public class JdhxpZdwxyBadjController extends BaseController {
 			djbaService.claim(data.getId().toString(), Utils.getCurrentUser()
 					.getId().toString());
 		}
-		 djbaService.changeAudit(shyj, shsj, data, flag);
+		djbaService.changeAudit(shyj, shsj, data, flag);
 		return null;
 	}
 
@@ -826,8 +829,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) {
+		if (djbaFlowService.getCandidateTaskByUserAndBusKey(Utils
+				.getCurrentUser().getId().toString(), ba.getId().toString()) != null) {
 			djbaFlowService.claim(ba.getId().toString(), Utils.getCurrentUser()
 					.getId().toString());
 		}
@@ -845,10 +848,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 {

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -37,7 +37,7 @@ jyr.jzzy.roleType=004
 #\u4f5c\u4e1a\u7533\u62a5\u7248\u672c\u65f6\u95f4YYYYMMDD
 zysb.version.date=20150508
 #\u9644\u8bc1\u5e74\u5ba1\u5f00\u59cb\u68c0\u6d4b\u5e74\u4efd
-fzns.check.date=2016
+fzns.check.date=2017
 #\u7763\u67e5\u662f\u5426\u5e02\u7ea7\u5ba1\u6279(Y/N)
 dc.sjsp=N
 #\u7763\u67e5\u662f\u5426\u5ef6\u671f\u6574\u6539(Y/N)

gkaq/yjpt-java/trunk/resources/sql/init/9.update.sql.ftl

@@ -612,5 +612,5 @@ update T_YJPT_JYRJCXX j set j.ZS=4201018 where j.SZD=420104;
 --港区数据所在水域修正
 Alter table t_yjpt_gq modify gqszsylx varchar(10);
 
---经营人的自动审批字段置为空
+--经营人的自动审批字段置为空 20160923
 update  t_yjpt_user u set u.byzd2="" where u.sfjyr='Y';