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

@@ -2,6 +2,10 @@ package com.hssx.cloudmodel.mapper;
 
 import com.hssx.cloudmodel.entity.MouldOperationDynamics;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hssx.cloudmodel.entity.vo.UserVO;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MouldOperationDynamicsMapper extends BaseMapper<MouldOperationDynamics> {
 
+    List<MouldOperationDynamics> selectOperationDynamicsList(Date startDate, Date endDate, UserVO userVO);
 }

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

@@ -634,12 +634,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         Date startDate = df1.parse(date1.toString());
         Date endDate = df1.parse(date2.toString());
         SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<MouldOperationDynamics> mouldOperationDynamics  = new ArrayList<>();
         if (userVO.getStartTime() != null && userVO.getEndTime() != null) {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             qw.le("indate",startDate);
             qw.ge("indate", endDate);
+            mouldOperationDynamics = mouldOperationDynamicsMapper.selectOperationDynamicsList(startDate,endDate,userVO);
         }
-        List<MouldOperationDynamics> mouldOperationDynamics = mouldOperationDynamicsMapper.selectList(qw);
+
         for (MouldOperationDynamics dynamic : mouldOperationDynamics) {
             List<String> rowList = new ArrayList<String>();
             //文件名
@@ -676,6 +677,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         boolean isCanCreate = false;
         if (user == null) {
             msg.setError("用户不存在或者未登录");
+            return msg;
         }else{
             MouldOperationDynamics dynamics = mouldOperationDynamicsMapper.selectOne(new QueryWrapper<MouldOperationDynamics>().eq("belongType", 4).eq("mould_id", userVO.getMouldId()).orderByDesc("id"));
             if(null != dynamics){

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

@@ -22,5 +22,9 @@
     <sql id="Base_Column_List">
         id, file_id, operator_id, operator_name, indate, file_name, belong_type, content, mould_id, is_pass, applicant_id, applicant_name
     </sql>
+    <select id="selectOperationDynamicsList">
+        select
+        <include refid="Base_Column_List"/>
 
+    </select>
 </mapper>