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

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

@@ -1181,7 +1181,7 @@ public class ZysqbpController extends BaseController {
 				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		try {
 			BusinessContext bc = createBusinessContext();
-			if (null == vo.getId() || vo.getId().equals(0l)) {
+			if (null == vo.getId() || vo.getId().equals(0L)) {
 				vo.setAddDate(new Date());
 				vo.setAddUser(Utils.getCurrentUser());
 				vo.setRecordCode(getCurrentRoleCode(functionId));
@@ -1189,6 +1189,7 @@ public class ZysqbpController extends BaseController {
 				vo.setUpdateDate(new Date());
 				vo.setUpdateUser(Utils.getCurrentUser());
 			}
+			
 			vo = zysqbpService.saveEntity(vo);
 			long cost = System.currentTimeMillis() - startTime;
 			LOGGER.info(url + "<SUCCESS> (save ) cost:" + cost);
@@ -1218,6 +1219,29 @@ public class ZysqbpController extends BaseController {
 				+ "."
 				+ Thread.currentThread().getStackTrace()[2].getMethodName();
 		BusinessContext bc = createBusinessContext();
+		
+		
+		/***********从开工、完工报处调用save函数才需要执行这边代码****plus by xh-2016-11-02*************/
+		//开工报
+		if(vo.getKgzt().equals("K")){//为这个值表明是在填写开工报，在flex页面save处特别设置的
+			vo.setKgzt("Y");
+			//开工报填报人
+			if(vo.getSr()==null && Constants.YES.equals(Utils.getCurrentUser().getSfjyr())){
+				//经营人账户登陆只可以填报一次 ，管理员账号登陆可以修改，但是管理员肯定不是开工、完工报填写人
+				vo.setSr(Utils.getCurrentUser().getName());
+			}
+		}
+		//完工报 
+		if(vo.getWgzt().equals("W")){
+			vo.setWgzt("Y");
+			if(vo.getFr()==null && Constants.YES.equals(Utils.getCurrentUser().getSfjyr())){
+				//经营人账户登陆只可以填报一次 ，管理员账号登陆可以修改，但是管理员肯定不是开工、完工报填写人
+				vo.setFr(Utils.getCurrentUser().getName());
+			}
+		}
+		/*-------------------------------------------------------------------------------*/
+		
+		
 		vo = zysqbpService.saveKgwg(vo);
 		// 同步到省级
 		if (Constants.DEPLOY_MODE_CITY.equals(GlobalData.DEPLOY_MODE)

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zysqbp/ZysqbpEntity.java

@@ -19,6 +19,7 @@ import org.springframework.flex.remoting.RemotingExclude;
 
 import com.jtgh.yjpt.common.Constants;
 import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.auth.UserEntity;
 import com.jtgh.yjpt.entity.common.AccessoryEntity;
 import com.jtgh.yjpt.entity.common.CodeEntity;
 import com.jtgh.yjpt.entity.common.TaskInfoEntity;
@@ -145,7 +146,57 @@ public class ZysqbpEntity extends BaseEntity<Long> {
 	private String bz;
 	/** 集装箱号*/
 	private String jzxxh;
+	
+	
+	/*******************************新增字段用于记录开工报、完工报填报人  plus by xh-2016-11-02**************************************/
+	/**  开工报填报人ID */
+//	private UserEntity sr;//start_reporter 之前这么写和flex的vo映射不了，不知道为啥，因为太长、有“_”？ 
+//	
+//	@ManyToOne(fetch = FetchType.LAZY, targetEntity = UserEntity.class)
+//	@JoinColumn(name = "sr")
+//	@RemotingExclude 
+//	public UserEntity getSr() {
+//		return sr;
+//	}
+//	
+//	public void setSr(UserEntity sr) {
+//		this.sr = sr;
+//	}
+	
+	/** 完工报填报人ID*/
+//	private UserEntity fr;
+//	
+//	@ManyToOne(fetch = FetchType.LAZY, targetEntity = UserEntity.class)
+//	@JoinColumn(name = "fr")
+//	@RemotingExclude 
+//	public UserEntity getFr() {
+//		return fr;
+//	}
+//	
+//	public void setFr(UserEntity fr) {
+//		this.fr = fr;
+//	}
+    //以上用ID的方式不行，会与user表进行连表查询会报错，但是省级数据库user表并没有与市级同步，会报错，所以这边是直接用名字吧
+	
+	private String sr;
+	public String getSr() {
+		return sr;
+	}
+	public void setSr(String sr) {
+		this.sr = sr;
+	}
 
+	private String fr;
+	public String getFr() {
+		return fr;
+	}
+	public void setFr(String fr) {
+		this.fr = fr;
+	}
+
+	
+	/*-------------------------------新增字段用于记录开工报、完工报填报人 end -------------------------------------------------------------*/
+	
 	public String getCnno() {
 		return cnno;
 	}

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

@@ -8573,7 +8573,7 @@ Alter TABLE T_YJPT_JYRXX_BW ADD JGXS2 NUMBER;
 
 --港区增加水系类型0701
 DELETE FROM T_YJPT_GGDM WHERE ID>=2204 AND ID<=2207;
-Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
+Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CRODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2204,null,'SXLX',null,1,'SXLX.CJGL',null,null,null,null,1,null,null,null,null,null,' 长江干流',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2205,null,'SXLX',null,2,'SXLX.HHSX',null,null,null,null,1,null,null,null,null,null,' 淮河水系',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2206,null,'SXLX',null,3,'SXLX.CJZL',null,null,null,null,1,null,null,null,null,null,' 长江支流',null,null,'0',null,null,null,null,null);
 Insert into T_YJPT_GGDM (ID,FID,GROUPCODE,CODE,PX,MC,ADD_USER,ADD_DATE,UPDATE_USER,UPDATE_DATE,RECORD_STATUS,SFTB,TBZT,TBDYID,QYLB,SSQY,BZ,SZD,GQ,RECORD_CODE,BYZD1,BYZD2,BYZD3,BYZD4,BYZD5) values (2207,null,'SXLX',null,4,'SXLX.QTSX',null,null,null,null,1,null,null,null,null,null,' 其他水系',null,null,'0',null,null,null,null,null);
@@ -8605,4 +8605,9 @@ alter  table T_GKHS_BZHWAQSYD modify sbdwbh varchar2(30);
 alter  table T_GKHS_SZGTAQSYD modify sbdwbh varchar2(30);
 alter  table T_GKHS_SZYTAQSYD modify sbdwbh varchar2(30);
 </#if>
-
+<#if versionDate?date("yyyyMMdd") lt "20161102"?date("yyyyMMdd")>
+Alter TABLE T_YJPT_WXHWGKZYSBD ADD SR VARCHAR2(100);
+Alter TABLE T_YJPT_WXHWGKZYSBD ADD FR VARCHAR2(100);
+COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.SR IS '开工报填报人StartReport';
+COMMENT ON COLUMN T_YJPT_WXHWGKZYSBD.FR IS '完工报填报人FinishReport';
+</#if>

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

@@ -7,7 +7,7 @@
 	<context-param>
 		<description>系统版本</description>
 		<param-name>version</param-name>
-		<param-value>4.0.0</param-value>
+		<param-value>4.2.0</param-value>
 	</context-param>
 	<context-param>
 		<description>0:省级;1:市级</description>