Antiloveg 8 years ago
parent
commit
d7a8657dd8

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

@@ -988,7 +988,6 @@ public class AdminApiController extends BaseApiController {
 				cog.setIssuingDate(log.getRecordTime());
 				break;
 			}
-			cog.setConsultant(null == log.getOperator() ? "" : log.getOperator());
 			log.setId(UUID.randomUUID().toString());
 			log.setCid(cog.getId());
 			log.setOperator(TokenManager.getAdminId());

+ 5 - 1
src/main/java/com/goafanti/common/model/UserIdentity.java

@@ -5,6 +5,9 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
+
 public class UserIdentity {
     private String id;
 
@@ -253,7 +256,8 @@ public class UserIdentity {
     public void setAmountMoney(BigDecimal amountMoney) {
         this.amountMoney = amountMoney;
     }
-
+    
+    @JsonFormat(shape = Shape.STRING)
     public Integer getAuditStatus() {
         return auditStatus;
     }

+ 9 - 2
src/main/java/com/goafanti/techservice/patent/controller/PatentApiController.java

@@ -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);

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

@@ -50,7 +50,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.3
+static.host=//afts.hnzhiming.com/1.0.4
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

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

@@ -52,7 +52,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.3
+static.host=//afts.hnzhiming.com/1.0.4
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

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

@@ -50,4 +50,4 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//afts.hnzhiming.com/1.0.3
+static.host=//afts.hnzhiming.com/1.0.4

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

@@ -52,7 +52,7 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-static.host=//aftts.hnzhiming.com/1.0.3
+static.host=//aftts.hnzhiming.com/1.0.4
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload