|
|
@@ -100,6 +100,8 @@ public class PatentApiController extends BaseApiController {
|
|
|
patentInfo.setDeletedSign(0);
|
|
|
patentInfo.setConfirmState(0);
|
|
|
patentInfo.setPatentState(1);
|
|
|
+ String p = userService.selectByPrimaryKey(TokenManager.getUserId()).getAid();
|
|
|
+ patentInfo.setPrincipal(p);
|
|
|
patentInfoService.insert(patentInfo);
|
|
|
|
|
|
PatentRegistration patentRegistration = new PatentRegistration();
|
|
|
@@ -119,7 +121,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
log.setPid(patentInfo.getId());
|
|
|
log.setRecordTime(patentInfo.getCreateTime());
|
|
|
log.setState(1);
|
|
|
- log.setPrincipal(userService.selectByPrimaryKey(TokenManager.getUserId()).getAid());
|
|
|
+ log.setPrincipal(p);
|
|
|
patentLogService.insert(log);
|
|
|
res.setData(patentInfo);
|
|
|
}
|
|
|
@@ -259,11 +261,15 @@ public class PatentApiController extends BaseApiController {
|
|
|
patentInfo.setDeletedSign(0);
|
|
|
patentInfo.setConfirmState(0);
|
|
|
patentInfo.setPatentState(1);
|
|
|
+ String p = userService.selectByPrimaryKey(TokenManager.getUserId()).getAid();
|
|
|
+ patentInfo.setPrincipal(p);
|
|
|
patentInfoService.insert(patentInfo);
|
|
|
+
|
|
|
PatentRegistration patentRegistration = new PatentRegistration();
|
|
|
patentRegistration.setId(UUID.randomUUID().toString());
|
|
|
patentRegistration.setPid(patentInfo.getId());
|
|
|
patentRegistrationService.insert(patentRegistration);
|
|
|
+
|
|
|
PatentCost patentCost = new PatentCost();
|
|
|
patentCost.setId(UUID.randomUUID().toString());
|
|
|
patentCost.setPid(patentInfo.getId());
|
|
|
@@ -276,7 +282,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
log.setPid(patentInfo.getId());
|
|
|
log.setRecordTime(patentInfo.getCreateTime());
|
|
|
log.setState(1);
|
|
|
- log.setPrincipal(userService.selectByPrimaryKey(TokenManager.getUserId()).getAid());
|
|
|
+ log.setPrincipal(p);
|
|
|
log.setOperator(TokenManager.getAdminId());
|
|
|
patentLogService.insert(log);
|
|
|
res.setData(patentInfo);
|
|
|
@@ -326,6 +332,7 @@ public class PatentApiController extends BaseApiController {
|
|
|
break;
|
|
|
}
|
|
|
patentInfo.setPatentState(patentLog.getState());
|
|
|
+ patentInfo.setPrincipal(patentLog.getPrincipal());
|
|
|
patentLog.setPid(xid);
|
|
|
patentLog.setId(UUID.randomUUID().toString());
|
|
|
patentLog.setRecordTime(d);
|