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

@@ -18,5 +18,5 @@ import java.util.List;
  */
 public interface MouldOperationDynamicsMapper extends BaseMapper<MouldOperationDynamics> {
 
-    List<MouldOperationDynamics> selectOperationDynamicsList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, UserVO userVO);
+    List<MouldOperationDynamics> selectOperationDynamicsList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("userVO") UserVO userVO);
 }

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

@@ -84,16 +84,19 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                     msg.setError("当前模具编号已存在，请重新输入其他模具编号");
                     return msg;
                 } else {
-                    if (mould.getProduceCompanyId() != null) {
-                        Company company = companyMapper.selectById(mould.getProduceCompanyId());
-                        mould.setProduceCompanyName(company.getCompanyName());
-                        mould.setArea(company.getCompanyAddress());
-                    }
+//                    if (mould.getProduceCompanyId() != null) {
+//                        Company company = companyMapper.selectById(mould.getProduceCompanyId());
+//                        mould.setProduceCompanyName(company.getCompanyName());
+//                        mould.setArea(company.getCompanyAddress());
+//                    }
                     mould.setCreatorId(user.getId());
-                    mould.setCompanyId(user.getCompanyId());
+                    mould.setCompanyId(model.getCompanyId());
                     mould.setEquipmentId(model.getEquipmentId());
                     mould.setProjectId(model.getProjectId());
                     mould.setRunTimes(model.getRunTimes());
+                    mould.setProduceCompanyName(model.getProduceCompanyName());
+                    mould.setProduceCompanyId(model.getProduceCompanyId());
+                    mould.setArea(model.getArea());
                     mouldMapper.insert(mould);
                     //将之前的模具与项目和设备解绑
                     model.setProjectId(null);