Browse Source

copyright logs

albertshaw 8 years ago
parent
commit
ed7e0f6fb2

+ 14 - 0
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -158,6 +158,20 @@ public class AdminCopyrightApiController extends CertifyApiController {
 		return res;
 	}
 
+	@RequestMapping(value = "/logs", method = RequestMethod.GET)
+	public Result logs(String id) {
+		Result res = new Result();
+		if (!checkAdminLogin(res)) {
+			return res;
+		}
+		if (StringUtils.isBlank(id)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "公司"));
+		} else {
+			res.setData(copyrightInfoService.findLogsByPrimaryKey(id));
+		}
+		return res;
+	}
+
 	private boolean handleBindingError(Result res, BindingResult bindingResult) {
 		if (bindingResult.hasErrors()) {
 			for (FieldError fe : bindingResult.getFieldErrors()) {

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

@@ -25,4 +25,6 @@ public interface CopyrightInfoMapper {
 	List<CopyrightInfoSummary> findListByPage(Map<String, Object> params);
 
 	int findListCount(Map<String, Object> params);
+
+	int deleteByPrimaryKeys(List<String> id);
 }

+ 11 - 6
src/main/java/com/goafanti/common/dao/CopyrightLogMapper.java

@@ -1,17 +1,22 @@
 package com.goafanti.common.dao;
 
+import java.util.List;
+
 import com.goafanti.common.model.CopyrightLog;
+import com.goafanti.copyright.bo.CopyrightLogBO;
 
 public interface CopyrightLogMapper {
-    int deleteByPrimaryKey(String id);
+	int deleteByPrimaryKey(String id);
+
+	int insert(CopyrightLog record);
 
-    int insert(CopyrightLog record);
+	int insertSelective(CopyrightLog record);
 
-    int insertSelective(CopyrightLog record);
+	CopyrightLog selectByPrimaryKey(String id);
 
-    CopyrightLog selectByPrimaryKey(String id);
+	int updateByPrimaryKeySelective(CopyrightLog record);
 
-    int updateByPrimaryKeySelective(CopyrightLog record);
+	int updateByPrimaryKey(CopyrightLog record);
 
-    int updateByPrimaryKey(CopyrightLog record);
+	List<CopyrightLogBO> findByCopyrightId(String id);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -350,4 +350,11 @@
 	</if>
   </select>
   
+  <update id="deleteByPrimaryKeys" parameterType="java.util.List">
+  	update copyright_info set delete_sign = 1
+  	where id in 
+	<foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+		#{item}
+	</foreach>
+  </update>
 </mapper>

+ 7 - 0
src/main/java/com/goafanti/common/mapper/CopyrightLogMapper.xml

@@ -114,4 +114,11 @@
       comment = #{comment,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="findByCopyrightId" parameterType="java.lang.String" resultType="com.goafanti.copyright.bo.CopyrightLogBO">
+    select a.name as principal, b.name as operator, cl.record_time as recordTime, cl.status as status, cl.comment as comment
+    from copyright_log cl
+   	left join admin a on cl.principal = a.id
+   	left join admin b on cl.operator = b.id
+    where cl.cid = #{id,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 85 - 0
src/main/java/com/goafanti/copyright/bo/CopyrightLogBO.java

@@ -0,0 +1,85 @@
+package com.goafanti.copyright.bo;
+
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+public class CopyrightLogBO {
+
+	/**
+	 * 操作时间
+	 */
+	private Date	recordTime;
+
+	/**
+	 * 状态
+	 */
+	private Integer	status;
+
+	/**
+	 * 负责人
+	 */
+	private String	principal;
+
+	/**
+	 * 操作人
+	 */
+	private String	operator;
+
+	/**
+	 * 备注
+	 */
+	private String	comment;
+
+	public Date getRecordTime() {
+		return recordTime;
+	}
+
+	public void setRecordTime(Date recordTime) {
+		this.recordTime = recordTime;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getPrincipal() {
+		return principal;
+	}
+
+	public void setPrincipal(String principal) {
+		this.principal = principal;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(String comment) {
+		this.comment = comment;
+	}
+
+	public String getRecordTimeFormattedDate() {
+		if (this.recordTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.recordTime, "yyyy-MM-dd");
+		}
+	}
+
+	public void setRecordTimeFormattedDate(String recordTimeFormattedDate) {
+
+	}
+}

+ 3 - 0
src/main/java/com/goafanti/copyright/service/CopyrightInfoService.java

@@ -6,6 +6,7 @@ import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.model.CopyrightInfo;
 import com.goafanti.common.model.CopyrightLog;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
+import com.goafanti.copyright.bo.CopyrightLogBO;
 import com.goafanti.core.mybatis.page.Pagination;
 
 public interface CopyrightInfoService {
@@ -24,4 +25,6 @@ public interface CopyrightInfoService {
 			CopyrightStatus status, String[] createTime, String[] acceptTime, String[] authTime, Integer pageNo,
 			Integer pageSize);
 
+	List<CopyrightLogBO> findLogsByPrimaryKey(String id);
+
 }

+ 7 - 2
src/main/java/com/goafanti/copyright/service/impl/CopyrightInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.goafanti.common.enums.CopyrightStatus;
 import com.goafanti.common.model.CopyrightInfo;
 import com.goafanti.common.model.CopyrightLog;
 import com.goafanti.copyright.bo.CopyrightInfoDetail;
+import com.goafanti.copyright.bo.CopyrightLogBO;
 import com.goafanti.copyright.service.CopyrightInfoService;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -65,8 +66,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 
 	@Override
 	public int batchDeleteByPrimaryKey(List<String> id) {
-		
-		return 0;
+		return copyrightInfoMapper.deleteByPrimaryKeys(id);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -136,4 +136,9 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 		return copyrightInfoMapper.findByPrimaryKey(id);
 	}
 
+	@Override
+	public List<CopyrightLogBO> findLogsByPrimaryKey(String id) {
+		return copyrightLogMapper.findByCopyrightId(id);
+	}
+
 }