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

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/zysqbp/ZysqbpEdit.mxml

@@ -177,6 +177,7 @@
 				zysqbp.zysjq=zysjq.dateTime;
 				zysqbp.zysjz=zysjz.dateTime;
 				zysqbp.inorout = jcg.textValue as String;
+				zysqbp.lhxz = lhxz.text;
 				zysqbp.aqffcs = tsyqhsm.text;
 				zysqbp.cm=cm.text;
 				zysqbp.zywtr=zywtr.text;

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/common/systimer/SysSynTimer.java

@@ -1,5 +1,6 @@
 package com.jtgh.yjpt.common.systimer;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,7 +127,9 @@ public class SysSynTimer {
 				}
 			} else if (Constants.DEPLOY_MODE_PROVINCE
 					.equals(GlobalData.DEPLOY_MODE)) {
-				List<AccessoryEntity> list = accessoryService.sjSynFail();
+				//安全评价备案之省局往 市局同步的数据过滤 掉 
+				//List<AccessoryEntity> list = accessoryService.sjSynFail();
+				List<AccessoryEntity> list = new ArrayList<AccessoryEntity>();
 				for (AccessoryEntity accessoryEntity : list) {
 					String tbzt = Constants.YES;
 					List<CodeEntity> szdList = InitServlet.groupcodeMap

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/auth/AuthenticateController.java

@@ -134,6 +134,7 @@ public class AuthenticateController extends BaseController {
 			bc.setAttribute("uploadFileSize", GlobalData.UPLOAD_FILE_SIZE);
 			bc.setAttribute("uploadImageSize", GlobalData.UPLOAD_IMAGE_SIZE);
 			bc.setAttribute("btyyj", codeService.findOne(11200015l).getBz());
+			bc.setAttribute("thyj", codeService.findOne(11200016l).getBz());
 		} else {
 			bc.setAttribute("status", true);
 			// bc.setAttribute("user", user);
@@ -386,6 +387,7 @@ public class AuthenticateController extends BaseController {
 		bc.setAttribute("uploadFileSize", GlobalData.UPLOAD_FILE_SIZE);
 		bc.setAttribute("uploadImageSize", GlobalData.UPLOAD_IMAGE_SIZE);
 		bc.setAttribute("btyyj", codeService.findOne(11200015l).getBz());
+		bc.setAttribute("thyj", codeService.findOne(11200016l).getBz());
 		bc.setAttribute("version", GlobalData.APP_VERSION);
 		if (Constants.NO.equals(user.getSfjyr())) {
 			// 非经营人

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

@@ -4286,7 +4286,7 @@ public class ZysqbpController extends BaseController {
 			entity2.setrNum(wxhwpmEntity.getId());
 			memService.save(entity2);
 		} else {
-			memService.updateMem(wxhwpmEntity.getLhxz(), new Date(), memList2
+			memService.updateMem(wxhwpmEntity.getAqffcs(), new Date(), memList2
 					.get(0).getId());
 		}
 		return createBusinessContext();