Browse Source

测试debug

Antiloveg 9 years ago
parent
commit
52da3acdd8

+ 2 - 2
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -354,7 +354,7 @@
         principal = #{principal,jdbcType=VARCHAR},
       </if>
       <if test="confirmState != null">
-        confirmState = #{confirmState,jdbcType=INTEGER},
+        confirm_state = #{confirmState,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
@@ -622,7 +622,7 @@
                p.patent_catagory as patentCatagory ,p.patent_state as patentState , p.authorized_date as authorizedDate
         from user u
 		INNER JOIN patent_info p on u.id =p.uid
-		INNER JOIN organization_identity o on o.uid = u.id where p.patent_state=8 
+		INNER JOIN organization_identity o on o.uid = u.id 
 		<if test="locationProvince != null">
 		 and o.location_province = #{locationProvince,jdbcType=VARCHAR}
 		</if>

+ 3 - 2
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -169,8 +169,9 @@
   </select>
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
-   select u.lvl,u.nickname,u.email,u.number,u.type,i.person_portrait_url, i.id ,i.uid from user u LEFT JOIN user_info  i 
-   on u.id = i.uid where i.uid = #{uid,jdbcType = VARCHAR}
+   select u.lvl,u.nickname,u.email,u.number,u.type,i.person_portrait_url, o.logo_url ,i.id ,i.uid from user u LEFT JOIN user_info  i 
+   on u.id = i.uid 
+   LEFT JOIN organization_info o on u.id = o.uid where u.id = #{uid,jdbcType = VARCHAR}
   </select>
   
   <select id="selectUserDownLoadBoByUserId" resultMap="UserDownLoadBo" parameterType="java.lang.String">

+ 13 - 12
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -99,6 +99,8 @@ public class PatentApiController extends BaseApiController {
 		PatentCost patentCost = new PatentCost();
 		patentCost.setId(UUID.randomUUID().toString());
 		patentCost.setPid(patentInfo.getId());
+		patentCost.setAnnualFeeState(0);
+		patentCost.setPaymentState(0);
 		patentCostService.insert(patentCost);
 		res.setData(patentInfo);
 		return res;
@@ -221,6 +223,8 @@ public class PatentApiController extends BaseApiController {
 		PatentCost patentCost = new PatentCost();
 		patentCost.setId(UUID.randomUUID().toString());
 		patentCost.setPid(patentInfo.getId());
+		patentCost.setAnnualFeeState(0);
+		patentCost.setPaymentState(0);
 		patentCostService.insert(patentCost);
 		res.setData(patentInfo);
 		return res;
@@ -255,7 +259,7 @@ public class PatentApiController extends BaseApiController {
 		    d = null;
 	    }
 		
-		if (patentLog.getPrincipal() != null ) {
+		if (!StringUtils.isBlank(patentLog.getPrincipal())) {
 			switch (patentLog.getState()) {
 			case 1:
 				patentInfo.setCreateTime(d);
@@ -438,7 +442,7 @@ public class PatentApiController extends BaseApiController {
 	 * 用户确认申报材料
 	 * @return
 	 */
-	@RequestMapping(value= "clientConfirm",method = RequestMethod.POST)
+	@RequestMapping(value= "/clientConfirm",method = RequestMethod.POST)
 	public Result clientConfirmApplicationMaterials(String pid){
 		Result res = new Result();
 		PatentInfo p = new PatentInfo();
@@ -632,9 +636,10 @@ public class PatentApiController extends BaseApiController {
 				row.createCell(7).setCellValue("未缴费");
 			}
 			row.createCell(8).setCellValue(null == obj.getAuthorizedDateFormattedDate() ? "" : calDeadline(obj.getAuthorizedDateFormattedDate()));
-			DownloadUtils downloadUtils = new DownloadUtils();
-			downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
+			
 		}
+		DownloadUtils downloadUtils = new DownloadUtils();
+		downloadUtils.downloadExcel(response, sheetName + Calendar.getInstance().getTimeInMillis() + ".xls", workbook);
 	}
 	
 
@@ -700,12 +705,12 @@ public class PatentApiController extends BaseApiController {
 		 Result res = new Result();
 		 String fileName = "";
 		 if(StringUtils.isBlank(oid)){
-			 fileName = "/patent" + TokenManager.getUserId()+ "_" + sign + ".doc";
+			 fileName = "/patent/" + TokenManager.getUserId()+ "_" + sign + ".doc";
 		 }else{
 			 if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
-				 fileName = "/patent" + oid + "_" + sign + ".doc";	 
+				 fileName = "/patent/" + oid + "_" + sign + ".doc";	 
 			 }else{
-				 fileName = "/patent" + oid + "_" + sign + ".jpg"; 
+				 fileName = "/patent/" + oid + "_" + sign + ".jpg"; 
 			 }
 		 }
 		 res.setData(handleFile(res, fileName , req));
@@ -721,7 +726,7 @@ public class PatentApiController extends BaseApiController {
 	@RequestMapping(value="/downloadTemplate",method = RequestMethod.GET)
 	public Result downloadPatentProryStatement(HttpServletResponse response,  HttpServletRequest request){
 		Result res = new Result();
-		String filename = "专利代理委托书模版" + Long.toString(System.nanoTime())+".doc"; 
+		String filename = "Patent" + Long.toString(System.nanoTime())+".doc"; 
 		String fileSaveRootPath = uploadPrivatePath + "/patent/patent_prory_statement.doc";
 		return patentDownload(res,response,filename,fileSaveRootPath);
 	}
@@ -737,10 +742,6 @@ public class PatentApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "下载文件不存在!"));
 			return res;
 		}
-		/*if(null == TokenManager.getAdminToken()){
-			res.getError().add(buildError(ErrorConstants.FILE_NON_EXISTENT, "权限不足,无法下载!"));	
-			return res;
-		}*/
 		String filename = "";
 		if(sign.equals("patent_prory_statement") || sign.equals("patent_writing")){
 		    filename =Long.toString(System.nanoTime())+".doc"; 

+ 14 - 1
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -33,6 +33,12 @@ public class UserPageHomeBo {
       */
      private String personPortraitUrl;
      
+     /**
+      * 公司LogoUrl
+      * @return
+      */
+     private String logoUrl;
+     
 	public String getId() {
 		return id;
 	}
@@ -81,6 +87,13 @@ public class UserPageHomeBo {
 	public void setPersonPortraitUrl(String personPortraitUrl) {
 		this.personPortraitUrl = personPortraitUrl;
 	}
-     
+	public String getLogoUrl() {
+		return logoUrl;
+	}
+	public void setLogoUrl(String logoUrl) {
+		this.logoUrl = logoUrl;
+	}
+    
+	
      
 }

+ 2 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -603,8 +603,9 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/ability", method = RequestMethod.GET)
 	public Result ability() {
 		Result res = new Result();
+		UidAndTypeBo ub = basicInfo(userService);
 		//UserAbility u = userAbilityService.selectUserAbilityByUserId(basicInfo(userService).getUid());
-		UserAbility u =userAbilityService.selectUserAbilityByUserId("ba00235e-eb3a-45b4-8c9d-000fe507cbca");
+		UserAbility u =userAbilityService.selectUserAbilityByUserId(ub.getUid());
 		res.setData(u);
 		return res;
 	}

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
+	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
 	  
 	</bean>
 	

+ 1 - 1
src/main/webapp/WEB-INF/web.xml

@@ -10,7 +10,7 @@
 		and Filters -->
 	<context-param>
 		<param-name>spring.profiles.active</param-name>
-		<param-value>local</param-value>
+		<param-value>dev</param-value>
 	</context-param>
 
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->