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/MouldFileController.java

@@ -237,8 +237,7 @@ public class MouldFileController {
      * @return
      */
     @ApiOperation("文档勾选批量下载")
-    @RequestMapping(value = "/downloadfileList",method=RequestMethod.GET,produces="application/json")
-    @ResponseBody
+    @RequestMapping(value = "/downloadfileList")
     public HttpRespMsg downloadfileList(UserVO userVO, HttpServletRequest request, HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
         try {

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

@@ -672,8 +672,8 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 //        Date startDate = df1.parse(date1.toString());
 //        Date endDate2 = calendar.getTime();
 //        Date endDate = df1.parse(date2.toString());
-//        SimpleDateFormat dateSdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat dateSdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat dateSdf2 = new SimpleDateFormat("yyyy年MM月dd+HH时mm分ss秒");
 //        String startDate = dateSdf.format(startDate1);
 //        String endDate = dateSdf.format(endDate2);
@@ -702,6 +702,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 rowList.add("模具报废");
             }
             //下载时间
+
             rowList.add(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(dynamic.getIndate())
             );
             list.add(rowList);
@@ -736,9 +737,10 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 
     public String download(HttpServletRequest request, HttpServletResponse response, String downloadPath, Mould vo, List<MouldFile> mouldFiles, String oldFilePath){
         //响应头的设置
-//        response.reset();
+        response.reset();
         response.setCharacterEncoding("utf-8");
-        response.setContentType("multipart/form-data");
+//        response.setContentType("multipart/form-data");
+        response.setContentType("application/x-download");
         //设置压缩包的名字
         //解决不同浏览器压缩包名字含有中文时乱码的问题
         String downloadName = vo.getModelNo() +".zip";

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

@@ -51,6 +51,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     ProjectApproveMapper projectApproveMapper;
     @Resource
     PowerMapper powerMapper;
+    @Resource
+    UserCompanyMapper userCompanyMapper;
 
     @Override
     public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user, String userIds,
@@ -478,26 +480,30 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId, Integer projectId) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer id, Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectById(id);
         QueryWrapper<User> qw = new QueryWrapper<User>();
+        List<Integer> ids = new ArrayList<>();
+        ids.add(-1);
         if (!"".equals(companyIds) && companyIds != null) {
-            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
-            //该项目的项目经理不能充当参与人
-            Integer managerId = -1;
-            if (projectId != null) {
-                Project project = projectMapper.selectById(projectId);
-                if (adminId == project.getManagerId()) {
-                    //是本项目的项目项目经理需要返回本人
-                    qw.eq("id", adminId);
-                }
+            ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
+        }
+        List<Integer> uids = new ArrayList<>();
+        uids.add(-1);
+        if(Constant.SYS_ID == user.getParentId()){
+            //资产方管理员
+            uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
+        }else{
+            //项目经理
+            if(null != projectId){
+                Project pro = projectMapper.selectById(projectId);
+                user = userMapper.selectById(pro.getCreatorId());
+                uids = userCompanyMapper.selectList(new QueryWrapper<UserCompany>().eq("cooperation_company_id", user.getCompanyId()).in("belong_company_id",ids)).stream().map(UserCompany::getUserId).collect(Collectors.toList());
             }
-            //所选公司下的人
-            qw.in("company_id", ids);
-            //不包含资产方的系统管理员
-            qw.ne("parent_id", Constant.SYS_ID);
-            msg.data = userMapper.selectList(qw);
         }
+        qw.in("id",uids).ne("id",id);
+        msg.data = userMapper.selectList(qw);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/util/ExcelUtil.java

@@ -131,14 +131,14 @@ public class ExcelUtil {
                     start++;
                 }
             }
-            OutputStream os = response.getOutputStream();//在线下载
+//            OutputStream os = response.getOutputStream();//在线下载
             File dir = null;
             dir = new File(downloadPath);
             // D://cloud/upload 文件上传后所存储的位置,部署到服务器上时配置服务器地址即可
             if (!dir.exists()) {
                 dir.mkdirs();
             }
-//            FileOutputStream os = new FileOutputStream(downloadPath+fileName);//保存到本地
+            FileOutputStream os = new FileOutputStream(downloadPath+fileName);//保存到本地
             workBook.write(os);
             os.flush();
             os.close();

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

@@ -46,8 +46,8 @@
         <where>
             mould_id = #{userVO.mouldId}
             and content = '下载'
-            <if test="startTime != null and endTime != null">
-                and DATE_FORMAT(indate,'%Y-%m-%d') between #{startTime} and #{endTime}
+            <if test="userVO.startTime != null and userVO.endTime != null">
+                and DATE_FORMAT(indate,'%Y-%m-%d') between #{userVO.startTime} and #{userVO.endTime}
             </if>
         </where>
     </select>