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/service/impl/MouldServiceImpl.java

@@ -164,7 +164,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     public HttpRespMsg maintenanceReminder() throws Exception {
         HttpRespMsg msg = new HttpRespMsg();
         //查询所有被分配到项目的模具
-        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().isNotNull("project_id"));
+        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().isNotNull("project_id").isNotNull("maintain_count"));
         for (Mould mould : moulds) {
             List<Integer> counts = ListUtil.convertIntegerIdsArrayToList(mould.getMaintainCount());
             Collections.sort(counts);

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

@@ -44,6 +44,7 @@
         on  tbmf.part_id = tbp.id
         where
           mould_id = #{userVO.mouldId}
+          group by tbp.id
     </select>
     <select id="getPart2dFileByPartId" resultType="com.hssx.cloudmodel.entity.MouldFile">
         select
@@ -54,6 +55,7 @@
             tb_mould_file
         where
             part_id = #{id}
+            and dwg_type = 0
     </select>
     <select id="getPart3dFileByPartId" resultType="com.hssx.cloudmodel.entity.MouldFile">
         select
@@ -64,5 +66,6 @@
             tb_mould_file
         where
             part_id = #{id}
+        and dwg_type = 1
     </select>
 </mapper>