模具详情

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -70,7 +70,8 @@ public class MouldController {
 
     /**
      * 给项目分配模具获取该公司下的模具列表
-     * token 当前人唯一权限
+     * token 当前人唯一权限 pageNum 当前页码，pageSize 每页条数  projectId 项目id筛选（默认传-1）
+     * serchType 搜索类型0-模具编号，1-模具名称(默认传-1) keyName 关键字查询
      * @return
      */
     @ApiOperation("模具列表")

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

@@ -12,7 +12,7 @@ public class UserVO extends User {
     private String companyName;
     private String roleName;
     private String keyName;//项目名称
-    private Integer serchType;//搜索类型0-项目名称，1-模具编号
+    private Integer serchType;//搜索类型0-模具编号，1-模具名称
     private Integer projectId;
 
     public Integer getProjectId() {

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

@@ -19,4 +19,6 @@ import java.util.List;
 public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
     List<MouldEquipmentVO> getListByCompanyId(@Param("belongCompanyId") Integer belongCompanyId,@Param("list") List<Integer> ides);
+
+    List<MouldEquipment> getList();
 }

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

@@ -79,7 +79,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         if (user != null) {
             if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 PageHelper.startPage(page.getPageNum(), page.getPageSize());
-                List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.selectList(new QueryWrapper<MouldEquipment>());
+                List<MouldEquipment> mouldEquipments = mouldEquipmentMapper.getList();
                 PageInfo<MouldEquipment> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
             } else {

cloud-model/src/main/java/com/hssx/cloudmodel/util/PageUtil.java

@@ -6,7 +6,7 @@ import java.util.List;
 /**
  * Author: 吴涛涛 cuiyi@itany.com
  * Date : 2019 - 07 - 27 9:25
- * Description:<描述>
+ * Description:<描述> 模仿pagehelper参数的分页封装类
  * Version: 1.0
  */
 public class PageUtil<T> {

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

@@ -52,4 +52,16 @@
             #{item}
         </foreach>
     </select>
+    <select id="getList" resultMap="BaseResultMapVO">
+        select
+          tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,
+          tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
+          tbme.is_use, tbme.hill_number,tbc.company_name companyName
+        from
+          tb_mould_equipment tbme
+        left join
+          tb_company tbc
+        on
+          tbme.belong_company_id = tbc.id
+    </select>
 </mapper>