修改模具设备选择接口

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

@@ -1,7 +1,10 @@
 package com.hssx.cloudmodel.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hssx.cloudmodel.entity.Mould;
 
+import java.time.LocalDateTime;
+
 /**
  * Author: 吴涛涛 cuiyi@itany.com
  * Date : 2019 - 08 - 05 13:49
@@ -11,4 +14,8 @@ import com.hssx.cloudmodel.entity.Mould;
 public class MouldVO extends Mould {
     private String mouldEquipmentNo;
     private String projectName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endTime;
+    private String mangerName;
+    private String equipmentNo;
 }

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

@@ -3,12 +3,14 @@ package com.hssx.cloudmodel.mapper;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 吴涛涛
@@ -16,5 +18,5 @@ import java.util.List;
  */
 public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
-    List<MouldEquipmentVO> getListByCompanyId(Integer belongCompanyId);
+    List<MouldEquipmentVO> getListByCompanyId(@Param("belongCompanyId") Integer belongCompanyId,@Param("list") List<Integer> ides);
 }

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

@@ -4,19 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hssx.cloudmodel.constant.Constant;
+import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.MouldEquipmentVO;
 import com.hssx.cloudmodel.mapper.MouldEquipmentMapper;
+import com.hssx.cloudmodel.mapper.MouldMapper;
 import com.hssx.cloudmodel.service.MouldEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +35,8 @@ import java.util.List;
 public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper, MouldEquipment> implements MouldEquipmentService {
     @Resource
     MouldEquipmentMapper mouldEquipmentMapper;
+    @Resource
+    MouldMapper mouldMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMouldEquipment(MouldEquipment mouldEquipment, User user) {
@@ -86,7 +92,15 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
     @Override
     public HttpRespMsg getListByCompanyId(MouldEquipmentVO mouldEquipmentVO) {
         HttpRespMsg msg = new HttpRespMsg();
-        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId());
+        List<Integer> ides = new ArrayList<>();
+        List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().eq("company_id", mouldEquipmentVO.getBelongCompanyId()));
+        for (Mould mould : moulds) {
+            ides.add(mould.getEquipmentId());
+        }
+        if(ides.size()==0){
+            ides.add(-1);
+        }
+        List<MouldEquipmentVO> list = mouldEquipmentMapper.getListByCompanyId(mouldEquipmentVO.getBelongCompanyId(),ides);
         msg.data = list;
         return msg;
     }

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

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.MouldMapper;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -28,10 +30,21 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         HttpRespMsg msg = new HttpRespMsg();
         if(mould.getId() != null){
             //修改
-            mouldMapper.updateById(mould);
+            Mould m = mouldMapper.selectOne(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
+            if((m != null && m.getId()==mould.getId()) || m == null){
+                mouldMapper.updateById(mould);
+            }else{
+                msg.setError("当前模具编号已存在，请重新输入其他模具编号");
+            }
         }else{
-            mould.setCreatorId(user.getId());
-            mouldMapper.insert(mould);
+            //查询当前模具编号的模具是否存在
+            Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
+            if(count>0){
+                msg.setError("当前模具编号已存在，请重新输入其他模具编号");
+            }else{
+                mould.setCreatorId(user.getId());
+                mouldMapper.insert(mould);
+            }
         }
         return msg;
     }

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

@@ -43,5 +43,13 @@
           tb_company tbc
         on
           tbme.belong_company_id = tbc.id
+        where
+          tbme.belong_company_id = #{belongCompanyId}
+        and
+        tbme.id not in
+        <foreach item="item" index="index" collection="list"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
     </select>
 </mapper>

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

@@ -32,8 +32,6 @@
         <id column="id" property="id" />
         <result column="model_no" property="modelNo" />
         <result column="model_name" property="modelName" />
-        <result column="water_gap" property="waterGap" />
-        <result column="tonnage" property="tonnage" />
         <result column="oc_cycle" property="ocCycle" />
         <result column="daily_output" property="dailyOutput" />
         <result column="company_id" property="companyId" />
@@ -51,6 +49,8 @@
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
+        <result column="projectName" property="projectName" />
+        <result column="mangerName" property="mangerName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -63,7 +63,8 @@
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         select
-          tbm.model_no model_no, tbm.model_name, tbmp.end_time,tbm.state,tbm.project_name,manger_name,factory_name,area,equipment_no
+          tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+          tbp.manger_name mangerName,tbm.factory_name factory_name,tbm.area area,tbm.equipment_no equipmentNo,tbm.setting_life setting_life
         from
           tb_mould tbm
         left join
@@ -71,7 +72,15 @@
         on
           tbm.equipment_id = tbmp.id
         left join
-
-
+         tb_project  tbp
+        on tbp.id = tbm.project_id
+        <where>
+            <if test="userVO.serchType == 0">
+                tbp.project_name like concat('%',#{userVO.keyName},'%')
+            </if>
+            <if test="userVO.serchType == 1">
+                tbm.model_no like concat('%',#{userVO.keyName},'%')
+            </if>
+        </where>
     </select>
 </mapper>