Browse Source

成果管理--删除&图片上传

Antiloveg 8 years ago
parent
commit
2242656709

+ 4 - 0
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -1,5 +1,7 @@
 package com.goafanti.achievement.service;
 
+import java.util.List;
+
 import com.goafanti.achievement.bo.AchievementListBo;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -16,4 +18,6 @@ public interface AchievementService {
 
 	Achievement selectByPrimaryKey(String id);
 
+	int deleteByPrimaryKey(List<String> asList);
+
 }

+ 6 - 0
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -143,4 +144,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		return achievementMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public int deleteByPrimaryKey(List<String> id) {
+		return achievementMapper.batchDeleteByPrimaryKey(id);
+	}
+
 }

+ 54 - 16
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -1,12 +1,16 @@
 package com.goafanti.admin.controller;
 
+import java.util.Arrays;
+
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.goafanti.achievement.bo.InputAchievement;
@@ -15,6 +19,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AchievementFields;
+import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.model.Achievement;
 import com.goafanti.common.utils.StringUtils;
 
@@ -23,12 +28,45 @@ import com.goafanti.common.utils.StringUtils;
 public class AdminAchievementApiController extends CertifyApiController {
 	@Resource
 	private AchievementService achievementService;
-	
+
+	/**
+	 * 图片上传
+	 */
+	@RequestMapping(value = "/uploadPicture", method = RequestMethod.POST)
+	public Result uploadPicture(HttpServletRequest req, String sign) {
+		Result res = new Result();
+
+		AttachmentType attachmentType = AttachmentType.getField(sign);
+
+		if (attachmentType == AttachmentType.ACHIEVEMENT_TECHNICAL_PICTURE
+				|| attachmentType == AttachmentType.ACHIEVEMENT_MATURITY_PICTURE) {
+			res.setData(handleFiles(res, "/achievement/", false, req, sign, "achievement"));
+		} else {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
+		}
+
+		return res;
+	}
+
+	/**
+	 * 删除
+	 */
+	@RequestMapping(value = "/delete", method = RequestMethod.POST)
+	private Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
+		Result res = new Result();
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
+			res.setData(achievementService.deleteByPrimaryKey(Arrays.asList(ids)));
+		}
+		return res;
+	}
+
 	/**
 	 * 详情
 	 */
 	@RequestMapping(value = "/detail", method = RequestMethod.GET)
-	private Result detail(String id){
+	private Result detail(String id) {
 		Result res = new Result();
 		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
@@ -77,26 +115,26 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
-		
+
 		Achievement a = new Achievement();
 		BeanUtils.copyProperties(ia, a);
 		achievementService.saveAchievementByManager(a);
 		return res;
 	}
-	
+
 	/**
 	 * 修改成果
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
-	public Result update(@Valid InputAchievement ia, BindingResult bindingResult){
+	public Result update(@Valid InputAchievement ia, BindingResult bindingResult) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					AchievementFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
-		
-		if (StringUtils.isBlank(ia.getId())){
+
+		if (StringUtils.isBlank(ia.getId())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果ID", "成果ID"));
 			return res;
 		}
@@ -104,14 +142,14 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (!res.getError().isEmpty()) {
 			return res;
 		}
-		
+
 		Achievement a = new Achievement();
 		BeanUtils.copyProperties(ia, a);
 		achievementService.updateAchievementByManager(a);
 		return res;
 	}
-	
-	private Result disposeInputAchievement(Result res, InputAchievement ia){
+
+	private Result disposeInputAchievement(Result res, InputAchievement ia) {
 		if (StringUtils.isBlank(ia.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果名称", "成果名称"));
 			return res;
@@ -136,28 +174,28 @@ public class AdminAchievementApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人类型", "所有人类型"));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(ia.getOwnerIdNumber())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人证件号", "所有人证件号"));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(ia.getOwnerMobile())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人联系电话", "所有人联系电话"));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(ia.getOwnerEmail())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人电子邮箱", "所有人电子邮箱"));
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(ia.getOwnerPostalAddress())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到所有人通讯地址", "所有人通讯地址"));
 			return res;
 		}
-		
-		if (null == ia.getCooperationMode()){
+
+		if (null == ia.getCooperationMode()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;
 		}

+ 4 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.Achievement;
 
 public interface AchievementMapper {
@@ -16,4 +18,6 @@ public interface AchievementMapper {
     int updateByPrimaryKey(Achievement record);
 
 	int updateReleaseDate(String id);
+
+	int batchDeleteByPrimaryKey(List<String> id);
 }

+ 3 - 1
src/main/java/com/goafanti/common/enums/AttachmentType.java

@@ -13,7 +13,9 @@ public enum AttachmentType {
 	FINANCE("finance", "企业财务报表"), ROSTER("roster", "企业花名册"), SOCIAL_SECURITY("social_security", "企业社保情况表"), 
 	HONOR("honor", "荣誉及其他证明材料"), LAST_YEAR_RATEPAY("last_year_ratepay", "上年度纳税申报表"), TECH_PROJECT("tech_project", "科技项目申报材料"),
 	STANDARD("standard", "标准制定附件"), MANUSCRIPT("manuscript", "知识产权稿件"), ORGCODE("orgcode", "组织结构代码证"), LICENCE("licence", "营业执照"),
-	DEMAND_PICTURE("demand_picture", "需求图片资料"), DEMAND_TEXT_FILE("demand_text_file", "需求文本文件资料");
+	DEMAND_PICTURE("demand_picture", "科技需求图片资料"), DEMAND_TEXT_FILE("demand_text_file", "科技需求文本文件资料"),
+	ACHIEVEMENT_TECHNICAL_PICTURE("achievement_technical_picture", "科技成果技术图片"), 
+	ACHIEVEMENT_MATURITY_PICTURE("achievement_maturity_picture", "科技成果成熟度资料图片");
 
 	private AttachmentType(String code, String desc) {
 		this.code = code;

+ 8 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -690,5 +690,13 @@
   <update id="updateReleaseDate" parameterType="java.lang.String">
   	update achievement set release_date = null
   	where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+  <update id="batchDeleteByPrimaryKey" parameterType="java.util.List">
+  	update achievement set deleted_sign = 1
+  	where  id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
   </update>
 </mapper>