Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldFile.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -43,6 +45,7 @@ public class MouldFile extends Model<MouldFile> {
      * 上传时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldOperationDynamics.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -49,6 +51,7 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
      * 操作的时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -285,7 +285,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
-                            dynamics.setApplicantName(mf.getUploadtor());
                             dynamics.setBelongType(oldData.getBlongType());
                             dynamics.setContent(Constant.APPROVAL);
                             dynamics.setOperatorName(approverNames);
@@ -295,9 +294,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }else if(mf.getState() < 0){
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
                         if(count == 0){
+                            dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
-                            dynamics.setApplicantName(mf.getUploadtor());
                             dynamics.setBelongType(oldData.getBlongType());
                             dynamics.setContent(Constant.APPROVAL);
                             dynamics.setOperatorName(approverNames);
@@ -349,7 +348,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                             dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
-                            dynamics.setApplicantName(mf.getUploadtor());
                             dynamics.setBelongType(oldData.getBlongType());
                             dynamics.setContent(Constant.APPROVAL);
                             dynamics.setOperatorName(approverNames);
@@ -359,9 +357,9 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }else if(mf.getState() < 0){
                         Integer count = mouldOperationDynamicsMapper.selectCount(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("is_pass", 0).eq("mould_id", oldData.getModelId()));
                         if(count == 0){
+                            dynamics.setMouldId(oldData.getModelId());
                             dynamics.setApplicantName(oldData.getUploadtor());
                             dynamics.setApplicantId(oldData.getUplodtorId());
-                            dynamics.setApplicantName(mf.getUploadtor());
                             dynamics.setBelongType(oldData.getBlongType());
                             dynamics.setContent(Constant.APPROVAL);
                             dynamics.setOperatorName(approverNames);