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/mapper/UserMapper.java

@@ -21,5 +21,5 @@ public interface UserMapper extends BaseMapper<User> {
 
     UserVO getUserByAccount(@Param("userVO") UserVO userVO);
 
-    List<UserVO> selectUserListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("keyName") String keyName,@Param("list")List<Integer> uIds);
+    List<UserVO> selectUserListByCondition(@Param("roleType") Integer roleType, @Param("companyId")Integer companyId,@Param("flag") Integer flag, @Param("keyName") String keyName,@Param("list")List<Integer> uIds,@Param("user")User user);
 }

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

@@ -96,23 +96,6 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                     projectFile.setFileType(sufix);//文件后缀
                     projectFile.setFileUrl("/upload/" + fileName);
                     projectFile.setBlongType(blongType);
-                    Mould mou = mouldMapper.selectById(userVO.getMouldId());
-                    Project project = projectMapper.selectById(mou.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);
-
-                        } else if (user.getSubordinateType() == 1) {
-                            //上传人为生产方，自动审核通过
-                            projectFile.setState(2);
-                        } else {
-                            projectFile.setState(0);
-                        }
-                    }else{
-                        projectFile.setState(0);
-                    }
                     File saveFile = new File(dir, fileName);
                     try {
                         saveFile.createNewFile();
@@ -136,9 +119,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         fileName2 = rand + sufix;
                         projectFile.setFileType2(sufix);//文件后缀
                         projectFile.setFileUrl2("/upload/" + fileName2);
-
                         File saveFile2 = new File(dir, fileName2);
-
                         try {
                             saveFile2.createNewFile();
                             file2.transferTo(saveFile2);
@@ -159,7 +140,48 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         projectFile.setDwgType(userVO.getDwgType());
                     }
                     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{
+                        projectFile.setState(0);
+                    }
                     //添加上传记录
                     MouldOperationDynamics dynamics = new MouldOperationDynamics();
                     dynamics.setContent(Constant.UPLOAD);

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

@@ -537,7 +537,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
             } else if (Constant.SYS_ID == userVO.getParentId()) {
-
                 if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
                     //资产方管理员
                     moulds = mouldMapper.selectListByCondition(userVO);

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

@@ -92,7 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
                 uIds.addAll(projectApproveIds);
                 uIds.add(-1);
-                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
+                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds,user);
             } else if (user.getSubordinateType() == 1) {
                 List<Integer> projectIds = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("company_id", user.getCompanyId())).stream().map(CustomCompany::getProjectId).collect(Collectors.toList());
                 projectIds.add(-1);
@@ -102,7 +102,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", projectIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
                 uIds.addAll(projectApproveIds);
                 uIds.add(-1);
-                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
+                users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds,user);
+                //去除项目经理自己
             }
         } else {
             List<Integer> pIds = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", user.getId())).stream().map(Project::getId).collect(Collectors.toList());
@@ -112,7 +113,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", pIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
             uIds.addAll(projectApproveIds);
             uIds.add(-1);
-            users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds);
+            users = userMapper.selectUserListByCondition(roleType, companyId, flag, keyName, uIds,user);
         }
         List<Project> projects = new ArrayList<>();
         for (UserVO userVO : users) {
@@ -195,7 +196,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                             projects = projectMapper.selectList(qw);
                             userVO.setProjects(projects);
                         }
-                    } else {
+                    }
+                }else{
                         List<Integer> pIds = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", user.getId())).stream().map(Project::getId).collect(Collectors.toList());
                         pIds.add(-1);
                         if (user.getSubordinateType() == 0) {
@@ -223,7 +225,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                             userVO.setProjects(projects);
                         }
                     }
-                }
             } else {
                 msg.setError("当前用户未登录，或者用户不存在");
             }

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -125,7 +125,7 @@
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbp.manager_id managerId,tbm.equipment_id equipment_id,is_maintain,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.holes,tbm.pre_update_id,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.holes,tbm.pre_update_id,tbco.company_name produceCompany,
         tbp.manager mangerName,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times,
         tbmp.lng,tbmp.lat
@@ -143,6 +143,10 @@
         tb_company tbc
         on
         tbc.id = tbm.company_id
+        left join
+        tb_company tbco
+        on
+        tbco.id = tbm.produce_company_id
         <where>
             <if test="userVO.searchType == 0 and userVO.keyName != '' and userVO.keyName != null">
                 AND tbm.model_no like concat('%',#{userVO.keyName},'%')

cloud-model/src/main/resources/mapper/UserMapper.xml

@@ -88,6 +88,7 @@
             <foreach collection="list" index="index" open="(" item="item" close=")" separator=",">
               #{item}
         </foreach>
+            and u.id != #{user.id}
             <if test="flag==0 and keyName != '' and keyName !=null">
                 AND u.username like concat('%',#{keyName},'%')
             </if>