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/constant/Constant.java

@@ -31,6 +31,7 @@ public class Constant {
     public static final String MOULD_PREFIX = "YMMJ";//模具编号前缀
     public static final String PROJECT_PREFIX = "YMXM";//项目编号
     public static final String UPLOAD = "上传";//上传
+    public static final String UPDATE = "申请模具更新";//申请模具更新
     public static final String DOWNLOAD = "下载";//下载
     public static final String APPROVAL = "审批";//审批
     public static final Integer UPDATE_AUTHORITY = 0;//修改权限

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -75,17 +75,16 @@ public class UserController {
     /**
      * 添加/修改用户
      * @param user
-     * 参数：id 用户id  account 账号  password 密码 username 姓名
+     * 参数：id 用户id   password 密码 username 姓名
      * @return
      */
-    @ApiOperation("修改用户密码")
+    @ApiOperation("修改用户名或密码")
     @RequestMapping("/updatePassword")
     @ResponseBody
     public HttpRespMsg updatePassword(User user, HttpServletRequest request,
                                         HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        user.setPassword(MD5Util.getPassword(user.getPassword()));
-        msg.data = userService.updateById(user);
+        msg = userService.changeUserInfo(user);
         return msg;
     }
 

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

@@ -25,4 +25,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg pageList(PageUtil page,Integer companyId,Integer flag,String keyName,User user,Integer roleType);
 
     HttpRespMsg deleteUser(User user);
+
+    HttpRespMsg changeUserInfo(User user);
 }

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

@@ -189,7 +189,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     }
                 }
                 msg.data = projectFile;
-            }else{
+            }else {
                 //模具更新操作
                 MouldFile projectFile = new MouldFile();
                 projectFile.setUplodtorId(user.getId());
@@ -197,6 +197,34 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 projectFile.setModelId(userVO.getMouldId());
                 projectFile.setBlongType(blongType);
                 mouldFileMapper.insert(projectFile);
+                //添加上传记录
+                MouldOperationDynamics dynamics = new MouldOperationDynamics();
+                dynamics.setContent(Constant.UPDATE);
+                dynamics.setOperatorId(user.getId());
+                dynamics.setOperatorName(user.getUsername());
+                dynamics.setMouldId(userVO.getMouldId());
+                dynamics.setBelongType(blongType);
+                mouldOperationDynamicsMapper.insert(dynamics);
+                Mould mould = mouldMapper.selectById(userVO.getMouldId());
+                Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("id", mould.getProjectId()));
+                List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                String content = "";
+                for (ProjectApprove projectApprove : projectApproves) {
+                    NewsNotice newsNotice = new NewsNotice();
+                    newsNotice.setRefId(projectFile.getId());
+                    newsNotice.setProjectId(project.getId());
+                    newsNotice.setProjectName(project.getProjectName());
+                    newsNotice.setNoticeType(Constant.APPROVEL_TYPE);
+                    if (blongType == 4) {
+                        content = "模具更新";
+                    }
+                    newsNotice.setContent("有新的" + content + "申请记录,待您审批。");
+                    newsNoticeMapper.insert(newsNotice);
+                    NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
+                    newsNoticeUser.setUserId(user.getId());
+                    newsNoticeUser.setNewsId(newsNotice.getId());
+                    newsNoticeUserMapper.insert(newsNoticeUser);
+                }
             }
         } else {
             msg.setError("当前用户不存在或者未登录");

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

@@ -149,6 +149,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return msg;
     }
 
+    @Override
+    public HttpRespMsg changeUserInfo(User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User newUser = new User();
+        newUser.setId(user.getId());
+        if (null == user.getPassword()) {
+            newUser.setPassword(MD5Util.getPassword(user.getPassword()));
+        }
+        if(null == user.getUsername()){
+            newUser.setUsername(user.getUsername());
+        }
+        userMapper.updateById(newUser);
+        return msg;
+    }
+
     @Override
     public HttpRespMsg addAndUpdateUser(User user, Integer flag, Integer addType, Integer projectId) {
         //获取该账号的创建者