Antiloveg 8 anni fa
parent
commit
f176d89201

+ 4 - 1
src/main/java/com/goafanti/common/model/ContractLog.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 import org.apache.commons.lang3.time.DateFormatUtils;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.goafanti.common.constant.AFTConstants;
 
 public class ContractLog {
@@ -62,7 +64,8 @@ public class ContractLog {
     public void setRecordTime(Date recordTime) {
         this.recordTime = recordTime;
     }
-
+    
+    @JsonFormat(shape = Shape.STRING)
     public Integer getStatus() {
 		return status;
 	}

+ 1 - 7
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -188,7 +188,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);
 		cl.setRecordTime(now.getTime());
-		cl.setStatus(ContractStatus.CREATE.getCode());
+		cl.setStatus(c.getStatus());
 		cl.setCid(c.getId());
 		return cl;
 	}
@@ -221,15 +221,9 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 		c.setSignDate(signDate);
 		contractMapper.updateByPrimaryKeySelective(c);
 
-		/*ContractLog clog = disposeContractLog(c);
-		clog.setStatus(ContractStatus.SIGN.getCode());
-		clog.setRecordTime(signDate);
-		clog.setOperator(TokenManager.getAdminId());
-		clog.setPrincipal(TokenManager.getAdminId());*/
 
 		List<ContractLog> logs = new ArrayList<>();
 		List<Notice> notice = new ArrayList<>();
-		//logs.add(clog);
 
 		for (int i = 0; i < principals.length; i++) {
 			ContractLog log = disposeContractLog(c);