merge

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChAprOrgan.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -42,6 +44,8 @@ public class ChAprOrgan implements Serializable {
     /**
      * 创建时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date effTime;
 
     /**
@@ -52,11 +56,15 @@ public class ChAprOrgan implements Serializable {
     /**
      * 终止时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date endTime;
 
     /**
      * 首次操作时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date fcd;
 
     /**
@@ -67,6 +75,8 @@ public class ChAprOrgan implements Serializable {
     /**
      * 末次操作时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date lcd;
 
     /**
@@ -259,6 +269,8 @@ public class ChAprOrgan implements Serializable {
     /**
      * 审核时间（长护）
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date checkTimeCh;
 
     /**
@@ -279,6 +291,8 @@ public class ChAprOrgan implements Serializable {
     /**
      * 审核时间（理赔）
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date checkTimeLp;
 
     /**
@@ -287,4 +301,4 @@ public class ChAprOrgan implements Serializable {
     private Short checkStatusLp;
 
     private static final long serialVersionUID = 1L;
-}
+}
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

@@ -73,10 +73,6 @@ public class AprOrganServiceImpl extends ServiceImpl<AprOrganMapper, ChAprOrgan>
         if (chAprOrgan.getAprOrganId() == null) {
             //新增
             chAprOrgan.setEffTime(new Date());
-            chAprOrgan.setEndTime(new Date());
-            chAprOrgan.setLcd(new Date());
-            chAprOrgan.setCheckTimeCh(new Date());
-            chAprOrgan.setCheckTimeLp(new Date());
             chAprOrgan.setStatus((short) 0);
             aprOrganMapper.insert(chAprOrgan);
         } else {