Просмотр исходного кода

Accept Merge Request #122 v1.0.22 : (master -> test)

Merge Request: v1.0.22
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/122
Antiloveg лет назад: 9
Родитель
Сommit
1fe2a3c5c0

+ 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;

+ 7 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -218,7 +218,7 @@ public class AdminApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (null == id) {
+		if (StringUtils.isBlank(id)) {
 			OrgCognizanceProportion cp = new OrgCognizanceProportion();
 			cp.setId(UUID.randomUUID().toString());
 			cp.setUid(uid);
@@ -2754,12 +2754,18 @@ public class AdminApiController extends CertifyApiController {
 	public Result disposeCenterDetail(@Valid InputOrgTechCenterDetail orgTechCenterDetail, BindingResult bindingResult,
 			String projectTimeFormattedDate, String termStartTimeFormattedDate, String termEndTimeFormattedDate) {
 		Result res = new Result();
+		
 
 		if (bindingResult.hasErrors()) {
 			res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
 					OrgTechCenterDetailFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(orgTechCenterDetail.getCid())){
+			res.getError().add(buildError(ErrorConstants.STATUS_ERROR, "研发部门相关信息未保存,无法保存!"));
+			return res;
+		}
 
 		if (!StringUtils.isBlank(projectTimeFormattedDate)) {
 			try {

+ 6 - 1
src/main/java/com/goafanti/admin/controller/AdminCopyrightApiController.java

@@ -48,7 +48,7 @@ public class AdminCopyrightApiController extends CertifyApiController {
 	private AdminService			adminService;
 
 	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@RequestParam(name = "ids[]", required = true) String[] ids, @Valid InputCopyright ic,
+	public Result circulation(@RequestParam(name = "ids[]", required = false) String[] ids, @Valid InputCopyright ic,
 			BindingResult bindingResult, String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -56,6 +56,11 @@ public class AdminCopyrightApiController extends CertifyApiController {
 					CopyrightFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+			return res;
+		}
 
 		if (null == ic.getStatus()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));

+ 6 - 2
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -104,7 +104,7 @@ public class AdminPatentApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/circulation", method = RequestMethod.POST)
-	public Result circulation(@RequestParam(name = "ids[]", required = true) String[] ids, @Valid InputPatentInfo pi,
+	public Result circulation(@RequestParam(name = "ids[]", required = false) String[] ids, @Valid InputPatentInfo pi,
 			BindingResult bindingResult, String recordTimeFormattedDate) {
 		Result res = new Result();
 		if (bindingResult.hasErrors()) {
@@ -112,6 +112,11 @@ public class AdminPatentApiController extends CertifyApiController {
 					PatentInfoFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+			return res;
+		}
 
 		if (null == pi.getState()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到流转状态", "流转状态"));
@@ -275,7 +280,6 @@ public class AdminPatentApiController extends CertifyApiController {
 		BeanUtils.copyProperties(patentInfo, pi);
 		BeanUtils.copyProperties(patentInfo, pl);
 		patentInfoService.updatePatentInfo(pi, pl, recordTime);
-		res.setData(1);
 		return res;
 	}
 

+ 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 

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

@@ -134,13 +134,13 @@
   </select>
   
    <select id="findTechWebsiteListByPage" resultType="com.goafanti.techproject.bo.TechWebsiteListBo" parameterType="java.lang.String" >
-   select w.id, w.uid, i.unit_name as unitName, i.location_province as province, 
+   select w.id, w.uid, i.unit_name as unitName, i.licence_province as province, 
 		w.department, w.website, w.account_number as accountNumber,
 		w.password
 		from tech_website w 
 	LEFT JOIN organization_identity i on w.uid = i.uid where w.deleted_sign = 0 
     <if test="province != null">
-    	and i.location_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=VARCHAR}
     </if>
     <if test="unitName != null" >
     	and i.unit_name like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')  
@@ -157,7 +157,7 @@
 	LEFT JOIN organization_identity i on w.uid = i.uid 
 	where w.deleted_sign = 0 
     <if test="province != null">
-    	and i.location_province = #{province,jdbcType=VARCHAR}
+    	and i.licence_province = #{province,jdbcType=VARCHAR}
     </if>
     <if test="uid != null" >
     	and w.uid = #{uid,jdbcType=VARCHAR}

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

@@ -237,7 +237,7 @@ public class CopyrightInfoServiceImpl extends BaseMybatisDao<CopyrightInfoMapper
 			for (CopyrightInfo copyrightInfo : list) {
 				CopyrightLog copyrightLog = new CopyrightLog();
 				BeanUtils.copyProperties(cl, copyrightLog);
-				copyrightLog.getId();
+				copyrightLog.setId(UUID.randomUUID().toString());
 				copyrightLog.setCid(copyrightInfo.getId());
 				copyrightLog.setOperator(TokenManager.getAdminId());
 				log.add(copyrightLog);

+ 1 - 4
src/main/java/com/goafanti/patent/service/impl/PatentInfoServiceImpl.java

@@ -382,7 +382,6 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 			p.setPrincipal(log.getPrincipal());
 			patentLogMapper.insert(log);
 
-			patentInfoMapper.updateByPrimaryKeySelective(p);
 			if (PatentInfoStatus.getStatus(p.getPatentState()) == PatentInfoStatus.AUTHORIZE) {
 				OrgIntellectualProperty o = new OrgIntellectualProperty();
 				o.setId(UUID.randomUUID().toString());
@@ -423,11 +422,9 @@ public class PatentInfoServiceImpl extends BaseMybatisDao<PatentInfoMapper> impl
 					orgIntellectualPropertyMapper.updateByPrimaryKeySelective(o);
 				}
 			}
-
 			createNotice(p, log);
-
 		}
-
+		patentInfoMapper.updateByPrimaryKeySelective(p);
 	}
 
 	@Override

+ 1 - 1
src/main/resources/props/config_dev.properties

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.21
+static.host=//afts.hnzhiming.com/1.0.22
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.21
+static.host=//afts.hnzhiming.com/1.0.22
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

+ 1 - 1
src/main/resources/props/config_prod.properties

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.21
+static.host=//afts.hnzhiming.com/1.0.22

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.21
+static.host=//aftts.hnzhiming.com/1.0.22
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload