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

@@ -3,6 +3,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.UserVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 public interface MouldOperationDynamicsMapper extends BaseMapper<MouldOperationDynamics> {
 
-    List<MouldOperationDynamics> selectOperationDynamicsList(Date startDate, Date endDate, UserVO userVO);
+    List<MouldOperationDynamics> selectOperationDynamicsList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, UserVO userVO);
 }

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

@@ -78,10 +78,6 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //更新模具操作
                 //取出之前模具的信息
                 Mould model = mouldMapper.selectById(mould.getPreUpdateId());
-                //将之前的模具与项目和设备解绑
-                model.setProjectId(null);
-                model.setEquipmentId(null);
-                mouldMapper.updateById(model);
                 //查询当前模具编号的模具是否存在
                 Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
                 if (count > 0) {
@@ -99,6 +95,10 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     mould.setProjectId(model.getProjectId());
                     mould.setRunTimes(model.getRunTimes());
                     mouldMapper.insert(mould);
+                    //将之前的模具与项目和设备解绑
+                    model.setProjectId(null);
+                    model.setEquipmentId(null);
+                    mouldMapper.updateById(model);
                 }
             } else {
                 //普通创建模具

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

@@ -25,6 +25,9 @@
     <select id="selectOperationDynamicsList">
         select
         <include refid="Base_Column_List"/>
-
+        from
+        tb_mould_operation_dynamics
+        where
+          indate between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') and (DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s'))
     </select>
 </mapper>