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/controller/ProjectFileController.java

@@ -28,7 +28,6 @@ import java.util.UUID;
  * @since 2019-07-30
  */
 @Controller
-@CrossOrigin
 @RequestMapping("/projectfile")
 public class ProjectFileController {
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldEquipment.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;
 
 /**
@@ -37,12 +39,14 @@ public class MouldEquipment extends Model<MouldEquipment> {
      * 启动时间
      */
     @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Part.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 Part extends Model<Part> {
      * 添加的时间
      */
     @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

@@ -142,46 +142,46 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     mouldFileMapper.insert(projectFile);
                     Project project = projectMapper.selectById(mould.getProjectId());
                     Integer count = projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId()).eq("project_id", project.getId()));
-                    if(count>0){
-                        if (user.getSubordinateType() == 0) {
-                            //上传人为资产方审批人,自动审核通过
-                            projectFile.setState(1);
-                            MouldOperationDynamics dynamics = new MouldOperationDynamics();
-                            dynamics.setMouldId(userVO.getMouldId());
-                            dynamics.setBelongType(blongType);
-                            dynamics.setFileId(projectFile.getId());
-                            if (null != projectFile.getFileName2()) {
-                                dynamics.setFileName(projectFile.getFileName() + "," + projectFile.getFileName2());
-                            } else {
-                                dynamics.setFileName(projectFile.getFileName());
-                            }
-                            dynamics.setOperatorId(user.getId());
-                            dynamics.setOperatorName(user.getUsername());
-                            dynamics.setContent(Constant.APPROVAL);
-                            mouldOperationDynamicsMapper.insert(dynamics);
-                        } else if (user.getSubordinateType() == 1) {
-                            //上传人为生产方，自动审核通过
-                            projectFile.setState(2);
-                            //上传人为资产方审批人,自动审核通过
-                            MouldOperationDynamics dynamics = new MouldOperationDynamics();
-                            dynamics.setMouldId(userVO.getMouldId());
-                            dynamics.setBelongType(blongType);
-                            dynamics.setFileId(projectFile.getId());
-                            if (null != projectFile.getFileName2()) {
-                                dynamics.setFileName(projectFile.getFileName() + "," + projectFile.getFileName2());
-                            } else {
-                                dynamics.setFileName(projectFile.getFileName());
-                            }
-                            dynamics.setOperatorId(user.getId());
-                            dynamics.setOperatorName(user.getUsername());
-                            dynamics.setContent(Constant.APPROVAL);
-                            mouldOperationDynamicsMapper.insert(dynamics);
-                        } else {
-                            projectFile.setState(0);
-                        }
-                    }else{
+//                    if(count>0){
+//                        if (user.getSubordinateType() == 0) {
+//                            //上传人为资产方审批人,自动审核通过
+//                            projectFile.setState(1);
+//                            MouldOperationDynamics dynamics = new MouldOperationDynamics();
+//                            dynamics.setMouldId(userVO.getMouldId());
+//                            dynamics.setBelongType(blongType);
+//                            dynamics.setFileId(projectFile.getId());
+//                            if (null != projectFile.getFileName2()) {
+//                                dynamics.setFileName(projectFile.getFileName() + "," + projectFile.getFileName2());
+//                            } else {
+//                                dynamics.setFileName(projectFile.getFileName());
+//                            }
+//                            dynamics.setOperatorId(user.getId());
+//                            dynamics.setOperatorName(user.getUsername());
+//                            dynamics.setContent(Constant.APPROVAL);
+//                            mouldOperationDynamicsMapper.insert(dynamics);
+//                        } else if (user.getSubordinateType() == 1) {
+//                            //上传人为生产方，自动审核通过
+//                            projectFile.setState(2);
+//                            //上传人为资产方审批人,自动审核通过
+//                            MouldOperationDynamics dynamics = new MouldOperationDynamics();
+//                            dynamics.setMouldId(userVO.getMouldId());
+//                            dynamics.setBelongType(blongType);
+//                            dynamics.setFileId(projectFile.getId());
+//                            if (null != projectFile.getFileName2()) {
+//                                dynamics.setFileName(projectFile.getFileName() + "," + projectFile.getFileName2());
+//                            } else {
+//                                dynamics.setFileName(projectFile.getFileName());
+//                            }
+//                            dynamics.setOperatorId(user.getId());
+//                            dynamics.setOperatorName(user.getUsername());
+//                            dynamics.setContent(Constant.APPROVAL);
+//                            mouldOperationDynamicsMapper.insert(dynamics);
+//                        } else {
+//                            projectFile.setState(0);
+//                        }
+//                    }else{
                         projectFile.setState(0);
-                    }
+//                    }
                     //添加上传记录
                     MouldOperationDynamics dynamics = new MouldOperationDynamics();
                     dynamics.setContent(Constant.UPLOAD);

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

@@ -343,6 +343,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 if (count > 0) {
                     User existingUser = userMapper.selectOne(qw);
                     List<Integer> uids = userMapper.selectList(new QueryWrapper<User>().eq("parent_id", parentUser.getId())).stream().map(User::getId).collect(Collectors.toList());
+                    uids.add(-1);
                     Integer countUser = userMapper.selectCount(new QueryWrapper<User>().in("parent_id", uids));
                     if (existingUser.getParentId() == parentUser.getId()||countUser>0) {
                         msg.setError("该账号已存在，请勿重新创建");