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

@@ -41,13 +41,13 @@ public class MouldOperationDynamicsController {
     @ResponseBody
     public HttpRespMsg list(MouldOperationDynamics mouldOperationDynamics){
         HttpRespMsg msg = new HttpRespMsg();
+        List<Integer> list = new ArrayList<>();
         if(4 == mouldOperationDynamics.getBelongType()){
-            List<Integer> list = new ArrayList<>();
             list = recursion(mouldOperationDynamics.getMouldId(),list);
-            msg.data = mDynamicsService.list(new QueryWrapper<MouldOperationDynamics>().in("mould_id",list).eq("belong_type",mouldOperationDynamics.getBelongType()).orderByDesc("id"));
         }else{
-            msg.data = mDynamicsService.list(new QueryWrapper<MouldOperationDynamics>().eq("mould_id",mouldOperationDynamics.getMouldId()).eq("belong_type",mouldOperationDynamics.getBelongType()).orderByDesc("id"));
+            list.add(mouldOperationDynamics.getMouldId());
         }
+        msg.data = mDynamicsService.getlist(list,mouldOperationDynamics);
         return msg;
     }
 

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

@@ -0,0 +1,15 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.MouldOperationDynamics;
+import lombok.Data;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 08 - 23 10:30
+ * Description:<描述>
+ * Version: 1.0
+ */
+@Data
+public class MouldOperationDynamicsVO extends MouldOperationDynamics {
+    private String mouldNo;
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldOperationDynamicsMapper.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.MouldOperationDynamics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.MouldOperationDynamicsVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,7 @@ import java.util.List;
 public interface MouldOperationDynamicsMapper extends BaseMapper<MouldOperationDynamics> {
 
     List<MouldOperationDynamics> selectOperationDynamicsList(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("userVO") UserVO userVO);
+
+    List<MouldOperationDynamicsVO> getlist(@Param("list") List<Integer> list, @Param("mouldOperationDynamics")MouldOperationDynamics mouldOperationDynamics);
+
 }

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

@@ -2,6 +2,9 @@ package com.hssx.cloudmodel.service;
 
 import com.hssx.cloudmodel.entity.MouldOperationDynamics;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.cloudmodel.util.HttpRespMsg;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface MouldOperationDynamicsService extends IService<MouldOperationDynamics> {
 
+    HttpRespMsg getlist(List<Integer> list, MouldOperationDynamics mouldOperationDynamics);
 }

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

@@ -4,8 +4,12 @@ import com.hssx.cloudmodel.entity.MouldOperationDynamics;
 import com.hssx.cloudmodel.mapper.MouldOperationDynamicsMapper;
 import com.hssx.cloudmodel.service.MouldOperationDynamicsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +21,12 @@ import org.springframework.stereotype.Service;
 @Service
 public class MouldOperationDynamicsServiceImpl extends ServiceImpl<MouldOperationDynamicsMapper, MouldOperationDynamics> implements MouldOperationDynamicsService {
 
+    @Resource
+    MouldOperationDynamicsMapper mouldOperationDynamicsMapper;
+    @Override
+    public HttpRespMsg getlist(List<Integer> list, MouldOperationDynamics mouldOperationDynamics) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = mouldOperationDynamicsMapper.getlist(list,mouldOperationDynamics);
+        return msg;
+    }
 }

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

@@ -246,13 +246,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     map.put("download", 1);
                     map.put("view", 1);
                     map.put("approve", approve);
-                } else if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId())) > 0) {
-                    //是否为审批人
-                    map.put("update", 0);
-                    map.put("download", 1);
-                    map.put("view", 1);
-                    map.put("approve", 1);
-                } else {
+                }else {
                     //该项目的参与人
                     Integer update = 0;
                     Integer download = 0;

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

@@ -352,7 +352,6 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     projects = projectMapper.getProjectListByUidInProjectIds(keyName, projectIds);
                 }
             } else {
-
                 QueryWrapper<Project> qwPro = new QueryWrapper<>();
                 qwPro.eq("manager_id", user.getId());
                 projectIds = projectMapper.selectList(qwPro).stream().map(Project::getId).collect(Collectors.toList());
@@ -410,7 +409,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("download", 1);
             map.put("view", 1);
             map.put("approve", approve);
-        } else if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId())) > 0) {
+        } /*else if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", user.getId())) > 0) {
             //是否为审批人
             //该项目的参与人
             Integer update = 0;
@@ -435,7 +434,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("download", download);
             map.put("view", view);
             map.put("approve", approve);
-        } else {
+        }*/ else {
             //该项目的参与人
             Integer update = 0;
             Integer download = 0;

cloud-model/src/main/resources/application-prod.properties

@@ -37,7 +37,7 @@ spring.thymeleaf.prefix=classpath:/static/
 # 文件上传路径
 upload.path=E:/staticproject/cloudmodel
 ######################################################################################################
-# 文件上传路径
+# 文件下载路径
 download.path=E:/mould/download/
 # 邀请人员链接前缀
 invitation.url.prefix=https://118.190.47.230:9098/#/invite/

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

@@ -221,7 +221,7 @@ select
     <update id="updateModelProjectIdAndEquipmentIdToNullById">
         update
           tb_mould
-          SET project_id = NULL , equipment_id = NULL
+          SET /*project_id = NULL , */equipment_id = NULL
           where id = #{model.id}
     </update>
 </mapper>

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

@@ -17,6 +17,22 @@
         <result column="applicant_id" property="applicantId"/>
         <result column="applicant_name" property="applicantName"/>
     </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldOperationDynamicsVO">
+        <id column="id" property="id"/>
+        <result column="file_id" property="fileId"/>
+        <result column="operator_id" property="operatorId"/>
+        <result column="operator_name" property="operatorName"/>
+        <result column="indate" property="indate"/>
+        <result column="file_name" property="fileName"/>
+        <result column="belong_type" property="belongType"/>
+        <result column="content" property="content"/>
+        <result column="mould_id" property="mouldId"/>
+        <result column="is_pass" property="isPass"/>
+        <result column="applicant_id" property="applicantId"/>
+        <result column="applicant_name" property="applicantName"/>
+        <result column="mouldNo" property="mouldNo"/>
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
@@ -35,4 +51,23 @@
             </if>
         </where>
     </select>
+    <select id="getlist" resultMap="BaseResultMapVO">
+        select
+        tmod.id, tmod.file_id, tmod.operator_id, tmod.operator_name, tmod.indate, tmod.file_name, tmod.belong_type,
+        tmod.content, tmod.mould_id, tmod.is_pass, tmod.applicant_id, tmod.applicant_name,tbm.model_no mouldNo
+        from
+          tb_mould_operation_dynamics tmod
+        left join
+          tb_mould tbm
+        on
+          tmod.mould_id = tbm.id
+        <where>
+            tmod.mould_id in
+            <foreach collection="list" index="index" open="(" item="item" close=")" separator=",">
+                #{item}
+            </foreach>
+            and tmod.belong_type = #{mouldOperationDynamics.belongType}
+            Order By tmod.id desc
+        </where>
+</select>
 </mapper>

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

@@ -181,7 +181,7 @@
         on
           pu.user_id = u.id
         where
-          pu.project_id = #{id}
+          pu.project_id = #{id} and pu.role_type != 1
     </select>
 
     <resultMap id="BaseResultMapPowerList" type="com.hssx.cloudmodel.entity.vo.ProjectVO">