Antiloveg 8 years ago
parent
commit
f825eb666a

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TechWebsiteMapper.xml

@@ -173,7 +173,7 @@
   </update>
   
   <select id="selectTechWebsiteDetail" resultType="com.goafanti.techproject.bo.TechWebsiteDetailBo" parameterType="java.lang.String" >
-   SELECT t.id, t.account_number, t.department,t.password, t.uid, t.website, i.unit_name as unitName
+   SELECT t.id, t.account_number as accountNumber, t.department,t.password, t.uid, t.website, i.unit_name as unitName
 		from tech_website t LEFT JOIN organization_identity i on t.uid = i.uid 
     where t.id = #{id,jdbcType=VARCHAR}
   </select>

+ 11 - 0
src/main/java/com/goafanti/techproject/bo/InputTechProject.java

@@ -51,6 +51,9 @@ public class InputTechProject {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		consultant;
+	
+	@Size(min = 0, max = 255, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	private String approvalUrl;
      
 	public String getId() {
 		return id;
@@ -155,6 +158,14 @@ public class InputTechProject {
 	public void setConsultant(String consultant) {
 		this.consultant = consultant;
 	}
+
+	public String getApprovalUrl() {
+		return approvalUrl;
+	}
+
+	public void setApprovalUrl(String approvalUrl) {
+		this.approvalUrl = approvalUrl;
+	}
 	
 	
 

+ 4 - 2
src/main/java/com/goafanti/techproject/controller/TechProjectApiController.java

@@ -172,9 +172,11 @@ public class TechProjectApiController extends CertifyApiController {
 			return res;
 		}
 		
-		TechProject t = techProjectService.selectByPrimaryKey(techProject.getUid());
+		TechProject t = techProjectService.selectByPrimaryKey(techProject.getId());
 		if (null != t.getUid() && t.getUid().equals(curUser.getId())){
-			res.setData(techProjectService.updateTechProject(t, null, null));
+			TechProject tp = new TechProject();
+			BeanUtils.copyProperties(techProject, tp);
+			res.setData(techProjectService.updateTechProject(tp, null, null));
 		} else {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到科技申报项目", "科技项目申报"));
 		}

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.11
+static.host=//afts.hnzhiming.com/1.0.12
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.11
+static.host=//afts.hnzhiming.com/1.0.12
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.11
+static.host=//afts.hnzhiming.com/1.0.12

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.11
+static.host=//aftts.hnzhiming.com/1.0.12
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload