Antiloveg лет назад: 8
Родитель
Сommit
56750c402c

+ 21 - 22
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -840,10 +840,6 @@ public class AdminApiController extends BaseApiController {
 	public Result applyCognizance(String contacts, String comment, String consultant, String uid, Integer year,
 			Integer state) {
 		Result res = new Result();
-		if (null == year) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "申请认定年份不能为空!"));
-		}
-
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, uid)) {
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
 		}
@@ -856,14 +852,16 @@ public class AdminApiController extends BaseApiController {
 		c.setConsultant(consultant);
 		c.setYear(year);
 		c.setDeletedSign(0);
+		c.setState(state);
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		c.setCreateTime(now.getTime());
 		orgCognizanceService.insert(c);
 
 		OrgCognizanceLog log = new OrgCognizanceLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(c.getId());
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		log.setRecordTime(now.getTime());
+		log.setRecordTime(c.getCreateTime());
 		log.setState(state);
 		log.setComment(comment);
 		log.setPrincipal(userService.selectByPrimaryKey(uid).getAid());
@@ -1038,10 +1036,6 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
 	public Result annualReportDetail(String uid, Integer year) {
 		Result res = new Result();
-		if (null == year) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "当前年份年报数据异常!"));
-			return res;
-		}
 		res.setData(handleAnnualReport(uid, year));
 		return res;
 	}
@@ -1087,30 +1081,35 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/uploadTemplate", method = RequestMethod.POST)
 	public Result uploadPatentTemplate(HttpServletRequest req, String sign) {
 		Result res = new Result();
+		System.out.println("init");
 		String fileName = "";
 		List<MultipartFile> files = getFiles(req);
 		MultipartFile mf = files.get(0);
 		String suffix = mf.getOriginalFilename().substring(mf.getOriginalFilename().lastIndexOf("."));
-		if (suffix.equals("doc") || suffix.equals("doxc")) {
+		System.err.println("suffix" + " " + suffix);
+		if (suffix.equals(".doc") || suffix.equals(".docx")) {
 			if ("patent_prory_statement".equals(sign)) {
 				fileName = "patent_prory_statement" + suffix;
 			} else {
 				fileName = System.nanoTime() + "";
 			}
-			res.setData(handleFile(res, req, fileName, files, mf));
-			if (res.getData() != "") {
+			String name = handleFile(res, req, fileName, files, mf);
+			res.setData(name);
+			System.out.println(name);
+			if (res.getData() != "" && res.getData() != null && null == aftFileService.selectAftFileBySign(sign)) {
 				AftFile f = new AftFile();
 				f.setId(UUID.randomUUID().toString());
-				if ("patent_prory_statement".equals(sign)) {
-					f.setFileName("专利代理委托书模版");
-					f.setSign(sign);
-				} 
-				f.setFilePath("/admin/" + fileName);
-				f.setDeleletedSign(0);
-				aftFileService.insert(f);
+					if ("patent_prory_statement".equals(sign)) {
+						f.setFileName("专利代理委托书模版");
+						f.setSign(sign);
+					} 
+					f.setFilePath("/admin/" + fileName);
+					f.setDeleletedSign(0);
+					aftFileService.insert(f);
+				
 			}
 		} else {
-			res.getError().add(buildError(ErrorConstants.PARAM_PATTERN_ERROR, "文件格式错误,请重新上传!"));
+			res.getError().add(buildError(ErrorConstants.FILE_PATTERN_ERROR, "文件格式错误,请重新上传!"));
 		}
 		return res;
 	}

+ 3 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -58,5 +58,8 @@ public class ErrorConstants {
 	
 	public static final String DUPLICATE_DATA_ERROR = "DUPLICATE_DATA_ERROR";
 	
+	public static final String FILE_PATTERN_ERROR = "FILE_PATTERN_ERROR";
+	
+	
 
 }

+ 7 - 4
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -262,6 +262,7 @@ public class PublicController extends BaseController {
 	@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
 	public Result downloadFile(String fileName, HttpServletResponse response, String path) {
 		Result res = new Result();
+		fileName = fileName + path.substring(path.lastIndexOf("."));
 		return handleDownloadFile(response, fileName, path, res);
 	}
 	
@@ -274,12 +275,13 @@ public class PublicController extends BaseController {
 	public Result downloadTemplateFile(HttpServletResponse response,String sign){
 		Result res = new Result();
 		String fileName = "";
+		String path = aftFileService.selectAftFileBySign(sign).getFilePath();
+		String suffix = path.substring(path.lastIndexOf("."));
 		if (sign.equals("patent_prory_statement")){
-			fileName = "专利代理委托书模版";
+			fileName = "专利代理委托书模版" + suffix;
 		} else {
 			fileName = System.nanoTime() + " ";
 		}
-		String path = aftFileService.selectAftFileBySign(sign).getFilePath();
 		if (!StringUtils.isBlank(path)){
 			return handleDownloadFile(response, fileName, path, res);
 		} else {
@@ -298,7 +300,9 @@ public class PublicController extends BaseController {
 			in = new FileInputStream(file);
 			out = response.getOutputStream();
 			// 设置文件MIME类型
-			response.setContentType("application/octet-stream");
+			//response.setContentType("application/octet-stream");
+			response.setContentType("multipart/form-data");
+			fileName = java.net.URLEncoder.encode(fileName, "UTF-8");
 			response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
 			for (;;) {
 				int bytes = in.read(buffer);
@@ -324,6 +328,5 @@ public class PublicController extends BaseController {
 		return res;
 	}
 	
-	
 
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/PatentInfoMapper.java

@@ -26,5 +26,7 @@ public interface PatentInfoMapper {
 	int findClentApplyCount(Map<String, Object> params);
 
 	List<PatentRecieveSendBo> getPatentRecieveSendList();
+
+	int batchDeleteByPrimaryKey(List<String> id);
 	
 }

+ 6 - 20
src/main/java/com/goafanti/common/mapper/OrgCognizanceMapper.xml

@@ -283,31 +283,17 @@
   </select>
   
    <select id="findCognizanceBoCount" resultType="java.lang.Integer" parameterType="String">
-  	select count(1) from (
-  		
-  			select x.uid, x.cid, x.serial_number as serialNumber, x.location_province as locationProvince, 
-  	x.unit_name as unitName, x.contacts, x.create_time as createTime, x.comment, x.state, x.certificate_number as certificateNumber,
-	x.issuing_date as issuingDate, a.name as consultant from 
-	(select u.id as uid,
-	c.id as cid, c.serial_number, i.location_province,
-	i.unit_name, c.contacts, c.create_time, 
-	c.comment, c.state, c.certificate_number, 
-	c.issuing_date, c.consultant 
-	from user u INNER JOIN org_cognizance c on u.id = c.uid  and deleted_sign = 0
-	LEFT JOIN organization_identity i on i.uid = u.id) x  
-	LEFT JOIN  admin a on a.id = x.consultant
+  	select count(1) from 
+    user u INNER JOIN org_cognizance c on u.id = c.uid  and deleted_sign = 0
+	LEFT JOIN organization_identity i on i.uid = u.id  
 	where 1 = 1
 	<if test="uid != null">
-		and x.uid = #{uid,jdbcType=VARCHAR}
+		and c.uid = #{uid,jdbcType=VARCHAR}
 	</if>
 	<if test="locationProvince != null">
-		and x.location_province = #{locationProvince, jdbcType=VARCHAR}
-	</if>
-	order by x.issuing_date desc
-	<if test="page_sql!=null">
-		${page_sql}
+		and i.location_province = #{locationProvince, jdbcType=VARCHAR}
 	</if>
-	) as n
+	order by c.issuing_date desc
 	</select>
 	
 	

+ 0 - 3
src/main/java/com/goafanti/common/mapper/PatentCostMapper.xml

@@ -215,9 +215,6 @@
 		</if>
 		order by p.patent_application_date DESC) m
    on c.pid = m.pid 
-   <if test="page_sql!=null">
-		${page_sql}
-	</if>
 		   ) n 
   </select>
 </mapper>

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

@@ -634,9 +634,6 @@
 	</if>
 	 order by p.create_time desc) x
 	 LEFT JOIN admin a on a.id = x.author
-	 <if test="page_sql!=null">
-		${page_sql}
-	</if>
 		) 
 	as total
   </select>
@@ -678,9 +675,6 @@
 		order by p.authorized_date DESC
 		) n
 		on n.pid= c.pid where c.annual_fee_state=0
-	<if test="page_sql!=null">
-		${page_sql}
-	</if>
 		) as total
   </select>
   
@@ -771,14 +765,17 @@
 	    and  o.location_province=#{locationProvince,jdbcType=VARCHAR}
 	</if>
 	order by p.authorized_date DESC 
-	<if test="page_sql!=null">
-		${page_sql}
-	</if> 
 	
 	) as n
   </select>
   
-  
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  	update patent_info set deleted_sign = 1
+  	where  id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
   
   
 </mapper>

+ 6 - 11
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -923,10 +923,6 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/applyCognizance", method = RequestMethod.POST)
 	public Result applyCognizance(String contacts, String comment, Integer year, Integer state) {
 		Result res = new Result();
-		if (null == year) {
-			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "申请认定年份不能为空!"));
-		}
-		
 		if (null != orgCognizanceService.selectCognizanceByUidAndYear(year, TokenManager.getUserId())){
 			res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年度高企认定已申请!"));
 		}
