Antiloveg 8 years ago
parent
commit
2bdc1bc152

+ 4 - 0
schema/permission.sql

@@ -336,6 +336,10 @@ insert into `permission`(`id`, `url`, `name`)
 values
 (UUID(), 'api/admin/patent/circulation', '专利申请管理--专利批量流转');
 
+insert into `permission`(`id`, `url`, `name`) 
+values
+(UUID(), 'api/admin/copyright/circulation', '软著申请管理--软著批量流转');
+
 
 
 

+ 1 - 0
src/main/java/com/goafanti/admin/bo/NoticeBo.java

@@ -7,6 +7,7 @@ public class NoticeBo extends Notice{
 	private String unitName;
 	
 	private String principle;
+	
 
 	public String getUnitName() {
 		return unitName;

+ 0 - 12
src/main/java/com/goafanti/admin/controller/AdminTechProjectApiController.java

@@ -27,7 +27,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
-import com.goafanti.common.enums.PatentInfoFields;
 import com.goafanti.common.enums.TechProjectFields;
 import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
@@ -65,17 +64,6 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	@Resource
 	private AdminService			adminService;
 
-	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@RequestParam(name = "ids[]", required = true) String[] ids, @Valid InputTechProject tp,
-			BindingResult bindingResult, String recordTimeFormattedDate) {
-		Result res = new Result();
-		if (bindingResult.hasErrors()) {
-			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
-			return res;
-		}
-		return res;
-	}
 
 	/**
 	 * 咨询师下拉列表

+ 28 - 26
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -202,7 +202,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@Override
 	public void updateCognizance(OrgCognizance cog, OrgCognizanceLog log, Date recordTime, String aid) {
-		if (null != log.getState() && null != recordTime && null != cog.getUid()) {
+		if (null != log.getState() && null != recordTime && null != cog.getUid() && null != log.getPrincipal()) {
 			log.setRecordTime(recordTime);
 
 			if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.DELIVERD) {
@@ -307,31 +307,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 				pageNo, pageSize);
 	}
 
-	private void createNotice(OrgCognizance cog, OrgCognizanceLog l) {
-		OrgCognizance info = orgCognizanceMapper.selectByPrimaryKey(cog.getId());
-
-		Notice n = new Notice();
-		Calendar now = Calendar.getInstance();
-		now.set(Calendar.MILLISECOND, 0);
-		n.setId(UUID.randomUUID().toString());
-		n.setCreateTime(now.getTime());
-		n.setReaded(NoticeReadStatus.UNREAD.getCode());
-		
-		User u = userMapper.selectByPrimaryKey(cog.getUid());
-		if (null != u){
-			n.setPid(u.getAid());
-		}
-		
-		n.setUid(cog.getUid());
-		n.setRid(cog.getId());
-		
-		n.setYear(cog.getYear());
-		
-		n.setAid(l.getPrincipal());
-		n.setContent("编号" + info.getSerialNumber() + "  " + OrgCognizanceStatus.getStatus(l.getState()).getDesc());
-		n.setNoticeType(NoticeStatus.COGNIZANCE.getCode());
-		noticeMapper.insert(n);
-	}
+	
 
 	@Override
 	public OrgCognizance selectByPrimaryKey(String id) {
@@ -358,5 +334,31 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 		o.setTechProject(ProportionStatus.UNFINISHED.getCode());
 		return o;
 	}
+	
+	private void createNotice(OrgCognizance cog, OrgCognizanceLog l) {
+		OrgCognizance info = orgCognizanceMapper.selectByPrimaryKey(cog.getId());
+
+		Notice n = new Notice();
+		Calendar now = Calendar.getInstance();
+		now.set(Calendar.MILLISECOND, 0);
+		n.setId(UUID.randomUUID().toString());
+		n.setCreateTime(now.getTime());
+		n.setReaded(NoticeReadStatus.UNREAD.getCode());
+		
+		User u = userMapper.selectByPrimaryKey(cog.getUid());
+		if (null != u){
+			n.setPid(u.getAid());
+		}
+		
+		n.setUid(cog.getUid());
+		n.setRid(cog.getId());
+		
+		n.setYear(cog.getYear());
+		
+		n.setAid(l.getPrincipal());
+		n.setContent("编号" + info.getSerialNumber() + "  " + OrgCognizanceStatus.getStatus(l.getState()).getDesc());
+		n.setNoticeType(NoticeStatus.COGNIZANCE.getCode());
+		noticeMapper.insert(n);
+	}
 
 }

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

@@ -164,7 +164,7 @@
   
   <select id="findUnreadNoticeListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.NoticeBo">
     select n.id, n.aid, n.uid, n.notice_type as noticeType, n.content, n.create_time as createTime, 
-		oi.unit_name as unitName, n.rid, a.name as principle, n.readed
+		oi.unit_name as unitName, n.rid, a.name as principle, n.readed, n.year
 		from notice n 
 		LEFT JOIN organization_identity oi on n.uid = oi.uid
 		LEFT JOIN admin a on a.id = n.pid 
@@ -189,7 +189,7 @@
   
   <select id="findReadedNoticeListByPage" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.NoticeBo">
      select n.id, n.uid, n.aid, n.notice_type as noticeType, n.content, n.create_time as createTime, 
-		oi.unit_name as unitName, n.rid, a.name as principle, n.readed
+		oi.unit_name as unitName, n.rid, a.name as principle, n.readed, n.year
 		from notice n 
 		LEFT JOIN organization_identity oi on n.uid = oi.uid
 		LEFT JOIN admin a on a.id = n.pid