@@ -938,14 +934,17 @@ public class CognizanceApiController extends BaseApiController {
 		c.setComment(comment);
 		c.setDeletedSign(0);
 		c.setYear(year);
+		c.setState(state);
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		c.setCreateTime(now.getTime());
 		orgCognizanceService.insert(c);
 
 		OrgCognizanceLog log = new OrgCognizanceLog();
 		log.setId(UUID.randomUUID().toString());
 		log.setCid(c.getId());
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		log.setRecordTime(now.getTime());
+		
+		log.setRecordTime(c.getCreateTime());
 		log.setState(state);
 		log.setComment(comment);
 		log.setPrincipal(userService.selectByPrimaryKey(TokenManager.getUserId()).getAid());
@@ -1024,10 +1023,6 @@ public class CognizanceApiController extends BaseApiController {
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
 	public Result annualReportDetail(Integer year) {
 		Result res = new Result();
-		if (null == year) {
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "当前年份年报数据异常!"));
-			return res;
-		}
 		res.setData(handleAnnualReport(TokenManager.getUserId(), year));
 		return res;
 	}

+ 25 - 0
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -2,6 +2,7 @@ package com.goafanti.techservice.patent.controller;
 
 import java.io.IOException;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -94,6 +95,9 @@ public class PatentApiController extends BaseApiController {
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		patentInfo.setCreateTime(now.getTime());
+		patentInfo.setDeletedSign(0);
+		patentInfo.setConfirmState(0);
+		patentInfo.setPatentState(1);
 		patentInfoService.insert(patentInfo);
 		
 		PatentRegistration patentRegistration = new PatentRegistration();
@@ -118,6 +122,22 @@ public class PatentApiController extends BaseApiController {
 		res.setData(patentInfo);
 		return res;
 	}
+	
+	/**
+	 * 删除专利记录
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "/deletePatent", method = RequestMethod.POST)
+	public Result deletePatent(@RequestParam(name = "ids[]", required = true) String[] ids){
+		Result res = new Result();
+		List<String> id = new ArrayList<String>();
+		for (String s : ids) {
+			id.add(s);
+		}
+		res.setData(patentInfoService.batchDeleteByPrimaryKey(id));
+		return res;
+	}
 
 	/**
 	 * 用户端专利详情
@@ -185,6 +205,8 @@ public class PatentApiController extends BaseApiController {
 				patentName, patentState, createTime, patentApplicationDate, author, pNo, pSize));
 		return res;
 	}
+	
+	
 
 	/**
 	 * 获取公司
@@ -231,6 +253,9 @@ public class PatentApiController extends BaseApiController {
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		patentInfo.setCreateTime(now.getTime());
+		patentInfo.setDeletedSign(0);
+		patentInfo.setConfirmState(0);
+		patentInfo.setPatentState(1);
 		patentInfoService.insert(patentInfo);
 		PatentRegistration patentRegistration = new PatentRegistration();
 		patentRegistration.setId(UUID.randomUUID().toString());

+ 3 - 0
src/main/java/com/goafanti/techservice/patent/service/PatentInfoService.java

@@ -2,6 +2,7 @@ package com.goafanti.techservice.patent.service;
 
 import java.text.ParseException;
 import java.util.Date;
+import java.util.List;
 
 import com.goafanti.common.model.PatentInfo;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -33,5 +34,7 @@ public interface PatentInfoService {
 			String patentNumber, String office, String locationProvince, String unitName, Integer patentCatagory,
 			String patentName, Integer patentState, String author, Integer pNo, Integer pSize);
 
+	int batchDeleteByPrimaryKey(List<String> id);
+
 
 }

+ 7 - 0
src/main/java/com/goafanti/techservice/patent/service/impl/PatentInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.techservice.patent.service.impl;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -263,6 +264,12 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 	}
 
 
+	@Override
+	public int batchDeleteByPrimaryKey(List<String> id) {
+		return patentInfoMapper.batchDeleteByPrimaryKey(id);
+	}
+
+
 	
 
 }